details: https://code.openbravo.com/erp/devel/pi/rev/89ba5b74782a changeset: 19057:89ba5b74782a user: daniel <daniel.martins <at> xpand-it.com> date: Wed Oct 24 16:20:58 2012 +0100 summary: Related to issue 21507.Add the options -Credit and -Debit to the Report Type in User Defined Accounting Report
details: https://code.openbravo.com/erp/devel/pi/rev/691418c9a8b9 changeset: 19058:691418c9a8b9 user: daniel <daniel.martins <at> xpand-it.com> date: Wed Oct 24 19:00:00 2012 +0100 summary: Related to issue 21507.Add a conditional option (Consider Zero) to the User Defined Accounting Report details: https://code.openbravo.com/erp/devel/pi/rev/e9513e612a33 changeset: 19059:e9513e612a33 user: daniel <daniel.martins <at> xpand-it.com> date: Wed Nov 14 14:43:10 2012 +0000 summary: Related to issue 21945.Modify the "Account" combo box so you can select not only a sub-account but any other element level details: https://code.openbravo.com/erp/devel/pi/rev/3c68da0ffda1 changeset: 19060:3c68da0ffda1 user: daniel <daniel.martins <at> xpand-it.com> date: Thu Nov 15 17:55:44 2012 +0000 summary: Related to issue 21945.Modify the "Account" combo box so you can select not only a sub-account but any other element level details: https://code.openbravo.com/erp/devel/pi/rev/3ba207ffcdec changeset: 19061:3ba207ffcdec user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Dec 17 13:01:20 2012 +0100 summary: Fixed issue 22308.Fixed issue 21507.Fixed issue 21945.Apply code review and fix issues. details: https://code.openbravo.com/erp/devel/pi/rev/55d6d93f9d91 changeset: 19062:55d6d93f9d91 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon Dec 17 18:34:33 2012 +0100 summary: Fixed issue 22501.Merge User Defined Accounting Report enhancement. diffstat: .hgsigs | 1 + .hgtags | 1 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/LocationSettingsHandler.java | 115 +++++++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 4 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/model/tables/AD_ACCOUNTINGRPT_ELEMENT.xml | 4 + src-db/database/sourcedata/AD_COLUMN.xml | 40 ++- src-db/database/sourcedata/AD_ELEMENT.xml | 15 + src-db/database/sourcedata/AD_FIELD.xml | 55 ++- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/AD_REF_LIST.xml | 63 ++++ src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.java | 43 ++- src/org/openbravo/erpCommon/ad_process/CreateAccountingReport_data.xsql | 145 ++++++--- 54 files changed, 510 insertions(+), 155 deletions(-) diffs (truncated from 1689 to 300 lines): diff -r 3db450e737fd -r 55d6d93f9d91 .hgsigs --- a/.hgsigs Fri Dec 14 10:26:11 2012 +0100 +++ b/.hgsigs Mon Dec 17 18:34:33 2012 +0100 @@ -91,3 +91,4 @@ dcee1af5f243600cbed68798e892b7ba73a06ffa 0 iEYEABECAAYFAlC081kACgkQCX/oGf+2qkMU0ACfVvvLz1k+IF5axkQ2PQbFbJdLAVgAoN8XtUH6J76jpKSCx3GriplFPxdl d9dc1dcdb1f7da6ca0e0fcff57ac4f6c2f5e938c 0 iEYEABECAAYFAlCj2v8ACgkQCX/oGf+2qkPEsgCeOLWp7v5gU6Ip90kOBdOF+mejRHsAoObtRXJVe+gNq2nUa7Xu1EbVxsag 3ded67251154d0aa958eacb918de97fd5a77e3dc 0 iEYEABECAAYFAlC3tuIACgkQCX/oGf+2qkO0zgCdFACe5suzHq8pukNoc8ghZJlvO6UAn3wzW4/wmIEfmngxthdtqRTrSQ2X +9fd46b5349c522407c7fe4eaedeed678487e02a2 0 iEYEABECAAYFAlDK72cACgkQCX/oGf+2qkNv1gCfYsphl/F7dyNNh+u046YI9RwEdD4AoMPAoXJFhg9rV8gF6tZgeSMSAOV3 diff -r 3db450e737fd -r 55d6d93f9d91 .hgtags --- a/.hgtags Fri Dec 14 10:26:11 2012 +0100 +++ b/.hgtags Mon Dec 17 18:34:33 2012 +0100 @@ -102,3 +102,4 @@ c8ad7ddf47ddda7a33b56bafceff8d1ae5dadef2 3.0MP16.3 f731024ec763373bd02a0825d0f42e1ddb15eb32 3.0MP17 41ad849c6978ec887187853448c1f1a79fc01c4f 3.0MP17.1 +43986bd34e503950718f87d719d70fccfc8607fe 3.0MP18 diff -r 3db450e737fd -r 55d6d93f9d91 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Dec 14 10:26:11 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Dec 17 18:34:33 2012 +0100 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19003]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19052]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 3db450e737fd -r 55d6d93f9d91 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Dec 14 10:26:11 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Dec 17 18:34:33 2012 +0100 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19003]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19052]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19003]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19052]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3db450e737fd -r 55d6d93f9d91 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri Dec 14 10:26:11 2012 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Dec 17 18:34:33 2012 +0100 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.19003]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.19052]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 3db450e737fd -r 55d6d93f9d91 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Dec 14 10:26:11 2012 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Dec 17 18:34:33 2012 +0100 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.19003]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.19052]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3db450e737fd -r 55d6d93f9d91 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri Dec 14 10:26:11 2012 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Dec 17 18:34:33 2012 +0100 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.19003]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.19052]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 3db450e737fd -r 55d6d93f9d91 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Dec 14 10:26:11 2012 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Dec 17 18:34:33 2012 +0100 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.19003]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.19052]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.19003]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.19052]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.19003]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.19052]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.19003]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.19052]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3db450e737fd -r 55d6d93f9d91 modules/org.openbravo.client.application/src/org/openbravo/client/application/event/LocationSettingsHandler.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/LocationSettingsHandler.java Mon Dec 17 18:34:33 2012 +0100 @@ -0,0 +1,115 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.1 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2012 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ +package org.openbravo.client.application.event; + +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; + +import javax.enterprise.event.Observes; + +import org.apache.log4j.Logger; +import org.openbravo.base.exception.OBException; +import org.openbravo.base.model.Entity; +import org.openbravo.base.model.ModelProvider; +import org.openbravo.client.kernel.event.EntityDeleteEvent; +import org.openbravo.client.kernel.event.EntityNewEvent; +import org.openbravo.client.kernel.event.EntityPersistenceEventObserver; +import org.openbravo.client.kernel.event.EntityUpdateEvent; +import org.openbravo.erpCommon.utility.OBMessageUtils; +import org.openbravo.model.common.geography.Country; + +/** + * Action handler that checks if the location settings defined by the user contains legal values + * + * + * @author openbravo + */ +public class LocationSettingsHandler extends EntityPersistenceEventObserver { + private static Entity[] entities = { ModelProvider.getInstance().getEntity(Country.ENTITY_NAME) }; + protected Logger logger = Logger.getLogger(this.getClass()); + + @Override + protected Entity[] getObservedEntities() { + return entities; + } + + public void onUpdate(@Observes + EntityUpdateEvent event) { + if (!isValidEvent(event)) { + return; + } + Country instanceCountry = (Country) event.getTargetInstance(); + checkCorrectValues(instanceCountry.getNumericmask(), instanceCountry.getDatetimeformat(), + instanceCountry.getDateformat()); + } + + public void onSave(@Observes + EntityNewEvent event) { + if (!isValidEvent(event)) { + return; + } + Country instanceCountry = (Country) event.getTargetInstance(); + checkCorrectValues(instanceCountry.getNumericmask(), instanceCountry.getDatetimeformat(), + instanceCountry.getDateformat()); + } + + public void onDelete(@Observes + EntityDeleteEvent event) { + if (!isValidEvent(event)) { + return; + } + } + + private void checkCorrectValues(String numericmask, String datetimeformat, String dateformat) { + if (numericmask != null) { + if (checkNumericMask(numericmask)) { + try { + new DecimalFormat(numericmask); + } catch (IllegalArgumentException iaex) { + throw new OBException(OBMessageUtils.messageBD("InvalidNumericMask")); + } + } else { + throw new OBException(OBMessageUtils.messageBD("InvalidNumericMask")); + } + } + try { + if (datetimeformat != null) + new SimpleDateFormat(datetimeformat); + } catch (IllegalArgumentException iaex) { + throw new OBException(OBMessageUtils.messageBD("InvalidDateTimeFormat")); + } + try { + if (dateformat != null) + if (checkDateFormat(dateformat)) + new SimpleDateFormat(dateformat); + else + throw new OBException(OBMessageUtils.messageBD("InvalidDateFormat")); + } catch (IllegalArgumentException iaex) { + throw new OBException(OBMessageUtils.messageBD("InvalidDateFormat")); + } + } + + private boolean checkNumericMask(String numericmask) { + return numericmask.matches("[#0\\.,]+"); + } + + private boolean checkDateFormat(String date) { + return date.matches("[^aHkKhmsSzZ]+"); + } +} diff -r 3db450e737fd -r 55d6d93f9d91 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js Fri Dec 14 10:26:11 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js Mon Dec 17 18:34:33 2012 +0100 @@ -512,7 +512,7 @@ keyPressFilterNumeric: null, doBlurLogic: false, operator: 'equals', - validOperators: ['equals', 'lessThan', 'greaterThan', 'notEqual', 'lessThan', 'lessThanOrEqual', 'greaterThanOrEqual', 'between', 'betweenInclusive', 'isNull', 'isNotNull', 'equalsField', 'notEqualField', 'greaterThanField', 'lessThanField', 'greaterOrEqualField', 'lessOrEqualField'], + validOperators: ['equals', 'lessThan', 'greaterThan', 'notEqual', 'lessThan', 'lessOrEqual', 'greaterOrEqual', 'between', 'betweenInclusive', 'isNull', 'isNotNull', 'equalsField', 'notEqualField', 'greaterThanField', 'lessThanField', 'greaterOrEqualField', 'lessOrEqualField'], // prevent handling of equal symbol in filteritem keyDownAction: function (item, form, keyName) { @@ -585,6 +585,9 @@ convertToStringValue: function (value) { var type = this.typeInstance; + if (isc.isA.String(value) && !isNaN(value)) { + value = parseFloat(value); + } if (!isc.isA.String(value)) { // on purpose no grouping symbol return OB.Utilities.Number.JSToOBMasked(value, type.maskNumeric, type.decSeparator, null, type.groupInterval); diff -r 3db450e737fd -r 55d6d93f9d91 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Fri Dec 14 10:26:11 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Mon Dec 17 18:34:33 2012 +0100 @@ -136,7 +136,9 @@ response = OB.KeyboardManager.Shortcuts.monitor('OBGrid.filter', this.grid.fieldSourceGrid); if (response !== false) { - response = this.Super('filterFieldsKeyDown', arguments); + if (item.keyDownAction) { + return item.keyDownAction(item, form, keyName); + } } return response; }, diff -r 3db450e737fd -r 55d6d93f9d91 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Fri Dec 14 10:26:11 2012 +0100 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Mon Dec 17 18:34:33 2012 +0100 @@ -6,7 +6,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.19003]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.19052]]></VERSION> <!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION> <!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP> <!--D393BE6F22BB44B7B728259B34FC795A--> <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL> diff -r 3db450e737fd -r 55d6d93f9d91 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Dec 14 10:26:11 2012 +0100 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Dec 17 18:34:33 2012 +0100 @@ -7,7 +7,7 @@ <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID> -<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.19003]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.19052]]></STARTVERSION> ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
