diff --git a/modules/Migration/schema/540_to_600RC.php b/modules/Migration/schema/540_to_600RC.php
index 96054ff69daa1364d34ebfaecd88810c2b92b899..f7bda04ee05732d4480817c64911415f53427c11 100644
--- a/modules/Migration/schema/540_to_600RC.php
+++ b/modules/Migration/schema/540_to_600RC.php
@@ -1551,7 +1551,7 @@ foreach ($inventoryModules as $key => $moduleName) {
 	$field->displaytype = '5';
 	$field->masseditable = '0';
 	$field->quickcreate = '0';
-	$field->columntype = 'INT(11)';
+	$field->columntype = 'DECIMAL(25,3)';
 	$blockInstance->addField($field);
 }
 
diff --git a/modules/Migration/schema/811_to_812.php b/modules/Migration/schema/811_to_812.php
index 795ce6e92c5090d429e68776e19b7b4356c53e0d..d0315444bb21edc529a41c26dcc628b7deb84fc0 100644
--- a/modules/Migration/schema/811_to_812.php
+++ b/modules/Migration/schema/811_to_812.php
@@ -36,4 +36,9 @@ if (defined('VTIGER_UPGRADE')) {
     $db->pquery("ALTER TABLE vtiger_products MODIFY COLUMN productname VARCHAR(255)", array());
     $db->pquery("ALTER TABLE vtiger_service MODIFY COLUMN servicename VARCHAR(255)", array());
 
+    // Shipping & Handling tax column data-type should be consistent (for Invoice fixed in 660 migration).
+    $db->pquery('ALTER TABLE vtiger_salesorder MODIFY s_h_percent DECIMAL(25,3)', array());
+    $db->pquery('ALTER TABLE vtiger_purchaseorder MODIFY s_h_percent DECIMAL(25,3)', array());
+    $db->pquery('ALTER TABLE vtiger_quotes MODIFY s_h_percent DECIMAL(25,3)', array());
+
 }