details: https://code.openbravo.com/erp/devel/main/rev/35d251a9e659 changeset: 18094:35d251a9e659 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Sep 27 17:13:54 2012 +0200 summary: Fixes Issue 0010979 : Display Error for unparsed XML Files.
In Import translation process, added an error message with the files that has not been parsed. details: https://code.openbravo.com/erp/devel/main/rev/e3837a02a9d5 changeset: 18095:e3837a02a9d5 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Sep 28 10:09:48 2012 +0200 summary: Related to issue 21697: Numeric filters are executed when they lose the focus Now, the numeric filter will be applied not only when the Enter key is pressed, but also when the focus leaves the filter. details: https://code.openbravo.com/erp/devel/main/rev/fe3bcfb01f48 changeset: 18096:fe3bcfb01f48 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Sep 28 10:52:06 2012 +0200 summary: Related to issue 10979: Backs out changes until final fix is ready details: https://code.openbravo.com/erp/devel/main/rev/803d0686dbd3 changeset: 18097:803d0686dbd3 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Sep 28 11:24:29 2012 +0200 summary: Fixes bug 21697: When a date filter is removed, it is applied when tabbing out Before this fix, in order to delete a date filter the Enter key had to be pressed. This was not consistent, because in order to apply a not-null date filter, it was enough to tab out of the column. Now, if the date filter text is deleted and the column loses the focus, the change will be applied even if the Enter key is not pressed. details: https://code.openbravo.com/erp/devel/main/rev/8d6028e7aba3 changeset: 18098:8d6028e7aba3 user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Sep 24 16:44:28 2012 +0200 summary: Fixes issue 21639: Created new selector for managing large amounts of data. details: https://code.openbravo.com/erp/devel/main/rev/275e131b7c0c changeset: 18099:275e131b7c0c user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Sep 26 09:18:03 2012 +0200 summary: Fixes issue 21695: Generate Commission button not visible for inactive commissions. details: https://code.openbravo.com/erp/devel/main/rev/7d287a549177 changeset: 18100:7d287a549177 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Sep 26 11:02:44 2012 +0200 summary: Fixes issue 21696: The combo of organization does not work properly. details: https://code.openbravo.com/erp/devel/main/rev/c8550f22b989 changeset: 18101:c8550f22b989 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Sep 27 18:17:32 2012 +0200 summary: Fixes issue 21738: Period control status is not being checked when processing Payment, Transaction or Reconciliation documents. details: https://code.openbravo.com/erp/devel/main/rev/19db32dec44e changeset: 18102:19db32dec44e user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Sep 28 14:25:46 2012 +0200 summary: Fixes issue 21787: Contextual menu not shown in grid is no parent is selected The contextual menu will not be shown in grid view is no parent is selected, unless the current view is located in the header tab. details: https://code.openbravo.com/erp/devel/main/rev/2f8994cfcaaf changeset: 18103:2f8994cfcaaf user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Sep 28 14:30:26 2012 +0200 summary: Related to issue 21787: Fixed typo in comment details: https://code.openbravo.com/erp/devel/main/rev/e952e0c0f83e changeset: 18104:e952e0c0f83e user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Sep 28 14:37:39 2012 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/0bdd29a50fcc changeset: 18105:0bdd29a50fcc user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Fri Sep 28 12:59:32 2012 +0200 summary: Fixes Issue 0010979 : Display Error for unparsed XML Files. In Import translation process, throws an exception when there are unparsable files. details: https://code.openbravo.com/erp/devel/main/rev/a3f3fdcb4970 changeset: 18106:a3f3fdcb4970 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Sep 28 15:28:44 2012 +0200 summary: Related to issue 21741: Backout of changeset 18066 The changed that only fixed this issue partially has been backed out. The complete fix will be included in MP17. details: https://code.openbravo.com/erp/devel/main/rev/4c8b2e89747d changeset: 18107:4c8b2e89747d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Sep 28 13:36:46 2012 +0000 summary: documentation details: https://code.openbravo.com/erp/devel/main/rev/8196ffa8a2e2 changeset: 18108:8196ffa8a2e2 user: Priya Muthukumar <priya.muthukumar <at> openbravo.com> date: Mon Oct 01 08:59:55 2012 +0200 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/b71fe7fa5c07 changeset: 18109:b71fe7fa5c07 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Sep 28 14:31:55 2012 +0200 summary: Related to issue 20814: Html numbers appearing fixed. details: https://code.openbravo.com/erp/devel/main/rev/14cd97e452fb changeset: 18110:14cd97e452fb user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Oct 01 12:04:35 2012 +0200 summary: Related to issue 21738: Reconciliation header date taken into account. details: https://code.openbravo.com/erp/devel/main/rev/181ee1644e9d changeset: 18111:181ee1644e9d user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Oct 01 18:25:04 2012 +0200 summary: Adds license textAdds license text. details: https://code.openbravo.com/erp/devel/main/rev/471b8c5410e5 changeset: 18112:471b8c5410e5 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Mon Oct 01 19:00:47 2012 +0200 summary: Issue 21697: Backout 803d0686dbd3 as it breaks int-gui tests details: https://code.openbravo.com/erp/devel/main/rev/85a11d1edcaf changeset: 18113:85a11d1edcaf user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Mon Oct 01 19:01:27 2012 +0200 summary: Issue 21697: Backout e3837a02a9d5 as it breaks int-gui tests details: https://code.openbravo.com/erp/devel/main/rev/6e548a022f3d changeset: 18114:6e548a022f3d user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Oct 02 12:28:51 2012 +0200 summary: Fixes issue 21808: Selects the last reconciliation making sure it returns only one record. details: https://code.openbravo.com/erp/devel/main/rev/252042c05795 changeset: 18115:252042c05795 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Oct 02 16:26:39 2012 +0200 summary: Related to issue 21738 and fixes issue 21829: Reconciliation shows an error. details: https://code.openbravo.com/erp/devel/main/rev/c31dbf8b0595 changeset: 18116:c31dbf8b0595 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Tue Oct 02 20:54:51 2012 +0200 summary: Issue 21808: Backout cset 6e548a022f3d before it breaks on oracle details: https://code.openbravo.com/erp/devel/main/rev/bc139372e444 changeset: 18117:bc139372e444 user: Priya Muthukumar <priya.muthukumar <at> openbravo.com> date: Wed Oct 03 09:58:33 2012 +0200 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/e376b0a5e6e5 changeset: 18118:e376b0a5e6e5 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Oct 03 11:40:52 2012 +0200 summary: Fixes issue 21808: Selects the last reconciliation making sure it returns only one record. details: https://code.openbravo.com/erp/devel/main/rev/3fcf43c77bdd changeset: 18119:3fcf43c77bdd user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Oct 03 18:03:05 2012 +0200 summary: Fixed issue 21851: AltGr works ok again in classic popups in linux details: https://code.openbravo.com/erp/devel/main/rev/dcaf9effeb4a changeset: 18120:dcaf9effeb4a user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Oct 03 18:51:34 2012 +0200 summary: Synchronize QA Testing sample data. details: https://code.openbravo.com/erp/devel/main/rev/34211605322e changeset: 18121:34211605322e user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Oct 03 20:42:45 2012 +0200 summary: Creating 2013 for QA Testing and opening it. details: https://code.openbravo.com/erp/devel/main/rev/c067ea513614 changeset: 18122:c067ea513614 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Oct 04 18:06:21 2012 +0200 summary: CI: update AD_MODULE to version 18121 diffstat: .hgsigs | 2 + .hgtags | 2 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 11 + 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.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml | 12 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java | 50 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 12 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 12 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 26 + 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/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 5 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 5 +- 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.google/src-db/database/sourcedata/AD_TREENODE.xml | 2 +- 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 +- referencedata/sampledata/QA_Testing.xml | 10022 +++++++++- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 + src-db/database/sourcedata/AD_COLUMN.xml | 35 +- src-db/database/sourcedata/AD_ELEMENT.xml | 9 +- src-db/database/sourcedata/AD_FIELD.xml | 36 +- src-db/database/sourcedata/AD_MENU.xml | 4 +- src-db/database/sourcedata/AD_MESSAGE.xml | 12 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PROCESS.xml | 3 +- src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/AD_TAB.xml | 22 +- src-db/database/sourcedata/AD_TREENODE.xml | 14 +- src-db/database/sourcedata/AD_WINDOW.xml | 10 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 26 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 236 + src/org/openbravo/erpCommon/ad_forms/TranslationManager.java | 11 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml | 8 +- src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java | 182 + src/org/openbravo/erpCommon/security/Login.html | 2 +- src/org/openbravo/erpCommon/security/Login_F1.html | 2 +- web/js/utils.js | 74 +- 73 files changed, 10805 insertions(+), 232 deletions(-) diffs (truncated from 17380 to 300 lines): diff -r 3b92f8d1358a -r c067ea513614 .hgsigs --- a/.hgsigs Thu Sep 27 19:37:28 2012 +0200 +++ b/.hgsigs Thu Oct 04 18:06:21 2012 +0200 @@ -78,5 +78,7 @@ e73588ed4b71972072141cda206f2382c618fbc8 0 iEYEABECAAYFAlAlOJcACgkQCX/oGf+2qkN2uwCg1Nd3SJnzR1OdCXmMDHxOm/C8kEsAoMF+P+CltaPNylrKX7B4wimfTW/e a934dbe3f5fad31293f1a5a2cc6f2ca630fd0f31 0 iEYEABECAAYFAlAGLkgACgkQCX/oGf+2qkOu/ACfYJXb8JwO69uZVxLM2u6BHOwQHj4AoJ08uNluEH3iB94pfMnCsD2URUX8 110a8fe1328f4a9e7e5ff1179ace3e529286cfce 0 iEYEABECAAYFAlBN5pQACgkQCX/oGf+2qkN9ZACZAZXSsoFWJoDLsoqPj9aGd6QiEjoAoP79Il22Awt4fupQo3hqZL+JOYd9 +6476bb0e9da298f7adb7759265f784d9eb28884d 0 iEYEABECAAYFAlBkPuAACgkQCX/oGf+2qkMUxgCgglb7oUz6aO/2IC55x7u2xRy65HoAnj83lJHvsqrlllOquMxoLJ2UkTkO 3ef42df4953f5813543c5d1cb2b323d13c8c0359 0 iEYEABECAAYFAlA/cv4ACgkQCX/oGf+2qkMT3gCgjbewzyw3X/1MOZjn6V5P3HqrQtoAoPdsUsBzwVelyg7jpbUhhzGW5Vbz +d221450bb4d5334f101e6d0fe5d2e941bb714f0a 0 iEYEABECAAYFAlBqvAsACgkQCX/oGf+2qkNIogCfTU6AVwlfmEH2DZUjGkiE1zzo25MAoOkIN46+PHwWKslqp5lxFShVzVTd 7643bde3a4855fc35ddf7269a221ba0e77863a75 0 iEYEABECAAYFAlBgQyAACgkQCX/oGf+2qkNE2ACfb7Xzd4dq5VTeUnFo9VSsPqoQHtsAn063Puz1dhXpBsvhgkpbDV7fXiR6 diff -r 3b92f8d1358a -r c067ea513614 .hgtags --- a/.hgtags Thu Sep 27 19:37:28 2012 +0200 +++ b/.hgtags Thu Oct 04 18:06:21 2012 +0200 @@ -89,5 +89,7 @@ 6319e314cf98d9fd0df44324e8a5b2aead800b54 3.0MP12.2 33314611486b1823d42d1059110369d7705ef13f 3.0MP13 0389ecbdda642f959d524d644f1a73a3bc27d57a 3.0MP13.1 +141c70bce6606bca6bf2b8422b9c27fbf19e7ede 3.0MP13.2 35168ddf12d33e94aeb18d2c79c6d9255a26c742 3.0MP14 +6861c9689350eae52de16fad01f78b37f5164c9e 3.0MP14.1 bf2e6628cebd62b56796fe8433c35378d516e375 3.0MP15 diff -r 3b92f8d1358a -r c067ea513614 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Oct 04 18:06:21 2012 +0200 @@ -220,6 +220,17 @@ <!--44973749BE9E47989F1E9D4A1C52EDEF--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--44973749BE9E47989F1E9D4A1C52EDEF--></AD_MESSAGE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--><AD_MESSAGE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_MESSAGE_ID><![CDATA[48898A3B7F9141C0B9BFBDD9AE5FCF8F]]></AD_MESSAGE_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <VALUE><![CDATA[APRM_PeriodNotAvailableClearedItem]]></VALUE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <MSGTEXT><![CDATA[The period of the cleared item (%s) is not open or available.]]></MSGTEXT> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--></AD_MESSAGE> + <!--49C16126D1A141C398175B0632C08F95--><AD_MESSAGE> <!--49C16126D1A141C398175B0632C08F95--> <AD_MESSAGE_ID><![CDATA[49C16126D1A141C398175B0632C08F95]]></AD_MESSAGE_ID> <!--49C16126D1A141C398175B0632C08F95--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3b92f8d1358a -r c067ea513614 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 04 18:06:21 2012 +0200 @@ -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.17992]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.18121]]></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 3b92f8d1358a -r c067ea513614 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 Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Oct 04 18:06:21 2012 +0200 @@ -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.17992]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.18121]]></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.17992]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.18121]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3b92f8d1358a -r c067ea513614 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml Thu Oct 04 18:06:21 2012 +0200 @@ -33,6 +33,18 @@ <!--575E470ABADB4C278132C957A78C47E3--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--575E470ABADB4C278132C957A78C47E3--></AD_VAL_RULE> +<!--E00B19370995405C8014D48E2DE98FD1--><AD_VAL_RULE> +<!--E00B19370995405C8014D48E2DE98FD1--> <AD_VAL_RULE_ID><![CDATA[E00B19370995405C8014D48E2DE98FD1]]></AD_VAL_RULE_ID> +<!--E00B19370995405C8014D48E2DE98FD1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--E00B19370995405C8014D48E2DE98FD1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--E00B19370995405C8014D48E2DE98FD1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--E00B19370995405C8014D48E2DE98FD1--> <NAME><![CDATA[AD_Org show product's child organizations]]></NAME> +<!--E00B19370995405C8014D48E2DE98FD1--> <DESCRIPTION><![CDATA[It only shows the child organizations of the organization of the product.]]></DESCRIPTION> +<!--E00B19370995405C8014D48E2DE98FD1--> <TYPE><![CDATA[S]]></TYPE> +<!--E00B19370995405C8014D48E2DE98FD1--> <CODE><![CDATA[AD_ISORGINCLUDED(ad_org.ad_org_id, @Product_Org@, ad_org.ad_client_id)<>-1 AND IsReady = 'Y']]></CODE> +<!--E00B19370995405C8014D48E2DE98FD1--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--E00B19370995405C8014D48E2DE98FD1--></AD_VAL_RULE> + <!--FF8080812E448A62012E44943A160017--><AD_VAL_RULE> <!--FF8080812E448A62012E44943A160017--> <AD_VAL_RULE_ID><![CDATA[FF8080812E448A62012E44943A160017]]></AD_VAL_RULE_ID> <!--FF8080812E448A62012E44943A160017--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3b92f8d1358a -r c067ea513614 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java Thu Oct 04 18:06:21 2012 +0200 @@ -46,7 +46,9 @@ import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; +import org.openbravo.dal.service.OBQuery; import org.openbravo.data.FieldProvider; +import org.openbravo.erpCommon.ad_forms.AcctServer; import org.openbravo.erpCommon.utility.DateTimeData; import org.openbravo.erpCommon.utility.OBError; import org.openbravo.erpCommon.utility.Utility; @@ -214,6 +216,32 @@ return; } + if (!FIN_Utility.isPeriodOpen(reconciliation.getClient().getId(), + AcctServer.DOCTYPE_Reconciliation, reconciliation.getOrganization().getId(), + strStatementDate)) { + msg.setType("Error"); + msg.setTitle(Utility.messageBD(this, "Error", vars.getLanguage())); + msg.setMessage(Utility.parseTranslation(this, vars, vars.getLanguage(), + "@PeriodNotAvailable@")); + vars.setMessage(strTabId, msg); + msg = null; + printPageClosePopUpAndRefreshParent(response, vars); + return; + } + + String identifier = linesInNotAvailablePeriod(reconciliation.getId()); + if (!identifier.equalsIgnoreCase("")) { + msg.setType("Error"); + msg.setTitle(Utility.messageBD(this, "Error", vars.getLanguage())); + msg.setMessage(String.format( + Utility.messageBD(this, "APRM_PeriodNotAvailableClearedItem", vars.getLanguage()), + identifier)); + vars.setMessage(strTabId, msg); + msg = null; + printPageClosePopUpAndRefreshParent(response, vars); + return; + } + for (APRM_FinaccTransactionV finacctrxv : reconciliation.getAPRMFinaccTransactionVList()) { if (reconciliation.getEndingDate().compareTo( finacctrxv.getFinancialAccountTransaction().getTransactionDate()) < 0) { @@ -461,4 +489,26 @@ return "This servlet manages manual transactions reconciliations."; } + private String linesInNotAvailablePeriod(String reconciliationId) { + final StringBuilder hql = new StringBuilder(); + + hql.append(" as rl "); + hql.append(" where rl.reconciliation.id = '").append(reconciliationId).append("' "); + hql.append(" and c_chk_open_period(rl.organization, rl.transactionDate, 'REC', null) = 0 "); + hql.append(" order by rl.transactionDate"); + + final OBQuery<FIN_ReconciliationLine_v> obqRL = OBDal.getInstance().createQuery( + FIN_ReconciliationLine_v.class, hql.toString()); + obqRL.setMaxResult(1); + + List<FIN_ReconciliationLine_v> obqRLlist = obqRL.list(); + + if (obqRLlist.size() == 0) { + return ""; + } else { + return obqRLlist.get(0).getIdentifier(); + } + + } + } diff -r 3b92f8d1358a -r c067ea513614 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Thu Oct 04 18:06:21 2012 +0200 @@ -39,6 +39,7 @@ import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.database.ConnectionProvider; +import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.erpCommon.utility.OBError; import org.openbravo.erpCommon.utility.Utility; import org.openbravo.model.common.businesspartner.BusinessPartner; @@ -103,6 +104,17 @@ dao.createAPRMReadyPreference(); } + if (!FIN_Utility.isPeriodOpen(payment.getClient().getId(), payment.getDocumentType() + .getDocumentCategory(), payment.getOrganization().getId(), OBDateUtils + .formatDate(payment.getPaymentDate()))) { + msg.setType("Error"); + msg.setTitle(Utility.messageBD(conProvider, "Error", language)); + msg.setMessage(Utility.parseTranslation(conProvider, vars, language, + "@PeriodNotAvailable@")); + bundle.setResult(msg); + OBDal.getInstance().rollbackAndClose(); + return; + } Set<String> documentOrganizations = OBContext.getOBContext() .getOrganizationStructureProvider(payment.getClient().getId()) .getNaturalTree(payment.getOrganization().getId()); diff -r 3b92f8d1358a -r c067ea513614 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java Thu Oct 04 18:06:21 2012 +0200 @@ -30,6 +30,8 @@ import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.database.ConnectionProvider; +import org.openbravo.erpCommon.ad_forms.AcctServer; +import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.erpCommon.utility.OBError; import org.openbravo.erpCommon.utility.Utility; import org.openbravo.model.common.currency.ConversionRateDoc; @@ -66,6 +68,16 @@ // *********************** // Process Transaction // *********************** + if (!FIN_Utility.isPeriodOpen(transaction.getClient().getId(), + AcctServer.DOCTYPE_FinAccTransaction, transaction.getOrganization().getId(), + OBDateUtils.formatDate(transaction.getDateAcct()))) { + msg.setType("Error"); + msg.setTitle(Utility.messageBD(conProvider, "Error", language)); + msg.setMessage(Utility.parseTranslation(conProvider, vars, language, + "@PeriodNotAvailable@")); + bundle.setResult(msg); + return; + } final FIN_FinancialAccount financialAccount = transaction.getAccount(); financialAccount.setCurrentBalance(financialAccount.getCurrentBalance().add( transaction.getDepositAmount().subtract(transaction.getPaymentAmount()))); diff -r 3b92f8d1358a -r c067ea513614 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Thu Oct 04 18:06:21 2012 +0200 @@ -38,6 +38,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateUtils; import org.apache.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.Session; import org.hibernate.criterion.Restrictions; import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import org.openbravo.base.secureApp.VariablesSecureApp; @@ -1029,4 +1031,28 @@ } } + public static boolean isPeriodOpen(String client, String documentType, String org, String dateAcct) { + final Session session = OBDal.getInstance().getSession(); + + final StringBuilder hql = new StringBuilder(); + hql.append("select max(p.id) as period "); + hql.append(" from FinancialMgmtPeriodControl pc "); + hql.append(" left join pc.period p "); + hql.append(" where p.client = '").append(client).append("' "); + hql.append(" and pc.documentCategory = '").append(documentType).append("' "); + hql.append(" and pc.periodStatus = 'O' "); + hql.append(" and pc.organization = ad_org_getcalendarowner('").append(org).append("') "); + hql.append(" and to_date('").append(dateAcct).append("') >= p.startingDate "); + hql.append(" and to_date('").append(dateAcct).append("') < p.endingDate + 1 "); + + final Query qry = session.createQuery(hql.toString()); + + String period = (String) (qry.list().get(0)); + + if (period == null) { + return false; + } else { + return true; + } + } } diff -r 3b92f8d1358a -r c067ea513614 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 Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 04 18:06:21 2012 +0200 @@ -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.17992]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.18121]]></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 3b92f8d1358a -r c067ea513614 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 Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Oct 04 18:06:21 2012 +0200 @@ -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.17992]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.18121]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3b92f8d1358a -r c067ea513614 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 Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 04 18:06:21 2012 +0200 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
