details: https://code.openbravo.com/erp/devel/main/rev/4a6b93fea344 changeset: 15290:4a6b93fea344 user: Jon AlegrÃa <jon.alegria <at> openbravo.com> date: Tue Feb 14 12:25:32 2012 +0100 summary: Fixes issue 0019746: Problem introducing an attribute set value
details: https://code.openbravo.com/erp/devel/main/rev/53c0739aa632 changeset: 15291:53c0739aa632 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed Feb 15 20:31:23 2012 +0100 summary: Fixes bug 19769: You cannot select a dataset through Enterprise module management with client/organization access level details: https://code.openbravo.com/erp/devel/main/rev/05e845f8c320 changeset: 15292:05e845f8c320 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed Feb 15 20:33:15 2012 +0100 summary: Fixes bug 19767, Fixes bug 19768 details: https://code.openbravo.com/erp/devel/main/rev/aacd22f7c6af changeset: 15293:aacd22f7c6af user: David Miguelez <david.miguelez <at> openbravo.com> date: Fri Feb 17 13:08:40 2012 +0000 summary: Added compatibility with Payment Aging Balance Report details: https://code.openbravo.com/erp/devel/main/rev/b165b5619b09 changeset: 15294:b165b5619b09 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Feb 15 12:05:27 2012 +0100 summary: Changed Exception for OBException details: https://code.openbravo.com/erp/devel/main/rev/bc31938647cc changeset: 15295:bc31938647cc user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Feb 15 17:56:28 2012 +0100 summary: Resolved API break and changed copyright dates. details: https://code.openbravo.com/erp/devel/main/rev/54a3a02cf401 changeset: 15296:54a3a02cf401 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Feb 15 19:10:02 2012 +0100 summary: Fixes issue showing empty bussines partners when excluded details: https://code.openbravo.com/erp/devel/main/rev/75977e14a4b1 changeset: 15297:75977e14a4b1 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Feb 15 20:13:48 2012 +0100 summary: Fixes issue when sorting names with blank spaces inside details: https://code.openbravo.com/erp/devel/main/rev/3006091f34c4 changeset: 15298:3006091f34c4 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Feb 16 10:04:53 2012 +0100 summary: Related to issue 0019785: Fixes issue with dates and possible API change. details: https://code.openbravo.com/erp/devel/main/rev/f53ffc318e10 changeset: 15299:f53ffc318e10 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Feb 16 13:12:41 2012 +0100 summary: Related to issue 0019785: Fixes API change. diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 88 + modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html | 212 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java | 169 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml | 17 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 937 +++++++++- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml | 38 +- src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java | 7 +- src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql | 3 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 169 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 2 +- src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql | 16 +- 12 files changed, 1451 insertions(+), 209 deletions(-) diffs (truncated from 2597 to 300 lines): diff -r b3e0f9d55682 -r f53ffc318e10 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js Thu Feb 16 12:47:10 2012 +0000 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js Thu Feb 16 13:12:41 2012 +0100 @@ -11,7 +11,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-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ diff -r b3e0f9d55682 -r f53ffc318e10 modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Feb 16 12:47:10 2012 +0000 +++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Feb 16 13:12:41 2012 +0100 @@ -165,6 +165,17 @@ <!--2E1CF9F4C3E94DDF8267520EAE434F8C--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> <!--2E1CF9F4C3E94DDF8267520EAE434F8C--></AD_TEXTINTERFACES> +<!--2FAD31FCFE354886A1DCF184253A833A--><AD_TEXTINTERFACES> +<!--2FAD31FCFE354886A1DCF184253A833A--> <AD_TEXTINTERFACES_ID><![CDATA[2FAD31FCFE354886A1DCF184253A833A]]></AD_TEXTINTERFACES_ID> +<!--2FAD31FCFE354886A1DCF184253A833A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2FAD31FCFE354886A1DCF184253A833A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2FAD31FCFE354886A1DCF184253A833A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2FAD31FCFE354886A1DCF184253A833A--> <TEXT><![CDATA[Empty Business Partner]]></TEXT> +<!--2FAD31FCFE354886A1DCF184253A833A--> <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME> +<!--2FAD31FCFE354886A1DCF184253A833A--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--2FAD31FCFE354886A1DCF184253A833A--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> +<!--2FAD31FCFE354886A1DCF184253A833A--></AD_TEXTINTERFACES> + <!--30969F03CBFC4DE7BCFBC71FA5D34EDA--><AD_TEXTINTERFACES> <!--30969F03CBFC4DE7BCFBC71FA5D34EDA--> <AD_TEXTINTERFACES_ID><![CDATA[30969F03CBFC4DE7BCFBC71FA5D34EDA]]></AD_TEXTINTERFACES_ID> <!--30969F03CBFC4DE7BCFBC71FA5D34EDA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -275,6 +286,17 @@ <!--43C8186236514013ADE1E5C8DB7A043B--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> <!--43C8186236514013ADE1E5C8DB7A043B--></AD_TEXTINTERFACES> +<!--4721249AEDFF435C893526F191DCFAF6--><AD_TEXTINTERFACES> +<!--4721249AEDFF435C893526F191DCFAF6--> <AD_TEXTINTERFACES_ID><![CDATA[4721249AEDFF435C893526F191DCFAF6]]></AD_TEXTINTERFACES_ID> +<!--4721249AEDFF435C893526F191DCFAF6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--4721249AEDFF435C893526F191DCFAF6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--4721249AEDFF435C893526F191DCFAF6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--4721249AEDFF435C893526F191DCFAF6--> <TEXT><![CDATA[Include empty Business Partner]]></TEXT> +<!--4721249AEDFF435C893526F191DCFAF6--> <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME> +<!--4721249AEDFF435C893526F191DCFAF6--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--4721249AEDFF435C893526F191DCFAF6--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> +<!--4721249AEDFF435C893526F191DCFAF6--></AD_TEXTINTERFACES> + <!--47D05363EA0A431E94988745BA473BD1--><AD_TEXTINTERFACES> <!--47D05363EA0A431E94988745BA473BD1--> <AD_TEXTINTERFACES_ID><![CDATA[47D05363EA0A431E94988745BA473BD1]]></AD_TEXTINTERFACES_ID> <!--47D05363EA0A431E94988745BA473BD1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -330,6 +352,17 @@ <!--55A3D8825B094737B9E1479A50AE73B1--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> <!--55A3D8825B094737B9E1479A50AE73B1--></AD_TEXTINTERFACES> +<!--64984571E7EE46B590D617CAB3D28598--><AD_TEXTINTERFACES> +<!--64984571E7EE46B590D617CAB3D28598--> <AD_TEXTINTERFACES_ID><![CDATA[64984571E7EE46B590D617CAB3D28598]]></AD_TEXTINTERFACES_ID> +<!--64984571E7EE46B590D617CAB3D28598--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--64984571E7EE46B590D617CAB3D28598--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--64984571E7EE46B590D617CAB3D28598--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--64984571E7EE46B590D617CAB3D28598--> <TEXT><![CDATA[Payment Date To:]]></TEXT> +<!--64984571E7EE46B590D617CAB3D28598--> <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME> +<!--64984571E7EE46B590D617CAB3D28598--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--64984571E7EE46B590D617CAB3D28598--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> +<!--64984571E7EE46B590D617CAB3D28598--></AD_TEXTINTERFACES> + <!--64F1EDBA15314054B3A147A4262B95FE--><AD_TEXTINTERFACES> <!--64F1EDBA15314054B3A147A4262B95FE--> <AD_TEXTINTERFACES_ID><![CDATA[64F1EDBA15314054B3A147A4262B95FE]]></AD_TEXTINTERFACES_ID> <!--64F1EDBA15314054B3A147A4262B95FE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -396,6 +429,17 @@ <!--7C6A82A324CD477F82B8E89EF51D7563--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> <!--7C6A82A324CD477F82B8E89EF51D7563--></AD_TEXTINTERFACES> +<!--7F5AB117CCB640BAB9142318F124DDCD--><AD_TEXTINTERFACES> +<!--7F5AB117CCB640BAB9142318F124DDCD--> <AD_TEXTINTERFACES_ID><![CDATA[7F5AB117CCB640BAB9142318F124DDCD]]></AD_TEXTINTERFACES_ID> +<!--7F5AB117CCB640BAB9142318F124DDCD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--7F5AB117CCB640BAB9142318F124DDCD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--7F5AB117CCB640BAB9142318F124DDCD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--7F5AB117CCB640BAB9142318F124DDCD--> <TEXT><![CDATA[Only empty Business Partner]]></TEXT> +<!--7F5AB117CCB640BAB9142318F124DDCD--> <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME> +<!--7F5AB117CCB640BAB9142318F124DDCD--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--7F5AB117CCB640BAB9142318F124DDCD--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> +<!--7F5AB117CCB640BAB9142318F124DDCD--></AD_TEXTINTERFACES> + <!--7FF75B077A6D4C2CA4752A0F82AD7B39--><AD_TEXTINTERFACES> <!--7FF75B077A6D4C2CA4752A0F82AD7B39--> <AD_TEXTINTERFACES_ID><![CDATA[7FF75B077A6D4C2CA4752A0F82AD7B39]]></AD_TEXTINTERFACES_ID> <!--7FF75B077A6D4C2CA4752A0F82AD7B39--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -539,6 +583,17 @@ <!--9BEBF44EF99C4B228D71CFC101710095--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> <!--9BEBF44EF99C4B228D71CFC101710095--></AD_TEXTINTERFACES> +<!--A062D2FD534B478CBBDD8BFE94834193--><AD_TEXTINTERFACES> +<!--A062D2FD534B478CBBDD8BFE94834193--> <AD_TEXTINTERFACES_ID><![CDATA[A062D2FD534B478CBBDD8BFE94834193]]></AD_TEXTINTERFACES_ID> +<!--A062D2FD534B478CBBDD8BFE94834193--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A062D2FD534B478CBBDD8BFE94834193--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A062D2FD534B478CBBDD8BFE94834193--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A062D2FD534B478CBBDD8BFE94834193--> <TEXT><![CDATA[Payment Date From]]></TEXT> +<!--A062D2FD534B478CBBDD8BFE94834193--> <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME> +<!--A062D2FD534B478CBBDD8BFE94834193--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--A062D2FD534B478CBBDD8BFE94834193--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> +<!--A062D2FD534B478CBBDD8BFE94834193--></AD_TEXTINTERFACES> + <!--A178474701304374BF37B9FFBB6B8E38--><AD_TEXTINTERFACES> <!--A178474701304374BF37B9FFBB6B8E38--> <AD_TEXTINTERFACES_ID><![CDATA[A178474701304374BF37B9FFBB6B8E38]]></AD_TEXTINTERFACES_ID> <!--A178474701304374BF37B9FFBB6B8E38--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -792,6 +847,17 @@ <!--D331A2D41B8840838C4708C92DC5E435--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> <!--D331A2D41B8840838C4708C92DC5E435--></AD_TEXTINTERFACES> +<!--D3B9E8172CB74CA98A74A6B119612106--><AD_TEXTINTERFACES> +<!--D3B9E8172CB74CA98A74A6B119612106--> <AD_TEXTINTERFACES_ID><![CDATA[D3B9E8172CB74CA98A74A6B119612106]]></AD_TEXTINTERFACES_ID> +<!--D3B9E8172CB74CA98A74A6B119612106--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--D3B9E8172CB74CA98A74A6B119612106--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--D3B9E8172CB74CA98A74A6B119612106--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--D3B9E8172CB74CA98A74A6B119612106--> <TEXT><![CDATA[Payment Date From:]]></TEXT> +<!--D3B9E8172CB74CA98A74A6B119612106--> <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME> +<!--D3B9E8172CB74CA98A74A6B119612106--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--D3B9E8172CB74CA98A74A6B119612106--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> +<!--D3B9E8172CB74CA98A74A6B119612106--></AD_TEXTINTERFACES> + <!--D3DA75B510A54CEDAD7813134FA06BB7--><AD_TEXTINTERFACES> <!--D3DA75B510A54CEDAD7813134FA06BB7--> <AD_TEXTINTERFACES_ID><![CDATA[D3DA75B510A54CEDAD7813134FA06BB7]]></AD_TEXTINTERFACES_ID> <!--D3DA75B510A54CEDAD7813134FA06BB7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -803,6 +869,17 @@ <!--D3DA75B510A54CEDAD7813134FA06BB7--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> <!--D3DA75B510A54CEDAD7813134FA06BB7--></AD_TEXTINTERFACES> +<!--D79B532849AC43F09FB38375FB9CBBA2--><AD_TEXTINTERFACES> +<!--D79B532849AC43F09FB38375FB9CBBA2--> <AD_TEXTINTERFACES_ID><![CDATA[D79B532849AC43F09FB38375FB9CBBA2]]></AD_TEXTINTERFACES_ID> +<!--D79B532849AC43F09FB38375FB9CBBA2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--D79B532849AC43F09FB38375FB9CBBA2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--D79B532849AC43F09FB38375FB9CBBA2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--D79B532849AC43F09FB38375FB9CBBA2--> <TEXT><![CDATA[Payment Date To]]></TEXT> +<!--D79B532849AC43F09FB38375FB9CBBA2--> <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME> +<!--D79B532849AC43F09FB38375FB9CBBA2--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--D79B532849AC43F09FB38375FB9CBBA2--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> +<!--D79B532849AC43F09FB38375FB9CBBA2--></AD_TEXTINTERFACES> + <!--D97008CA65654BE69AFCDEECC9D20210--><AD_TEXTINTERFACES> <!--D97008CA65654BE69AFCDEECC9D20210--> <AD_TEXTINTERFACES_ID><![CDATA[D97008CA65654BE69AFCDEECC9D20210]]></AD_TEXTINTERFACES_ID> <!--D97008CA65654BE69AFCDEECC9D20210--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -880,6 +957,17 @@ <!--DEE5ED85F85742E0B8F4F000946A3B19--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> <!--DEE5ED85F85742E0B8F4F000946A3B19--></AD_TEXTINTERFACES> +<!--DF2CC16AD5894BA7B620A962C4632C27--><AD_TEXTINTERFACES> +<!--DF2CC16AD5894BA7B620A962C4632C27--> <AD_TEXTINTERFACES_ID><![CDATA[DF2CC16AD5894BA7B620A962C4632C27]]></AD_TEXTINTERFACES_ID> +<!--DF2CC16AD5894BA7B620A962C4632C27--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--DF2CC16AD5894BA7B620A962C4632C27--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--DF2CC16AD5894BA7B620A962C4632C27--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--DF2CC16AD5894BA7B620A962C4632C27--> <TEXT><![CDATA[Exclude empty Business Partner]]></TEXT> +<!--DF2CC16AD5894BA7B620A962C4632C27--> <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME> +<!--DF2CC16AD5894BA7B620A962C4632C27--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--DF2CC16AD5894BA7B620A962C4632C27--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID> +<!--DF2CC16AD5894BA7B620A962C4632C27--></AD_TEXTINTERFACES> + <!--E460023C097749C5892A9CE255BD6FEB--><AD_TEXTINTERFACES> <!--E460023C097749C5892A9CE255BD6FEB--> <AD_TEXTINTERFACES_ID><![CDATA[E460023C097749C5892A9CE255BD6FEB]]></AD_TEXTINTERFACES_ID> <!--E460023C097749C5892A9CE255BD6FEB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r b3e0f9d55682 -r f53ffc318e10 modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html --- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html Thu Feb 16 12:47:10 2012 +0000 +++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html Thu Feb 16 13:12:41 2012 +0100 @@ -13,7 +13,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SL -* All portions are Copyright (C) 2009-2011 Openbravo SL +* All portions are Copyright (C) 2009-2012 Openbravo SL * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -56,15 +56,17 @@ function printPDF() { initialize_MessageBox('messageBoxID'); - if (validate()) + if (validate()){ openPDFFiltered("PaymentReport.html?Command=PDF","PDF"); + } return true; } function printXLS() { initialize_MessageBox('messageBoxID'); - if (validate()) + if (validate()){ openPDFFiltered("PaymentReport.html?Command=XLS","EXCEL"); + } return true; } </script> @@ -78,19 +80,19 @@ function validate() { var frm=document.frmMain; - if (inputValue(frm.inpOrg)==null || inputValue(frm.inpOrg)=="") { + if (inputValue(frm.inpOrg)===null || inputValue(frm.inpOrg)==="") { setWindowElementFocus(frm.inpOrg); showJSMessage(7); return false; - } else if (inputValue(frm.inpConvertCurrencyId)==null || inputValue(frm.inpConvertCurrencyId)=="") { + } else if (inputValue(frm.inpConvertCurrencyId)===null || inputValue(frm.inpConvertCurrencyId)==="") { setWindowElementFocus(frm.inpConvertCurrencyId); showJSMessage(7); return false; - } else if (inputValue(frm.inpConversionDate)==null || inputValue(frm.inpConversionDate)=="") { + } else if (inputValue(frm.inpConversionDate)===null || inputValue(frm.inpConversionDate)==="") { setWindowElementFocus(frm.inpConversionDate); showJSMessage(7); return false; - } else if (inputValue(frm.inpPaymType)==null || inputValue(frm.inpPaymType)=="") { + } else if (inputValue(frm.inpPaymType)===null || inputValue(frm.inpPaymType)==="") { setWindowElementFocus(frm.inpPaymType); showJSMessage(7); return false; @@ -103,6 +105,10 @@ return true; } function onLoadDo(){ + + var selectedGroupBy = null; + var groupby = null; + this.windowTables = new Array( new windowTableId('client', 'buttonHTML') ); @@ -114,6 +120,14 @@ enableShortcuts('edition'); setBrowserAutoComplete(false); + selectedGroupBy = document.getElementById('paramcNoBPartner').value; + groupby = document.getElementById('inpcNoBPartner'); + for (i=0;i<groupby.length;i++){ + if (groupby[i].value === selectedGroupBy){ + groupby[i].selected = true; + } + } + try { onloadFunctions(); } catch (e) {} @@ -140,7 +154,7 @@ // Ordering criteria left: The option in grouping criteria gets hidden and it is put at the end. for (i = 0; i < ord.length; i++){ - if (gro.options[gro.selectedIndex].value == ord.options[i].value){ + if (gro.options[gro.selectedIndex].value === ord.options[i].value){ ord[i].style.visibility = "hidden"; lastOrd = ord[i]; } @@ -157,7 +171,7 @@ // Ordering criteria right: The option in grouping criteria gets hidden and it is put at the end. for (i = 0; i < sho.length ; i++){ - if (gro.options[gro.selectedIndex].value == sho.options[i].value){ + if (gro.options[gro.selectedIndex].value === sho.options[i].value){ sho[i].style.visibility = "hidden"; lastSho = sho[i]; } @@ -185,14 +199,14 @@ for (i = 0; i < ord.length; i++){ // Duplicates between left and right. for (j = 0; j < sho.length; j++){ - if (ord.options[i].value == sho.options[j].value){ + if (ord.options[i].value === sho.options[j].value){ elementsToRemove.push(i); } } // Duplicates in left part. for (j = 0; j < ord.length; j++){ - if (ord.options[i].value == ord.options[j].value && i != j){ - if (ord.options[i].style.visibility == "hidden"){ + if (ord.options[i].value === ord.options[j].value && i != j){ + if (ord.options[i].style.visibility === 'hidden'){ elementsToRemove.push(i); } else { elementsToRemove.push(j); @@ -208,7 +222,7 @@ // Ordering criteria left: Moving to last position intermediate hidden objects. for (i = 0; i < ord.length; i++){ - if (ord.options[i].style.visibility == "hidden"){ + if (ord.options[i].style.visibility === 'hidden'){ hiddenElement = ord[i]; ord.remove(i); ord.add(hiddenElement, null); @@ -217,7 +231,7 @@ // Ordering criteria right: Moving to last position intermediate hidden objects. for (i = 0; i < sho.length; i++){ - if (sho.options[i].style.visibility == "hidden"){ + if (sho.options[i].style.visibility === 'hidden'){ hiddenElement = sho[i]; sho.remove(i); sho.add(hiddenElement, null); @@ -243,7 +257,7 @@ for (i = 0; i < arrSelStatus.length; i++ ){ for (j = 0; j < status.options.length; j++){ - if (arrSelStatus[i] == status.options[j].value){ ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
