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

IDEMPIERE-3046 Add Currency Field to Cost Adjustment Window 

Resolve issue Costing-level=batch/lot in the cost adjustment line with error message No costing record.
This commit is contained in:
Soo Fang Lee 2016-05-05 22:22:50 -07:00
parent f5ab7ac27e
commit d0ef43655e
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
org.adempiere.base.callout/src/org/adempiere/base/callout/CostAdjustmentCalloutFactory.java
View File

@ -75,31 +75,38 @@ public class CostAdjustmentCalloutFactory implements IColumnCalloutFactory {
} else { } else {
MProduct product = MProduct.get(ctx, (Integer) value); MProduct product = MProduct.get(ctx, (Integer) value);
MClient client = MClient.get(ctx); MClient client = MClient.get(ctx);
Object asiValue = mTab.getValue(I_M_InventoryLine.COLUMNNAME_M_AttributeSetInstance_ID);
int M_ASI_ID = asiValue != null ? (Integer)asiValue : 0;
int AD_Org_ID = inventory.getAD_Org_ID();
int C_Currency_ID = inventory.getC_Currency_ID();
MAcctSchema as = client.getAcctSchema(); MAcctSchema as = client.getAcctSchema();
if (as.getC_Currency_ID() != C_Currency_ID)
{ String costingLevel = product.getCostingLevel(as);
MAcctSchema[] ass = MAcctSchema.getClientAcctSchema(ctx, client.get_ID()); if (MAcctSchema.COSTINGLEVEL_BatchLot.equals(costingLevel)) {
for (int i = 0; i < ass.length ; i ++) mTab.setValue(I_M_InventoryLine.COLUMNNAME_CurrentCostPrice, BigDecimal.ZERO);
mTab.setValue(I_M_InventoryLine.COLUMNNAME_NewCostPrice, BigDecimal.ZERO);
}else {
Object asiValue = mTab.getValue(I_M_InventoryLine.COLUMNNAME_M_AttributeSetInstance_ID);
int M_ASI_ID = asiValue != null ? (Integer)asiValue : 0;
int AD_Org_ID = inventory.getAD_Org_ID();
int C_Currency_ID = inventory.getC_Currency_ID();
if (as.getC_Currency_ID() != C_Currency_ID)
{ {
MAcctSchema a = ass[i]; MAcctSchema[] ass = MAcctSchema.getClientAcctSchema(ctx, client.get_ID());
if (a.getC_Currency_ID() == C_Currency_ID) for (int i = 0; i < ass.length ; i ++)
as = a ; {
MAcctSchema a = ass[i];
if (a.getC_Currency_ID() == C_Currency_ID)
as = a ;
}
} }
} MCost cost = product.getCostingRecord(as, AD_Org_ID, M_ASI_ID, costingMethod);
MCost cost = product.getCostingRecord(as, AD_Org_ID, M_ASI_ID, costingMethod); if (cost == null) {
if (cost == null) { if (!MCostElement.COSTINGMETHOD_StandardCosting.equals(costingMethod)) {
if (!MCostElement.COSTINGMETHOD_StandardCosting.equals(costingMethod)) { mTab.setValue(mField, null);
mTab.setValue(mField, null); return Msg.getMsg(Env.getCtx(), "NoCostingRecord");
return Msg.getMsg(Env.getCtx(), "NoCostingRecord"); }
} }
} else {
mTab.setValue(I_M_InventoryLine.COLUMNNAME_CurrentCostPrice, cost.getCurrentCostPrice()); mTab.setValue(I_M_InventoryLine.COLUMNNAME_CurrentCostPrice, cost.getCurrentCostPrice());
mTab.setValue(I_M_InventoryLine.COLUMNNAME_NewCostPrice, cost.getCurrentCostPrice()); mTab.setValue(I_M_InventoryLine.COLUMNNAME_NewCostPrice, cost.getCurrentCostPrice());
} }
} }
} }
@ -139,6 +146,13 @@ public class CostAdjustmentCalloutFactory implements IColumnCalloutFactory {
} }
} }
MCost cost = product.getCostingRecord(as, AD_Org_ID, M_ASI_ID, costingMethod); MCost cost = product.getCostingRecord(as, AD_Org_ID, M_ASI_ID, costingMethod);
if (cost == null) {
if (!MCostElement.COSTINGMETHOD_StandardCosting.equals(costingMethod)) {
mTab.setValue(mField, null);
return Msg.getMsg(Env.getCtx(), "NoCostingRecord");
}
}
if (cost != null) { if (cost != null) {
BigDecimal currentCost = (BigDecimal) mTab.getValue(I_M_InventoryLine.COLUMNNAME_CurrentCostPrice); BigDecimal currentCost = (BigDecimal) mTab.getValue(I_M_InventoryLine.COLUMNNAME_CurrentCostPrice);
if (currentCost == null || currentCost.compareTo(cost.getCurrentCostPrice())==0) return null; if (currentCost == null || currentCost.compareTo(cost.getCurrentCostPrice())==0) return null;
@ -146,6 +160,7 @@ public class CostAdjustmentCalloutFactory implements IColumnCalloutFactory {
mTab.setValue(I_M_InventoryLine.COLUMNNAME_CurrentCostPrice, cost.getCurrentCostPrice()); mTab.setValue(I_M_InventoryLine.COLUMNNAME_CurrentCostPrice, cost.getCurrentCostPrice());
mTab.setValue(I_M_InventoryLine.COLUMNNAME_NewCostPrice, cost.getCurrentCostPrice()); mTab.setValue(I_M_InventoryLine.COLUMNNAME_NewCostPrice, cost.getCurrentCostPrice());
} }
} }
return null; return null;
} }