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

IDEMPIERE-3078 IDEMPIERE-1770 created code for a non-existing column

This commit is contained in:
Carlos Ruiz 2016-05-30 22:29:09 -05:00
parent 803979d925
commit 367f50673b
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.adempiere.base/src/org/compiere/model/MInOut.java
View File

@ -1851,11 +1851,8 @@ public class MInOut extends X_M_InOut implements DocAction
for(MInOutLineMA sMA : shipmentMAS){ for(MInOutLineMA sMA : shipmentMAS){
BigDecimal lineMAQty = qtyToReturn; BigDecimal lineMAQty = qtyToReturn;
BigDecimal qtyReturnable = (BigDecimal)sMA.get_Value(MInOutLineMA.COLUMNNAME_ReturnedQty); if(lineMAQty.compareTo(Env.ZERO)>0){
if (qtyReturnable == null) lineMAQty = Env.ZERO;
qtyReturnable = Env.ZERO;
if(lineMAQty.compareTo(qtyReturnable)>0){
lineMAQty = qtyReturnable;
} }
MInOutLineMA ma = MInOutLineMA.addOrCreate(line, sMA.getM_AttributeSetInstance_ID(), lineMAQty, sMA.getDateMaterialPolicy(),true); MInOutLineMA ma = MInOutLineMA.addOrCreate(line, sMA.getM_AttributeSetInstance_ID(), lineMAQty, sMA.getDateMaterialPolicy(),true);

4
org.adempiere.base/src/org/compiere/model/MInOutLineMA.java
View File

@ -43,11 +43,10 @@ public class MInOutLineMA extends X_M_InOutLineMA
/** /**
* *
*/ */
private static final long serialVersionUID = -4131812777103744727L; private static final long serialVersionUID = -2610075295914545809L;
/** Log */ /** Log */
private static CLogger s_log = CLogger.getCLogger (MInOutLineMA.class); private static CLogger s_log = CLogger.getCLogger (MInOutLineMA.class);
public static String COLUMNNAME_ReturnedQty ="returnedQty";
/** /**
* Get Material Allocations for Line * Get Material Allocations for Line
@ -237,7 +236,6 @@ public class MInOutLineMA extends X_M_InOutLineMA
while (rs.next()) while (rs.next())
{ {
MInOutLineMA lineMA = new MInOutLineMA(ctx, rs, trxName); MInOutLineMA lineMA = new MInOutLineMA(ctx, rs, trxName);
lineMA.set_Value(COLUMNNAME_ReturnedQty, rs.getBigDecimal(COLUMNNAME_ReturnedQty));
list.add(lineMA); list.add(lineMA);
} }