From: Jorg J. <jj...@us...> - 2005-09-29 22:02:41
|
Update of /cvsroot/compiere/serverRoot/src/main/server/org/compiere/acct In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29807/src/main/server/org/compiere/acct Modified Files: Doc_MatchPO.java DocLine_Material.java Log Message: Index: Doc_MatchPO.java =================================================================== RCS file: /cvsroot/compiere/serverRoot/src/main/server/org/compiere/acct/Doc_MatchPO.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Doc_MatchPO.java 28 Sep 2005 01:33:47 -0000 1.17 --- Doc_MatchPO.java 29 Sep 2005 22:02:30 -0000 1.18 *************** *** 153,157 **** if (pca.getCostingMethod() != null) costingMethod = pca.getCostingMethod(); ! BigDecimal costs = m_pc.getProductCosts(as, p_vo.AD_Org_ID, costingMethod); // No Costs yet - no PPV --- 153,157 ---- if (pca.getCostingMethod() != null) costingMethod = pca.getCostingMethod(); ! BigDecimal costs = m_pc.getProductCosts(as, p_vo.AD_Org_ID, costingMethod, m_C_OrderLine_ID); // No Costs yet - no PPV Index: DocLine_Material.java =================================================================== RCS file: /cvsroot/compiere/serverRoot/src/main/server/org/compiere/acct/DocLine_Material.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DocLine_Material.java 5 Aug 2005 18:42:16 -0000 1.10 --- DocLine_Material.java 29 Sep 2005 22:02:30 -0000 1.11 *************** *** 159,163 **** public BigDecimal getProductCosts (MAcctSchema as, int AD_Org_ID) { ! BigDecimal costs = getProductCost().getProductCosts(as, AD_Org_ID, null); if (costs != null) return costs; --- 159,164 ---- public BigDecimal getProductCosts (MAcctSchema as, int AD_Org_ID) { ! BigDecimal costs = getProductCost() ! .getProductCosts(as, AD_Org_ID, null, m_C_OrderLine_ID); if (costs != null) return costs; |