details: /erp/devel/main/rev/ea2c952a026e
changeset: 10796:ea2c952a026e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Feb 18 16:28:40 2011 +0100
summary: Invoke callback function in setContextInfo even FIC is not called
details: /erp/devel/main/rev/0d3fcac6a08a
changeset: 10797:0d3fcac6a08a
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Feb 18 16:55:57 2011 +0100
summary: Removed classic ui preference
details: /erp/devel/main/rev/97cf9fb63023
changeset: 10798:97cf9fb63023
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 18 17:05:49 2011 +0100
summary: Added fixed width and height to OB image in order to show it in the
proper place
details: /erp/devel/main/rev/a49e48752aa7
changeset: 10799:a49e48752aa7
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Feb 18 17:15:59 2011 +0100
summary: Increase safeness of callout parsing
details: /erp/devel/main/rev/c5d2a34d936d
changeset: 10800:c5d2a34d936d
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Feb 18 17:34:34 2011 +0100
summary: Fix default values for button references which have an associate
list reference
details: /erp/devel/main/rev/9d1716b9b81b
changeset: 10801:9d1716b9b81b
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Feb 18 17:50:55 2011 +0100
summary: CI: merge back from main
details: /erp/devel/main/rev/a7235c01dfce
changeset: 10802:a7235c01dfce
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Feb 18 18:03:36 2011 +0100
summary: On NEW mode, auxiliary inputs which depend on a default value of a
column will be shown correctly
details: /erp/devel/main/rev/2c10d1d0ee1a
changeset: 10803:2c10d1d0ee1a
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Fri Feb 18 18:06:06 2011 +0100
summary: [Sample Data] Fix inconsistent invoices in F&B
details: /erp/devel/main/rev/eb96c8dd63e2
changeset: 10804:eb96c8dd63e2
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Feb 18 18:09:27 2011 +0100
summary: Force getting session attributes in getContextInfo for display logic
This makes it work in case isEditingGrid and isShowingForm are false
details: /erp/devel/main/rev/4f87b4b4185d
changeset: 10805:4f87b4b4185d
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Feb 18 20:13:44 2011 +0100
summary: CI: update AD_MODULE to version 10804
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 8 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
| 12 -
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
| 2 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
| 2 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 8 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 3 +
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/EnumUIDefinition.java
| 8 +
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.client.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.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 +-
referencedata/sampledata/F_B_International_Group.xml
| 9960 +++++----
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
44 files changed, 5103 insertions(+), 5042 deletions(-)
diffs (truncated from 13041 to 300 lines):
diff -r 389366b95f4f -r 4f87b4b4185d
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 20:13:44 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.10786]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10804]]></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 389366b95f4f -r 4f87b4b4185d
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 Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 20:13:44 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.10786]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.10804]]></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.10786]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.10804]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 389366b95f4f -r 4f87b4b4185d
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 Feb 18 15:26:10 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 20:13:44 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.10786]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.10804]]></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 389366b95f4f -r 4f87b4b4185d
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
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 20:13:44 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.10786]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.10804]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 389366b95f4f -r 4f87b4b4185d
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
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 20:13:44 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.10786]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.10804]]></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 389366b95f4f -r 4f87b4b4185d
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
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 20:13:44 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.10786]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.10804]]></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.10786]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.10804]]></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.10786]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.10804]]></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.10786]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.10804]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 389366b95f4f -r 4f87b4b4185d
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
Fri Feb 18 20:13:44 2011 +0100
@@ -93,16 +93,4 @@
<!--C5C3ECF98CB14B02B88D2FE46D810739-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--C5C3ECF98CB14B02B88D2FE46D810739--></AD_PREFERENCE>
-<!--FF8081812DBF2839012DBF4D98400060--><AD_PREFERENCE>
-<!--FF8081812DBF2839012DBF4D98400060-->
<AD_PREFERENCE_ID><![CDATA[FF8081812DBF2839012DBF4D98400060]]></AD_PREFERENCE_ID>
-<!--FF8081812DBF2839012DBF4D98400060-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8081812DBF2839012DBF4D98400060--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8081812DBF2839012DBF4D98400060--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8081812DBF2839012DBF4D98400060-->
<AD_USER_ID><![CDATA[100]]></AD_USER_ID>
-<!--FF8081812DBF2839012DBF4D98400060--> <VALUE><![CDATA[N]]></VALUE>
-<!--FF8081812DBF2839012DBF4D98400060-->
<PROPERTY><![CDATA[OBUIAPP_UseClassicMode]]></PROPERTY>
-<!--FF8081812DBF2839012DBF4D98400060-->
<ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
-<!--FF8081812DBF2839012DBF4D98400060-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--FF8081812DBF2839012DBF4D98400060--></AD_PREFERENCE>
-
</data>
diff -r 389366b95f4f -r 4f87b4b4185d
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
Fri Feb 18 20:13:44 2011 +0100
@@ -83,6 +83,8 @@
OB.TopLayout.OpenbravoLogo = isc.Img.create({
imageType: 'normal',
+ imageWidth: '122',
+ imageHeight: '34',
src: OB.Application.contextUrl + 'utility/GetOpenbravoLogo.png',
getInnerHTML: function() {
var html = this.Super('getInnerHTML', arguments);
diff -r 389366b95f4f -r 4f87b4b4185d
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
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Fri Feb 18 20:13:44 2011 +0100
@@ -45,7 +45,7 @@
</#if>
<#if fieldDefinition.showIf != "">
showIf: function(item, value, form, values) {
- var context = form.view.getContextInfo(false, true),
+ var context = form.view.getContextInfo(false, true, true),
currentValues = values || form.view.getCurrentValues(), i;
// Fixing null values to match 2.50 behaviour '' == null
diff -r 389366b95f4f -r 4f87b4b4185d
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Fri Feb 18 20:13:44 2011 +0100
@@ -200,6 +200,11 @@
jsContent, changeEventCols, calloutsToCall, lastfieldChanged);
}
+ if (mode.equals("NEW")) {
+ // In the case of NEW mode, we compute auxiliary inputs again to take
into account that
+ // auxiliary inputs could depend on a default value
+ computeAuxiliaryInputs(mode, tab, columnValues);
+ }
// Construction of the final JSONObject
long t7 = System.currentTimeMillis();
JSONObject finalObject = buildJSONObject(mode, tab, columnValues, row,
changeEventCols,
@@ -826,7 +831,8 @@
NativeArray subelements = (NativeArray) element.get(1,
null);
for (int j = 0; j < subelements.getLength(); j++) {
NativeArray subelement = (NativeArray)
subelements.get(j, null);
- if (subelement.get(2,
null).toString().equalsIgnoreCase("True")) {
+ if (subelement.get(2, null) != null
+ && subelement.get(2,
null).toString().equalsIgnoreCase("True")) {
String value = subelement.get(0, null).toString();
log.debug("Column: " + col.getDBColumnName() + "
Value: " + value);
String oldValue = rq.getRequestParameter(colId);
diff -r 389366b95f4f -r 4f87b4b4185d
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
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Fri Feb 18 20:13:44 2011 +0100
@@ -1566,6 +1566,9 @@
setContextInfo: function(sessionProperties, callbackFunction){
// no need to set the context in this case
if (this.isEditingGrid || this.isShowingForm) {
+ if (callbackFunction) {
+ callbackFunction();
+ }
return;
}
if (!sessionProperties) {
diff -r 389366b95f4f -r 4f87b4b4185d
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 20:13:44 2011 +0100
@@ -6,7 +6,7 @@
<!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->
<VERSION><![CDATA[1.0.10786]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->
<VERSION><![CDATA[1.0.10804]]></VERSION>
<!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the
HTML Widget superclass that allows to create widget classes that embed the html
code.]]></DESCRIPTION>
<!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you
can define your own widget classes just setting up your own html code or the
html code provided by third parties.]]></HELP>
<!--D393BE6F22BB44B7B728259B34FC795A-->
<URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
diff -r 389366b95f4f -r 4f87b4b4185d
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 20:13:44 2011 +0100
@@ -7,7 +7,7 @@
<!--DCE798FBC5B648F7A3C81A6941720A57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--DCE798FBC5B648F7A3C81A6941720A57-->
<AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
<!--DCE798FBC5B648F7A3C81A6941720A57-->
<AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->
<STARTVERSION><![CDATA[2.1.10786]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->
<STARTVERSION><![CDATA[2.1.10804]]></STARTVERSION>
<!--DCE798FBC5B648F7A3C81A6941720A57--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDANT_MODULE_NAME><![CDATA[My
Openbravo Tab]]></DEPENDANT_MODULE_NAME>
<!--DCE798FBC5B648F7A3C81A6941720A57-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 389366b95f4f -r 4f87b4b4185d
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 20:13:44 2011 +0100
@@ -6,7 +6,7 @@
<!--4B828F4D03264080AA1D2057B13F613C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--4B828F4D03264080AA1D2057B13F613C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--4B828F4D03264080AA1D2057B13F613C--> <NAME><![CDATA[User Interface Client
Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->
<VERSION><![CDATA[2.1.10786]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->
<VERSION><![CDATA[2.1.10804]]></VERSION>
<!--4B828F4D03264080AA1D2057B13F613C--> <DESCRIPTION><![CDATA[Provides
framework functionality for the Openbravo User Interface]]></DESCRIPTION>
<!--4B828F4D03264080AA1D2057B13F613C--> <HELP><![CDATA[The user interface
client kernel is a generation framework for generating client (browser)
components used in Openbravo. Its components are mainly used by other modules
to provide customizable and extendable user interfaces.]]></HELP>
<!--4B828F4D03264080AA1D2057B13F613C-->
<URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
diff -r 389366b95f4f -r 4f87b4b4185d
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 20:13:44 2011 +0100
@@ -7,7 +7,7 @@
<!--26B041893E844A53AFA58BC326C4F0D7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--26B041893E844A53AFA58BC326C4F0D7-->
<AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
<!--26B041893E844A53AFA58BC326C4F0D7-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->
<STARTVERSION><![CDATA[3.0.10786]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->
<STARTVERSION><![CDATA[3.0.10804]]></STARTVERSION>
<!--26B041893E844A53AFA58BC326C4F0D7--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--26B041893E844A53AFA58BC326C4F0D7-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--26B041893E844A53AFA58BC326C4F0D7-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->
<AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->
<AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->
<STARTVERSION><![CDATA[1.1.10786]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->
<STARTVERSION><![CDATA[1.1.10804]]></STARTVERSION>
<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <DEPENDANT_MODULE_NAME><![CDATA[JBoss
Weld]]></DEPENDANT_MODULE_NAME>
<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
<!--D7BA4BB0844942C58DC46B9E23CF8E67--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--D7BA4BB0844942C58DC46B9E23CF8E67-->
<AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
<!--D7BA4BB0844942C58DC46B9E23CF8E67-->
<AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--D7BA4BB0844942C58DC46B9E23CF8E67-->
<STARTVERSION><![CDATA[2.0.10786]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->
<STARTVERSION><![CDATA[2.0.10804]]></STARTVERSION>
<!--D7BA4BB0844942C58DC46B9E23CF8E67--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--D7BA4BB0844942C58DC46B9E23CF8E67--> <DEPENDANT_MODULE_NAME><![CDATA[JSON
REST Webservice]]></DEPENDANT_MODULE_NAME>
<!--D7BA4BB0844942C58DC46B9E23CF8E67-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 389366b95f4f -r 4f87b4b4185d
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
Fri Feb 18 20:13:44 2011 +0100
@@ -21,6 +21,7 @@
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import org.openbravo.base.exception.OBException;
+import org.openbravo.dal.core.DalUtil;
import org.openbravo.model.ad.ui.Field;
/**
@@ -53,6 +54,13 @@
if (!field.isDisplayed()) {
return value.toString();
}
+ if (!getValueFromSession
+ && ((String)
DalUtil.getId(field.getColumn().getReference())).equals("28")
+ && !value.has("value")) {
+ // When reference is button, set 'N' as default if there is default
+ value.put("value", "N");
+ value.put("classicValue", "N");
+ }
return getValueInComboReference(field, getValueFromSession,
value.has("classicValue") ? value
.getString("classicValue") : "");
} catch (JSONException e) {
diff -r 389366b95f4f -r 4f87b4b4185d
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 18 20:13:44 2011 +0100
@@ -6,7 +6,7 @@
<!--2758CD25B2704AF6BBAD10365FC82C06--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--2758CD25B2704AF6BBAD10365FC82C06--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--2758CD25B2704AF6BBAD10365FC82C06--> <NAME><![CDATA[Workspace &
Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->
<VERSION><![CDATA[2.1.10786]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->
<VERSION><![CDATA[2.1.10804]]></VERSION>
<!--2758CD25B2704AF6BBAD10365FC82C06--> <DESCRIPTION><![CDATA[Workspace &
Widgets]]></DESCRIPTION>
<!--2758CD25B2704AF6BBAD10365FC82C06--> <HELP><![CDATA[Provides the
infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
<!--2758CD25B2704AF6BBAD10365FC82C06-->
<URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
diff -r 389366b95f4f -r 4f87b4b4185d
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 15:26:10 2011 +0100
+++
b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 18 20:13:44 2011 +0100
@@ -7,7 +7,7 @@
<!--15F51F03882F444CAB6593B4566DC929--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--15F51F03882F444CAB6593B4566DC929-->
<AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
<!--15F51F03882F444CAB6593B4566DC929-->
<AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
------------------------------------------------------------------------------
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
