details: https://code.openbravo.com/erp/devel/main/rev/1edba90e26f3 changeset: 19966:1edba90e26f3 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 25 08:11:58 2013 +0100 summary: realated to issue 23300
-In case of error in the process rollback so no err 500 is produced in the request and the message can be seen in UI -Changed severity and message in case of process failure -Force organization * for the new user-role row details: https://code.openbravo.com/erp/devel/main/rev/1bde37da0a01 changeset: 19967:1bde37da0a01 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 25 08:59:38 2013 +0100 summary: realated to issue 23300: added missing import details: https://code.openbravo.com/erp/devel/main/rev/86e3929e8eef changeset: 19968:86e3929e8eef user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Fri Jan 04 11:45:58 2013 +0530 summary: Fixes Issue 22555: The accounting dimension "Trx. Org" should be hidden details: https://code.openbravo.com/erp/devel/main/rev/a3f5f7b142d1 changeset: 19969:a3f5f7b142d1 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Sun Mar 24 18:09:34 2013 +0530 summary: Fixes Issue 23345: Error in moving a node in a tree details: https://code.openbravo.com/erp/devel/main/rev/4af01860e02e changeset: 19970:4af01860e02e user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Mon Mar 25 12:14:56 2013 +0100 summary: Fixes bug 23366 details: https://code.openbravo.com/erp/devel/main/rev/c0d54b7470f9 changeset: 19971:c0d54b7470f9 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Mon Mar 25 12:22:57 2013 +0100 summary: Fixes bug 23100 and removes unused code. details: https://code.openbravo.com/erp/devel/main/rev/c996d8a16780 changeset: 19972:c996d8a16780 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Mar 14 12:57:33 2013 +0100 summary: [Open Close Period] Period control window + end year closing update for permanent closing details: https://code.openbravo.com/erp/devel/main/rev/d88f47aa7a96 changeset: 19973:d88f47aa7a96 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Mar 14 19:41:35 2013 +0100 summary: Fixes Issues in periodControlStatus.js details: https://code.openbravo.com/erp/devel/main/rev/58e503099893 changeset: 19974:58e503099893 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Mar 15 10:47:04 2013 +0100 summary: [Open Close Period] adds end year close window details: https://code.openbravo.com/erp/devel/main/rev/3f5e49082765 changeset: 19975:3f5e49082765 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Mar 15 12:31:17 2013 +0100 summary: [Open Close Period] adds grouping for accounting info in end year close window details: https://code.openbravo.com/erp/devel/main/rev/3e522644ee6e changeset: 19976:3e522644ee6e user: David Miguelez <david.miguelez <at> openbravo.com> date: Fri Mar 15 12:52:06 2013 +0100 summary: [End Year Close] Adds Close and Undo Close buttons. details: https://code.openbravo.com/erp/devel/main/rev/a18249bddc0f changeset: 19977:a18249bddc0f user: David Miguelez <david.miguelez <at> openbravo.com> date: Fri Mar 15 13:21:45 2013 +0100 summary: [Year Closing] Removes buttons. details: https://code.openbravo.com/erp/devel/main/rev/0265ebbab0eb changeset: 19978:0265ebbab0eb user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Mar 15 14:27:03 2013 +0100 summary: [period open close] adds EndYearCloseUtility.java details: https://code.openbravo.com/erp/devel/main/rev/c75630e93a58 changeset: 19979:c75630e93a58 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Mar 15 17:05:13 2013 +0100 summary: [period open close] Fixes EndYearCloseUtility.java details: https://code.openbravo.com/erp/devel/main/rev/2de23acfd457 changeset: 19980:2de23acfd457 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Mar 15 18:57:22 2013 +0100 summary: [period open close] Adds end year close process details: https://code.openbravo.com/erp/devel/main/rev/6df90f34c813 changeset: 19981:6df90f34c813 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Mar 15 19:15:27 2013 +0100 summary: [open close period] Fixes autosave details: https://code.openbravo.com/erp/devel/main/rev/485930036c1b changeset: 19982:485930036c1b user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Mar 15 20:18:02 2013 +0100 summary: [open close period] Fixes end year close process validation details: https://code.openbravo.com/erp/devel/main/rev/d9ff9aee8bce changeset: 19983:d9ff9aee8bce user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Mar 18 11:15:21 2013 +0100 summary: [open close period] Merge with pi details: https://code.openbravo.com/erp/devel/main/rev/4dd0c12150c1 changeset: 19984:4dd0c12150c1 user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Mar 18 13:30:24 2013 +0100 summary: [open close period] Fixes c_year_close_v view. details: https://code.openbravo.com/erp/devel/main/rev/2b3788d009be changeset: 19985:2b3788d009be user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Mar 19 17:06:12 2013 +0100 summary: [open close periods] Filters Open/Close actions depending on the Period status. details: https://code.openbravo.com/erp/devel/main/rev/e2c5698411c8 changeset: 19986:e2c5698411c8 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Mar 20 11:39:14 2013 +0100 summary: [open close period] Not allow to edit Period in a status that is not Never Opened. details: https://code.openbravo.com/erp/devel/main/rev/01be4b3a3ea0 changeset: 19987:01be4b3a3ea0 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed Mar 20 12:14:26 2013 +0100 summary: [open close periods] Some fixes for fields reordering... details: https://code.openbravo.com/erp/devel/main/rev/0d47a0d113e4 changeset: 19988:0d47a0d113e4 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed Mar 20 12:52:46 2013 +0100 summary: [open close period control] Modify some field to add read only details: https://code.openbravo.com/erp/devel/main/rev/f5f0ce85391a changeset: 19989:f5f0ce85391a user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed Mar 20 13:01:25 2013 +0100 summary: Move new windows to its place in the menu details: https://code.openbravo.com/erp/devel/main/rev/40126b936d2e changeset: 19990:40126b936d2e user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Mar 20 17:54:15 2013 +0100 summary: [open close period control] Changes ID of new Window for avoid Design Defect in DBSourceManager. Also adds new PopUp in TestRegistry Object for automating the Window. details: https://code.openbravo.com/erp/devel/main/rev/bc4c824d2cda changeset: 19991:bc4c824d2cda user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Mar 20 19:29:24 2013 +0100 summary: [open close period control] Changes order of records in ad_window.xml details: https://code.openbravo.com/erp/devel/main/rev/7d19bc57aa78 changeset: 19992:7d19bc57aa78 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Mar 21 10:32:38 2013 +0100 summary: [open close period control] Merge with pi details: https://code.openbravo.com/erp/devel/main/rev/a85c7237a4e2 changeset: 19993:a85c7237a4e2 user: David Miguelez <david.miguelez <at> openbravo.com> date: Fri Mar 22 16:56:11 2013 +0100 summary: [open period close control] Add OK button to TestRegistry. details: https://code.openbravo.com/erp/devel/main/rev/4a53ec3c84ad changeset: 19994:4a53ec3c84ad user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Mar 25 12:29:46 2013 +0100 summary: [open close period control] Merge with pi. details: https://code.openbravo.com/erp/devel/main/rev/db8257024071 changeset: 19995:db8257024071 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Mar 25 13:11:37 2013 +0100 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/e3b29ef25597 changeset: 19996:e3b29ef25597 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 25 14:11:09 2013 +0100 summary: realated to issue 23300: portal user name is set as email details: https://code.openbravo.com/erp/devel/main/rev/05f84268a2a6 changeset: 19997:05f84268a2a6 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 25 14:52:47 2013 +0100 summary: fixed issue 23388: Do not include default widgets in portal roles details: https://code.openbravo.com/erp/devel/main/rev/0419d3571df6 changeset: 19998:0419d3571df6 user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Mar 25 17:32:56 2013 +0100 summary: Related to Issue 22300. Blocks Unpost of a Document if the Period is closed for that DocBaseType. details: https://code.openbravo.com/erp/devel/main/rev/87e9cc7c19f9 changeset: 19999:87e9cc7c19f9 user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Mar 25 17:36:11 2013 +0100 summary: Rollback undesired change. details: https://code.openbravo.com/erp/devel/main/rev/36052ef2d635 changeset: 20000:36052ef2d635 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue Mar 05 11:07:44 2013 +0530 summary: Fixes issue 23201: Can't delete widget using admin others details: https://code.openbravo.com/erp/devel/main/rev/2d2b0f1dddcd changeset: 20001:2d2b0f1dddcd user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Mar 26 16:19:29 2013 +0100 summary: CI: update AD_MODULE to version 20000 diffstat: 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/ApplicationComponentProvider.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/OpenClosePeriodHandler.java | 218 + 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.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java | 8 + 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.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java | 8 + modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java | 11 +- 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/functions/C_PERIOD_PROCESS.xml | 47 +- src-db/database/model/tables/C_PERIOD.xml | 7 + src-db/database/model/tables/C_PERIODCONTROL.xml | 8 + src-db/database/model/tables/C_PERIODCONTROL_LOG.xml | 7 + src-db/database/model/triggers/C_PERIOD_TRG2.xml | 22 + src-db/database/model/views/C_YEAR_CLOSE_V.xml | 4 + src-db/database/model/views/FACT_ACCT_END_YEAR_V.xml | 4 + src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 +- src-db/database/sourcedata/AD_COLUMN.xml | 1106 +++++++ src-db/database/sourcedata/AD_ELEMENT.xml | 61 + src-db/database/sourcedata/AD_FIELD.xml | 1498 +++++++++- src-db/database/sourcedata/AD_MENU.xml | 29 +- src-db/database/sourcedata/AD_MESSAGE.xml | 37 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PROCESS.xml | 20 + src-db/database/sourcedata/AD_REFERENCE.xml | 36 + src-db/database/sourcedata/AD_REF_LIST.xml | 115 +- src-db/database/sourcedata/AD_TAB.xml | 115 +- src-db/database/sourcedata/AD_TABLE.xml | 42 + src-db/database/sourcedata/AD_TREENODE.xml | 70 +- src-db/database/sourcedata/AD_WINDOW.xml | 38 +- src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 15 + src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java | 11 +- src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_actionButton/DropRegFactAcct_data.xsql | 5 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 203 +- src/org/openbravo/erpCommon/ad_process/EndYearClose.java | 63 + src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility.java | 419 ++ src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility_data.xsql | 725 ++++ src/org/openbravo/erpCommon/businessUtility/PeriodControlUtility.java | 120 + src/org/openbravo/erpCommon/componentprovider/CoreProvider.java | 44 + src/org/openbravo/erpCommon/utility/WindowTreeChecks.java | 2 +- src/org/openbravo/financial/ResetAccounting.java | 8 +- src/org/openbravo/portal/GrantPortalAccessProcess.java | 28 +- web/js/periodControlStatus.js | 256 + 81 files changed, 5336 insertions(+), 269 deletions(-) diffs (truncated from 8068 to 300 lines): diff -r 096f0a4c98fd -r 2d2b0f1dddcd modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 25 00:11:39 2013 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 26 16:19:29 2013 +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.19960]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.20000]]></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 096f0a4c98fd -r 2d2b0f1dddcd 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 Mon Mar 25 00:11:39 2013 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 26 16:19:29 2013 +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.19960]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.20000]]></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.19960]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.20000]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 096f0a4c98fd -r 2d2b0f1dddcd 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 Mon Mar 25 00:11:39 2013 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 26 16:19:29 2013 +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.19960]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.20000]]></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 096f0a4c98fd -r 2d2b0f1dddcd 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 Mon Mar 25 00:11:39 2013 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 26 16:19:29 2013 +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.19960]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.20000]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 096f0a4c98fd -r 2d2b0f1dddcd 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 Mon Mar 25 00:11:39 2013 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 26 16:19:29 2013 +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.19960]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.20000]]></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 096f0a4c98fd -r 2d2b0f1dddcd 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 Mon Mar 25 00:11:39 2013 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 26 16:19:29 2013 +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.19960]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.20000]]></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.19960]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.20000]]></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.19960]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.20000]]></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.19960]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.20000]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 096f0a4c98fd -r 2d2b0f1dddcd modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java Mon Mar 25 00:11:39 2013 +0530 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java Tue Mar 26 16:19:29 2013 +0100 @@ -80,7 +80,6 @@ @Override public List<ComponentResource> getGlobalComponentResources() { final List<ComponentResource> globalResources = new ArrayList<ComponentResource>(); - globalResources.add(createStaticResource( "web/org.openbravo.client.application/js/utilities/ob-utilities.js", true)); globalResources.add(createStaticResource( @@ -434,6 +433,7 @@ + KernelConstants.SKIN_PARAMETER + "/org.openbravo.client.application/ob-rtl-styles.js", false)); } + globalResources.add(createStaticResource("web/js/periodControlStatus.js", true)); return globalResources; } diff -r 096f0a4c98fd -r 2d2b0f1dddcd modules/org.openbravo.client.application/src/org/openbravo/client/application/event/OpenClosePeriodHandler.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/OpenClosePeriodHandler.java Tue Mar 26 16:19:29 2013 +0100 @@ -0,0 +1,218 @@ +/* + ************************************************************************* + * 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) 2013 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ +package org.openbravo.client.application.event; + +import java.util.Map; + +import org.apache.log4j.Logger; +import org.codehaus.jettison.json.JSONArray; +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONObject; +import org.openbravo.base.exception.OBException; +import org.openbravo.base.provider.OBProvider; +import org.openbravo.base.secureApp.VariablesSecureApp; +import org.openbravo.client.kernel.BaseActionHandler; +import org.openbravo.client.kernel.RequestContext; +import org.openbravo.dal.service.OBDal; +import org.openbravo.data.FieldProvider; +import org.openbravo.erpCommon.businessUtility.PeriodControlUtility; +import org.openbravo.erpCommon.utility.ComboTableData; +import org.openbravo.erpCommon.utility.OBError; +import org.openbravo.erpCommon.utility.OBMessageUtils; +import org.openbravo.erpCommon.utility.Utility; +import org.openbravo.model.financialmgmt.calendar.Period; +import org.openbravo.model.financialmgmt.calendar.PeriodControl; +import org.openbravo.model.financialmgmt.calendar.PeriodControlLog; +import org.openbravo.service.db.DalConnectionProvider; +import org.openbravo.service.db.DbUtility; + +public class OpenClosePeriodHandler extends BaseActionHandler { + static Logger log4j = Logger.getLogger(OpenClosePeriodHandler.class); + + @Override + protected JSONObject execute(Map<String, Object> parameters, String content) { + JSONObject response = new JSONObject(); + try { + final JSONObject request = new JSONObject(content); + + final String action = request.getString("action"); + final JSONArray periodIdList = request.getJSONArray("recordIdList"); + VariablesSecureApp vars = RequestContext.get().getVariablesSecureApp(); + + if ("ACTION_COMBO".equals(action)) { + int size = periodIdList.length(); + if (size == 0) { + return response; + } + String strAction = ""; + if (size == 1) { + if (OBDal.getInstance().get(Period.class, periodIdList.get(0)) == null) { + PeriodControl periodControl = OBDal.getInstance().get(PeriodControl.class, + periodIdList.get(0)); + strAction = periodControl.getPeriodStatus(); + } else { + Period period = OBDal.getInstance().get(Period.class, periodIdList.get(0)); + strAction = period.getStatus(); + } + } else { + if (OBDal.getInstance().get(Period.class, periodIdList.get(0)) == null) { + for (String id : PeriodControlUtility.parseJSON(periodIdList)) { + PeriodControl periodControl = OBDal.getInstance().get(PeriodControl.class, id); + if ("".equals(strAction)) { + strAction = periodControl.getPeriodStatus(); + } + if (!strAction.equals(periodControl.getPeriodStatus())) { + strAction = ""; + break; + } + } + } else { + for (String id : PeriodControlUtility.parseJSON(periodIdList)) { + Period period = OBDal.getInstance().get(Period.class, id); + if ("".equals(strAction)) { + strAction = period.getStatus(); + } + if (!strAction.equals(period.getStatus())) { + strAction = ""; + break; + } + } + } + } + response.put("actionComboBox", getActionComboBox(strAction, vars)); + return response; + } else { + if (periodIdList.length() == 0) { + throw new OBException("@NotSelected@"); + } + if (OBDal.getInstance().get(Period.class, periodIdList.get(0)) == null) { + for (String id : PeriodControlUtility.parseJSON(periodIdList)) { + PeriodControl pc = OBDal.getInstance().get(PeriodControl.class, id); + if (action.equals(pc.getPeriodStatus())) { + continue; + } + pc.setPeriodAction(action); + OBDal.getInstance().save(pc); + OBDal.getInstance().flush(); + OBError error = PeriodControlUtility.openClosePeriodControl(id); + if ("Error".equals(error.getType())) { + throw new OBException(error.getMessage()); + } + } + } else { + for (Period p : PeriodControlUtility.getOrderedPeriods(periodIdList)) { + PeriodControlLog pcl = OBProvider.getInstance().get(PeriodControlLog.class); + pcl.setClient(p.getClient()); + pcl.setOrganization(p.getOrganization()); + pcl.setCalendar(p.getYear().getCalendar()); + pcl.setCascade(true); + pcl.setPeriodAction(action); + pcl.setPeriodNo(p); + pcl.setPeriod(p); + pcl.setYear(p.getYear()); + pcl.setProcessed(false); + pcl.setProcessNow(false); + OBDal.getInstance().save(pcl); + OBDal.getInstance().flush(); + OBError error = PeriodControlUtility.openClosePeriod(pcl); + if ("Error".equals(error.getType())) { + throw new OBException(error.getMessage()); + } + } + } + OBDal.getInstance().commitAndClose(); + JSONObject errorMessage = new JSONObject(); + errorMessage.put("severity", "success"); + errorMessage.put("text", + Utility.messageBD(new DalConnectionProvider(), "ProcessOK", vars.getLanguage())); + response.put("message", errorMessage); + } + } catch (Exception e) { + OBDal.getInstance().rollbackAndClose(); + log4j.error("OpenCloseProcess error: " + e.getMessage(), e); + + Throwable ex = DbUtility.getUnderlyingSQLException(e); + String message = OBMessageUtils.translateError(ex.getMessage()).getMessage(); + try { + JSONObject errorMessage = new JSONObject(); + errorMessage.put("severity", "error"); + errorMessage.put("text", message); + response.put("message", errorMessage); + } catch (JSONException ignore) { + ignore.printStackTrace(); + } + } + + return response; + + } + + /** + * Converts the OBError message to a JSONObject message. + * <p> + * Mapping: type <-> severity, message <-> text ------------------------------------------------------------------------------ Own the Future-Intel® Level Up Game Demo Contest 2013 Rise to greatness in Intel's independent game demo contest. Compete for recognition, cash, and the chance to get your game on Steam. $5K grand prize plus 10 genre and skill prizes. Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
