In case Bill Bpartner and Bill Location are not set, search for them …

…instead of blindly taking those from bpartner (which may not be "invoice locations" #5834
metasfresh · Nov 28, 2019 · 180d40f · 180d40f
1 parent 0459087
commit 180d40f
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/de.metas.business/src/main/java-legacy/org/compiere/model/MOrder.java b/de.metas.business/src/main/java-legacy/org/compiere/model/MOrder.java
@@ -949,12 +949,7 @@ protected boolean beforeSave(final boolean newRecord)
 		// No Bill - get from Ship
 		if (getBill_BPartner_ID() <= 0)
 		{
-			setBill_BPartner_ID(getC_BPartner_ID());
-			setBill_Location_ID(getC_BPartner_Location_ID());
-		}
-		if (getBill_Location_ID() == 0)
-		{
-			setBill_Location_ID(getC_BPartner_Location_ID());
+			orderBL.setBillLocation(this);
 		}
 
 		//