midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4593 Error completing a Standard Sales Order with Shipper and Calculated Freight Cost Rule (#454)

This commit is contained in:
Carlos Ruiz 2020-12-10 13:57:25 +01:00 committed by GitHub
parent e017046dac
commit 4d96ac1f8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.base/src/org/adempiere/process/SalesOrderRateInquiryProcess.java
View File

@ -96,6 +96,8 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
else if (ol.getM_Product_ID() > 0) else if (ol.getM_Product_ID() > 0)
{ {
MProduct product = new MProduct(getCtx(), ol.getM_Product_ID(), get_TrxName()); MProduct product = new MProduct(getCtx(), ol.getM_Product_ID(), get_TrxName());
if (product.isService())
continue;
BigDecimal weight = product.getWeight(); BigDecimal weight = product.getWeight();
if (weight == null || weight.compareTo(BigDecimal.ZERO) == 0) if (weight == null || weight.compareTo(BigDecimal.ZERO) == 0)
@ -250,6 +252,8 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
else if (ol.getM_Product_ID() > 0) else if (ol.getM_Product_ID() > 0)
{ {
MProduct product = new MProduct(ctx, ol.getM_Product_ID(), trxName); MProduct product = new MProduct(ctx, ol.getM_Product_ID(), trxName);
if (product.isService())
continue;
BigDecimal weight = product.getWeight(); BigDecimal weight = product.getWeight();
if (weight == null || weight.compareTo(BigDecimal.ZERO) == 0) if (weight == null || weight.compareTo(BigDecimal.ZERO) == 0)

2
org.adempiere.base/src/org/compiere/model/MOrder.java
View File

@ -1550,6 +1550,8 @@ public class MOrder extends X_C_Order implements DocAction
else if (ol.getM_Product_ID() > 0) else if (ol.getM_Product_ID() > 0)
{ {
MProduct product = new MProduct(getCtx(), ol.getM_Product_ID(), get_TrxName()); MProduct product = new MProduct(getCtx(), ol.getM_Product_ID(), get_TrxName());
if (product.isService())
continue;
BigDecimal weight = product.getWeight(); BigDecimal weight = product.getWeight();
if (weight == null || weight.compareTo(BigDecimal.ZERO) == 0) if (weight == null || weight.compareTo(BigDecimal.ZERO) == 0)