details: https://code.openbravo.com/erp/devel/pi/rev/f1927a14a32f changeset: 20842:f1927a14a32f user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Sun Aug 04 12:47:43 2013 +0530 summary: Fixes Issue 24316: The partner selector is filtering by default in product window
details: https://code.openbravo.com/erp/devel/pi/rev/cb5dd42e3937 changeset: 20843:cb5dd42e3937 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Sun Aug 04 18:01:41 2013 +0530 summary: Fixes Issue 24378: Taxes are not correctly calculate in some cases details: https://code.openbravo.com/erp/devel/pi/rev/46899b90a9aa changeset: 20844:46899b90a9aa user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Jul 24 11:15:27 2013 +0530 summary: Fixes Issue 24386: Payment generated when voiding an unpaid invoice When Payment Method configured as Automatic, payment is generated for an unpaid invoice when voiding the document diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 22 ++++++++++ src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml | 8 ++- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 4 +- 3 files changed, 30 insertions(+), 4 deletions(-) diffs (89 lines): diff -r cfbd7f663288 -r 46899b90a9aa 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 Thu Aug 01 16:13:26 2013 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Wed Jul 24 11:15:27 2013 +0530 @@ -69,6 +69,7 @@ v_Line FIN_FINACC_TRANSACTION.LINE%TYPE; v_count NUMBER; v_PaymentPriority VARCHAR(32); +v_InvoicePaid CHAR(1); v_creditmultiplier NUMBER:= 1; v_lang AD_User.Default_AD_Language%TYPE; v_orderno C_Order.DocumentNo%TYPE:=null; @@ -132,6 +133,27 @@ -- complete invoice IF (p_docaction = 'CO') THEN + -- Do not add payment for the reversal invoice if the voided invoice is not paid + SELECT COUNT(*) + INTO v_Count + FROM C_Invoice_Reverse + WHERE C_Invoice_ID = p_record_id; + + IF(v_Count <> 0) THEN + SELECT COALESCE(ispaid, 'Y') + INTO v_InvoicePaid + FROM C_Invoice + WHERE C_Invoice_ID IN ( + SELECT Reversed_C_Invoice_ID + FROM C_Invoice_Reverse + WHERE C_Invoice_Id = p_record_id + ); + + IF (v_InvoicePaid = 'N') THEN + RETURN; + END IF; + END IF; + -- Checking Payment Method ID is available IF(v_PaymentMethod IS NULL) THEN RAISE_APPLICATION_ERROR(-20000, '@APRM_PAYMENTMETHOD_MISSING@'); diff -r cfbd7f663288 -r 46899b90a9aa src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml --- a/src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml Thu Aug 01 16:13:26 2013 +0530 +++ b/src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml Wed Jul 24 11:15:27 2013 +0530 @@ -28,7 +28,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2012 Openbravo SLU +* All portions are Copyright (C) 2012-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -37,11 +37,15 @@ v_message VARCHAR2(2000):=''; v_NetPrice NUMBER; v_TaxAmount NUMBER; + v_calcPrecision NUMBER:=50; BEGIN --BODY IF (p_qty = 0 OR p_grossamt = 0) THEN RETURN 0; END IF; - v_TaxAmount := C_GET_TAX_AMT_FROM_NET(p_tax_id, p_grossamt, p_alternatetaxbaseamt, p_priceprecision, 0); + IF (p_priceprecision > 50) THEN + v_calcPrecision := p_priceprecision; + END IF; + v_TaxAmount := C_GET_TAX_AMT_FROM_NET(p_tax_id, p_grossamt, p_alternatetaxbaseamt, v_calcPrecision, 0); DBMS_OUTPUT.PUT_LINE('Unit tax ' || v_TaxAmount); v_NetPrice:= ROUND(p_grossamt * (p_grossamt / (p_grossamt + v_TaxAmount)) / p_qty, p_priceprecision); diff -r cfbd7f663288 -r 46899b90a9aa src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml --- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Thu Aug 01 16:13:26 2013 +0530 +++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Wed Jul 24 11:15:27 2013 +0530 @@ -1547,7 +1547,7 @@ <!--A246D4AC538E42BE9F0CD8182A558712--> <SORTNO><![CDATA[7]]></SORTNO> <!--A246D4AC538E42BE9F0CD8182A558712--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A246D4AC538E42BE9F0CD8182A558712--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD> -<!--A246D4AC538E42BE9F0CD8182A558712--> <DEFAULT_EXPRESSION><![CDATA[if (OB.isSalesTransaction() == true) {'true'} else {if (OB.getWindowId() == '800097' ) {'true'} else {''}}]]></DEFAULT_EXPRESSION> +<!--A246D4AC538E42BE9F0CD8182A558712--> <DEFAULT_EXPRESSION><![CDATA[if(OB.getWindowId() == '140') {if (OB.getParameters().get("inpissold") == "true" && OB.getParameters().get("inpispurchased") == "false") {'true'} else {''}} else {if (OB.isSalesTransaction() == true) {'true'} else {if (OB.getWindowId() == '800097' ) {'true'} else {''}}}]]></DEFAULT_EXPRESSION> <!--A246D4AC538E42BE9F0CD8182A558712--> <DISPLAY_EXPRESSION><![CDATA[customer]]></DISPLAY_EXPRESSION> <!--A246D4AC538E42BE9F0CD8182A558712--> <CLAUSE_LEFT_PART><![CDATA[bp.customer]]></CLAUSE_LEFT_PART> <!--A246D4AC538E42BE9F0CD8182A558712--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> @@ -2306,7 +2306,7 @@ <!--F91FD25B57A74BD587AEDB091A0FD53D--> <SORTNO><![CDATA[8]]></SORTNO> <!--F91FD25B57A74BD587AEDB091A0FD53D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--F91FD25B57A74BD587AEDB091A0FD53D--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD> -<!--F91FD25B57A74BD587AEDB091A0FD53D--> <DEFAULT_EXPRESSION><![CDATA[if (OB.isSalesTransaction() == true) {''} else {if (OB.getWindowId() == '800097' || OB.getWindowId() == '132' ) {''} else {'true'}}]]></DEFAULT_EXPRESSION> +<!--F91FD25B57A74BD587AEDB091A0FD53D--> <DEFAULT_EXPRESSION><![CDATA[if(OB.getWindowId() == '140') {if (OB.getParameters().get("inpispurchased") == "true" && OB.getParameters().get("inpissold") == "false") {'true'} else {''}} else {if (OB.isSalesTransaction() == true) {''} else {if (OB.getWindowId() == '800097' || OB.getWindowId() == '132' ) {''} else {'true'}}}]]></DEFAULT_EXPRESSION> <!--F91FD25B57A74BD587AEDB091A0FD53D--> <DISPLAY_EXPRESSION><![CDATA[vendor]]></DISPLAY_EXPRESSION> <!--F91FD25B57A74BD587AEDB091A0FD53D--> <CLAUSE_LEFT_PART><![CDATA[bp.vendor]]></CLAUSE_LEFT_PART> <!--F91FD25B57A74BD587AEDB091A0FD53D--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> ------------------------------------------------------------------------------ Get your SQL database under version control now! Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out. http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
