details: /erp/devel/main/rev/ab9973f3e5b8
changeset: 12139:ab9973f3e5b8
user: Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date: Thu May 12 18:52:55 2011 +0200
summary: Four column lay-out: Final
details: /erp/devel/main/rev/1c3a638a6b50
changeset: 12140:1c3a638a6b50
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu May 12 18:52:58 2011 +0200
summary: Issue 17113: Add a copy of showIf definition to obShowIf
- This reference copy is used in the showIf of the section. Somehow the item
showIf function definition gets set to null
- Fixes several JSLint warnings
details: /erp/devel/main/rev/67e716398e7a
changeset: 12141:67e716398e7a
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu May 12 18:55:45 2011 +0200
summary: Fixes issue 17113: Use a copy of showIf in the sections
- Use a copy of showIf defined at Item level, to see if the section needs to
be shown or not
- Solve several JSLint warnings
- Remove the logic on processFICReturn since is not used anymore
details: /erp/devel/main/rev/32c90cc9117f
changeset: 12142:32c90cc9117f
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu May 12 19:07:46 2011 +0200
summary: Fixes issue 17082: Alert Managment Window - Items can not be
displayed
details: /erp/devel/main/rev/db2ff87c56e8
changeset: 12143:db2ff87c56e8
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu May 12 19:11:30 2011 +0200
summary: Fixed issue 17146. Criteria not to compute combos made more strict.
If a combo is not showed, but either is mandatory, or has a default, then it
needs to be computed because the validation needs to be applied (in case its
mandatory, the first one of a validated list needs to be chosen, and in case
there is a default, maybe the default is not part of the validated list).
details: /erp/devel/main/rev/fbca014448d8
changeset: 12144:fbca014448d8
user: Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date: Thu May 12 19:39:01 2011 +0200
summary: Fixes issue 17149: HQL query error
details: /erp/devel/main/rev/c2d039ea351d
changeset: 12145:c2d039ea351d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu May 12 19:48:52 2011 +0200
summary: Related to issue 17082: Alert Managment Window - Items can not be
displayed
details: /erp/devel/main/rev/d6f22b9d4b32
changeset: 12146:d6f22b9d4b32
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu May 12 19:50:11 2011 +0200
summary: Related to issue 17081: Pending Goods Receipt Widget - Items can not
be displayed
details: /erp/devel/main/rev/74a5c5067d69
changeset: 12147:74a5c5067d69
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu May 12 22:04:44 2011 +0200
summary: Related to issue 17136: You cannot enter to Menu window but an ugly
error shows up
details: /erp/devel/main/rev/38474a07fa69
changeset: 12148:38474a07fa69
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu May 12 22:06:18 2011 +0200
summary: Fixes issue 17151: MyOB: dragging widgets, widgets can be dropped
next to but not below/above another
details: /erp/devel/main/rev/f6b0c2a24b6a
changeset: 12149:f6b0c2a24b6a
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri May 13 06:22:07 2011 +0200
summary: CI: merge back from main
details: /erp/devel/main/rev/ef589888c4c0
changeset: 12150:ef589888c4c0
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Fri May 13 09:11:09 2011 +0200
summary: Issue 17152: Initial Client Setup with Standard Roles dataset
selected is failing
details: /erp/devel/main/rev/fd0f35084779
changeset: 12151:fd0f35084779
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu May 12 20:02:13 2011 +0200
summary: Fixes issue 17113: Use the obShowIf instead of showIf
details: /erp/devel/main/rev/310c45e82c0d
changeset: 12152:310c45e82c0d
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Fri May 13 10:42:25 2011 +0200
summary: Fixes issue 16619: Handle alwaysTakeSpace for HiddenItems
details: /erp/devel/main/rev/84da0073d386
changeset: 12153:84da0073d386
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri May 13 18:27:25 2011 +0200
summary: CI: update AD_MODULE to version 12152
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/FormInitializationComponent.java
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
| 9 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 59 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 39 -
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
| 3 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java
| 3 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
| 12 +-
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.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
| 12 +-
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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
| 21 +-
modules/org.openbravo.v3.datasets/referencedata/standard/V3_Roles.xml
| 22 -
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 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 2 +-
src-db/database/sourcedata/AD_FIELD.xml
| 983 ++++++---
src-db/database/sourcedata/AD_MENU.xml
| 2 +-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_TAB.xml
| 2 +-
src-db/database/sourcedata/AD_WINDOW.xml
| 2 +-
52 files changed, 762 insertions(+), 560 deletions(-)
diffs (truncated from 6185 to 300 lines):
diff -r 14155037e51d -r 84da0073d386
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Thu May 12 17:51:53 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri May 13 18:27:25 2011 +0200
@@ -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.12117]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.12152]]></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 14155037e51d -r 84da0073d386
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu May 12 17:51:53 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri May 13 18:27:25 2011 +0200
@@ -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.12117]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.12152]]></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.12117]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.12152]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 14155037e51d -r 84da0073d386
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Thu May 12 17:51:53 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Fri May 13 18:27:25 2011 +0200
@@ -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.12117]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.12152]]></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 14155037e51d -r 84da0073d386
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu May 12 17:51:53 2011 +0200
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri May 13 18:27:25 2011 +0200
@@ -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.12117]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.12152]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 14155037e51d -r 84da0073d386
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Thu May 12 17:51:53 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Fri May 13 18:27:25 2011 +0200
@@ -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.12117]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.12152]]></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 14155037e51d -r 84da0073d386
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu May 12 17:51:53 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri May 13 18:27:25 2011 +0200
@@ -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.12117]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.12152]]></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.12117]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.12152]]></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.12117]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.12152]]></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.12117]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.12152]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 14155037e51d -r 84da0073d386
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
Thu May 12 17:51:53 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Fri May 13 18:27:25 2011 +0200
@@ -440,6 +440,7 @@
} else {
// Else, the default is used
if (visibleProperties != null && !field.getColumn().isMandatory()
+ && field.getColumn().getDefaultValue() == null
&& !visibleProperties.contains("inp" +
Sqlc.TransformaNombreColumna(col))) {
// If the column is not currently visible, and its not
mandatory, we don't need to
// compute the combo.
diff -r 14155037e51d -r 84da0073d386
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
Thu May 12 17:51:53 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
Fri May 13 18:27:25 2011 +0200
@@ -36,7 +36,7 @@
editOnFocus: true,
showCellContextMenus: true,
selectOnEdit: false,
-
+
// keeps track if we are in objectSelectionMode or in toggleSelectionMode
// objectSelectionMode = singleRecordSelection === true
singleRecordSelection: false,
@@ -122,15 +122,14 @@
this.Super('initWidget', arguments);
},
- setDataSource: function() {
- this.Super('setDataSource', arguments);
+ setDataSource: function(ds) {
+ this.Super('setDataSource', [ds, this.gridFields]);
// Some properties need to be set when the datasource is loaded to avoid
errors when form is
// open the first time.
- this.setFields(this.gridFields);
this.setSelectionAppearance('checkbox');
// this extra call is needed to solve this issue:
- https://issues.openbravo.com/view.php?id=17145
+ // https://issues.openbravo.com/view.php?id=17145
this.refreshFields();
this.sort('creationDate', 'descending');
diff -r 14155037e51d -r 84da0073d386
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
Thu May 12 17:51:53 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Fri May 13 18:27:25 2011 +0200
@@ -203,7 +203,7 @@
var height, width, top, left;
var complementsNS4 = '';
var auxField = '';
- var hidden;
+ var hidden, i;
if (url.indexOf('Location') !== -1) {
height = 300;
@@ -226,7 +226,7 @@
}
if (parameters) {
var total = parameters.length;
- for (var i = 0; i < total; i++) {
+ for (i = 0; i < total; i++) {
if (auxField !== '') {
auxField += '&';
}
@@ -353,7 +353,7 @@
src :
'[SKIN]/../../org.openbravo.client.application/images/form/search_picker.png',
click: function(form, item) {
var url = item.getValue();
- if(!url || url.indexOf('://') == -1) {
+ if(!url || url.indexOf('://') === -1) {
return;
}
window.open(url);
@@ -431,12 +431,16 @@
return false;
},
- // Update the property alwaysTakeSpace when collapsing/expanding a section
+ // Update the property alwaysTakeSpace when collapsing/expanding a section
+ // Note: The HiddenItem fields are not updated, they always have
alwaysTakeSpace to false
updateAlwaysTakeSpace: function(flag) {
- var i, f = this.form;
+ var i, f = this.form, item;
for(i = 0; i < this.itemIds.length; i++) {
- f.getItem(this.itemIds[i]).alwaysTakeSpace = flag;
+ item = f.getItem(this.itemIds[i]);
+ if(item && item.editorType !== 'HiddenItem') {
+ item.alwaysTakeSpace = flag;
+ }
}
},
@@ -474,10 +478,10 @@
return ret;
},
-
+
setNewFocusItemExpanding: function(){
- var newFocusItem = null;
- for (var i = 0; i < this.itemIds.length; i++) {
+ var newFocusItem = null, i;
+ for (i = 0; i < this.itemIds.length; i++) {
var itemName = this.itemIds[i], item = this.form.getItem(itemName);
// isFocusable is a method added in ob-smartclient.js
if (item.isFocusable()) {
@@ -492,6 +496,31 @@
} else {
newFocusItem.focusInItem();
}
+ },
+
+ showIf: function(item, value, form, values) {
+ var i, field;
+
+ if(!this.itemIds) {
+ return false;
+ }
+
+ for (i = 0; i < this.itemIds.length; i++) {
+ field = form.getItem(this.itemIds[i]);
+
+ if(!field || field.editorType === 'HiddenItem') {
+ continue;
+ }
+
+ if (field.obShowIf) {
+ if(field.obShowIf(field, value, form)) {
+ return true;
+ }
+ } else {
+ return true;
+ }
+ }
+ return false;
}
});
@@ -1107,10 +1136,10 @@
init: function(){
this.setKeyPressFilter(this.keyPressFilterNumeric);
this.typeInstance = SimpleType.getType(this.type);
- var newValidators = [];
+ var newValidators = [], i;
// get rid of the isFloat validators, as we have
// specific validation based on the format definition
- for (var i = 0; i < this.validators.length; i++) {
+ for (i = 0; i < this.validators.length; i++) {
if (this.validators[i].type !== 'isFloat') {
newValidators.push(this.validators[i]);
}
@@ -1126,7 +1155,9 @@
// for precision, the textual value is sent to the server
// which can be transferred to a bigdecimal there
changed: function (form, item, value) {
- this.form.setTextualValue(this.name, this.getEnteredValue(),
this.typeInstance);
+ if (this.form.setTextualValue) {
+ this.form.setTextualValue(this.name, this.getEnteredValue(),
this.typeInstance);
+ }
this.Super('changed', arguments);
},
@@ -1147,8 +1178,8 @@
},
returnNewCaretPosition: function(numberStr, oldCaretPosition){
- var newCaretPosition = oldCaretPosition;
- for (var i = oldCaretPosition; i > 0; i--) {
+ var newCaretPosition = oldCaretPosition, i;
+ for (i = oldCaretPosition; i > 0; i--) {
if (numberStr.substring(i - 1, i) === this.getGroupSeparator()) {
newCaretPosition = newCaretPosition - 1;
}
diff -r 14155037e51d -r 84da0073d386
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Thu May 12 17:51:53 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Fri May 13 18:27:25 2011 +0200
@@ -616,45 +616,6 @@
}
}
- // Hiding sections that where all fields are not visible
- for(i = 0; i < this.getItems().length; i++) {
- item = this.getItem(i);
- if(item && item.getClassName() === 'OBSectionItem') {
-
- section = item;
-
- // Keep whether it was expanded and expand in case it was not.
Collapsed
- // sections keep all its fields as not visible, so they were hidden.
- var wasExpanded = section.isExpanded();
- if (!wasExpanded) {
- section.expandSection();
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
