details: https://code.openbravo.com/erp/devel/pi/rev/dd7797ef2a18 changeset: 14949:dd7797ef2a18 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Wed Dec 21 09:56:48 2011 +0100 summary: Fixes issue 19198: There is a column not implemented with code related
details: https://code.openbravo.com/erp/devel/pi/rev/f6414bbcade5 changeset: 14950:f6414bbcade5 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Wed Dec 21 16:01:20 2011 +0100 summary: Fixes issue 19223: Payment Method selected for a payment term line is not the one used in the corresponding payment in/out plan line. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 22 +++++---- src-db/database/model/functions/C_INVOICE_POST.xml | 18 ++++--- src-db/database/sourcedata/AD_FIELD.xml | 2 +- 3 files changed, 24 insertions(+), 18 deletions(-) diffs (96 lines): diff -r 222a1f0084c5 -r f6414bbcade5 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Wed Dec 21 12:10:00 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Wed Dec 21 16:01:20 2011 +0100 @@ -258,14 +258,16 @@ FOR cur_payments IN ( SELECT line, percentage, onremainder, excludetax, - COALESCE(paymentrule, v_paymentrule) AS paymentrule, + COALESCE(cptl.paymentrule, v_paymentrule) AS paymentrule, (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday END) AS fixmonthday, (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday2 END) AS Fixmonthday2, (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday3 END) AS fixmonthday3, - netdays, fixmonthoffset, netday, isnextbusinessday - FROM c_paymenttermline - WHERE c_paymentterm_id=v_paymentterm - AND isactive = 'Y' + netdays, fixmonthoffset, netday, isnextbusinessday, + COALESCE(cptl.fin_paymentmethod_id,c.fin_paymentmethod_id) as fin_paymentmethod_id + FROM c_paymenttermline cptl,c_invoice c + WHERE cptl.c_paymentterm_id=v_paymentterm + AND cptl.isactive = 'Y' + AND c_invoice_id = p_record_id UNION -- Header of paymentTerm is processed at last SELECT 9999 AS line, 100 AS percentage, 'Y' AS onremainder, 'N' AS excludetax, @@ -273,9 +275,11 @@ (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday END) AS fixmonthday, (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday2 END) AS Fixmonthday2, (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday3 END) AS fixmonthday3, - netdays, fixmonthoffset, netday, isnextbusinessday - FROM c_paymentterm - WHERE c_paymentterm_id=v_paymentterm + netdays, fixmonthoffset, netday, isnextbusinessday, + c.fin_paymentmethod_id + FROM c_paymentterm cpt ,c_invoice c + WHERE cpt.c_paymentterm_id=v_paymentterm + AND c_invoice_id = p_record_id ORDER BY line ) LOOP @@ -313,7 +317,7 @@ v_payment_schedule_invoice, v_client_id, v_org_id, 'Y', now(), p_user, now(), p_user, p_record_id, v_currency_id, null, - v_PaymentMethod, + cur_payments.fin_paymentmethod_id, v_scheduledamount, v_planneddate, v_scheduledamount, v_PaymentPriority ); diff -r 222a1f0084c5 -r f6414bbcade5 src-db/database/model/functions/C_INVOICE_POST.xml --- a/src-db/database/model/functions/C_INVOICE_POST.xml Wed Dec 21 12:10:00 2011 +0100 +++ b/src-db/database/model/functions/C_INVOICE_POST.xml Wed Dec 21 16:01:20 2011 +0100 @@ -774,9 +774,10 @@ END LOOP; IF (v_IsSOTrx='Y') THEN -- Undo revenue and credit limit - UPDATE C_BPARTNER - SET ActualLifeTimeValue=ActualLifeTimeValue -(v_Multiplier * C_Base_Convert(v_GrandTotal, v_Currency_ID, v_Client_ID, v_DateAcct, v_Org_ID)) - WHERE C_BPartner_ID=v_BPartner_ID; + --The next lines (3) have been commented due to the issue 19198 + --UPDATE C_BPARTNER + --SET ActualLifeTimeValue=ActualLifeTimeValue -(v_Multiplier * C_Base_Convert(v_GrandTotal, v_Currency_ID, v_Client_ID, v_DateAcct, v_Org_ID)) + --WHERE C_BPartner_ID=v_BPartner_ID; FOR Cur_ReactivateInvoiceLine IN (SELECT C_InvoiceLine_ID, C_Orderline_ID, M_InoutLine_ID, QtyInvoiced FROM C_INVOICELINE @@ -1277,11 +1278,12 @@ WHERE AD_User_ID=v_BPartner_User_ID; -- Update total revenue and credit limit -- It is reversed in C_Allocation_Trg - IF (v_IsSOTrx='Y') THEN - UPDATE C_BPARTNER - SET ActualLifeTimeValue=ActualLifeTimeValue +(v_Multiplier * C_Base_Convert(v_GrandTotal, v_Currency_ID, v_Client_ID, v_DateAcct, v_Org_ID)) - WHERE C_BPartner_ID=v_BPartner_ID; - END IF; + --The next lines (5) have been commented due to the issue 19198 + --IF (v_IsSOTrx='Y') THEN + --UPDATE C_BPARTNER + --SET ActualLifeTimeValue=ActualLifeTimeValue +(v_Multiplier * C_Base_Convert(v_GrandTotal, v_Currency_ID, v_Client_ID, v_DateAcct, v_Org_ID)) + --WHERE C_BPartner_ID=v_BPartner_ID; + --END IF; END IF;--FINISH_PROCESS IF (NOT FINISH_PROCESS AND NOT END_PROCESSING) THEN /************************************************************************** diff -r 222a1f0084c5 -r f6414bbcade5 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Wed Dec 21 12:10:00 2011 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Wed Dec 21 16:01:20 2011 +0100 @@ -23105,7 +23105,7 @@ <!--2128--> <AD_FIELD_ID><![CDATA[2128]]></AD_FIELD_ID> <!--2128--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--2128--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--2128--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2128--> <ISACTIVE><![CDATA[N]]></ISACTIVE> <!--2128--> <NAME><![CDATA[Lifetime Revenue to Date]]></NAME> <!--2128--> <DESCRIPTION><![CDATA[Actual Life Time Revenue]]></DESCRIPTION> <!--2128--> <HELP><![CDATA[The Actual Life Time Value is the recorded revenue to be generated by this Business Partner.]]></HELP> ------------------------------------------------------------------------------ Write once. Port to many. Get the SDK and tools to simplify cross-platform app development. Create new or port existing apps to sell to consumers worldwide. Explore the Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join http://p.sf.net/sfu/intel-appdev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
