details: /erp/devel/main/rev/8ddd471e7e4e
changeset: 10412:8ddd471e7e4e
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Feb 07 19:03:40 2011 +0100
summary: Clicking link title now opens linked window
details: /erp/devel/main/rev/9c281083cde2
changeset: 10413:9c281083cde2
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Feb 07 19:03:56 2011 +0100
summary: Solved issue that linked items section was shown when clicking in
new mode
details: /erp/devel/main/rev/5a78c692d93c
changeset: 10414:5a78c692d93c
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Feb 07 19:24:10 2011 +0100
summary: Added implicit default for boolean datatypes. Added filter for the
'null' string
details: /erp/devel/main/rev/20c65d449dba
changeset: 10415:20c65d449dba
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Feb 07 19:34:24 2011 +0100
summary: Added process popup to testregistry
details: /erp/devel/main/rev/50dbcdd9a7a9
changeset: 10416:50dbcdd9a7a9
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Feb 07 21:29:58 2011 +0100
summary: CI: merge back from main
details: /erp/devel/main/rev/0c1dcc495e00
changeset: 10417:0c1dcc495e00
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Feb 08 08:37:15 2011 +0100
summary: Solved filtering problem with foreign key fields
details: /erp/devel/main/rev/72fe44d26b81
changeset: 10418:72fe44d26b81
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Feb 08 10:15:32 2011 +0100
summary: CI: update AD_MODULE to version 10417
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/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 9 ++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 32 +++++++++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-linked-items.js
| 14 ++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 21 +++++-
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/BooleanUIDefinition.java
| 22 ++++++
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java
| 9 --
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
| 2 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TextUIDefinition.java
| 2 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 4 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/YesNoUIDefinition.java
| 17 +++++
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 +-
45 files changed, 187 insertions(+), 86 deletions(-)
diffs (truncated from 1030 to 300 lines):
diff -r 67b1779380be -r 72fe44d26b81
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 08 10:15:32 2011 +0100
@@ -6,7 +6,7 @@
<!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and
Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10402]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10417]]></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 67b1779380be -r 72fe44d26b81
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
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 08 10:15:32 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.10402]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.10417]]></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.10402]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.10417]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 67b1779380be -r 72fe44d26b81
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
Mon Feb 07 18:43:23 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 08 10:15:32 2011 +0100
@@ -6,7 +6,7 @@
<!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.10402]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.10417]]></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 67b1779380be -r 72fe44d26b81
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
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 08 10:15:32 2011 +0100
@@ -7,7 +7,7 @@
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.10402]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.10417]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 67b1779380be -r 72fe44d26b81
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
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 08 10:15:32 2011 +0100
@@ -6,7 +6,7 @@
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface
Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.10402]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.10417]]></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 67b1779380be -r 72fe44d26b81
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
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 08 10:15:32 2011 +0100
@@ -7,7 +7,7 @@
<!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.10402]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.10417]]></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.10402]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.10417]]></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.10402]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.10417]]></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.10402]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.10417]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 67b1779380be -r 72fe44d26b81
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Tue Feb 08 10:15:32 2011 +0100
@@ -29,6 +29,7 @@
// * OBYesNoItem: combo box for yes/no values
// * OBLinkTitleItem: an interface supporting a link button in the title.
// * OBFKItem: combo box for foreign key references
+// * OBFKFilterTextItem: text item for filtering on FK fields
// * OBListItem: combo box for list references
// == OBCheckboxItem ==
@@ -302,6 +303,14 @@
validateOnExit: true
});
+//== OBFKFilterTextItem ==
+//Input used for filtering on FK fields.
+isc.ClassFactory.defineClass('OBFKFilterTextItem', TextItem);
+
+isc.OBFKFilterTextItem.addProperties({
+ validateOnExit: true
+});
+
// == OBTextAreaItem ==
// Input for large strings
isc.ClassFactory.defineClass('OBTextAreaItem', TextAreaItem);
diff -r 67b1779380be -r 72fe44d26b81
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Tue Feb 08 10:15:32 2011 +0100
@@ -134,6 +134,29 @@
return ret;
},
+ // repair that filter criteria on fk fields can be
+ // on the identifier instead of the field itself.
+ // after applying the filter the grid will set the criteria
+ // back in the filtereditor effectively clearing
+ // the filter field. The code here repairs/prevents this.
+ setValuesAsCriteria : function (criteria, refresh) {
+ // make a copy so that we don't change the object
+ // which is maybe used somewhere else
+ criteria = isc.addProperties({}, criteria);
+ var index, prop;
+
+ for (prop in criteria) {
+ if (criteria.hasOwnProperty(prop) && prop.endsWith('.' +
OB.Constants.IDENTIFIER)) {
+ value = criteria[prop];
+ index = prop.indexOf('.');
+ prop = prop.substring(0, index);
+ criteria[prop] = value;
+ }
+ }
+
+ return this.Super('setValuesAsCriteria', [criteria, refresh]);
+ },
+
actionButtonProperties: {
baseStyle: 'OBGridFilterFunnelIcon',
visibility: 'hidden',
@@ -220,8 +243,15 @@
}
for (var prop in criteria) {
if (criteria.hasOwnProperty(prop)) {
+ var value = criteria[prop];
+ // see the description in setValuesAsCriteria above
+ if (prop.endsWith('.' + OB.Constants.IDENTIFIER)) {
+ var index = prop.indexOf('.');
+ prop = prop.substring(0, index);
+ }
+
var field = this.filterEditor.getField(prop);
- if (this.isValidFilterField(field) && (criteria[prop] === false ||
criteria[prop])) {
+ if (this.isValidFilterField(field) && (value === false || value ||
value === 0)) {
return true;
}
}
diff -r 67b1779380be -r 72fe44d26b81
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
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
Tue Feb 08 10:15:32 2011 +0100
@@ -221,6 +221,7 @@
}
winPopUp.document.close();
}
+ OB.TestRegistry.register('org.openbravo.classicpopup.' + url, winPopUp);
winPopUp.focus();
return winPopUp;
};
diff -r 67b1779380be -r 72fe44d26b81
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-linked-items.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-linked-items.js
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-linked-items.js
Tue Feb 08 10:15:32 2011 +0100
@@ -76,6 +76,11 @@
},
expandSection: function(){
+ // if this is not there then when clicking inside the
+ // section item will visualize it
+ if (!this.isVisible()) {
+ return;
+ }
var ret = this.Super('expandSection', arguments);
this.getLinkedItemPart().setExpanded(true);
return ret;
@@ -83,7 +88,16 @@
hide: function(){
this.collapseSection();
+ this.prompt = '';
return this.Super('hide', arguments);
+ },
+
+ visibilityChanged: function(state) {
+ if (state) {
+ this.prompt = OB.I18N.getLabel('OBUIAPP_LinkedItemsPrompt');
+ } else {
+ this.prompt = '';
+ }
}
});
diff -r 67b1779380be -r 72fe44d26b81
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
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Tue Feb 08 10:15:32 2011 +0100
@@ -673,7 +673,7 @@
var imgHTML = isc.Canvas.imgHTML(searchIconObj);
- return "<span class='OBFormFieldLinkButton'>" + titleHTML +
'</span> ' + imgHTML;
+ return '<span class="OBFormFieldLinkButton" onclick="window[\'' +
item.ID + '\'].linkButtonClick();">' + titleHTML + '</span> ' + imgHTML;
}
return titleHTML;
diff -r 67b1779380be -r 72fe44d26b81
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Tue Feb 08 10:15:32 2011 +0100
@@ -571,9 +571,9 @@
},
convertCriteria: function(criteria){
- var selectedValues;
+ var selectedValues, prop, fld, value;
- criteria = criteria || {};
+ criteria = isc.addProperties({}, criteria || {});
if (this.targetRecordId) {
// do not filter on anything with a targetrecord
@@ -583,6 +583,23 @@
criteria._targetRecordId = this.targetRecordId;
}
+ // filter criteria for foreign key fields should be on the identifier
+ // note is again repaired in the filtereditor setValuesAsCriteria
+ // see the ob-grid.js
+ for (prop in criteria) {
+ if (criteria.hasOwnProperty(prop)) {
+ if (prop === this.view.parentProperty) {
+ continue;
+ }
+ fld = this.getField(prop);
+ if (fld && fld.foreignKeyField) {
+ value = criteria[prop];
+ delete criteria[prop];
+ criteria[prop + '.' + OB.Constants.IDENTIFIER] = value;
+ }
+ }
+ }
+
// note pass in criteria otherwise infinite looping!
this.resetEmptyMessage(criteria);
diff -r 67b1779380be -r 72fe44d26b81
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
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 08 10:15:32 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.10402]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->
<VERSION><![CDATA[1.0.10417]]></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 67b1779380be -r 72fe44d26b81
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
Mon Feb 07 18:43:23 2011 +0100
+++
b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 08 10:15:32 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.10402]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->
<STARTVERSION><![CDATA[2.1.10417]]></STARTVERSION>
<!--DCE798FBC5B648F7A3C81A6941720A57--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
------------------------------------------------------------------------------
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
