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

IDEMPIERE-3306 Product Type=Service Posting with price variation

This commit is contained in:
Carlos Ruiz 2017-02-27 10:38:19 +01:00
parent b8c975b8a3
commit c0808dd049
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.adempiere.base/src/org/compiere/acct/Doc_MatchInv.java
View File

@ -402,9 +402,12 @@ public class Doc_MatchInv extends Doc
} }
String costingMethod = m_pc.getProduct().getCostingMethod(as); String costingMethod = m_pc.getProduct().getCostingMethod(as);
MAccount account = m_pc.getAccount(ProductCost.ACCTTYPE_P_Asset, as);
if (m_pc.isService())
account = m_pc.getAccount(ProductCost.ACCTTYPE_P_Expense, as);
if (X_M_Cost.COSTINGMETHOD_AveragePO.equals(costingMethod)) { if (X_M_Cost.COSTINGMETHOD_AveragePO.equals(costingMethod)) {
MAccount account = zeroQty ? m_pc.getAccount(ProductCost.ACCTTYPE_P_AverageCostVariance, as) : m_pc.getAccount(ProductCost.ACCTTYPE_P_Asset, as); if (zeroQty)
account = m_pc.getAccount(ProductCost.ACCTTYPE_P_AverageCostVariance, as);
FactLine line = fact.createLine(null, FactLine line = fact.createLine(null,
m_pc.getAccount(ProductCost.ACCTTYPE_P_IPV, as), m_pc.getAccount(ProductCost.ACCTTYPE_P_IPV, as),
as.getC_Currency_ID(), ipv.negate()); as.getC_Currency_ID(), ipv.negate());
@ -413,8 +416,6 @@ public class Doc_MatchInv extends Doc
line = fact.createLine(null, account, as.getC_Currency_ID(), ipv); line = fact.createLine(null, account, as.getC_Currency_ID(), ipv);
updateFactLine(line); updateFactLine(line);
} else if (X_M_Cost.COSTINGMETHOD_AverageInvoice.equals(costingMethod) && !zeroQty) { } else if (X_M_Cost.COSTINGMETHOD_AverageInvoice.equals(costingMethod) && !zeroQty) {
MAccount account = m_pc.getAccount(ProductCost.ACCTTYPE_P_Asset, as);
FactLine line = fact.createLine(null, FactLine line = fact.createLine(null,
m_pc.getAccount(ProductCost.ACCTTYPE_P_IPV, as), m_pc.getAccount(ProductCost.ACCTTYPE_P_IPV, as),
as.getC_Currency_ID(), ipv.negate()); as.getC_Currency_ID(), ipv.negate());