details: /erp/devel/main/rev/67b678cbc7f3
changeset: 12691:67b678cbc7f3
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Wed Jun 01 18:07:03 2011 +0200
summary: Fixes issue 16904: Accounting error in Tax Payment process.
details: /erp/devel/main/rev/5fcba5660951
changeset: 12692:5fcba5660951
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Jun 03 11:29:44 2011 +0200
summary: Fixed issue 17487: Now the focus is set again in the grid after
closing the form
details: /erp/devel/main/rev/0ecc423a9d91
changeset: 12693:0ecc423a9d91
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Jun 03 13:25:00 2011 +0200
summary: CI: merge back from main
details: /erp/devel/main/rev/c77801c33289
changeset: 12694:c77801c33289
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Jun 03 13:29:43 2011 +0200
summary: [KS] The sections now can have the focus, although there is no
visual change
details: /erp/devel/main/rev/022b0d65ed79
changeset: 12695:022b0d65ed79
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jun 02 11:15:04 2011 +0200
summary: [uprg] Allow to set properties at system level
details: /erp/devel/main/rev/a2ee26976a2b
changeset: 12696:a2ee26976a2b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jun 02 11:31:34 2011 +0200
summary: [upgr] Show modal popups in upgrade to Sys Adm
details: /erp/devel/main/rev/61612a2d9fda
changeset: 12697:61612a2d9fda
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jun 02 11:36:50 2011 +0200
summary: [upgrade] Do not check sys admin by ID
details: /erp/devel/main/rev/b89470765b5c
changeset: 12698:b89470765b5c
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jun 02 11:45:10 2011 +0200
summary: [upgr] Removed debug alert
details: /erp/devel/main/rev/26babf4ec87b
changeset: 12699:26babf4ec87b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jun 02 12:03:43 2011 +0200
summary: [upgr] Show alert on login for non sys adm
details: /erp/devel/main/rev/f257dc5f1f92
changeset: 12700:f257dc5f1f92
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jun 02 13:04:13 2011 +0200
summary: [upgr] v3 merges QS
details: /erp/devel/main/rev/04dcf7ceb78b
changeset: 12701:04dcf7ceb78b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jun 02 13:04:52 2011 +0200
summary: [upgr] v3 datasets merges QS datasets
details: /erp/devel/main/rev/710d08ab96fa
changeset: 12702:710d08ab96fa
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jun 02 14:06:14 2011 +0200
summary: [upgr] Added preference to control upgrading in process
details: /erp/devel/main/rev/47eaf1a551f3
changeset: 12703:47eaf1a551f3
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 12:50:38 2011 +0200
summary: [upgr] Reword popup messages for upgrade
details: /erp/devel/main/rev/999709738e65
changeset: 12704:999709738e65
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 12:52:19 2011 +0200
summary: merge with pi
details: /erp/devel/main/rev/49282afdf70e
changeset: 12705:49282afdf70e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 12:53:47 2011 +0200
summary: [upg] Minor UI changes in upgrade
details: /erp/devel/main/rev/8ba4d160907f
changeset: 12706:8ba4d160907f
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 12:54:24 2011 +0200
summary: [upgr] Sending info about commercial instance to Scan and Check
consistency
details: /erp/devel/main/rev/41c78be3fa4e
changeset: 12707:41c78be3fa4e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 12:55:01 2011 +0200
summary: [upgr] Reword
details: /erp/devel/main/rev/8f00d6e4cfda
changeset: 12708:8f00d6e4cfda
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 12:55:55 2011 +0200
summary: [upgr] Refactored upgrade error messages
details: /erp/devel/main/rev/ff91c4d4be95
changeset: 12709:ff91c4d4be95
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 12:56:18 2011 +0200
summary: [upgr] Fixed msg just after scan
details: /erp/devel/main/rev/fd6c8e4a842a
changeset: 12710:fd6c8e4a842a
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 12:56:37 2011 +0200
summary: [upgr] Removed unnecesary section
details: /erp/devel/main/rev/102717e18418
changeset: 12711:102717e18418
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 13:18:43 2011 +0200
summary: [upgr] Fixed text interfaces
details: /erp/devel/main/rev/6899bf78cbae
changeset: 12712:6899bf78cbae
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 15:07:41 2011 +0200
summary: [upgr] Show modal poup-up for non sys admins
details: /erp/devel/main/rev/658a16978445
changeset: 12713:658a16978445
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 15:15:25 2011 +0200
summary: [upgr] Rewording upgrade popups
details: /erp/devel/main/rev/8206929bd7f1
changeset: 12714:8206929bd7f1
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 15:16:41 2011 +0200
summary: [upgr] Removed unused message
details: /erp/devel/main/rev/aa36b4313168
changeset: 12715:aa36b4313168
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 15:17:38 2011 +0200
summary: [upgr] Merged UI changes in upgrade process
details: /erp/devel/main/rev/4064add5c519
changeset: 12716:4064add5c519
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 15:31:36 2011 +0200
summary: [upgr] Removed testing code
details: /erp/devel/main/rev/610d93fd706a
changeset: 12717:610d93fd706a
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Fri Jun 03 15:57:06 2011 +0200
summary: [APRM Multicurrency] Capture exception & fix conversion rate
calculation
details: /erp/devel/main/rev/8ad71ff65fad
changeset: 12718:8ad71ff65fad
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jun 03 16:25:32 2011 +0200
summary: reverted incorrect changes in 102717e18418
details: /erp/devel/main/rev/6f28c4fd4d65
changeset: 12719:6f28c4fd4d65
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Jun 06 10:21:18 2011 +0200
summary: Related to issue 17493: Selenium tests are broken because of a
change in the Date fields behaviour
details: /erp/devel/main/rev/ec7648883c87
changeset: 12720:ec7648883c87
user: Shankar Balachandran <shaanjus4u <at> gmail.com>
date: Sun Jun 05 21:37:06 2011 +0530
summary: Fix Issue 0016310 : Disable logic in Print/Email button
details: /erp/devel/main/rev/dc774882d890
changeset: 12721:dc774882d890
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Jun 06 11:47:32 2011 +0200
summary: Added Shankar Balachandran to contributors
details: /erp/devel/main/rev/a6720308a0a8
changeset: 12722:a6720308a0a8
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Mon Jun 06 11:48:43 2011 +0200
summary: [APRM] Leave amount as credit option not properly managed.
>From Add details window if the business partner in the header is null
it is not possible to leave amount as credit.
In Add Payment From Transaction depends on the business partner
selected in the grid. If there are different bp selected the
credit is not allowe.
details: /erp/devel/main/rev/5e50f384b771
changeset: 12723:5e50f384b771
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Jun 06 12:21:35 2011 +0200
summary: Fixed issue 17303. Added readonly property also in grid view.
details: /erp/devel/main/rev/10a741a716c8
changeset: 12724:10a741a716c8
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Jun 06 12:57:54 2011 +0200
summary: Fixes issue 17481: Switching to a non-saved tab takes quite long
details: /erp/devel/main/rev/ae5f76231b44
changeset: 12725:ae5f76231b44
user: Egoitz Castillo <egoitz.castillo <at> openbravo.com>
date: Mon Jun 06 14:01:11 2011 +0200
summary: Fixed Issue 16994. Attribute selector on createfrom
details: /erp/devel/main/rev/38ebcaec435d
changeset: 12726:38ebcaec435d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Jun 06 14:48:18 2011 +0200
summary: Fixes issue 17186: After selecting a purchase order the loading data
remains and the window gets blocked
details: /erp/devel/main/rev/17a483723305
changeset: 12727:17a483723305
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Jun 06 15:26:46 2011 +0200
summary: Fixed issue 17514: Now row is not selected when going to child using
KS
details: /erp/devel/main/rev/ed501799de8c
changeset: 12728:ed501799de8c
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Jun 06 15:58:50 2011 +0200
summary: Related to issue 17514
details: /erp/devel/main/rev/df5f4e5d19cf
changeset: 12729:df5f4e5d19cf
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Jun 06 16:11:01 2011 +0200
summary: Fixed issue 17503: Now tab switch using KS doesn't skip a tab
details: /erp/devel/main/rev/aefaedafb236
changeset: 12730:aefaedafb236
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Jun 07 03:36:45 2011 +0200
summary: CI: update AD_MODULE to version 12729
diffstat:
CONTRIBUTORS
| 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.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
| 3 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
| 76 +-
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
| 52 +-
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_MESSAGE.xml
| 130 +++++
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/HeartBeatPopupActionHandler.java
| 63 ++
modules/org.openbravo.client.application/src/org/openbravo/client/application/StorePropertyActionHandler.java
| 27 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
| 11 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
| 76 +++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-popup.js
| 5 -
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js
| 38 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section.js
| 2 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
| 20 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js
| 9 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
| 32 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-property-store.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.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.datasets/src-db/database/sourcedata/AD_MODULE_MERGE.xml
| 23 +
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
| 14 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_MERGE.xml
| 23 +
src-db/database/model/functions/C_TAXPAYMENT_POST.xml
| 2 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 70 ++-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_REF_LIST.xml
| 12 +
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 229 ++++++---
src/org/openbravo/base/secureApp/LoginHandler.java
| 53 --
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 180 +++++--
src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html
| 14 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorUpgrade.html
| 61 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorUpgrade.xml
| 27 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_UpgradeInfo.html
| 8 +-
src/org/openbravo/erpCommon/info/AttributeSetInstance.java
| 2 +
src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java
| 3 +
72 files changed, 949 insertions(+), 479 deletions(-)
diffs (truncated from 2898 to 300 lines):
diff -r 3723e0cd3861 -r aefaedafb236 CONTRIBUTORS
--- a/CONTRIBUTORS Fri Jun 03 07:22:39 2011 +0200
+++ b/CONTRIBUTORS Tue Jun 07 03:36:45 2011 +0200
@@ -12,3 +12,4 @@
Thirumalai Kandasami <[email protected]> - Bug fixing
Sreedhar Sirigiri TDS - provided deep linking with filter clause
Mallikarjun M TDS - provided deep linking with filter clause
+Shankar Balachandran <[email protected]> - Bug fixing
diff -r 3723e0cd3861 -r aefaedafb236
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri Jun 03 07:22:39 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Tue Jun 07 03:36:45 2011 +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.12565]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.12729]]></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 3723e0cd3861 -r aefaedafb236
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 Jun 03 07:22:39 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Jun 07 03:36:45 2011 +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.12565]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.12729]]></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.12565]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 3723e0cd3861 -r aefaedafb236
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
Fri Jun 03 07:22:39 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
Tue Jun 07 03:36:45 2011 +0200
@@ -289,7 +289,8 @@
}
function initializeTemplate(){
- initFIN_Utilities(document.frmMain);
+ // credit is allowed looking at the business partner selection in the grid
+ initFIN_Utilities(document.frmMain, true, true);
processLabels();
displayLogicElement('paramCustBalance', isTrue('isReceipt'));
displayLogicElement('NoPackageslinkCalc', isTrue('isReceipt'));
diff -r 3723e0cd3861 -r aefaedafb236
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
Fri Jun 03 07:22:39 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
Tue Jun 07 03:36:45 2011 +0200
@@ -37,6 +37,7 @@
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.advpaymentmngt.process.FIN_AddPayment;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
+import org.openbravo.base.exception.OBException;
import org.openbravo.base.filter.IsIDFilter;
import org.openbravo.base.filter.RequestFilter;
import org.openbravo.base.filter.ValueListFilter;
@@ -214,48 +215,49 @@
if (strAction.equals("PRP") || strAction.equals("PPP") ||
strAction.equals("PRD")
|| strAction.equals("PPW")) {
- try {
- message = FIN_AddPayment.processPayment(vars, this,
- (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" :
"D", payment);
-
- // PPW: process made payment and withdrawal
- // PRD: process made payment and deposit
- if ((strAction.equals("PRD") || strAction.equals("PPW"))
- && !"Error".equals(message.getType())) {
-
vars.setSessionValue("AddPaymentFromTransaction|closeAutomatically", "Y");
- vars.setSessionValue("AddPaymentFromTransaction|PaymentId",
payment.getId());
- }
- if (strDifferenceAction.equals("refund")) {
- Boolean newPayment =
!payment.getFINPaymentDetailList().isEmpty();
- FIN_Payment refundPayment =
FIN_AddPayment.createRefundPayment(this, vars, payment,
- refundAmount.negate());
- OBError auxMessage = FIN_AddPayment.processPayment(vars, this,
(strAction
- .equals("PRP") || strAction.equals("PPP")) ? "P" : "D",
refundPayment);
- if (newPayment) {
- final String strNewRefundPaymentMessage =
Utility.parseTranslation(this, vars, vars
- .getLanguage(), "@APRM_RefundPayment@" + ": " +
refundPayment.getDocumentNo())
- + ".";
- message.setMessage(strNewRefundPaymentMessage + " " +
message.getMessage());
- if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) !=
0) {
- payment.setDescription(payment.getDescription() +
strNewRefundPaymentMessage
- + "\n");
- OBDal.getInstance().save(payment);
- OBDal.getInstance().flush();
- }
- } else {
- message = auxMessage;
+ message = FIN_AddPayment.processPayment(vars, this,
(strAction.equals("PRP") || strAction
+ .equals("PPP")) ? "P" : "D", payment);
+ if (message != null && "Error".equals(message.getType())) {
+ throw new OBException();
+ }
+ // PPW: process made payment and withdrawal
+ // PRD: process made payment and deposit
+ if ((strAction.equals("PRD") || strAction.equals("PPW"))
+ && !"Error".equals(message.getType())) {
+
vars.setSessionValue("AddPaymentFromTransaction|closeAutomatically", "Y");
+ vars.setSessionValue("AddPaymentFromTransaction|PaymentId",
payment.getId());
+ }
+ if (strDifferenceAction.equals("refund")) {
+ Boolean newPayment = !payment.getFINPaymentDetailList().isEmpty();
+ FIN_Payment refundPayment =
FIN_AddPayment.createRefundPayment(this, vars, payment,
+ refundAmount.negate());
+ OBError auxMessage = FIN_AddPayment.processPayment(vars, this,
+ (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" :
"D", refundPayment);
+ if (newPayment) {
+ final String strNewRefundPaymentMessage =
Utility.parseTranslation(this, vars, vars
+ .getLanguage(), "@APRM_RefundPayment@" + ": " +
refundPayment.getDocumentNo())
+ + ".";
+ message.setMessage(strNewRefundPaymentMessage + " " +
message.getMessage());
+ if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) !=
0) {
+ payment
+ .setDescription(payment.getDescription() +
strNewRefundPaymentMessage + "\n");
+ OBDal.getInstance().save(payment);
+ OBDal.getInstance().flush();
}
- }
- } catch (Exception ex) {
- message = Utility.translateError(this, vars, vars.getLanguage(),
ex.getMessage());
- log4j.error(ex);
- if (!message.isConnectionAvailable()) {
- bdErrorConnection(response);
- return;
+ } else {
+ message = auxMessage;
}
}
}
+ } catch (Exception ex) {
+ String strMessage = FIN_Utility.getExceptionMessage(ex);
+ if (message != null && "Error".equals(message.getType())) {
+ strMessage = message.getMessage();
+ }
+ bdErrorGeneralPopUp(request, response, "Error", strMessage);
+ OBDal.getInstance().rollbackAndClose();
+ return;
} finally {
OBContext.restorePreviousMode();
}
diff -r 3723e0cd3861 -r aefaedafb236
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
---
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Fri Jun 03 07:22:39 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Tue Jun 07 03:36:45 2011 +0200
@@ -21,6 +21,7 @@
var frm = null,
isReceipt = true,
isCreditAllowed = true,
+ isCreditCheckedFromBPinGrid = false,
globalMaskNumeric = "#0.00",
globalDecSeparator = ".",
globalGroupSeparator = ",",
@@ -30,10 +31,11 @@
return frm.elements[objectName].value === 'Y';
}
-function initFIN_Utilities(_frm, _creditAllowed) {
+function initFIN_Utilities(_frm, _creditAllowed, _isCreditCheckedFromBPinGrid)
{
frm = _frm;
isReceipt = isTrue('isReceipt');
isCreditAllowed = _creditAllowed !== undefined ? _creditAllowed : true;
+ isCreditCheckedFromBPinGrid = _isCreditCheckedFromBPinGrid !== undefined ?
_isCreditCheckedFromBPinGrid : false;
if (!isCreditAllowed) {
frm.inpUseCredit.checked = false;
}
@@ -211,9 +213,28 @@
(compare(value, '<=', 0) && compare(value, '>=', maxValue)));
}
+function applyPrecisionToMask(currencyPrecision) {
+ var i, c, output, currentDecimalMask, currentPrecision;
+ var toConvertDecimalMask = globalMaskNumeric;
+ if (globalMaskNumeric.indexOf(globalDecSeparator) !== -1) {
+ currentDecimalMask =
globalMaskNumeric.substring(globalMaskNumeric.indexOf(globalDecSeparator),
globalMaskNumeric.length);
+ currentPrecision = currentDecimalMask.length - globalDecSeparator.length;
+ if (currentPrecision) {
+ toConvertDecimalMask = globalDecSeparator;
+ c = currentDecimalMask.charAt(1);
+ for (i = 0; i < currencyPrecision; i++) {
+ toConvertDecimalMask = toConvertDecimalMask + c;
+ }
+ toConvertDecimalMask = globalMaskNumeric.replace(currentDecimalMask,
toConvertDecimalMask);
+ }
+ }
+ return toConvertDecimalMask;
+}
+
function updateConvertedAmounts( recalcExchangeRate ) {
var exchangeRate = frm.inpExchangeRate;
var precision = frm.inpFinancialAccountCurrencyPrecision ?
frm.inpFinancialAccountCurrencyPrecision.value : 2;
+ var roundedMask = applyPrecisionToMask(precision);
var expectedConverted = frm.inpExpectedConverted;
var actualConverted = frm.inpActualConverted;
var expectedPayment= frm.inpExpectedPayment;
@@ -222,14 +243,14 @@
if (actualConverted && expectedConverted && exchangeRate) {
if( recalcExchangeRate ) {
if( actualConverted.value && actualPayment.value) {
- exchangeRate.value = divide(actualConverted.value,
actualPayment.value);
+ exchangeRate.value = formattedNumberOpTemp(actualConverted.value, '/',
actualPayment.value, roundedMask, globalDecSeparator, globalGroupSeparator,
globalGroupInterval);
} else {
exchangeRate.value = '';
}
} else {
- actualConverted.value = multiply(actualPayment.value,
exchangeRate.value).toFixed(precision);
+ actualConverted.value = formattedNumberOpTemp(actualPayment.value, '*',
exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator,
globalGroupInterval);
}
- expectedConverted.value =
multiply(expectedPayment.value,exchangeRate.value).toFixed(precision);
+ expectedConverted.value = formattedNumberOpTemp(expectedPayment.value,
'*', exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator,
globalGroupInterval);
}
}
@@ -302,7 +323,7 @@
function updateTotal() {
var chk = frm.inpScheduledPaymentDetailId;
- var total = 0, i;
+ var total = 0, i, invalidSpan;
var scheduledPaymentDetailId, pendingAmount, amount, isAnyChecked = false;
var selectedBusinessPartners = {
numberofitems: 0,
@@ -352,7 +373,10 @@
initialize_MessageBox('messageBoxID');
}
if (chk.checked) {
-
document.getElementById('paraminvalidSpan'+scheduledPaymentDetailId).style.display
= !isBetweenZeroAndMaxValue(amount, pendingAmount) ? 'block' : 'none';
+ invalidSpan =
document.getElementById('paraminvalidSpan'+scheduledPaymentDetailId);
+ if (invalidSpan) {
+
document.getElementById('paraminvalidSpan'+scheduledPaymentDetailId).style.display
= !isBetweenZeroAndMaxValue(amount, pendingAmount) ? 'block' : 'none';
+ }
total = (frm.elements["inpPaymentAmount" +
scheduledPaymentDetailId].value === '') ? "0" : frm.elements["inpPaymentAmount"
+ scheduledPaymentDetailId].value;
selectedBusinessPartners.increase(frm.elements['inpRecordBP'+scheduledPaymentDetailId]);
isAnyChecked = true;
@@ -369,7 +393,10 @@
initialize_MessageBox('messageBoxID');
}
if (chk[i].checked) {
-
document.getElementById('paraminvalidSpan'+scheduledPaymentDetailId).style.display
= !isBetweenZeroAndMaxValue(amount, pendingAmount) ? 'block' : 'none';
+ invalidSpan =
document.getElementById('paraminvalidSpan'+scheduledPaymentDetailId);
+ if (invalidSpan) {
+
document.getElementById('paraminvalidSpan'+scheduledPaymentDetailId).style.display
= !isBetweenZeroAndMaxValue(amount, pendingAmount) ? 'block' : 'none';
+ }
total = (frm.elements["inpPaymentAmount" +
scheduledPaymentDetailId].value === '') ? total :
add(total,frm.elements["inpPaymentAmount" + scheduledPaymentDetailId].value);
selectedBusinessPartners.increase(frm.elements['inpRecordBP'+scheduledPaymentDetailId]);
isAnyChecked = true;
@@ -396,7 +423,9 @@
}
}
}
- isCreditAllowed = !selectedBusinessPartners.isMultibpleSelection();
+ if (isCreditCheckedFromBPinGrid) {
+ isCreditAllowed = !selectedBusinessPartners.isMultibpleSelection();
+ }
updateDifference();
updateConvertedAmounts();
}
@@ -457,7 +486,7 @@
mark = false;
}
frm.elements["inpPaymentAmount" + key].disabled = !mark;
- var expectedAmount = frm.inpExpectedPayment.value;
+ var expectedAmount = frm.inpExpectedPayment.value, invalidSpan;
var recordAmount = frm.elements["inpRecordAmt" + key].value;
if (mark) {
@@ -470,7 +499,10 @@
}
frm.elements["inpPaymentAmount" + key].value = '';
frm.inpExpectedPayment.value = subtract(expectedAmount, recordAmount);
- document.getElementById('paraminvalidSpan'+key).style.display = 'none';
+ invalidSpan = document.getElementById('paraminvalidSpan'+key);
+ if (invalidSpan) {
+ document.getElementById('paraminvalidSpan'+key).style.display = 'none';
+ }
}
if (!mark) {
frm.inpAllLines.checked = false;
diff -r 3723e0cd3861 -r aefaedafb236
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 Jun 03 07:22:39 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Tue Jun 07 03:36:45 2011 +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.12565]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.12729]]></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>
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
