details: https://code.openbravo.com/erp/devel/pi/rev/ab0bb34403c0 changeset: 15887:ab0bb34403c0 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Mar 20 18:28:04 2012 +0100 summary: Fixes issue 19562: Xls document in Payment Report should dynamically widen the columns.
details: https://code.openbravo.com/erp/devel/pi/rev/db31bb9c804b changeset: 15888:db31bb9c804b user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Mar 22 09:08:42 2012 +0100 summary: Fixes issue 19529: Label of fields in Stock report. They are not in sync with the labels of the same fields in the storage bin. details: https://code.openbravo.com/erp/devel/pi/rev/eb9992adfdfa changeset: 15889:eb9992adfdfa user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Mar 22 11:18:38 2012 +0100 summary: Fixes issue 19929: When voiding and invoice, the taxes are not properly copied. diffstat: modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml | 42 ++-- src-db/database/model/functions/C_INVOICE_POST.xml | 24 +++ src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 77 +++++---- src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html | 8 +- 4 files changed, 93 insertions(+), 58 deletions(-) diffs (truncated from 373 to 300 lines): diff -r dcc67f06c182 -r eb9992adfdfa modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml --- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml Fri Mar 16 13:55:10 2012 +0000 +++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml Thu Mar 22 11:18:38 2012 +0100 @@ -2,8 +2,8 @@ <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd"; name="PaymentReportExcel" pageWidth="1800" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1740" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20"> <property name="ireport.scriptlethandling" value="0"/> <property name="ireport.encoding" value="UTF-8"/> - <property name="ireport.zoom" value="1.5"/> - <property name="ireport.x" value="1591"/> + <property name="ireport.zoom" value="1.0"/> + <property name="ireport.x" value="734"/> <property name="ireport.y" value="0"/> <import value="net.sf.jasperreports.engine.*"/> <import value="java.util.*"/> @@ -279,7 +279,7 @@ </columnHeader> <detail> <band height="25" splitType="Stretch"> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-2" style="Report_Footer" x="0" y="0" width="99" height="25"/> <box leftPadding="2"/> <textElement> @@ -287,7 +287,7 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{BPARTNER}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-4" style="Report_Footer" x="523" y="0" width="65" height="25"/> <box leftPadding="2"/> <textElement> @@ -295,7 +295,7 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{PAYMENT_DOCNO}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-5" style="Report_Footer" x="335" y="0" width="78" height="25"/> <box leftPadding="2"/> <textElement> @@ -303,7 +303,7 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[($F{SALES_PERSON}==null ? " " : $F{SALES_PERSON})]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-6" style="Report_Footer" x="413" y="0" width="55" height="25"/> <box leftPadding="2"/> <textElement> @@ -311,7 +311,7 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[($F{INVOICE_NUMBER}==null ? " " : $F{INVOICE_NUMBER}.toString())]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-7" style="Report_Footer" x="468" y="0" width="55" height="25"/> <box leftPadding="2"/> <textElement> @@ -319,7 +319,7 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[($F{INVOICE_DATE}== null ? " " : $F{INVOICE_DATE})]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-8" style="Report_Footer" x="1067" y="0" width="62" height="25"/> <box leftPadding="2"/> <textElement> @@ -327,28 +327,28 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[($F{DUE_DATE}== null ? " " : $F{DUE_DATE})]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-9" style="Report_Footer" x="1129" y="0" width="33" height="25"/> <textElement textAlignment="Center"> <font size="8"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[($F{PLANNED_DSO}== null ? " " : $F{PLANNED_DSO}.toString())]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-10" style="Report_Footer" x="1162" y="0" width="33" height="25"/> <textElement textAlignment="Center"> <font size="8"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[($F{CURRENT_DSO}== null ? " " : $F{CURRENT_DSO}.toString())]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-11" style="Report_Footer" x="1195" y="0" width="36" height="25"/> <textElement textAlignment="Center"> <font size="8"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[($F{OVERDUE}== null ? " " : $F{OVERDUE}.toString())]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-13" style="Report_Footer" x="1371" y="0" width="80" height="25"/> <box rightPadding="2"/> <textElement textAlignment="Right"> @@ -356,14 +356,14 @@ </textElement> <textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{BASE_AMOUNT}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-14" style="Report_Footer" x="1451" y="0" width="46" height="25"/> <textElement textAlignment="Center"> <font size="8"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-15" style="Report_Footer" x="1231" y="0" width="80" height="25"/> <box rightPadding="2"/> <textElement textAlignment="Right"> @@ -371,14 +371,14 @@ </textElement> <textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{TRANS_AMOUNT}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-16" style="Report_Footer" x="1311" y="0" width="60" height="25"/> <textElement textAlignment="Center"> <font size="8"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{TRANS_CURRENCY}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-17" style="Report_Footer" x="99" y="0" width="76" height="25"/> <box leftPadding="2"/> <textElement> @@ -386,7 +386,7 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{BP_GROUP}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-18" style="Report_Footer" x="175" y="0" width="76" height="25"/> <box leftPadding="2"/> <textElement> @@ -394,7 +394,7 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{STATUS}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-19" style="Report_Footer" x="251" y="0" width="84" height="25"/> <box leftPadding="2"/> <textElement> @@ -410,7 +410,7 @@ </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{PAYMENT_DESC}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-22" style="Report_Footer" x="987" y="0" width="80" height="25"/> <box leftPadding="2"/> <textElement> @@ -418,14 +418,14 @@ </textElement> <textFieldExpression class="java.util.Date"><![CDATA[$F{PAYMENT_DATE}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-14" style="Report_Footer" x="588" y="0" width="172" height="25"/> <textElement textAlignment="Left"> <font size="8"/> </textElement> <textFieldExpression class="java.lang.String"><![CDATA[$F{PAYMENT_METHOD}]]></textFieldExpression> </textField> - <textField isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement key="textField-14" style="Report_Footer" x="1497" y="0" width="77" height="25"/> <textElement textAlignment="Center"> <font size="8"/> diff -r dcc67f06c182 -r eb9992adfdfa src-db/database/model/functions/C_INVOICE_POST.xml --- a/src-db/database/model/functions/C_INVOICE_POST.xml Fri Mar 16 13:55:10 2012 +0000 +++ b/src-db/database/model/functions/C_INVOICE_POST.xml Thu Mar 22 11:18:38 2012 +0100 @@ -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 dcc67f06c182 -r eb9992adfdfa src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Fri Mar 16 13:55:10 2012 +0000 +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Mar 22 11:18:38 2012 +0100 @@ -8212,39 +8212,6 @@ <!--808188--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--808188--></AD_TEXTINTERFACES> -<!--808196--><AD_TEXTINTERFACES> -<!--808196--> <AD_TEXTINTERFACES_ID><![CDATA[808196]]></AD_TEXTINTERFACES_ID> -<!--808196--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--808196--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--808196--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--808196--> <TEXT><![CDATA[Shelves (x)]]></TEXT> -<!--808196--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html]]></FILENAME> -<!--808196--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--808196--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--808196--></AD_TEXTINTERFACES> - -<!--808197--><AD_TEXTINTERFACES> -<!--808197--> <AD_TEXTINTERFACES_ID><![CDATA[808197]]></AD_TEXTINTERFACES_ID> -<!--808197--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--808197--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--808197--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--808197--> <TEXT><![CDATA[Column (y)]]></TEXT> -<!--808197--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html]]></FILENAME> -<!--808197--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--808197--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--808197--></AD_TEXTINTERFACES> - -<!--808198--><AD_TEXTINTERFACES> -<!--808198--> <AD_TEXTINTERFACES_ID><![CDATA[808198]]></AD_TEXTINTERFACES_ID> -<!--808198--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--808198--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--808198--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--808198--> <TEXT><![CDATA[Height (z)]]></TEXT> -<!--808198--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html]]></FILENAME> -<!--808198--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--808198--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--808198--></AD_TEXTINTERFACES> - <!--808199--><AD_TEXTINTERFACES> <!--808199--> <AD_TEXTINTERFACES_ID><![CDATA[808199]]></AD_TEXTINTERFACES_ID> <!--808199--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -13549,6 +13516,17 @@ <!--28B043CED5304260B3F424705EC667CE--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--28B043CED5304260B3F424705EC667CE--></AD_TEXTINTERFACES> +<!--28DDB97537F74AE9A594421EBCA8742D--><AD_TEXTINTERFACES> +<!--28DDB97537F74AE9A594421EBCA8742D--> <AD_TEXTINTERFACES_ID><![CDATA[28DDB97537F74AE9A594421EBCA8742D]]></AD_TEXTINTERFACES_ID> +<!--28DDB97537F74AE9A594421EBCA8742D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--28DDB97537F74AE9A594421EBCA8742D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--28DDB97537F74AE9A594421EBCA8742D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--28DDB97537F74AE9A594421EBCA8742D--> <TEXT><![CDATA[Stack (y)]]></TEXT> +<!--28DDB97537F74AE9A594421EBCA8742D--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html]]></FILENAME> +<!--28DDB97537F74AE9A594421EBCA8742D--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--28DDB97537F74AE9A594421EBCA8742D--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--28DDB97537F74AE9A594421EBCA8742D--></AD_TEXTINTERFACES> + <!--2A1D06FA18B54BFE9CF2ACB115B588E3--><AD_TEXTINTERFACES> <!--2A1D06FA18B54BFE9CF2ACB115B588E3--> <AD_TEXTINTERFACES_ID><![CDATA[2A1D06FA18B54BFE9CF2ACB115B588E3]]></AD_TEXTINTERFACES_ID> <!--2A1D06FA18B54BFE9CF2ACB115B588E3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -15848,6 +15826,17 @@ <!--6333A12831B14D8E990F494A160914B6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--6333A12831B14D8E990F494A160914B6--></AD_TEXTINTERFACES> +<!--63817B510E8E4A1ABB7F2BAB38A0D313--><AD_TEXTINTERFACES> +<!--63817B510E8E4A1ABB7F2BAB38A0D313--> <AD_TEXTINTERFACES_ID><![CDATA[63817B510E8E4A1ABB7F2BAB38A0D313]]></AD_TEXTINTERFACES_ID> +<!--63817B510E8E4A1ABB7F2BAB38A0D313--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--63817B510E8E4A1ABB7F2BAB38A0D313--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--63817B510E8E4A1ABB7F2BAB38A0D313--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--63817B510E8E4A1ABB7F2BAB38A0D313--> <TEXT><![CDATA[Row (x)]]></TEXT> +<!--63817B510E8E4A1ABB7F2BAB38A0D313--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html]]></FILENAME> +<!--63817B510E8E4A1ABB7F2BAB38A0D313--> <ISUSED><![CDATA[Y]]></ISUSED> ------------------------------------------------------------------------------ This SF email is sponsosred by: Try Windows Azure free for 90 days Click Here http://p.sf.net/sfu/sfd2d-msazure _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
