details: /erp/devel/main/rev/4f16c638daf8
changeset: 10517:4f16c638daf8
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu Feb 10 10:20:38 2011 +0100
summary: Fix javascript error
details: /erp/devel/main/rev/daddaf069115
changeset: 10518:daddaf069115
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Thu Feb 10 11:17:18 2011 +0100
summary: Improve performance of new check added in changeset 49fcf5bafec1
details: /erp/devel/main/rev/97ed5fb24ab8
changeset: 10519:97ed5fb24ab8
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu Feb 10 11:25:01 2011 +0100
summary: Fix so that the message box doesn't immediately disappear after a
process is executed.
details: /erp/devel/main/rev/fed70a6fbbd9
changeset: 10520:fed70a6fbbd9
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Feb 10 11:44:59 2011 +0100
summary: CI: merge back from main
details: /erp/devel/main/rev/0708387e99f6
changeset: 10521:0708387e99f6
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Feb 10 11:54:30 2011 +0100
summary: Adds tab as identifier for fields. Helpful in linked items
details: /erp/devel/main/rev/7e93823c5c2b
changeset: 10522:7e93823c5c2b
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Feb 10 11:55:32 2011 +0100
summary: Adds new property for payment priority implementation
details: /erp/devel/main/rev/aad6c9b82211
changeset: 10523:aad6c9b82211
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu Feb 10 11:58:20 2011 +0100
summary: Use the currentValue in fillParameters only when needed
details: /erp/devel/main/rev/78844a19c9a9
changeset: 10524:78844a19c9a9
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Thu Feb 10 12:07:02 2011 +0100
summary: Add re-usable createLoadingLayout function to show a loading bar.
Returns a smartclient layout showing a loading text+image similar to the one
shown in the login process.
details: /erp/devel/main/rev/e88f79cba1a7
changeset: 10525:e88f79cba1a7
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu Feb 10 12:10:58 2011 +0100
summary: Fixes display logic handling - The form is now shown after FIC return
details: /erp/devel/main/rev/3db06df8e2e9
changeset: 10526:3db06df8e2e9
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Feb 10 14:18:21 2011 +0100
summary: CI: update AD_MODULE to version 10525
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|
4 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 11 ++++
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/ApplicationUtils.java
| 19 ++++---
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
| 15 +++++-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl
| 16 +++---
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
| 11 ++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 23
++++++---
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 9 ++-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.css
| 17 +++++++
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
| 9 +++
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2
+-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|
6 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 3 +-
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.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.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
| 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
| 12 ++--
src-db/database/sourcedata/AD_COLUMN.xml
| 2 +-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_REF_LIST.xml
| 12 +++++
47 files changed, 187 insertions(+), 106 deletions(-)
diffs (truncated from 1080 to 300 lines):
diff -r 49fcf5bafec1 -r 3db06df8e2e9
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Thu Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Thu Feb 10 14:18:21 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.10510]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10525]]></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 49fcf5bafec1 -r 3db06df8e2e9
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 Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu Feb 10 14:18:21 2011 +0100
@@ -7,7 +7,7 @@
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.10510]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.10525]]></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.10510]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.10525]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 49fcf5bafec1 -r 3db06df8e2e9
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 Feb 10 09:57:10 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Thu Feb 10 14:18:21 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.10510]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.10525]]></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 49fcf5bafec1 -r 3db06df8e2e9
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 Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu Feb 10 14:18:21 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.10510]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.10525]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 49fcf5bafec1 -r 3db06df8e2e9
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
Thu Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Thu Feb 10 14:18:21 2011 +0100
@@ -1113,4 +1113,15 @@
<!--FF8081812E0CE808012E0D37FF720093-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8081812E0CE808012E0D37FF720093--></AD_MESSAGE>
+<!--FF8081812E0F2FB1012E0F3248D5000B--><AD_MESSAGE>
+<!--FF8081812E0F2FB1012E0F3248D5000B-->
<AD_MESSAGE_ID><![CDATA[FF8081812E0F2FB1012E0F3248D5000B]]></AD_MESSAGE_ID>
+<!--FF8081812E0F2FB1012E0F3248D5000B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081812E0F2FB1012E0F3248D5000B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081812E0F2FB1012E0F3248D5000B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081812E0F2FB1012E0F3248D5000B-->
<VALUE><![CDATA[OBUIAPP_LOADING]]></VALUE>
+<!--FF8081812E0F2FB1012E0F3248D5000B-->
<MSGTEXT><![CDATA[Loading...]]></MSGTEXT>
+<!--FF8081812E0F2FB1012E0F3248D5000B--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8081812E0F2FB1012E0F3248D5000B-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081812E0F2FB1012E0F3248D5000B--></AD_MESSAGE>
+
</data>
diff -r 49fcf5bafec1 -r 3db06df8e2e9
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 Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Thu Feb 10 14:18:21 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.10510]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.10525]]></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 49fcf5bafec1 -r 3db06df8e2e9
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
Thu Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu Feb 10 14:18:21 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.10510]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.10525]]></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.10510]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.10525]]></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.10510]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.10525]]></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.10510]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.10525]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 49fcf5bafec1 -r 3db06df8e2e9
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
Thu Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
Thu Feb 10 14:18:21 2011 +0100
@@ -30,6 +30,7 @@
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.model.ad.access.Role;
import org.openbravo.model.ad.access.RoleOrganization;
import org.openbravo.model.ad.access.User;
@@ -48,15 +49,17 @@
private static Logger log = Logger.getLogger(ApplicationUtils.class);
static boolean showWindowInClassicMode(Window window) {
+ // FIXME Remove this once ImageBLOB is implemented
+ // Currently, windows with ImageBLOB reference columns will be shown in
classic mode
+ String qryStr = "as f where f.column.reference.id =
'4AA6C3BE9D3B4D84A3B80489505A23E5' "
+ + "and f.tab.window.id = :windowId ";
+ OBQuery<Field> qry = OBDal.getInstance().createQuery(Field.class, qryStr);
+ qry.setNamedParameter("windowId", window.getId());
+ if (qry.count() > 0) {
+ return true;
+ }
+
for (Tab tab : window.getADTabList()) {
-
- // FIXME Remove this once ImageBLOB is implemented
- // Currently, windows with ImageBLOB reference columns will be shown in
classic mode
- for (Field field : tab.getADFieldList()) {
- if
(field.getColumn().getReference().getId().equals("4AA6C3BE9D3B4D84A3B80489505A23E5"))
{
- return true;
- }
- }
if (tab.getSQLWhereClause() != null && tab.getHqlwhereclause() == null) {
// There is a tab with a SQL whereclause, but without a defined HQL
whereclause
return true;
diff -r 49fcf5bafec1 -r 3db06df8e2e9
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Thu Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Thu Feb 10 14:18:21 2011 +0100
@@ -44,9 +44,18 @@
},
</#if>
<#if fieldDefinition.showIf != "">
- showIf: function(item, value, form, currentValues) {
- currentValues = currentValues || form.view.getCurrentValues();
- var context = form.view.getContextInfo(false, true);
+ showIf: function(item, value, form, values) {
+ var context = form.view.getContextInfo(false, true),
+ currentValues = values || form.view.getCurrentValues(), i;
+
+ // Fixing null values to match 2.50 behaviour '' == null
+ for(i in currentValues) {
+ if(currentValues.hasOwnProperty(i) &&
+ currentValues[i] === null) {
+ currentValues[i] = '';
+ }
+ }
+
return context && (${fieldDefinition.showIf});
},
</#if>
diff -r 49fcf5bafec1 -r 3db06df8e2e9
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl
Thu Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl
Thu Feb 10 14:18:21 2011 +0100
@@ -25,20 +25,20 @@
</#list>
],
onFieldChanged: function(form, item, value) {
- form = form || this;
- var context = this.view.getContextInfo(false, true),
- currentValues = form.view.getCurrentValues();
+ var f = form || this,
+ context = this.view.getContextInfo(false, true),
+ currentValues = f.view.getCurrentValues();
<#list data.fields as field>
<#if field.readOnlyIf != "">
- if (form.readOnly) {
- form.getItem('${field.name}').disable();
+ if (f.readOnly) {
+ f.getItem('${field.name}').disable();
} else if(${field.readOnlyIf}) {
- form.getItem('${field.name}').disable();
+ f.getItem('${field.name}').disable();
} else {
- form.getItem('${field.name}').enable();
+ f.getItem('${field.name}').enable();
}
</#if>
</#list>
- form.setFindNewFocusItem();
+ f.setFindNewFocusItem();
}
})
diff -r 49fcf5bafec1 -r 3db06df8e2e9
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
Thu Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
Thu Feb 10 14:18:21 2011 +0100
@@ -107,8 +107,8 @@
// in the correct way, see the ob-view-grid.js editComplete method
validateJSONRecord: function(record) {
record = this.Super('validateJSONRecord', arguments);
- var newId = record.id;
- if (record._originalId) {
+ if (record && record._originalId) {
+ var newId = record.id;
record.id = record._originalId;
record._newId = newId;
}
diff -r 49fcf5bafec1 -r 3db06df8e2e9
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Thu Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Thu Feb 10 14:18:21 2011 +0100
@@ -756,7 +756,7 @@
this.messageBar.hide();
if (!this.isShowingForm) {
- this.switchFormGridVisibility();
+ this.viewForm.showFormOnFICReturn = true;
}
if (!record) { // new case
@@ -1423,7 +1423,7 @@
component = this.viewGrid.getEditForm();
form = component;
} else if (this.isShowingForm) {
- record = this.viewForm.getValues();
+ record = isc.addProperties({}, this.viewGrid.getSelectedRecord(),
this.viewForm.getValues());
component = this.viewForm;
form = component;
} else {
diff -r 49fcf5bafec1 -r 3db06df8e2e9
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
Thu Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
Thu Feb 10 14:18:21 2011 +0100
@@ -21,6 +21,17 @@
// are related to opening views, opening popups, displaying yes/no, etc.
OB.Utilities = {};
+// ** {{{OB.Utilities.createLoadingLayout}}} **
+// Creates a layout with the loading image.
+OB.Utilities.createLoadingLayout = function(){
+ var mainLayout = isc.HLayout.create({styleName:
OB.LoadingPrompt.mainLayoutStyleName, width: '100%', height: '100%', align:
'center', defaultLayoutAlign: 'center'});
+ var loadingLayout = isc.HLayout.create({styleName:
OB.LoadingPrompt.loadingLayoutStyleName, width: 1, height: 1, overflow:
'visible'});
+ mainLayout.addMember(loadingLayout);
+ loadingLayout.addMember(isc.Label.create({contents:
OB.I18N.getLabel('OBUIAPP_LOADING'), styleName: 'OBLoadingPromptLabel', width:
1, height: 1, overflow: 'visible'}));
+ loadingLayout.addMember(isc.Img.create(OB.LoadingPrompt.loadingImage));
+ return mainLayout;
+};
+
// ** {{{OB.Utilities.addRequiredSuffixToBaseStyle}}} **
// Adds the Required suffix to a base style for a required formitem, to show
it yellow in
// the forms.
diff -r 49fcf5bafec1 -r 3db06df8e2e9
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Thu Feb 10 09:57:10 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Thu Feb 10 14:18:21 2011 +0100
@@ -113,7 +113,6 @@
this.retrieveInitialValues(isNew);
- this.view.messageBar.hide();
// note on purpose using this.isNew, also takes into account the _new flag
if (this.isNew) {
this.view.statusBar.setStateLabel('OBUIAPP_New',
this.view.statusBar.newIcon);
@@ -306,8 +305,9 @@
this.auxInputs = {};
for (prop in auxInputs) {
if (auxInputs.hasOwnProperty(prop)) {
- this.setValue(prop, auxInputs[prop].value);
- this.auxInputs[prop] = auxInputs[prop].value;
+ value = typeof auxInputs[prop].value !== 'undefined' ?
auxInputs[prop].value : '';
+ this.setValue(prop, value);
+ this.auxInputs[prop] = value;
}
}
}
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
