details: https://code.openbravo.com/erp/devel/pi/rev/87c4f7a91638 changeset: 20731:87c4f7a91638 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Jul 01 11:35:22 2013 +0530 summary: Fixes Issue 24209: Payment plan is created in Sales Order when the amount=0
details: https://code.openbravo.com/erp/devel/pi/rev/6feeefdd8377 changeset: 20732:6feeefdd8377 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Jul 03 14:48:58 2013 +0530 summary: Fixes Issue 24211: Invoice status, Delivery status not properly calculated The delivery status, Invoice status are not properly calculated when there are negative quantities and their sum becomes zero details: https://code.openbravo.com/erp/devel/pi/rev/b61e4b708fce changeset: 20733:b61e4b708fce user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Jul 08 12:53:44 2013 +0530 summary: Fixes Issue 24218: Amounts not rounded in payment plan details: https://code.openbravo.com/erp/devel/pi/rev/525008ba1f6e changeset: 20734:525008ba1f6e user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Jul 08 18:11:15 2013 +0530 summary: Fixes Issue 24277: Empty End Year Close window - No data in grid details: https://code.openbravo.com/erp/devel/pi/rev/502eb3328dff changeset: 20735:502eb3328dff user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Jul 08 16:11:17 2013 +0530 summary: Fixes Issue 24253: Customer statement: Date filters are unwrittable details: https://code.openbravo.com/erp/devel/pi/rev/436cd2fa79fc changeset: 20736:436cd2fa79fc user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Jul 11 11:15:06 2013 +0200 summary: Fixed bug 24300 Fixed filter dates in reset accounting diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 78 +++++---- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 54 ++++++ src-db/database/model/views/C_YEAR_CLOSE_V.xml | 2 +- src-db/database/sourcedata/AD_COLUMN.xml | 8 +- src-db/database/sourcedata/AD_PROCESS_PARA.xml | 4 +- src/org/openbravo/financial/ResetAccounting.java | 6 +- 6 files changed, 105 insertions(+), 47 deletions(-) diffs (244 lines): diff -r de65f6acc7f0 -r 436cd2fa79fc modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Mon Jul 15 14:12:21 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Thu Jul 11 11:15:06 2013 +0200 @@ -16,7 +16,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) 2010 Openbravo SLU +* All portions are Copyright (C) 2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -114,48 +114,50 @@ RAISE_APPLICATION_ERROR(-20000, '@APRM_ORDER_MAN_PAYMENTS@'); END IF; v_payment_schedule_order := get_uuid(); - INSERT INTO fin_payment_schedule - ( - fin_payment_schedule_id, ad_client_id, ad_org_id, isactive, - created, createdby, updated, updatedby, - c_invoice_id, c_currency_id, c_order_id, - fin_paymentmethod_id, amount, duedate, expecteddate, - outstandingamt, fin_payment_priority_id - ) - VALUES - ( - v_payment_schedule_order, v_Client_ID, v_Org_ID, 'Y', - now(), p_user, now(), p_user, - null, v_currency_id, p_record_id, - v_paymentmethod_id, v_grandtotal, v_orderdate, v_orderdate, - v_grandtotal, v_PaymentPriority - ); + IF v_grandtotal <> 0 THEN + INSERT INTO fin_payment_schedule + ( + fin_payment_schedule_id, ad_client_id, ad_org_id, isactive, + created, createdby, updated, updatedby, + c_invoice_id, c_currency_id, c_order_id, + fin_paymentmethod_id, amount, duedate, expecteddate, + outstandingamt, fin_payment_priority_id + ) + VALUES + ( + v_payment_schedule_order, v_Client_ID, v_Org_ID, 'Y', + now(), p_user, now(), p_user, + null, v_currency_id, p_record_id, + v_paymentmethod_id, v_grandtotal, v_orderdate, v_orderdate, + v_grandtotal, v_PaymentPriority + ); - v_pendingamount := v_grandtotal; - --If exist a payment plan for an invoice it will always be an invoice generated completing this order - --so we can asume that all fin_payment_scheduledetail records are also related to the order. - --With the same asumption if the invoice has some paid amount it will always be by a paymetn for the whole - --amount generated on the invoice completion, so we can safely set as paid amount the whole amount of the - --payment plan. - FOR cur_invoicepayments IN ( - SELECT distinct psd.fin_payment_scheduledetail_id, ps.paidamt - FROM fin_payment_scheduledetail psd, c_orderline ol, c_invoiceline il, fin_payment_schedule ps - WHERE ol.c_order_id = p_record_id + v_pendingamount := v_grandtotal; + --If exist a payment plan for an invoice it will always be an invoice generated completing this order + --so we can asume that all fin_payment_scheduledetail records are also related to the order. + --With the same asumption if the invoice has some paid amount it will always be by a paymetn for the whole + --amount generated on the invoice completion, so we can safely set as paid amount the whole amount of the + --payment plan. + FOR cur_invoicepayments IN ( + SELECT distinct psd.fin_payment_scheduledetail_id, ps.paidamt + FROM fin_payment_scheduledetail psd, c_orderline ol, c_invoiceline il, fin_payment_schedule ps + WHERE ol.c_order_id = p_record_id AND ol.c_orderline_id = il.c_orderline_id AND il.c_invoice_id = ps.c_invoice_id AND psd.fin_payment_schedule_invoice = ps.fin_payment_schedule_id ) LOOP - UPDATE fin_payment_scheduledetail - SET fin_payment_schedule_order = v_payment_schedule_order - WHERE fin_payment_scheduledetail_id = cur_invoicepayments.fin_payment_scheduledetail_id; - SELECT v_pendingamount -(amount + coalesce(writeoffamt, 0)) INTO v_pendingamount - FROM fin_payment_scheduledetail - WHERE fin_payment_scheduledetail_id = cur_invoicepayments.fin_payment_scheduledetail_id; - UPDATE fin_payment_schedule - SET paidamt = paidamt + cur_invoicepayments.paidamt, - outstandingamt = outstandingamt - cur_invoicepayments.paidamt - WHERE fin_payment_schedule_id = v_payment_schedule_order; - END LOOP; + UPDATE fin_payment_scheduledetail + SET fin_payment_schedule_order = v_payment_schedule_order + WHERE fin_payment_scheduledetail_id = cur_invoicepayments.fin_payment_scheduledetail_id; + SELECT v_pendingamount -(amount + coalesce(writeoffamt, 0)) INTO v_pendingamount + FROM fin_payment_scheduledetail + WHERE fin_payment_scheduledetail_id = cur_invoicepayments.fin_payment_scheduledetail_id; + UPDATE fin_payment_schedule + SET paidamt = paidamt + cur_invoicepayments.paidamt, + outstandingamt = outstandingamt - cur_invoicepayments.paidamt + WHERE fin_payment_schedule_id = v_payment_schedule_order; + END LOOP; + END IF; IF (v_pendingamount <> 0) THEN INSERT INTO fin_payment_scheduledetail diff -r de65f6acc7f0 -r 436cd2fa79fc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Mon Jul 15 14:12:21 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Thu Jul 11 11:15:06 2013 +0200 @@ -2578,6 +2578,33 @@ <!--2C3C6561C2DB4025A367330BB9070FCB--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--2C3C6561C2DB4025A367330BB9070FCB--></AD_FIELD> +<!--2D22FFF55FDD405DB18F8CC23481333F--><AD_FIELD> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <AD_FIELD_ID><![CDATA[2D22FFF55FDD405DB18F8CC23481333F]]></AD_FIELD_ID> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <NAME><![CDATA[Amount]]></NAME> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <AD_TAB_ID><![CDATA[2ECAED4620B840BA8DD738140F58A629]]></AD_TAB_ID> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <AD_COLUMN_ID><![CDATA[7890366979642CEFE040007F01013334]]></AD_COLUMN_ID> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <SEQNO><![CDATA[140]]></SEQNO> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <GRID_SEQNO><![CDATA[21]]></GRID_SEQNO> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--2D22FFF55FDD405DB18F8CC23481333F--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--2D22FFF55FDD405DB18F8CC23481333F--></AD_FIELD> + <!--2D59DEFAF52341F9814A2F071792B57C--><AD_FIELD> <!--2D59DEFAF52341F9814A2F071792B57C--> <AD_FIELD_ID><![CDATA[2D59DEFAF52341F9814A2F071792B57C]]></AD_FIELD_ID> <!--2D59DEFAF52341F9814A2F071792B57C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -15949,6 +15976,33 @@ <!--B8BF3A9E948844DA807DDE25E75A0FFC--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--B8BF3A9E948844DA807DDE25E75A0FFC--></AD_FIELD> +<!--B96C393D0DCF47DFBBA99C2269D30891--><AD_FIELD> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <AD_FIELD_ID><![CDATA[B96C393D0DCF47DFBBA99C2269D30891]]></AD_FIELD_ID> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <NAME><![CDATA[Amount]]></NAME> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <AD_TAB_ID><![CDATA[15ECCF8974044A81982F57F9F1E1A67B]]></AD_TAB_ID> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <AD_COLUMN_ID><![CDATA[7890366979642CEFE040007F01013334]]></AD_COLUMN_ID> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <SEQNO><![CDATA[140]]></SEQNO> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <GRID_SEQNO><![CDATA[31]]></GRID_SEQNO> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--B96C393D0DCF47DFBBA99C2269D30891--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--B96C393D0DCF47DFBBA99C2269D30891--></AD_FIELD> + <!--B9BC67D6F48A46569F7E80607777A270--><AD_FIELD> <!--B9BC67D6F48A46569F7E80607777A270--> <AD_FIELD_ID><![CDATA[B9BC67D6F48A46569F7E80607777A270]]></AD_FIELD_ID> <!--B9BC67D6F48A46569F7E80607777A270--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r de65f6acc7f0 -r 436cd2fa79fc src-db/database/model/views/C_YEAR_CLOSE_V.xml --- a/src-db/database/model/views/C_YEAR_CLOSE_V.xml Mon Jul 15 14:12:21 2013 +0200 +++ b/src-db/database/model/views/C_YEAR_CLOSE_V.xml Thu Jul 11 11:15:06 2013 +0200 @@ -1,4 +1,4 @@ <?xml version="1.0"?> <database name="VIEW C_YEAR_CLOSE_V"> - <view name="C_YEAR_CLOSE_V"><![CDATA[SELECT (SELECT max(c_periodcontrol.c_periodcontrol_id) AS max FROM c_periodcontrol, c_period WHERE c_periodcontrol.c_period_id = c_period.c_period_id AND c_period.c_year_id = y.c_year_id AND c_periodcontrol.ad_org_id = o.ad_org_id) AS c_year_close_v_id, o.ad_client_id, o.ad_org_id, max(o.created) AS created, max(o.createdby) AS createdby, max(o.updated) AS updated, max(o.updatedby) AS updatedby, o.isactive, c.c_calendar_id, y.c_year_id, CASE WHEN max(closing.ad_org_closing_id) IS NULL THEN 'O' ELSE 'C' END AS status, CASE WHEN max(closing.ad_org_closing_id) IS NULL THEN 'C' ELSE 'O' END AS processed FROM ad_org o LEFT JOIN (SELECT ad_org.c_calendar_id, ad_org.ad_org_id FROM ad_org WHERE ad_org.c_calendar_id IS NOT NULL) c ON c.ad_org_id = ad_org_getcalendarowner(o.ad_org_id) LEFT JOIN c_year y ON c.c_calendar_id = y.c_calendar_id LEFT JOIN ad_org_closing closing ON (y.c_year_id || o.ad_org_id) = (closing.c_year_id || COALESCE(closing.ad_org_i d, o.ad_org_id)) WHERE o.isperiodcontrolallowed = 'Y' AND o.isactive = 'Y' GROUP BY o.ad_client_id, o.ad_org_id, o.isactive, c.c_calendar_id, y.c_year_id]]></view> + <view name="C_YEAR_CLOSE_V"><![CDATA[SELECT (SELECT max(c_periodcontrol.c_periodcontrol_id) AS max FROM c_periodcontrol, c_period WHERE c_periodcontrol.c_period_id = c_period.c_period_id AND c_period.c_year_id = y.c_year_id AND c_periodcontrol.ad_org_id = o.ad_org_id) AS c_year_close_v_id, o.ad_client_id, o.ad_org_id, max(o.created) AS created, max(o.createdby) AS createdby, max(o.updated) AS updated, max(o.updatedby) AS updatedby, o.isactive, c.c_calendar_id, y.c_year_id, CASE WHEN max(closing.ad_org_closing_id) IS NULL THEN 'O' ELSE 'C' END AS status, CASE WHEN max(closing.ad_org_closing_id) IS NULL THEN 'C' ELSE 'O' END AS processed FROM ad_org o LEFT JOIN (SELECT ad_org.c_calendar_id, ad_org.ad_org_id FROM ad_org WHERE ad_org.c_calendar_id IS NOT NULL) c ON c.ad_org_id = ad_org_getcalendarowner(o.ad_org_id) LEFT JOIN c_year y ON c.c_calendar_id = y.c_calendar_id RIGHT JOIN c_period p ON y.c_year_id = p.c_year_id LEFT JOIN ad_org_closing closing ON (y.c_year_id || o.ad_org_id ) = (closing.c_year_id || COALESCE(closing.ad_org_id, o.ad_org_id)) WHERE o.isperiodcontrolallowed = 'Y' AND o.isactive = 'Y' GROUP BY o.ad_client_id, o.ad_org_id, o.isactive, c.c_calendar_id, y.c_year_id]]></view> </database> diff -r de65f6acc7f0 -r 436cd2fa79fc src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Jul 15 14:12:21 2013 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Jul 11 11:15:06 2013 +0200 @@ -288369,8 +288369,8 @@ <!--9E82E728716246B393C40D2CDCA0133A--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--9E82E728716246B393C40D2CDCA0133A--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--9E82E728716246B393C40D2CDCA0133A--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> -<!--9E82E728716246B393C40D2CDCA0133A--> <SQLLOGIC><![CDATA[(select case when sum(ol.qtyordered) = 0 then 0 else -round(coalesce(sum(ol.qtydelivered), 0)/sum(ol.qtyordered) * 100, 0) end +<!--9E82E728716246B393C40D2CDCA0133A--> <SQLLOGIC><![CDATA[(select case when sum(abs(ol.qtyordered)) = 0 then 0 else +round(coalesce(sum(abs(ol.qtydelivered)), 0)/sum(abs(ol.qtyordered)) * 100, 0) end from c_orderline ol where ol.c_order_id=c_order_id and ol.c_order_discount_id is null )]]></SQLLOGIC> <!--9E82E728716246B393C40D2CDCA0133A--></AD_COLUMN> @@ -297094,8 +297094,8 @@ <!--B5B203AE8D674B8DABC6669419815CA7--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--B5B203AE8D674B8DABC6669419815CA7--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--B5B203AE8D674B8DABC6669419815CA7--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> -<!--B5B203AE8D674B8DABC6669419815CA7--> <SQLLOGIC><![CDATA[(select case when sum(ol.qtyordered) = 0 then 0 else -round(coalesce(sum(ol.qtyinvoiced), 0)/sum(ol.qtyordered) * 100, 0) end +<!--B5B203AE8D674B8DABC6669419815CA7--> <SQLLOGIC><![CDATA[(select case when sum(abs(ol.qtyordered)) = 0 then 0 else +round(coalesce(sum(abs(ol.qtyinvoiced)), 0)/sum(abs(ol.qtyordered)) * 100, 0) end from c_orderline ol where ol.c_order_id=c_order_id and ol.c_order_discount_id is null)]]></SQLLOGIC> <!--B5B203AE8D674B8DABC6669419815CA7--></AD_COLUMN> diff -r de65f6acc7f0 -r 436cd2fa79fc src-db/database/sourcedata/AD_PROCESS_PARA.xml --- a/src-db/database/sourcedata/AD_PROCESS_PARA.xml Mon Jul 15 14:12:21 2013 +0200 +++ b/src-db/database/sourcedata/AD_PROCESS_PARA.xml Thu Jul 11 11:15:06 2013 +0200 @@ -4214,7 +4214,7 @@ <!--6928C4E56A7F4760839813474B8B3451--> <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID> <!--6928C4E56A7F4760839813474B8B3451--> <COLUMNNAME><![CDATA[DateFrom]]></COLUMNNAME> <!--6928C4E56A7F4760839813474B8B3451--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> -<!--6928C4E56A7F4760839813474B8B3451--> <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH> +<!--6928C4E56A7F4760839813474B8B3451--> <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH> <!--6928C4E56A7F4760839813474B8B3451--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> <!--6928C4E56A7F4760839813474B8B3451--> <ISRANGE><![CDATA[N]]></ISRANGE> <!--6928C4E56A7F4760839813474B8B3451--> <AD_ELEMENT_ID><![CDATA[1581]]></AD_ELEMENT_ID> @@ -4433,7 +4433,7 @@ <!--8EB04CCC31FE41A3898688438944CBEE--> <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID> <!--8EB04CCC31FE41A3898688438944CBEE--> <COLUMNNAME><![CDATA[DateTo]]></COLUMNNAME> <!--8EB04CCC31FE41A3898688438944CBEE--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> -<!--8EB04CCC31FE41A3898688438944CBEE--> <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH> +<!--8EB04CCC31FE41A3898688438944CBEE--> <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH> <!--8EB04CCC31FE41A3898688438944CBEE--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> <!--8EB04CCC31FE41A3898688438944CBEE--> <ISRANGE><![CDATA[N]]></ISRANGE> <!--8EB04CCC31FE41A3898688438944CBEE--> <AD_ELEMENT_ID><![CDATA[1582]]></AD_ELEMENT_ID> diff -r de65f6acc7f0 -r 436cd2fa79fc src/org/openbravo/financial/ResetAccounting.java --- a/src/org/openbravo/financial/ResetAccounting.java Mon Jul 15 14:12:21 2013 +0200 +++ b/src/org/openbravo/financial/ResetAccounting.java Thu Jul 11 11:15:06 2013 +0200 @@ -344,10 +344,12 @@ String myQuery = "select distinct p from FinancialMgmtPeriodControl e left join e.period p left join p.year y left join y.calendar c where c.id = :calendarId and e.client.id = :clientId and e.documentCategory = :docbasetype and e.periodStatus = 'O' and e.organization.id = :orgPeriodControl"; if (!("".equals(datefrom))) { - myQuery = myQuery + " and p.startingDate >= :dateFrom"; + myQuery = myQuery + " and p.startingDate <= :dateFrom"; + myQuery = myQuery + " and p.endingDate >= :dateFrom"; } if (!("".equals(dateto))) { - myQuery = myQuery + " and p.endingDate <= :dateTo"; + myQuery = myQuery + " and p.startingDate <= :dateTo"; + myQuery = myQuery + " and p.endingDate >= :dateTo"; } Query query = OBDal.getInstance().getSession().createQuery(myQuery); // TODO: Review orgIds ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
