diff --git a/migration/i5.1/oracle/201809081552_IDEMPIERE-2621.sql b/migration/i5.1/oracle/201809081552_IDEMPIERE-2621.sql
new file mode 100644
index 0000000000..84e388b740
--- /dev/null
+++ b/migration/i5.1/oracle/201809081552_IDEMPIERE-2621.sql
@@ -0,0 +1,19 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-2621 Assign default warehouse from Org on inventory docs
+-- Sep 8, 2018 3:47:28 PM CEST
+UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_DATE('2018-09-08 15:47:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3523
+;
+
+-- Sep 8, 2018 3:48:02 PM CEST
+UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_DATE('2018-09-08 15:48:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3544
+;
+
+-- Sep 8, 2018 3:48:30 PM CEST
+UPDATE AD_Column SET AD_Val_Rule_ID=130, Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_DATE('2018-09-08 15:48:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=11469
+;
+
+SELECT register_migration_script('201809081552_IDEMPIERE-2621.sql') FROM dual
+;
+
diff --git a/migration/i5.1/postgresql/201809081552_IDEMPIERE-2621.sql b/migration/i5.1/postgresql/201809081552_IDEMPIERE-2621.sql
new file mode 100644
index 0000000000..3ac8826da0
--- /dev/null
+++ b/migration/i5.1/postgresql/201809081552_IDEMPIERE-2621.sql
@@ -0,0 +1,16 @@
+-- IDEMPIERE-2621 Assign default warehouse from Org on inventory docs
+-- Sep 8, 2018 3:47:28 PM CEST
+UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_TIMESTAMP('2018-09-08 15:47:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3523
+;
+
+-- Sep 8, 2018 3:48:02 PM CEST
+UPDATE AD_Column SET Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_TIMESTAMP('2018-09-08 15:48:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=3544
+;
+
+-- Sep 8, 2018 3:48:30 PM CEST
+UPDATE AD_Column SET AD_Val_Rule_ID=130, Callout='org.compiere.model.CalloutOrder.organization',Updated=TO_TIMESTAMP('2018-09-08 15:48:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=11469
+;
+
+SELECT register_migration_script('201809081552_IDEMPIERE-2621.sql') FROM dual
+;
+
diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
index 63a68e61fc..704a2eb6ab 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
@@ -1356,6 +1356,7 @@ public class CalloutOrder extends CalloutEngine
 		return "";
 	}	//	SalesOrderTenderType
 
+	/* Called from AD_Org_ID in tables C_Order, M_InOut, M_Inventory, M_Requisition */
 	public String organization(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value){
 		
 		//Return if Organization field is empty