details: https://code.openbravo.com/erp/devel/pi/rev/deb19445b7a6 changeset: 19220:deb19445b7a6 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Jan 02 11:25:47 2013 +0100 summary: Fixes issue 21859: Report Order Awaiting Invoice Report does not work properly.
details: https://code.openbravo.com/erp/devel/pi/rev/2a9b5cf3ee1d changeset: 19221:2a9b5cf3ee1d user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Jan 10 16:15:28 2013 +0100 summary: Fixes issue 22686: Not Balance error received when posting a payment. Although suspense balancing is not needed. diffstat: src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 3 +++ src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diffs (25 lines): diff -r e4e666560611 -r 2a9b5cf3ee1d src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java --- a/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Mon Jan 14 18:59:29 2013 +0100 +++ b/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Thu Jan 10 16:15:28 2013 +0100 @@ -414,6 +414,9 @@ StringBuffer sb = new StringBuffer(" ["); // Total retValue = retValue.add(new BigDecimal(getAmount(AcctServer.AMTTYPE_Gross))); + if ((new BigDecimal(generatedAmount)).signum() == 0) { + retValue = retValue.add(new BigDecimal(usedAmount)); + } sb.append(getAmount(AcctServer.AMTTYPE_Gross)); // - Lines for (int i = 0; i < p_lines.length; i++) { diff -r e4e666560611 -r 2a9b5cf3ee1d src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql --- a/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql Mon Jan 14 18:59:29 2013 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql Thu Jan 10 16:15:28 2013 +0100 @@ -39,7 +39,7 @@ (CASE C_ORDER.INVOICERULE WHEN 'S' THEN COALESCE(AD_REF_LIST_TRL.NAME, AD_REF_LIST.NAME)||' ('||C_INVOICESCHEDULE.NAME||')' ELSE COALESCE(AD_REF_LIST_TRL.NAME, AD_REF_LIST.NAME) END) AS INVOICERULE, C_ORDERLINE.LINE AS LINE, COALESCE(M_PRODUCT.NAME, M_PRODUCT.DESCRIPTION) AS PRODUCT, C_ORDERLINE.PRICEACTUAL AS PRICE, C_CURRENCY_CONVERT(C_ORDERLINE.PRICEACTUAL, COALESCE(C_ORDERLINE.C_CURRENCY_ID, C_ORDER.C_CURRENCY_ID), ?, TO_DATE(COALESCE(C_ORDER.DATEORDERED, NOW())), NULL, C_ORDERLINE.AD_CLIENT_ID, C_ORDERLINE.AD_ORG_ID) AS CONVPRICE, - C_ORDERLINE.QTYORDERED, C_UOM.UOMSYMBOL, NULL AS TAX, NULL AS TAXBASE, NULL AS CONVTAXBASE, C_ORDERLINE.LINENETAMT, + C_ORDERLINE.QTYORDERED - C_ORDERLINE.QTYINVOICED AS QTYORDERED, C_UOM.UOMSYMBOL, NULL AS TAX, NULL AS TAXBASE, NULL AS CONVTAXBASE, C_ORDERLINE.LINENETAMT, C_CURRENCY_CONVERT(C_ORDERLINE.LINENETAMT, COALESCE(C_ORDERLINE.C_CURRENCY_ID, C_ORDER.C_CURRENCY_ID), ?, TO_DATE(COALESCE(C_ORDER.DATEORDERED, NOW())), NULL, C_ORDERLINE.AD_CLIENT_ID, C_ORDERLINE.AD_ORG_ID) AS CONVLINENETAMT, C_CURRENCY_SYMBOL(C_ORDER.C_CURRENCY_ID, 0, 'Y') AS ORDERCURRENCYSYM, C_ORDER.C_CURRENCY_ID AS TRANSCURRENCYIDORDER, ------------------------------------------------------------------------------ Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS and more. Get SQL Server skills now (including 2012) with LearnDevNow - 200+ hours of step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only - learn more at: http://p.sf.net/sfu/learnmore_122512 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
