details: https://code.openbravo.com/erp/devel/pi/rev/fb0daa4e04b9 changeset: 21301:fb0daa4e04b9 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Oct 09 12:27:58 2013 +0200 summary: Fixed bug 24309 Cannot generate an invoice from a commission with sales_rep configured
details: https://code.openbravo.com/erp/devel/pi/rev/cd0eb90ce044 changeset: 21302:cd0eb90ce044 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Oct 08 17:40:16 2013 +0200 summary: Fixed issue 24847 payment report show always payments for default fin_account diffstat: modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 4 +- src-db/database/model/functions/C_COMMISSIONRUN_PROCESS.xml | 11 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diffs (65 lines): diff -r d11019120bec -r cd0eb90ce044 modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java --- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java Wed Oct 16 10:23:19 2013 +0200 +++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java Tue Oct 08 17:40:16 2013 +0200 @@ -440,7 +440,7 @@ hsqlScript.append(FIN_Payment.PROPERTY_ACCOUNT); hsqlScript.append(".id = '"); hsqlScript.append(strFinancialAccountId); - hsqlScript.append("' or ((inv."); + hsqlScript.append("' or ((pay is null and inv."); hsqlScript.append(Invoice.PROPERTY_SALESTRANSACTION); hsqlScript.append(" = 'Y'"); hsqlScript.append(" and invbp."); @@ -448,7 +448,7 @@ hsqlScript.append(".id = '"); hsqlScript.append(strFinancialAccountId); hsqlScript.append("')"); - hsqlScript.append(" or (inv."); + hsqlScript.append(" or (pay is null and inv."); hsqlScript.append(Invoice.PROPERTY_SALESTRANSACTION); hsqlScript.append(" = 'N'"); hsqlScript.append(" and invbp."); diff -r d11019120bec -r cd0eb90ce044 src-db/database/model/functions/C_COMMISSIONRUN_PROCESS.xml --- a/src-db/database/model/functions/C_COMMISSIONRUN_PROCESS.xml Wed Oct 16 10:23:19 2013 +0200 +++ b/src-db/database/model/functions/C_COMMISSIONRUN_PROCESS.xml Tue Oct 08 17:40:16 2013 +0200 @@ -50,6 +50,7 @@ v_IsDiscountPrinted CHAR(1); v_CommissionName VARCHAR(60); v_countNoCost NUMBER(10); + v_user varchar2(32); v_isdeferredexpense M_Product.IsDeferredExpense%TYPE; v_expplantype M_Product.ExpPlanType%TYPE; @@ -106,11 +107,12 @@ BEGIN FOR Cur_Data IN (SELECT com.Name, com.C_Currency_ID, com.C_BPartner_ID, pl.C_BPartner_Location_ID, PaymentRulePO, PO_PaymentTerm_ID, PO_PriceList_ID, - POReference, IsDiscountPrinted, p.SalesRep_ID, com.M_Product_ID, C_UOM_ID, p.name as bpartnername - FROM C_BPARTNER p, C_COMMISSION com LEFT JOIN C_BPARTNER_LOCATION pl ON com.C_BPartner_ID = pl.C_BPartner_ID + POReference, IsDiscountPrinted, p.SalesRep_ID, com.M_Product_ID, C_UOM_ID, p.name as bpartnername, us.ad_user_id + FROM C_BPARTNER p , AD_User us, C_COMMISSION com LEFT JOIN C_BPARTNER_LOCATION pl ON com.C_BPartner_ID = pl.C_BPartner_ID LEFT JOIN M_Product prd ON com.M_Product_ID = prd.M_Product_ID WHERE com.C_Commission_ID = CUR_ComRun.C_Commission_ID - AND com.C_BPartner_ID = p.C_BPartner_ID) LOOP + AND com.C_BPartner_ID = p.C_BPartner_ID + and us.C_BPartner_ID = p.C_BPartner_ID) LOOP v_CommissionName:=Cur_Data.Name; v_C_Currency_ID:=Cur_Data.C_Currency_ID; v_C_BPartner_ID:=Cur_Data.C_BPartner_ID; @@ -124,6 +126,7 @@ v_Product_ID:=Cur_Data.M_Product_ID; v_UOM_ID:=Cur_Data.C_UOM_ID; v_partnername:=Cur_Data.bpartnername; + v_user:=Cur_Data.ad_user_id; EXIT; END LOOP; END; @@ -178,7 +181,7 @@ CUR_ComRun.AD_Client_ID, CUR_ComRun.AD_Org_ID, 'Y', now(), '0', now(), '0', 'N', v_DocumentNo, 'DR', 'CO', 'N', 'N', v_C_DocType_ID, v_C_DocType_ID, CUR_ComRun.Description, - v_SalesRep_ID, + v_user, CUR_ComRun.Updated, NULL, 'N', CUR_ComRun.Updated, CUR_ComRun.Updated, -- DateInvoiced=DateAcct v_C_PaymentTerm_ID, v_C_BPartner_ID, v_C_BPartner_Location_ID, NULL, v_POReference, CUR_ComRun.Updated, v_IsDiscountPrinted, ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60135031&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
