details: /erp/devel/main/rev/bd69781e078e
changeset: 10575:bd69781e078e
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Feb 11 15:09:33 2011 +0100
summary: Now Registration page closes properly in all browsers
details: /erp/devel/main/rev/dafb724d2cb9
changeset: 10576:dafb724d2cb9
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Feb 11 15:28:28 2011 +0100
summary: solved issue with columnwidth in fkdefinition
details: /erp/devel/main/rev/4e2bdba8f942
changeset: 10577:4e2bdba8f942
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Feb 11 15:28:47 2011 +0100
summary: Tab with same table as parent only shows parent record now
details: /erp/devel/main/rev/c5f0379e728d
changeset: 10578:c5f0379e728d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Feb 11 15:29:09 2011 +0100
summary: Small formatting change
details: /erp/devel/main/rev/0cde86426cea
changeset: 10579:0cde86426cea
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Feb 11 15:43:05 2011 +0100
summary: Added classic modal popup to test registry
details: /erp/devel/main/rev/7ed5e8fa21e8
changeset: 10580:7ed5e8fa21e8
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Feb 11 17:13:25 2011 +0100
summary: CI: merge back from main
details: /erp/devel/main/rev/d56c5c16cc8f
changeset: 10581:d56c5c16cc8f
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Fri Feb 11 17:19:04 2011 +0100
summary: Reformat
details: /erp/devel/main/rev/2c18123e3ecf
changeset: 10582:2c18123e3ecf
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Feb 11 19:10:22 2011 +0100
summary: CI: update AD_MODULE to version 10581
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/org/openbravo/client/application/window/OBViewTab.java
| 10 ++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-compatibility.js
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
| 2 +-
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/ForeignKeyUIDefinition.java
| 2 +-
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_MODULE.xml
| 4 +-
src/org/openbravo/erpCommon/ad_forms/Registration.html
| 27 ++++---
src/org/openbravo/erpCommon/info/Project.java
| 31 +++++----
39 files changed, 112 insertions(+), 99 deletions(-)
diffs (truncated from 888 to 300 lines):
diff -r a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 11 19:10:22 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.10554]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10581]]></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 a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 11 19:10:22 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.10554]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.10581]]></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.10554]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.10581]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 11 19:10:22 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.10554]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.10581]]></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 a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 11 19:10:22 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.10554]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.10581]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 11 19:10:22 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.10554]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.10581]]></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 a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 11 19:10:22 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.10554]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.10581]]></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.10554]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.10581]]></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.10554]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.10581]]></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.10554]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.10581]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r a45a09e76576 -r 2c18123e3ecf
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Fri Feb 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Fri Feb 11 19:10:22 2011 +0100
@@ -27,6 +27,8 @@
import javax.inject.Inject;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
import org.openbravo.client.application.ApplicationUtils;
import org.openbravo.client.application.DynamicExpressionParser;
import
org.openbravo.client.application.window.OBViewFormComponent.FormFieldComparator;
@@ -186,7 +188,13 @@
if (parentProperty != null) {
return parentProperty;
}
- return ApplicationUtils.getParentProperty(tab,
parentTabComponent.getTab());
+ if
(tab.getTable().getId().equals(parentTabComponent.getTab().getTable().getId()))
{
+ final Entity entity =
ModelProvider.getInstance().getEntity(tab.getTable().getName());
+ parentProperty = entity.getIdProperties().get(0).getName();
+ } else {
+ parentProperty = ApplicationUtils.getParentProperty(tab,
parentTabComponent.getTab());
+ }
+ return parentProperty;
}
public String getViewForm() {
diff -r a45a09e76576 -r 2c18123e3ecf
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-compatibility.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-compatibility.js
Fri Feb 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-compatibility.js
Fri Feb 11 19:10:22 2011 +0100
@@ -354,6 +354,7 @@
});
cPopup.show();
cobcomp.Popup.postOpen(cPopup, theOpener, postParams);
+ OB.TestRegistry.register('org.openbravo.classicpopup.' + url, cPopup);
},
// ** {{{ Popup.postOpen(cPopup) }}} **
diff -r a45a09e76576 -r 2c18123e3ecf
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
Fri Feb 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
Fri Feb 11 19:10:22 2011 +0100
@@ -89,7 +89,7 @@
if (this.command === isc.OBStandardWindow.COMMAND_NEW) {
this.viewProperties.allowDefaultEditMode = false;
}
-
this.viewState=OB.PropertyStore.get("OBUIAPP_GridConfiguration",this.windowId);
+ this.viewState = OB.PropertyStore.get("OBUIAPP_GridConfiguration",
this.windowId);
this.view = isc.OBStandardView.create(this.viewProperties);
this.addView(this.view);
this.addMember(this.view);
diff -r a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 11 19:10:22 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.10554]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->
<VERSION><![CDATA[1.0.10581]]></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 a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 11 19:10:22 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.10554]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->
<STARTVERSION><![CDATA[2.1.10581]]></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 a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 11 19:10:22 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.10554]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->
<VERSION><![CDATA[2.1.10581]]></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 a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 11 19:10:22 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.10554]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->
<STARTVERSION><![CDATA[3.0.10581]]></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.10554]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->
<STARTVERSION><![CDATA[1.1.10581]]></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.10554]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->
<STARTVERSION><![CDATA[2.0.10581]]></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 a45a09e76576 -r 2c18123e3ecf
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
Fri Feb 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
Fri Feb 11 19:10:22 2011 +0100
@@ -57,7 +57,7 @@
length = field.getColumn().getLength();
}
final Property prop =
KernelUtils.getInstance().getPropertyFromColumn(field.getColumn());
- return ", width: width: isc.OBGrid.getDefaultColumnWidth(" + length + "),
displayField: '"
+ return ", width: isc.OBGrid.getDefaultColumnWidth(" + length + "),
displayField: '"
+ prop.getName() + "." + JsonConstants.IDENTIFIER + "'," +
"valueField: '" + prop.getName()
+ "'" + ", foreignKeyField: true" + super.getGridFieldProperties(field)
+ getShowHoverGridFieldSettings(field);
diff -r a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 11 19:10:22 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.10554]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->
<VERSION><![CDATA[2.1.10581]]></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 a45a09e76576 -r 2c18123e3ecf
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 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 11 19:10:22 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>
-<!--15F51F03882F444CAB6593B4566DC929-->
<STARTVERSION><![CDATA[2.1.10554]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->
<STARTVERSION><![CDATA[2.1.10581]]></STARTVERSION>
<!--15F51F03882F444CAB6593B4566DC929--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--15F51F03882F444CAB6593B4566DC929--> <DEPENDANT_MODULE_NAME><![CDATA[User
Interface Application]]></DEPENDANT_MODULE_NAME>
<!--15F51F03882F444CAB6593B4566DC929-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
<!--E71B28FC949D481D9F59C17D01E46EF9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--E71B28FC949D481D9F59C17D01E46EF9-->
<AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
<!--E71B28FC949D481D9F59C17D01E46EF9-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--E71B28FC949D481D9F59C17D01E46EF9-->
<STARTVERSION><![CDATA[3.0.10554]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->
<STARTVERSION><![CDATA[3.0.10581]]></STARTVERSION>
<!--E71B28FC949D481D9F59C17D01E46EF9--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E71B28FC949D481D9F59C17D01E46EF9-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--E71B28FC949D481D9F59C17D01E46EF9-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r a45a09e76576 -r 2c18123e3ecf
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 11 19:10:22 2011 +0100
@@ -6,7 +6,7 @@
<!--0A060B2AF1974E8EAA8DB61388E9AECC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0A060B2AF1974E8EAA8DB61388E9AECC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0A060B2AF1974E8EAA8DB61388E9AECC--> <NAME><![CDATA[Query/List
Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->
<VERSION><![CDATA[1.0.10554]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->
<VERSION><![CDATA[1.0.10581]]></VERSION>
<!--0A060B2AF1974E8EAA8DB61388E9AECC--> <DESCRIPTION><![CDATA[Provides the
Query/List superclass widget that allows to create widget classes that prints a
grid of data based on a query.]]></DESCRIPTION>
<!--0A060B2AF1974E8EAA8DB61388E9AECC--> <HELP><![CDATA[With this module you
can define your own widget classes that just with simple Application Dictionary
shows a grid of data based on a HQL Query.]]></HELP>
<!--0A060B2AF1974E8EAA8DB61388E9AECC-->
<URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
diff -r a45a09e76576 -r 2c18123e3ecf
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Feb 11 19:10:22 2011 +0100
@@ -7,7 +7,7 @@
<!--26558497C31140BFAB067BA4BC47D799--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--26558497C31140BFAB067BA4BC47D799-->
<AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
<!--26558497C31140BFAB067BA4BC47D799-->
<AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->
<STARTVERSION><![CDATA[2.1.10554]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->
<STARTVERSION><![CDATA[2.1.10581]]></STARTVERSION>
<!--26558497C31140BFAB067BA4BC47D799--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--26558497C31140BFAB067BA4BC47D799--> <DEPENDANT_MODULE_NAME><![CDATA[My
Openbravo Tab]]></DEPENDANT_MODULE_NAME>
<!--26558497C31140BFAB067BA4BC47D799-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r a45a09e76576 -r 2c18123e3ecf
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 11 14:27:45 2011 +0100
+++
b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
Fri Feb 11 19:10:22 2011 +0100
@@ -6,7 +6,7 @@
<!--2A5EE903D7974AC298C0504FBC4501A7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--2A5EE903D7974AC298C0504FBC4501A7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--2A5EE903D7974AC298C0504FBC4501A7--> <NAME><![CDATA[Payment
Report]]></NAME>
------------------------------------------------------------------------------
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
