details: /erp/devel/main/rev/17841edd7ee0
changeset: 11561:17841edd7ee0
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Apr 08 22:41:03 2011 +0200
summary: CI: merge back from main
details: /erp/devel/main/rev/36b4b33577a0
changeset: 11562:36b4b33577a0
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Apr 11 12:49:30 2011 +0200
summary: Fixes issue 16738: Error when opeing process request window in form
view
details: /erp/devel/main/rev/44e3587f19ba
changeset: 11563:44e3587f19ba
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Apr 11 14:37:34 2011 +0200
summary: Fixes issue16745: Ingrid editing: arrow down from a changed edit
cell does not open next row in edit mode
details: /erp/devel/main/rev/4d1b14a5f16f
changeset: 11564:4d1b14a5f16f
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Apr 11 14:39:35 2011 +0200
summary: Fixed issue 16742: Classic calendars now works ok in Chrome
details: /erp/devel/main/rev/140caa833ddc
changeset: 11565:140caa833ddc
user: Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date: Mon Apr 11 15:27:14 2011 +0200
summary: Fixes issue 16672: Accounting fixes in demo
details: /erp/devel/main/rev/c07f587c8a88
changeset: 11566:c07f587c8a88
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Apr 11 15:35:02 2011 +0200
summary: Fixed issue 16744. Property names will not be printed in each data
line.
details: /erp/devel/main/rev/d588e908d518
changeset: 11567:d588e908d518
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Mon Apr 11 17:00:32 2011 +0200
summary: Fixes issue 0016740: Purchase Invoice - Create lines From feature
does not take the unit price of the purchase order but the price list one
It has been removed the recalculation of the price of the line in case of
copying from an order or from a shipment with an order associated.
details: /erp/devel/main/rev/5976e82afd0b
changeset: 11568:5976e82afd0b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Apr 12 16:31:51 2011 +0200
summary: fixed bug 16668: Request Process shows only background processes
details: /erp/devel/main/rev/ee94070649ad
changeset: 11569:ee94070649ad
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Tue Apr 12 20:26:57 2011 +0200
summary: Fixes issue 16769: Filter the warehouses based on the -natural tree-
details: /erp/devel/main/rev/b5630110dd82
changeset: 11570:b5630110dd82
user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com>
date: Wed Apr 13 10:19:45 2011 +0200
summary: Fixes 16736: make userconfig.xml a template
This file is used to customize the FOP reports
details: /erp/devel/main/rev/4092392748d8
changeset: 11571:4092392748d8
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Apr 13 10:59:01 2011 +0200
summary: Fixes issue 16777: Autosave is triggered when using the Create new
widget from the navigation tool bar. Sales order
details: /erp/devel/main/rev/6914fbe010e7
changeset: 11572:6914fbe010e7
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Apr 13 13:03:46 2011 +0200
summary: Fixes issue 16788: Fixes case when a callout modifies an aux-input
details: /erp/devel/main/rev/da3706b645b0
changeset: 11573:da3706b645b0
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Apr 13 13:12:14 2011 +0200
summary: Issue 16788: Small code fix in debug statement
details: /erp/devel/main/rev/8a25bf27771e
changeset: 11574:8a25bf27771e
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Apr 13 13:44:16 2011 +0200
summary: Fixes issue 16795: Goods receipt window and goods shipment don't
work. All fields in blank
details: /erp/devel/main/rev/7937ca8bf655
changeset: 11575:7937ca8bf655
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Apr 13 18:01:57 2011 +0200
summary: Fixes issue 16788: Cast problem when trying to convert number values
details: /erp/devel/main/rev/332e17a26a30
changeset: 11576:332e17a26a30
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 14 06:28:20 2011 +0200
summary: Fix obvious javascript error when refreshing
details: /erp/devel/main/rev/a3d7655c758f
changeset: 11577:a3d7655c758f
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 14 06:28:51 2011 +0200
summary: Fixes issue 16789: What you enter through the ERP it is different
from what it is stored in the DB
details: /erp/devel/main/rev/d70478229985
changeset: 11578:d70478229985
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 14 15:27:28 2011 +0200
summary: Fixes issue 16813: When selecting a product from the product
selector, the attribute set value is not retrieved
details: /erp/devel/main/rev/903674792a99
changeset: 11579:903674792a99
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Apr 14 15:39:00 2011 +0200
summary: Fixed issue 16801.Don't use OBSelectorFilterSelectItem if not using
SelectorItem.
details: /erp/devel/main/rev/83a33e5f9f1f
changeset: 11580:83a33e5f9f1f
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 14 16:22:24 2011 +0200
summary: Fixes issue 16808: Grid view: Pop-ups don't get closed
details: /erp/devel/main/rev/6269327721fd
changeset: 11581:6269327721fd
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu Apr 14 21:04:03 2011 +0200
summary: Fixes issue 16788: Do not recompute the value of aux-input on CHANGE
mode
details: /erp/devel/main/rev/01ee143af834
changeset: 11582:01ee143af834
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Apr 15 13:05:41 2011 +0200
summary: Fixes issue 16818: Save button in Product window sometimes doesn't
work
details: /erp/devel/main/rev/08f78c14dc4b
changeset: 11583:08f78c14dc4b
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Apr 15 17:54:39 2011 +0200
summary: CI: update AD_MODULE to version 11582
diffstat:
config/userconfig.xml
| 52 ----
config/userconfig.xml.template
| 58 +++++
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/navigationbarcomponents/UserInfoWidgetActionHandler.java
| 11 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 106 ++++++---
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 8 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 12 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 5 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 39 +++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 6 +-
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/NumberUIDefinition.java
| 12 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TimeUIDefinition.java
| 10 +-
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.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
| 1 +
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.service.json/src/org/openbravo/service/json/JsonToDataConverter.java
| 18 +-
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.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 9 +-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 1 +
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
| 17 +-
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
src-db/database/sourcedata/AD_TAB.xml
| 2 +
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
| 4 +-
src/org/openbravo/erpCommon/security/Login.html
| 2 +-
src/org/openbravo/erpCommon/security/Login_F1.html
| 2 +-
web/js/utils.js
| 6 +-
58 files changed, 335 insertions(+), 194 deletions(-)
diffs (truncated from 1645 to 300 lines):
diff -r 7c21ad139c70 -r 08f78c14dc4b config/userconfig.xml
--- a/config/userconfig.xml Fri Apr 08 22:27:05 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo Public License
- * Version 1.1 (the "License"), being the Mozilla Public License
- * version 1.1 with a permitted attribution clause ; you may not use
- * this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.openbravo.com/legal/license.txt
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing rights
- * and limitations under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2005-2007 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s): Openbravo S.L.U.
- ************************************************************************
--->
-
-<!--<!DOCTYPE configuration SYSTEM "config.dtd">-->
-<!--
- this file contains templates which allow an user easy
- configuration of Fop. Actually normally you don't need this configuration
- file, but if you need to change configuration, you should
- always use this file and *not* config.xml.
- Usage: java org.apache.fop.apps.Fop -c userconfig.xml -fo fo-file -pdf
pdf-file
--->
-
-
-<configuration>
-
-<!--
-baseDir: normally the base directory is the directory where the fo file is
- located. if you want to specify your own, uncomment this entry.
- This value can also be a URL. Actually, the value is converted to
- a URL.
--->
-<!--
- <entry>
- <key>baseDir</key>
- <value></value>
- </entry>
--->
-
-<!--
-fontBaseDir: Similar to baseDir, except that this value is used for fonts. If
- it isn't specified, the value from baseDir is used.
--->
-<!--
- <entry>
- <key>fontBaseDir</key>
- <value>/tmp</value>
- </entry>
--->
-
-</configuration>
diff -r 7c21ad139c70 -r 08f78c14dc4b config/userconfig.xml.template
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/config/userconfig.xml.template Fri Apr 15 17:54:39 2011 +0200
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * version 1.1 with a permitted attribution clause ; you may not use
+ * this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.openbravo.com/legal/license.txt
+ * Software distributed under the License is distributed on an
+ * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing rights
+ * and limitations under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2005-2007 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): Openbravo S.L.U.
+ ************************************************************************
+-->
+
+<!--<!DOCTYPE configuration SYSTEM "config.dtd">-->
+<!--
+ this file contains templates which allow an user easy
+ configuration of Fop. Actually normally you don't need this configuration
+ file, but if you need to change configuration, you should
+ always use this file and *not* config.xml.
+ Usage: java org.apache.fop.apps.Fop -c userconfig.xml -fo fo-file -pdf
pdf-file
+-->
+
+
+<configuration>
+
+<!--
+baseDir: normally the base directory is the directory where the fo file is
+ located. if you want to specify your own, uncomment this entry.
+ This value can also be a URL. Actually, the value is converted to
+ a URL.
+-->
+<!--
+ <entry>
+ <key>baseDir</key>
+ <value></value>
+ </entry>
+-->
+
+<!--
+fontBaseDir: Similar to baseDir, except that this value is used for fonts. If
+ it isn't specified, the value from baseDir is used.
+-->
+<!--
+ <entry>
+ <key>fontBaseDir</key>
+ <value>/tmp</value>
+ </entry>
+-->
+
+</configuration>
diff -r 7c21ad139c70 -r 08f78c14dc4b
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri Apr 08 22:27:05 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri Apr 15 17:54:39 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.11559]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.11582]]></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 7c21ad139c70 -r 08f78c14dc4b
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 Apr 08 22:27:05 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Apr 15 17:54:39 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.11559]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.11582]]></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.11559]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.11582]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 7c21ad139c70 -r 08f78c14dc4b
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 Apr 08 22:27:05 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Fri Apr 15 17:54:39 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.11559]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.11582]]></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 7c21ad139c70 -r 08f78c14dc4b
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 Apr 08 22:27:05 2011 +0200
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Apr 15 17:54:39 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.11559]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.11582]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 7c21ad139c70 -r 08f78c14dc4b
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 Apr 08 22:27:05 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Fri Apr 15 17:54:39 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.11559]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.11582]]></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 7c21ad139c70 -r 08f78c14dc4b
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 Apr 08 22:27:05 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Apr 15 17:54:39 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.11559]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.11582]]></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.11559]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.11582]]></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.11559]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.11582]]></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.11559]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.11582]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 7c21ad139c70 -r 08f78c14dc4b
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
Fri Apr 08 22:27:05 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
Fri Apr 15 17:54:39 2011 +0200
@@ -42,6 +42,7 @@
import org.openbravo.client.kernel.StaticResourceComponent;
import org.openbravo.dal.core.DalUtil;
import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.security.OrganizationStructureProvider;
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
import org.openbravo.dal.service.OBQuery;
@@ -190,15 +191,15 @@
private JSONArray getWarehouses(String clientId) throws JSONException {
List<JSONObject> orgWarehouseArray = new ArrayList<JSONObject>();
+ final OrganizationStructureProvider osp = OBContext.getOBContext()
+ .getOrganizationStructureProvider(clientId);
OBCriteria<Organization> orgs =
OBDal.getInstance().createCriteria(Organization.class);
for (Organization org : orgs.list()) {
JSONObject orgWarehouse = new JSONObject();
orgWarehouse.put("orgId", org.getId());
- final OBQuery<Warehouse> warehouses = OBDal
- .getInstance()
- .createQuery(Warehouse.class,
- "ad_isorgincluded(organization.id, :orgId, :clientId)<>-1 and
client.id=:clientId order by name");
- warehouses.setNamedParameter("orgId", org.getId());
+ final OBQuery<Warehouse> warehouses =
OBDal.getInstance().createQuery(Warehouse.class,
+ "organization.id in (:orgList) and client.id=:clientId order by
name");
+ warehouses.setNamedParameter("orgList", osp.getNaturalTree(org.getId()));
warehouses.setNamedParameter("clientId", clientId);
warehouses.setFilterOnReadableClients(false);
warehouses.setFilterOnReadableOrganization(false);
diff -r 7c21ad139c70 -r 08f78c14dc4b
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 Apr 08 22:27:05 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Fri Apr 15 17:54:39 2011 +0200
@@ -157,7 +157,13 @@
if (property.getColumnName() != null) {
final String inpName = "inp" +
Sqlc.TransformaNombreColumna(property.getColumnName());
if (jsContent.has(inpName)) {
- convertedJson.put(property.getName(), jsContent.get(inpName));
+ final UIDefinition uiDef =
UIDefinitionController.getInstance().getUIDefinition(
+ property.getColumnId());
+ Object jsonValue = jsContent.get(inpName);
+ if (jsonValue instanceof String) {
+ jsonValue = uiDef.createFromClassicString((String) jsonValue);
+ }
+ convertedJson.put(property.getName(), jsonValue);
}
}
}
@@ -184,7 +190,7 @@
// Computation of the Auxiliary Input values
long t4 = System.currentTimeMillis();
- computeAuxiliaryInputs(mode, tab, columnValues);
+ computeAuxiliaryInputs(mode, tab, columnValues, jsContent);
// Computation of Column Values (using UIDefinition, so including combo
values and all
// relevant additional information)
@@ -205,7 +211,7 @@
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);
+ computeAuxiliaryInputs(mode, tab, columnValues, jsContent);
}
// Construction of the final JSONObject
long t7 = System.currentTimeMillis();
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
