details: /erp/devel/main/rev/151b068a770c
changeset: 10146:151b068a770c
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Jan 26 16:45:47 2011 +0100
summary: Fixes issue 0015778: General ledger report: Short cut in account
combination selector is not working well
It has been fixed properly issue 14983 adding all the parameters required to
the openSearch function
details: /erp/devel/main/rev/35e0a691dd42
changeset: 10147:35e0a691dd42
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Jan 26 16:25:38 2011 +0100
summary: Fix filterclause
details: /erp/devel/main/rev/a420436f11c1
changeset: 10148:a420436f11c1
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Jan 26 17:33:54 2011 +0100
summary: [process] Added frame menu to compatibility popup in order to make
process that use variables defined wihtin menu work
details: /erp/devel/main/rev/e0e2d3bd1013
changeset: 10149:e0e2d3bd1013
user: Asier Galdos <asier.galdos <at> almis.com>
date: Wed Jan 26 16:17:48 2011 +0100
summary: Fixes issue 15231. Ignore field definitions for URLWidget.
details: /erp/devel/main/rev/e7f2a7b320ff
changeset: 10150:e7f2a7b320ff
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Jan 26 17:55:33 2011 +0100
summary: Merge changes from branch pi-agaldos
details: /erp/devel/main/rev/31e1fa1177d8
changeset: 10151:31e1fa1177d8
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Jan 26 18:04:31 2011 +0100
summary: CI: merge back from main
details: /erp/devel/main/rev/8958848a52ff
changeset: 10152:8958848a52ff
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Jan 26 18:17:31 2011 +0100
summary: [process] Set throgh property whether menu process is opened in
modal mode
details: /erp/devel/main/rev/73632b7eb431
changeset: 10153:73632b7eb431
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Jan 26 18:24:48 2011 +0100
summary: Added remaining HQL order by clauses
details: /erp/devel/main/rev/9fa593e5a9f8
changeset: 10154:9fa593e5a9f8
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jan 27 09:19:01 2011 +0100
summary: [process] openProcessPopup allows sending POST
details: /erp/devel/main/rev/33fdbb4a6853
changeset: 10155:33fdbb4a6853
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jan 27 09:34:32 2011 +0100
summary: [process] Custom button processes can be executed in popup through
preference
details: /erp/devel/main/rev/6059f819fda4
changeset: 10156:6059f819fda4
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu Jan 27 09:46:19 2011 +0100
summary: Fixes issue 0015783: General ledger report: Organization combo loses
the value in the session
It has been removed the changes done for issue 14489 and it has been fixed
properly just removing the blank line in the Organization selector
details: /erp/devel/main/rev/c9ecc9f3821d
changeset: 10157:c9ecc9f3821d
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Jan 26 13:53:13 2011 +0100
summary: Fixes posting of bankstatements
details: /erp/devel/main/rev/117ed736cce4
changeset: 10158:117ed736cce4
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Jan 26 18:08:41 2011 +0100
summary: Fixes unmatching of transaction with no payment
details: /erp/devel/main/rev/cd86af3f3207
changeset: 10159:cd86af3f3207
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Jan 27 10:28:26 2011 +0100
summary: Increased description length for matching algorithm + posted button
in BS: now does not trigger autosave
details: /erp/devel/main/rev/9fcf528ba721
changeset: 10160:9fcf528ba721
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 13:10:07 2011 +0100
summary: Solved wrong parent tab/property computation
details: /erp/devel/main/rev/fdbff2dc951b
changeset: 10161:fdbff2dc951b
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 13:10:28 2011 +0100
summary: Added logos to testregistry
details: /erp/devel/main/rev/c287d1f2a912
changeset: 10162:c287d1f2a912
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 13:10:58 2011 +0100
summary: Solved issue with spaces in filename
details: /erp/devel/main/rev/16dff01b769f
changeset: 10163:16dff01b769f
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jan 27 13:10:05 2011 +0100
summary: [process] Call 2.50 action buttons in modal popup
details: /erp/devel/main/rev/443b855b3a70
changeset: 10164:443b855b3a70
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jan 27 13:29:13 2011 +0100
summary: [process] Fixed Copy from PO process
details: /erp/devel/main/rev/25e5185d70d7
changeset: 10165:25e5185d70d7
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 13:32:40 2011 +0100
summary: Removed system.errs
details: /erp/devel/main/rev/cdfca401ee0f
changeset: 10166:cdfca401ee0f
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 14:04:20 2011 +0100
summary: Updated audit trail button
details: /erp/devel/main/rev/bf1bb9f4a3f2
changeset: 10167:bf1bb9f4a3f2
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 14:06:13 2011 +0100
summary: Removed not-needed images
details: /erp/devel/main/rev/6a88caa4934a
changeset: 10168:6a88caa4934a
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 14:07:43 2011 +0100
summary: Removed not-needed images
details: /erp/devel/main/rev/5155e9f940fb
changeset: 10169:5155e9f940fb
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 14:16:34 2011 +0100
summary: Re-add wrongly removed images...
details: /erp/devel/main/rev/31cbac50689c
changeset: 10170:31cbac50689c
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 14:18:38 2011 +0100
summary: Double click maximizes lowest level
details: /erp/devel/main/rev/f9484b6c7079
changeset: 10171:f9484b6c7079
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu Jan 27 14:24:17 2011 +0100
summary: Replaced a query by a call to a List() method to improve performance
details: /erp/devel/main/rev/d446aaa0e679
changeset: 10172:d446aaa0e679
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jan 27 14:34:08 2011 +0100
summary: [process] Redirect close popup in 2.50 modal poups
details: /erp/devel/main/rev/b27ab0613f01
changeset: 10173:b27ab0613f01
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jan 27 14:51:15 2011 +0100
summary: [tree] Style for tree icon in toolbar
details: /erp/devel/main/rev/87aaf018267e
changeset: 10174:87aaf018267e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jan 27 15:18:56 2011 +0100
summary: [tree] Close tree modal popup
details: /erp/devel/main/rev/4975bba9f7de
changeset: 10175:4975bba9f7de
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jan 27 15:32:12 2011 +0100
summary: [audit] Open audit trail in modal in 2.50 windows
details: /erp/devel/main/rev/75335421281c
changeset: 10176:75335421281c
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Thu Jan 27 16:37:16 2011 +0100
summary: Issue 15739: Add testcase to cover insertion of non-latin1 chars
into clob
i.e. 'ñ' which uses two bytes in utf-8 encoding.
details: /erp/devel/main/rev/40b97deff689
changeset: 10177:40b97deff689
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu Jan 27 17:23:41 2011 +0100
summary: Added isThreadSafe column
details: /erp/devel/main/rev/381d6fa4457c
changeset: 10178:381d6fa4457c
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 19:42:48 2011 +0100
summary: Removed unnecessary code
details: /erp/devel/main/rev/1235744fbd78
changeset: 10179:1235744fbd78
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 19:43:31 2011 +0100
summary: Changed filter icon messages
details: /erp/devel/main/rev/e5b57d42c006
changeset: 10180:e5b57d42c006
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 19:44:52 2011 +0100
summary: Removed double registration in test registry
details: /erp/devel/main/rev/6eefbd8d76eb
changeset: 10181:6eefbd8d76eb
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jan 27 19:46:33 2011 +0100
summary: Replaced double quotes with single quote
details: /erp/devel/main/rev/94deb07307c5
changeset: 10182:94deb07307c5
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jan 27 17:20:20 2011 +0100
summary: fixed issue 15210: 2.50..3.00 compat skin should be enabled by
default
details: /erp/devel/main/rev/7075c26ce7c9
changeset: 10183:7075c26ce7c9
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Jan 28 09:02:52 2011 +0100
summary: Fix database inconsistency
details: /erp/devel/main/rev/91b91cf99318
changeset: 10184:91b91cf99318
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Fri Jan 28 10:15:37 2011 +0100
summary: Fixes issue 0015630: Project profitability report is not working
under some circumstances
It has been modified properly the UOM to convert to take always hours and has
been restored the gropping on the Profitability report SQL sentence to remove
the UOM. This sentence must be grouping only by project
details: /erp/devel/main/rev/6d96f4a4045c
changeset: 10185:6d96f4a4045c
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Jan 28 16:14:32 2011 +0100
summary: CI: update AD_MODULE to version 10184
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.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
| 2 +
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
|
8 +-
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
| 19 +-
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-db/database/sourcedata/AD_WINDOW.xml
| 2 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
| 40 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
| 8 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
| 19 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl
| 5 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
| 32 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
| 1 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ComputeSelectedRecordActionHandler.java
| 109 ++++-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 21 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
| 28 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-compatibility.js
|
6 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 35 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-tabset.js
|
2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 8 -
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
| 32 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/toolbar/iconButton-audit-press.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/toolbar/iconButton-audit.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/toolbar/iconButton-outerjoin-press.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/toolbar/iconButton-sum-press.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/toolbar/iconButton-tree.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-toolbar-styles.css
| 6 +
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-db/database/sourcedata/AD_WINDOW.xml
| 1 +
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseTemplateProcessor.java
| 2 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
| 58 +-
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-db/database/sourcedata/AD_WINDOW.xml
| 2 +
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/URLWidgetProvider.java
| 5 +
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
| 2 +-
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.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.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.datasource/src-db/database/sourcedata/AD_WINDOW.xml
| 1 +
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.selector/src-db/database/sourcedata/AD_TAB.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
| 4 +-
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
| 22 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 10 +-
src-db/database/build-create.xml
| 16 +-
src-db/database/model/tables/AD_WINDOW.xml
| 5 +
src-db/database/model/tables/FIN_MATCHING_ALGORITHM.xml
| 2 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 38 +-
src-db/database/sourcedata/AD_ELEMENT.xml
| 13 +
src-db/database/sourcedata/AD_FIELD.xml
| 27 +-
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
src-db/database/sourcedata/AD_TAB.xml
| 2 +-
src-db/database/sourcedata/AD_WINDOW.xml
| 216 ++++++++++
src-test/org/openbravo/test/dal/IssuesTest.java
| 23 +
src-wad/src/org/openbravo/wad/controls/WADButton.java
| 63 ++-
src/org/openbravo/base/secureApp/PopUp_Response.html
| 14 +-
src/org/openbravo/base/secureApp/VariablesSecureApp.java
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.html
| 6 +-
src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportExpense_data.xsql
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html
| 6 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
| 3 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.java
| 24 +-
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql
| 8 +-
src/org/openbravo/erpCommon/businessUtility/Preferences.java
| 16 +-
src/org/openbravo/erpCommon/security/Login.java
| 6 +-
src/org/openbravo/erpCommon/utility/ToolBar.java
| 3 +-
src/org/openbravo/erpCommon/utility/WindowTree.html
| 12 +-
87 files changed, 845 insertions(+), 258 deletions(-)
diffs (truncated from 4094 to 300 lines):
diff -r 0d3bd59d94da -r 6d96f4a4045c
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri Jan 28 16:14:32 2011 +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.9992]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10184]]></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 0d3bd59d94da -r 6d96f4a4045c
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
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Jan 28 16:14:32 2011 +0100
@@ -8,7 +8,7 @@
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.0.0]]></STARTVERSION>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<ENDVERSION><![CDATA[2.1.9992]]></ENDVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<ENDVERSION><![CDATA[2.1.10184]]></ENDVERSION>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User
Interface Selector]]></DEPENDANT_MODULE_NAME>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -22,7 +22,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.9992]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.10184]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 0d3bd59d94da -r 6d96f4a4045c
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
Fri Jan 28 16:14:32 2011 +0100
@@ -23,6 +23,7 @@
<!--2A9BA5FDA0F8470D881F8EA9DEDCC598--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
<!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--2A9BA5FDA0F8470D881F8EA9DEDCC598--> <UIPATTERN><![CDATA[RO]]></UIPATTERN>
+<!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->
<HQLORDERBYCLAUSE><![CDATA[-accountingDate,financialAccountTransaction,groupID,-sequenceNumber]]></HQLORDERBYCLAUSE>
<!--2A9BA5FDA0F8470D881F8EA9DEDCC598--></AD_TAB>
<!--5B9941AC1F6A4529A76FCA7CDA0A7D7A--><AD_TAB>
@@ -185,6 +186,7 @@
<!--C095D2CC39704DBE8B906B7CD7710968--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
<!--C095D2CC39704DBE8B906B7CD7710968-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--C095D2CC39704DBE8B906B7CD7710968--> <UIPATTERN><![CDATA[SR]]></UIPATTERN>
+<!--C095D2CC39704DBE8B906B7CD7710968-->
<HQLORDERBYCLAUSE><![CDATA[-transactionDate]]></HQLORDERBYCLAUSE>
<!--C095D2CC39704DBE8B906B7CD7710968--></AD_TAB>
<!--EB0466B2A22343F28773B356D292BC7E--><AD_TAB>
diff -r 0d3bd59d94da -r 6d96f4a4045c
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Fri Jan 28 16:14:32 2011 +0100
@@ -411,7 +411,13 @@
finTrans.getFinPayment().setStatus(
(finTrans.getFinPayment().isReceipt()) ? "RDNC" : "PWNC");
}
- finTrans.setStatus((finTrans.getFinPayment().isReceipt()) ? "RDNC" :
"PWNC");
+ boolean isReceipt = false;
+ if (finTrans.getFinPayment() != null) {
+ isReceipt = finTrans.getFinPayment().isReceipt();
+ } else {
+ isReceipt =
finTrans.getDepositAmount().compareTo(finTrans.getPaymentAmount()) > 0;
+ }
+ finTrans.setStatus(isReceipt ? "RDNC" : "PWNC");
finTrans.setReconciliation(null);
OBDal.getInstance().save(finTrans);
OBDal.getInstance().flush();
diff -r 0d3bd59d94da -r 6d96f4a4045c
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
Wed Jan 26 14:02:30 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Fri Jan 28 16:14:32 2011 +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.9992]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.10184]]></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 0d3bd59d94da -r 6d96f4a4045c
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
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Jan 28 16:14:32 2011 +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.9992]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.10184]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 0d3bd59d94da -r 6d96f4a4045c
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri Jan 28 16:14:32 2011 +0100
@@ -766,8 +766,8 @@
<!--FF8081812D949EEF012D94A1A9060024-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--FF8081812D949EEF012D94A1A9060024--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--FF8081812D949EEF012D94A1A9060024--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8081812D949EEF012D94A1A9060024-->
<VALUE><![CDATA[OBUIAPP_GridFilterIconToolTip]]></VALUE>
-<!--FF8081812D949EEF012D94A1A9060024--> <MSGTEXT><![CDATA[Grid is filtered.
Click to clear all filters]]></MSGTEXT>
+<!--FF8081812D949EEF012D94A1A9060024-->
<VALUE><![CDATA[OBUIAPP_GridFilterExplicitToolTip]]></VALUE>
+<!--FF8081812D949EEF012D94A1A9060024--> <MSGTEXT><![CDATA[Explicit (user)
filters applied. Click to clear.]]></MSGTEXT>
<!--FF8081812D949EEF012D94A1A9060024--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
<!--FF8081812D949EEF012D94A1A9060024-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8081812D949EEF012D94A1A9060024--></AD_MESSAGE>
@@ -909,10 +909,21 @@
<!--FF8081812DC07B0C012DC082C76E0014-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--FF8081812DC07B0C012DC082C76E0014--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--FF8081812DC07B0C012DC082C76E0014--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8081812DC07B0C012DC082C76E0014-->
<VALUE><![CDATA[OBUIAPP_GridImplicitFilterIconToolTip]]></VALUE>
-<!--FF8081812DC07B0C012DC082C76E0014--> <MSGTEXT><![CDATA[Grid is filtered
using an automatic filter expression, click to clear the filter or enter your
own filter criteria to override this automatic filtering.]]></MSGTEXT>
+<!--FF8081812DC07B0C012DC082C76E0014-->
<VALUE><![CDATA[OBUIAPP_GridFilterBothToolTip]]></VALUE>
+<!--FF8081812DC07B0C012DC082C76E0014--> <MSGTEXT><![CDATA[Filters applied.
Click to clear.]]></MSGTEXT>
<!--FF8081812DC07B0C012DC082C76E0014--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
<!--FF8081812DC07B0C012DC082C76E0014-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8081812DC07B0C012DC082C76E0014--></AD_MESSAGE>
+<!--FF8081812DC813F3012DC82111700015--><AD_MESSAGE>
+<!--FF8081812DC813F3012DC82111700015-->
<AD_MESSAGE_ID><![CDATA[FF8081812DC813F3012DC82111700015]]></AD_MESSAGE_ID>
+<!--FF8081812DC813F3012DC82111700015-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081812DC813F3012DC82111700015--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081812DC813F3012DC82111700015--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081812DC813F3012DC82111700015-->
<VALUE><![CDATA[OBUIAPP_GridFilterImplicitToolTip]]></VALUE>
+<!--FF8081812DC813F3012DC82111700015--> <MSGTEXT><![CDATA[Implicit (system)
filters applied. Click to clear.]]></MSGTEXT>
+<!--FF8081812DC813F3012DC82111700015--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8081812DC813F3012DC82111700015-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081812DC813F3012DC82111700015--></AD_MESSAGE>
+
</data>
diff -r 0d3bd59d94da -r 6d96f4a4045c
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
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Fri Jan 28 16:14:32 2011 +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.9992]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.10184]]></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 0d3bd59d94da -r 6d96f4a4045c
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
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Jan 28 16:14:32 2011 +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.9992]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.10184]]></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.9992]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.10184]]></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.9992]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.10184]]></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.9992]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.10184]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 0d3bd59d94da -r 6d96f4a4045c
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml
Fri Jan 28 16:14:32 2011 +0100
@@ -13,6 +13,7 @@
<!--54AE252A40C34DA285FC48DA94EB3847--> <PROCESSING><![CDATA[N]]></PROCESSING>
<!--54AE252A40C34DA285FC48DA94EB3847--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--54AE252A40C34DA285FC48DA94EB3847-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--54AE252A40C34DA285FC48DA94EB3847-->
<ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
<!--54AE252A40C34DA285FC48DA94EB3847--></AD_WINDOW>
<!--EBA40241D46D4FA4A24E4A09C61994AA--><AD_WINDOW>
@@ -30,6 +31,7 @@
<!--EBA40241D46D4FA4A24E4A09C61994AA--> <PROCESSING><![CDATA[N]]></PROCESSING>
<!--EBA40241D46D4FA4A24E4A09C61994AA--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--EBA40241D46D4FA4A24E4A09C61994AA-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--EBA40241D46D4FA4A24E4A09C61994AA-->
<ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
<!--EBA40241D46D4FA4A24E4A09C61994AA--></AD_WINDOW>
</data>
diff -r 0d3bd59d94da -r 6d96f4a4045c
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
Fri Jan 28 16:14:32 2011 +0100
@@ -23,6 +23,10 @@
import org.apache.log4j.Logger;
import org.hibernate.criterion.Expression;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.base.model.Property;
+import org.openbravo.dal.core.DalUtil;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
@@ -61,6 +65,42 @@
return false;
}
+ /**
+ * Computes the parent property for a certain tab and its parent tab. The
parentProperty is the
+ * property in the entity of the tab pointing to the parent tab.
+ *
+ * @param tab
+ * the child tab
+ * @param parentTab
+ * the parent tab
+ * @return the parentproperty in the source entity pointing to the parent
+ */
+ public static String getParentProperty(Tab tab, Tab parentTab) {
+ String parentProperty = "";
+ final Entity thisEntity =
ModelProvider.getInstance().getEntity(tab.getTable().getName());
+ final Entity parentEntity = ModelProvider.getInstance().getEntity(
+ parentTab.getTable().getName());
+ if (tab.getColumn() != null) {
+ final String columnId = (String) DalUtil.getId(tab.getColumn());
+ for (Property property : thisEntity.getProperties()) {
+ if (property.getColumnId() != null &&
property.getColumnId().equals(columnId)) {
+ parentProperty = property.getName();
+ }
+ }
+ } else {
+ for (Property property : thisEntity.getProperties()) {
+ if (property.isPrimitive() || property.isOneToMany()) {
+ continue;
+ }
+ if (property.getTargetEntity() == parentEntity) {
+ parentProperty = property.getName();
+ break;
+ }
+ }
+ }
+ return parentProperty;
+ }
+
public static boolean isClientAdmin() {
return OBContext.getOBContext().getRole().isClientAdmin();
}
diff -r 0d3bd59d94da -r 6d96f4a4045c
modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
Fri Jan 28 16:14:32 2011 +0100
@@ -24,10 +24,7 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.hibernate.criterion.Expression;
import org.openbravo.client.kernel.KernelUtils;
-import org.openbravo.dal.service.OBCriteria;
-import org.openbravo.dal.service.OBDal;
import org.openbravo.model.ad.ui.AuxiliaryInput;
import org.openbravo.model.ad.ui.Field;
import org.openbravo.model.ad.ui.Tab;
@@ -194,10 +191,7 @@
return "currentValues." + fieldName;
}
}
- OBCriteria<AuxiliaryInput> auxInC =
OBDal.getInstance().createCriteria(AuxiliaryInput.class);
- auxInC.add(Expression.eq(AuxiliaryInput.PROPERTY_TAB, tab));
- List<AuxiliaryInput> auxInputs = auxInC.list();
- for (AuxiliaryInput auxIn : auxInputs) {
+ for (AuxiliaryInput auxIn : tab.getADAuxiliaryInputList()) {
if (token.equalsIgnoreCase(auxIn.getName())) {
auxInputsInExpression.add(auxIn);
return TOKEN_PREFIX + auxIn.getName();
diff -r 0d3bd59d94da -r 6d96f4a4045c
modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
Wed Jan 26 14:02:30 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
Fri Jan 28 16:14:32 2011 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -36,8 +36,10 @@
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBCriteria;
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
