details: https://code.openbravo.com/erp/devel/pi/rev/3db1b5542465 changeset: 16015:3db1b5542465 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Apr 02 13:46:05 2012 +0200 summary: Fixes issue 19502: Production Run Status report. Q.Left has to be zero when the phase is closed.
details: https://code.openbravo.com/erp/devel/pi/rev/c8bab2dcca00 changeset: 16016:c8bab2dcca00 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Apr 03 10:04:32 2012 +0200 summary: Fixes issue 20119: text error in combo 'Financial Account' in payment execution form. details: https://code.openbravo.com/erp/devel/pi/rev/fdadad1f7c3d changeset: 16017:fdadad1f7c3d user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Apr 03 10:20:21 2012 +0200 summary: Backout of changeset 1a52e412153b. Fixes issue 19929. When voiding and invoice, the taxes are not properly copied. diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java | 2 +- src-db/database/model/functions/C_INVOICE_POST.xml | 24 ++++++++++ src/org/openbravo/erpCommon/ad_reports/ReportProductionRun_data.xsql | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) diffs (72 lines): diff -r 2807749fd6be -r fdadad1f7c3d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java Tue Apr 03 18:31:41 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java Tue Apr 03 10:20:21 2012 +0200 @@ -116,7 +116,7 @@ } else if (vars.commandIn("CALLOUTFINANCIALACCOUNT")) { String strFinancialAccountId = vars.getRequestGlobalVariable("inpFinancialAccount", ""); - String strPaymentMethodId = vars.getRequiredStringParameter("inpPaymentMethod"); + String strPaymentMethodId = vars.getRequestGlobalVariable("inpPaymentMethod", ""); String strOrgId = vars.getRequestGlobalVariable("inpOrgId", ""); String strCurrencyId = vars.getRequestGlobalVariable("inpCurrencyId", ""); boolean isReceipt = "Y".equals(vars.getGlobalVariable("inpIsReceipt", diff -r 2807749fd6be -r fdadad1f7c3d src-db/database/model/functions/C_INVOICE_POST.xml --- a/src-db/database/model/functions/C_INVOICE_POST.xml Tue Apr 03 18:31:41 2012 +0200 +++ b/src-db/database/model/functions/C_INVOICE_POST.xml Tue Apr 03 10:20:21 2012 +0200 @@ -58,6 +58,7 @@ Cur_ReactivateInvoiceLine RECORD; Cur_LastContact RECORD; Cur_lineqty RECORD; + Cur_InvoiceTax RECORD; -- Record Info v_Client_ID VARCHAR2(32); @@ -147,6 +148,8 @@ withholdamount NUMBER(10,2); cWithHoldId varchar2(32); Cur_InvoiceNetLine RECORD; + + v_LineMax NUMBER:=0; BEGIN IF (p_PInstance_ID IS NOT NULL) THEN @@ -614,6 +617,27 @@ END LOOP; -- Create Reversal Accounting Dimensions END LOOP; -- Create Reversal Invoice Lines + + -- Check if there is any manually added tax + FOR Cur_InvoiceTax IN + (SELECT c_tax_id, ad_client_id, ad_org_id, isactive, + taxbaseamt, taxamt, recalculate + FROM c_invoicetax + WHERE c_invoice_id = v_Record_ID + MINUS + SELECT c_tax_id, ad_client_id, ad_org_id, isactive, + -taxbaseamt, -taxamt, recalculate + FROM c_invoicetax + WHERE c_invoice_id = v_RInvoice_ID) + LOOP + SELECT MAX(line) + 10 INTO v_LineMax FROM c_invoicetax WHERE c_invoice_id = v_RInvoice_ID; + INSERT INTO c_invoicetax(c_tax_id, c_invoice_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, + taxbaseamt, taxamt, line, c_invoicetax_id, recalculate) + VALUES(Cur_InvoiceTax.c_tax_id, v_RInvoice_ID, Cur_InvoiceTax.ad_client_id, Cur_InvoiceTax.ad_org_id, Cur_InvoiceTax.isactive, + now(), v_UpdatedBy, now(), v_UpdatedBy, -Cur_InvoiceTax.taxbaseamt, -Cur_InvoiceTax.taxamt, v_LineMax, + get_uuid(), Cur_InvoiceTax.recalculate); + END LOOP; + -- Close Invoice UPDATE C_INVOICE SET DocStatus='VO', -- it IS reversed diff -r 2807749fd6be -r fdadad1f7c3d src/org/openbravo/erpCommon/ad_reports/ReportProductionRun_data.xsql --- a/src/org/openbravo/erpCommon/ad_reports/ReportProductionRun_data.xsql Tue Apr 03 18:31:41 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportProductionRun_data.xsql Tue Apr 03 10:20:21 2012 +0200 @@ -29,7 +29,7 @@ <Sql> <![CDATA[ SELECT wr.DocumentNo AS wrname, AD_MESSAGE_GET2(wr.CLOSED, to_char(?)) AS wrclosed, wr.LAUNCHDATE AS wrlaunch, wr.STARTDATE AS wrstart, wr.ENDDATE AS wrend, - wrp.SeqNo AS wrpname, wrp.QUANTITY AS wrpqty, wrp.DONEQUANTITY AS wrpdone, (wrp.QUANTITY - wrp.DONEQUANTITY ) AS wrpleft, + wrp.SeqNo AS wrpname, wrp.QUANTITY AS wrpqty, wrp.DONEQUANTITY AS wrpdone, (CASE WHEN pr.closephase = 'N' THEN (wrp.QUANTITY - wrp.DONEQUANTITY ) ELSE 0 END) AS wrpleft, p.NAME AS pname, wrp.COSTCENTERUSE AS wrpph, wrp.PREPTIME AS wrppt, AD_MESSAGE_GET2(wrp.CLOSED, to_char(?)) AS wrpclosed, pr.LINE AS prname, we.DocumentNo AS wename, pr.NEEDEDQUANTITY AS prneeded, pr.PRODUCTIONQTY AS prdone, pr.REJECTEDQUANTITY As prrej, wrp.SEQNO AS wrpseq, we.MOVEMENTDATE AS wedate, wr.MA_WorkRequirement_ID AS wrid, wrp.MA_WRPhase_ID AS wrpid ------------------------------------------------------------------------------ Better than sec? Nothing is better than sec when it comes to monitoring Big Data applications. Try Boundary one-second resolution app monitoring today. Free. http://p.sf.net/sfu/Boundary-dev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
