CI: promote changesets from pi to main
authorRM packaging bot <staff.rm@openbravo.com>
Sun, 23 Oct 2011 13:37:42 +0200
changeset 14061 35bf0a7aa166
parent 14018 a2c42dc950b6 (current diff)
parent 14060 80f4cf3ebd07 (diff)
child 14068 4573c67119bb
CI: promote changesets from pi to main
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 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.13994]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.14048]]></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>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 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.13994]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.14048]]></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.13994]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Sun Oct 23 13:37:42 2011 +0200
@@ -20,7 +20,6 @@
 package org.openbravo.advpaymentmngt.dao;
 
 import java.math.BigDecimal;
-import java.math.MathContext;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -408,10 +407,12 @@
     }
     if (finTxnAmount == null || finTxnAmount.compareTo(BigDecimal.ZERO) == 0) {
       finTxnAmount = paymentAmount.multiply(finTxnConvertRate);
-    } else if (paymentAmount != null && paymentAmount.compareTo(BigDecimal.ZERO) != 0) {
-      // Correct exchange rate for rounding that occurs in UI
-      finTxnConvertRate = finTxnAmount.divide(paymentAmount, MathContext.DECIMAL64);
     }
+    // This code commented due to fix in bug 17829
+    // else if (paymentAmount != null && paymentAmount.compareTo(BigDecimal.ZERO) != 0) {
+    // // Correct exchange rate for rounding that occurs in UI
+    // finTxnConvertRate = finTxnAmount.divide(paymentAmount, MathContext.DECIMAL64);
+    // }
 
     newPayment.setFinancialTransactionConvertRate(finTxnConvertRate);
     newPayment.setFinancialTransactionAmount(finTxnAmount);
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 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.13994]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.14048]]></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>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 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.13994]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -450,7 +450,7 @@
 <!--1A96C47A27AC49D7BEA41E57BBD59948-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1A96C47A27AC49D7BEA41E57BBD59948-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1A96C47A27AC49D7BEA41E57BBD59948-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--1A96C47A27AC49D7BEA41E57BBD59948-->  <POSITION><![CDATA[34]]></POSITION>
+<!--1A96C47A27AC49D7BEA41E57BBD59948-->  <POSITION><![CDATA[35]]></POSITION>
 <!--1A96C47A27AC49D7BEA41E57BBD59948-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1A96C47A27AC49D7BEA41E57BBD59948-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--1A96C47A27AC49D7BEA41E57BBD59948-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -3864,7 +3864,7 @@
 <!--B2DDC4BECBF24431AB1940C2A38F9C54-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--B2DDC4BECBF24431AB1940C2A38F9C54-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--B2DDC4BECBF24431AB1940C2A38F9C54-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--B2DDC4BECBF24431AB1940C2A38F9C54-->  <POSITION><![CDATA[33]]></POSITION>
+<!--B2DDC4BECBF24431AB1940C2A38F9C54-->  <POSITION><![CDATA[34]]></POSITION>
 <!--B2DDC4BECBF24431AB1940C2A38F9C54-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--B2DDC4BECBF24431AB1940C2A38F9C54-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--B2DDC4BECBF24431AB1940C2A38F9C54-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -3349,4 +3349,15 @@
 <!--FF80818132D550210132D55E7D600068-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF80818132D550210132D55E7D600068--></AD_MESSAGE>
 
+<!--FF808181331AD90C01331ADA2E15000C--><AD_MESSAGE>
+<!--FF808181331AD90C01331ADA2E15000C-->  <AD_MESSAGE_ID><![CDATA[FF808181331AD90C01331ADA2E15000C]]></AD_MESSAGE_ID>
+<!--FF808181331AD90C01331ADA2E15000C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF808181331AD90C01331ADA2E15000C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF808181331AD90C01331ADA2E15000C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF808181331AD90C01331ADA2E15000C-->  <VALUE><![CDATA[OBUIAPP_Save]]></VALUE>
+<!--FF808181331AD90C01331ADA2E15000C-->  <MSGTEXT><![CDATA[Save]]></MSGTEXT>
+<!--FF808181331AD90C01331ADA2E15000C-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF808181331AD90C01331ADA2E15000C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF808181331AD90C01331ADA2E15000C--></AD_MESSAGE>
+
 </data>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 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.13994]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.14048]]></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>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 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.13994]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.14048]]></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.13994]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.14048]]></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.13994]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.14048]]></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.13994]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.14048]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Sun Oct 23 13:37:42 2011 +0200
@@ -105,7 +105,7 @@
     // added for showing counts in the filtereditor row
     this.checkboxFieldDefaults = isc.addProperties(this.checkboxFieldDefaults, {
       canFilter: true,
-      frozen: true,
+      //frozen: true, /* Removed due to issue https://issues.openbravo.com/view.php?id=17611 */
       canFreeze: true,
       showHover: true,
       prompt: OB.I18N.getLabel('OBUIAPP_GridSelectAllColumnPrompt'),
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js	Sun Oct 23 13:37:42 2011 +0200
@@ -83,7 +83,7 @@
   },
   
   getAlertRules: function() {
-    post = {'eventType': 'getAlertRules' };
+    var post = {'eventType': 'getAlertRules' };
 
     OB.RemoteCallManager.call('org.openbravo.client.application.AlertManagementActionHandler',
         post, {}, function(rpcResponse, data, rpcRequest){
@@ -145,7 +145,7 @@
   },
   
   moveToStatus: function(alertIDs, oldStatus, newStatus) {
-    post = {'eventType': 'moveToStatus',
+    var post = {'eventType': 'moveToStatus',
             'oldStatus': oldStatus,
             'newStatus': newStatus,
             'alertIDs': alertIDs};
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js	Sun Oct 23 13:37:42 2011 +0200
@@ -70,7 +70,7 @@
     
     this.obManualURL = obManualURL || '';
     
-    this.tabTitle = tabTitle || null;
+    this.tabTitle = null;
     
     OB.Layout.HistoryManager.updateHistory();
   },
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-checkbox.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-checkbox.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,7 +19,7 @@
 
 // == OBCheckboxItem ==
 // Item used for Openbravo yes/no fields.
-isc.ClassFactory.defineClass('OBCheckboxItem', CheckboxItem);
+isc.ClassFactory.defineClass('OBCheckboxItem', isc.CheckboxItem);
 
 isc.OBCheckboxItem.addProperties({
   operator: 'equals'
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datechooser.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datechooser.js	Sun Oct 23 13:37:42 2011 +0200
@@ -20,7 +20,7 @@
 // == OBDateChooser ==
 // OBDateChooser inherits from SmartClient DateChooser
 // extends standard DateChooser implementation to be used in OBDateItem
-isc.ClassFactory.defineClass('OBDateChooser', DateChooser);
+isc.ClassFactory.defineClass('OBDateChooser', isc.DateChooser);
 
 isc.OBDateChooser.addProperties({
   firstDayOfWeek: 1,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js	Sun Oct 23 13:37:42 2011 +0200
@@ -22,7 +22,7 @@
 // in that it auto-completes while typing. A TODO: make this widget work the same as the 
 // OBDateItem, autocomplete when blurring.
 
-isc.ClassFactory.defineClass('OBDateTimeItem', OBDateItem);
+isc.ClassFactory.defineClass('OBDateTimeItem', isc.OBDateItem);
 
 isc.OBDateTimeItem.addClassProperties({
   
@@ -33,6 +33,8 @@
   // * {{{dateFormat}}}: the dateFormat in OB format
   // * {{{value}}}: the current entered value
   autoCompleteDate: function(dateFormat, value, item){
+    var fmt;
+    
     // if (!isTabPressed) {
     if (value === null) {
       return value;
@@ -209,7 +211,7 @@
 isc.OBDateTimeItem.addProperties({
   
   blurValue: function() {
-    return OBDateTimeItem.expandDateYear(this.dateFormat, this.getValue());
+    return isc.OBDateTimeItem.expandDateYear(this.dateFormat, this.getValue());
   },
 
   // ** {{{ change }}} **
@@ -221,7 +223,7 @@
       return;
     }
     // prevent change events from happening
-    var completedDate = OBDateTimeItem.autoCompleteDate(item.dateFormat, value, this);
+    var completedDate = isc.OBDateTimeItem.autoCompleteDate(item.dateFormat, value, this);
     if (completedDate !== oldValue) {
       item.setValue(completedDate);
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,7 +19,7 @@
 
 //== OBFKFilterTextItem ==
 //Input used for filtering on FK fields.
-isc.ClassFactory.defineClass('OBFKFilterTextItem', TextItem);
+isc.ClassFactory.defineClass('OBFKFilterTextItem', isc.TextItem);
 
 isc.OBFKFilterTextItem.addProperties({
   operator: 'iContains',
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js	Sun Oct 23 13:37:42 2011 +0200
@@ -37,8 +37,8 @@
       command: 'GETSIZE'
     };
     OB.RemoteCallManager.call('org.openbravo.client.application.window.ImagesActionHandler', {}, d, function(response, data, request){
-      var pageHeight = Page.getHeight()-100;
-      var pageWidth = Page.getWidth()-100;
+      var pageHeight = isc.Page.getHeight()-100;
+      var pageWidth = isc.Page.getWidth()-100;
       var height;
       var width;
       var ratio = data.width/data.height;
@@ -181,7 +181,7 @@
 
 // == OBImageItem ==
 // Item used for Openbravo ImageBLOB images.
-isc.ClassFactory.defineClass('OBImageItem', CanvasItem);
+isc.ClassFactory.defineClass('OBImageItem', isc.CanvasItem);
 
 isc.OBImageItem.addProperties({
   shouldSaveValue: true,
@@ -233,18 +233,11 @@
     return this.Super('setValue', arguments);
   },
   refreshImage: function(imageId){
-
       //If creating/replacing an image, the form is marked as modified
       //and the image id is set as the value of the item
       this.setValue(imageId);
       this.form.itemChangeActions();
-
-  },
-  changed: function (form, item, value) {
-    form.setValue(identifierFieldName, value);
-    return this.Super('changed', arguments);
   }
-
 });
 
 //== OBImageSelector ==
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,7 +19,7 @@
 
 //== OBLinkItem ==
 //Input for normal strings (links) with an added icon to navigate to the link  
-isc.ClassFactory.defineClass('OBLinkItem', TextItem);
+isc.ClassFactory.defineClass('OBLinkItem', isc.TextItem);
 
 isc.OBLinkItem.addProperties({
   validateOnExit: true,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-linkbutton.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-linkbutton.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,4 +19,4 @@
 
 //== OBLinkButtonItem ==
 //Button to emulate a standard html link.
-isc.ClassFactory.defineClass('OBLinkButtonItem', Button);
\ No newline at end of file
+isc.ClassFactory.defineClass('OBLinkButtonItem', isc.Button);
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,7 +19,7 @@
 
 //== OBListFilterItem ==
 // Combo box for list references in filter editors.
-isc.ClassFactory.defineClass('OBListFilterItem', OBListItem);
+isc.ClassFactory.defineClass('OBListFilterItem', isc.OBListItem);
 
 isc.OBListFilterItem.addProperties({
   allowExpressions: false,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,7 +19,7 @@
 
 // == OBListItem ==
 // Combo box for list references, note is extended by OBFKItem again.
-isc.ClassFactory.defineClass('OBListItem', ComboBoxItem);
+isc.ClassFactory.defineClass('OBListItem', isc.ComboBoxItem);
 
 isc.OBListItem.addProperties({
   operator: 'equals',
@@ -95,7 +95,7 @@
   },
 
   setEntries: function(entries) {
-    var length = entries.length,
+    var length = entries.length, i, id, identifier,
       valueField = this.getValueFieldName(), valueMap = {};
     this.entries = [];
     for (i = 0; i < length; i++) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Sun Oct 23 13:37:42 2011 +0200
@@ -130,7 +130,7 @@
 // == OBMinDateRangeItem ==
 // Item used for filtering by dates in the grid. Replaces the normal Smartclient
 // MiniDateRangeItem to make it editable.
-isc.ClassFactory.defineClass('OBMiniDateRangeItem', OBTextItem);
+isc.ClassFactory.defineClass('OBMiniDateRangeItem', isc.OBTextItem);
 
 isc.OBMiniDateRangeItem.addProperties(OB.DateItemProperties, {
   validateOnExit: false,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,7 +19,7 @@
 
 // = OBNumberIte =
 // Contains the widgets for editing numeric values.
-isc.ClassFactory.defineClass('OBNumberItem', TextItem);
+isc.ClassFactory.defineClass('OBNumberItem', isc.TextItem);
 
 // = OBNumberItem =
 // The Openbravo numeric form item.
@@ -37,7 +37,7 @@
   
   init: function(){
     this.setKeyPressFilter(this.keyPressFilterNumeric);
-    this.typeInstance = SimpleType.getType(this.type);
+    this.typeInstance = isc.SimpleType.getType(this.type);
     return this.Super('init', arguments);
   },
   
@@ -427,6 +427,8 @@
   },
   
   blur: function(){
+    var value;
+    
     if (this.doBlurLogic) {
       this.validate();  
 
@@ -485,10 +487,10 @@
   return false;
 };
 
-Validator.addValidator('isFloat', isc.OBNumberItem.validateCondition);
-Validator.addValidator('isInteger', isc.OBNumberItem.validateCondition);
+isc.Validator.addValidator('isFloat', isc.OBNumberItem.validateCondition);
+isc.Validator.addValidator('isInteger', isc.OBNumberItem.validateCondition);
 
-isc.ClassFactory.defineClass('OBNumberFilterItem', OBNumberItem);
+isc.ClassFactory.defineClass('OBNumberFilterItem', isc.OBNumberItem);
 
 isc.OBNumberFilterItem.addProperties({
   allowExpressions: true,
@@ -497,7 +499,7 @@
   keyPressFilterNumeric: '[0-9.,-=<>!#orand ]',
   doBlurLogic: false,
   operator: 'equals',
-  validOperators: ['equals', 'lessThan', 'greaterThan',
+  validOperators: ['equals', 'lessThan', 'greaterThan', 'notEqual',
                    'lessThan', 'lessThanOrEqual', 'greaterThanOrEqual',
                    'between', 'betweenInclusive', 'isNull', 'isNotNull'
                    ],
@@ -527,11 +529,17 @@
   
   buildValueExpressions: function(criterion) {
     var i = 0, criteria, length;
-    if (criterion && criterion.criteria) {
+    if (criterion && !criterion.criteria) {
+      criterion = { criteria: [criterion] };
+    }
+    if (criterion.criteria) {
       criterion = isc.clone(criterion);
       length = criterion.criteria.length;
       for (i = 0; i < length; i++) {
         criteria = criterion.criteria[i];
+        if (criteria.operator === 'iNotEqual') {
+          criteria.operator = 'notEqual';
+        }
         if (criteria.start) {
           criteria.start = this.convertToStringValue(criteria.start);
         }
@@ -543,7 +551,7 @@
         }
       }
     }
-    var ret = this.Super('buildValueExpressions', arguments);
+    var ret = this.Super('buildValueExpressions', [criterion]);
     if (isc.isA.String(ret) && ret.contains('undefined')) {
       return ret.replace('undefined', '');
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search-attribute.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search-attribute.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,7 +19,7 @@
 
 // = Search Attribute widget =
 // A specific subclass of OBSearchItem for attribute fields.
-isc.ClassFactory.defineClass('OBPAttributeSearchItem', OBSearchItem);
+isc.ClassFactory.defineClass('OBPAttributeSearchItem', isc.OBSearchItem);
 
 isc.OBPAttributeSearchItem.addProperties({
   operator: 'iContains',
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,7 +19,7 @@
 
 // == OBSearchItem ==
 // Item used for Openbravo search fields.
-isc.ClassFactory.defineClass('OBSearchItem', StaticTextItem);
+isc.ClassFactory.defineClass('OBSearchItem', isc.StaticTextItem);
 
 isc.ClassFactory.mixInInterface('OBSearchItem', 'OBLinkTitleItem');
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section-audit.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section-audit.js	Sun Oct 23 13:37:42 2011 +0200
@@ -18,7 +18,7 @@
  */
 
 //== OBAuditSectionItem ==
-isc.ClassFactory.defineClass('OBAuditSectionItem', OBSectionItem);
+isc.ClassFactory.defineClass('OBAuditSectionItem', isc.OBSectionItem);
 
 isc.OBAuditSectionItem.addProperties({
   // this field group does not participate in formbuilding
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section.js	Sun Oct 23 13:37:42 2011 +0200
@@ -20,7 +20,7 @@
 // == OBSectionItem ==
 // Form sections, used for notes, more information, attachment etc.
 
-isc.ClassFactory.defineClass('OBSectionItem', SectionItem);
+isc.ClassFactory.defineClass('OBSectionItem', isc.SectionItem);
 
 isc.OBSectionItem.addProperties({
   sectionExpanded: false,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-spinner.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-spinner.js	Sun Oct 23 13:37:42 2011 +0200
@@ -20,7 +20,7 @@
 
 // == OBSpinnerItem ==
 // Input for spinner number
-isc.ClassFactory.defineClass('OBSpinnerItem', SpinnerItem);
+isc.ClassFactory.defineClass('OBSpinnerItem', isc.SpinnerItem);
 
 isc.OBSpinnerItem.addProperties({
   operator: 'equals',
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js	Sun Oct 23 13:37:42 2011 +0200
@@ -20,7 +20,7 @@
 
 // == OBTextItem ==
 // Input for normal strings
-isc.ClassFactory.defineClass('OBTextItem', TextItem);
+isc.ClassFactory.defineClass('OBTextItem', isc.TextItem);
 
 isc.OBTextItem.addProperties({
   operator: 'iContains',
@@ -32,7 +32,7 @@
   }
 });
 
-isc.ClassFactory.defineClass('OBTextFilterItem', OBTextItem);
+isc.ClassFactory.defineClass('OBTextFilterItem', isc.OBTextItem);
 
 isc.OBTextFilterItem.addProperties({
   allowExpressions: true,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js	Sun Oct 23 13:37:42 2011 +0200
@@ -20,7 +20,7 @@
 // == OBTextAreaItem and OBPopupTextArea ==
 // Input for large strings, contains 2 widgets one for editing in the form
 // and one for in the grid.
-isc.ClassFactory.defineClass('OBTextAreaItem', TextAreaItem);
+isc.ClassFactory.defineClass('OBTextAreaItem', isc.TextAreaItem);
 
 isc.OBTextAreaItem.addProperties({
   operator: 'iContains',
@@ -29,7 +29,7 @@
   selectOnFocus: false,
   
   isDisabled: function() {
-    this.Super('isDisabled', arguments);
+    return this.Super('isDisabled', arguments);
   },
 
   itemHoverHTML: function(item, form) {
@@ -40,7 +40,7 @@
 });
 
 // used in the grid
-isc.ClassFactory.defineClass('OBPopUpTextAreaItem', PopUpTextAreaItem);
+isc.ClassFactory.defineClass('OBPopUpTextAreaItem', isc.PopUpTextAreaItem);
 
 isc.OBPopUpTextAreaItem.addProperties({
   validateOnExit: true,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,7 +19,7 @@
 
 // == OBTimeItem ==
 // For entering times.
-isc.ClassFactory.defineClass('OBTimeItem', TimeItem);
+isc.ClassFactory.defineClass('OBTimeItem', isc.TimeItem);
 
 isc.OBTimeItem.addProperties({
   operator: 'equals',
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,7 +19,7 @@
 
 // == OBYesNoItem ==
 // Extends ComboBoxItem with preset yes and no values.
-isc.ClassFactory.defineClass('OBYesNoItem', ComboBoxItem);
+isc.ClassFactory.defineClass('OBYesNoItem', isc.ComboBoxItem);
 
 isc.OBYesNoItem.addProperties({
   operator: 'equals',
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-form-button.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-form-button.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,7 +19,7 @@
 
 // == OBFormButton ==
 // The default form button.
-isc.ClassFactory.defineClass('OBFormButton', Button);
+isc.ClassFactory.defineClass('OBFormButton', isc.Button);
 
 isc.OBFormButton.addProperties({
   autoFit: true,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js	Sun Oct 23 13:37:42 2011 +0200
@@ -273,6 +273,8 @@
   },
 
   enableShortcuts: function(){
+    var i;
+    
     if (this.buttonBar.members) {
       for (i = 0; i < this.buttonBar.members.length; i++) {
         if (this.buttonBar.members[i].enableShortcut) {
@@ -283,7 +285,7 @@
   },
 
   disableShortcuts: function(){
-    var length;
+    var length, i;
     if (this.buttonBar.members) {
       length = this.buttonBar.members.length;
       for (i = 0; i < length; i++) {
@@ -329,6 +331,29 @@
   },
 
   updateContentTitle: function(arrayTitleField, message) {
+    var linkImageWidth = this.titleLinkImageWidth,
+      linkImageHeight = this.titleLinkImageHeight;
+
+    if (typeof linkImageWidth !== 'undefined') {
+      linkImageWidth = linkImageWidth.toString();
+      if (linkImageWidth.indexOf('px') === -1) {
+        linkImageWidth = linkImageWidth + 'px';
+      }
+      linkImageWidth = 'width: ' + linkImageWidth + ';';
+    } else {
+      linkImageWidth = '';
+    }
+
+    if (typeof linkImageHeight !== 'undefined') {
+      linkImageHeight = linkImageHeight.toString();
+      if (linkImageHeight.indexOf('px') === -1) {
+        linkImageHeight = linkImageHeight + 'px';
+      }
+      linkImageHeight = 'height: ' + linkImageHeight + ';';
+    } else {
+      linkImageHeight = '';
+    }
+
     var msg = '', i, length;
     if (!isc.Page.isRTL()) { // LTR mode
       if (this.statusCode) {
@@ -340,7 +365,14 @@
           if (i !== 0 || this.statusCode) {
             msg += '<span class="' + (this.separatorLabelStyle?this.separatorLabelStyle:'') + '">' + '&nbsp;&nbsp;|&nbsp;&nbsp;' + '</span>';
           }
-          msg += '<span class="' + (this.titleLabelStyle?this.titleLabelStyle:'') + '">' + arrayTitleField[0][i] + ': ' + '</span>';
+          if (typeof arrayTitleField[2][i] !== 'undefined' && typeof arrayTitleField[3][i] !== 'undefined' && typeof arrayTitleField[4][i] !== 'undefined' && typeof arrayTitleField[5][i] !== 'undefined') {
+            msg += '<span class="' + (this.titleLinkStyle?this.titleLinkStyle:'') + 
+              '" onclick="OB.Utilities.openDirectView(\'' + arrayTitleField[2][i] + '\', \'' + arrayTitleField[3][i] + '\', \'' + arrayTitleField[4][i] + '\', \'' + arrayTitleField[5][i] + '\')">' + 
+              arrayTitleField[0][i] + ':&nbsp;<img src="' + (this.titleLinkImageSrc?this.titleLinkImageSrc:'') + '" style="' + linkImageWidth + linkImageHeight + '" />&nbsp;' + 
+              '</span>';
+          } else {
+            msg += '<span class="' + (this.titleLabelStyle?this.titleLabelStyle:'') + '">' + arrayTitleField[0][i] + ':&nbsp;' + '</span>';
+          }
           msg += '<span class="' + (this.fieldLabelStyle?this.fieldLabelStyle:'') + '">' + this.getValidValue(arrayTitleField[1][i]) + '</span>';
         }
       }
@@ -360,7 +392,14 @@
       if (arrayTitleField) {
         for (i = arrayTitleField[0].length-1; i >= 0; i--) {
           msg += '<span class="' + (this.fieldLabelStyle?this.fieldLabelStyle:'') + '">' + this.getValidValue(arrayTitleField[1][i]) + '</span>';
-          msg += '<span class="' + (this.titleLabelStyle?this.titleLabelStyle:'') + '">' + ' :' + arrayTitleField[0][i] + '</span>';
+          if (typeof arrayTitleField[2][i] !== 'undefined' && typeof arrayTitleField[3][i] !== 'undefined' && typeof arrayTitleField[4][i] !== 'undefined' && typeof arrayTitleField[5][i] !== 'undefined') {
+            msg += '<span class="' + (this.titleLinkStyle?this.titleLinkStyle:'') + 
+              '" onclick="OB.Utilities.openDirectView(\'' + arrayTitleField[2][i] + '\', \'' + arrayTitleField[3][i] + '\', \'' + arrayTitleField[4][i] + '\', \'' + arrayTitleField[5][i] + '\')">' + 
+              '&nbsp;<img src="' + (this.titleLinkImageSrc?this.titleLinkImageSrc:'') + '" style="' + linkImageWidth + linkImageHeight + '"/>&nbsp;:' + arrayTitleField[0][i] + 
+              '</span>';
+          } else {
+            msg += '<span class="' + (this.titleLabelStyle?this.titleLabelStyle:'') + '">' + ' :' + arrayTitleField[0][i] + '</span>';
+          }
           if (i !== 0 || this.statusCode) {
             msg += '<span class="' + (this.separatorLabelStyle?this.separatorLabelStyle:'') + '">' + '&nbsp;&nbsp;|&nbsp;&nbsp;' + '</span>';
           }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js	Sun Oct 23 13:37:42 2011 +0200
@@ -230,13 +230,16 @@
   },
   
   fillAttachments: function(attachments){
-	var id;
+    var id, i, length;
+    
     this.savedAttachments = attachments;
     this.destroyAndRemoveMembers(this.getMembers());
     var hLayout = isc.HLayout.create();
+    
     if(this.getForm().isNew){
       return;	
     }
+    
     this.addMember(hLayout);
     var me = this;
     var addButton = isc.OBLinkButtonItem.create({
@@ -269,7 +272,7 @@
         theForm: form,
         canvas: me,
         click: function(){
-          var form = this.theForm;
+          var fileName, form = this.theForm;
           var addFunction = function(clickedOK){
             if(clickedOK){
               var hTempLayout = isc.HLayout.create();
@@ -299,8 +302,11 @@
             return;
           }
           value = value?value:'';
+          
           var lastChar=value.lastIndexOf("\\") + 1;
-          var fileName = lastChar===-1?value:value.substring(lastChar);
+          
+          fileName = lastChar === -1 ? value : value.substring(lastChar);
+  
           if(this.theForm.theCanvas.fileExists(fileName, this.canvas.savedAttachments)){
             isc.confirm(OB.I18N.getLabel('OBUIAPP_ConfirmUploadOverwrite'), addFunction);
           }else{
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Sun Oct 23 13:37:42 2011 +0200
@@ -96,22 +96,27 @@
   },
   
   getStatusBarFields: function() {
-    var statusBarFields = [[],[]], i, item, value, tmpValue,
+    var statusBarFields = [[],[],[],[],[], []], i, item, title, refColumnName, targetEntity, value, displayedValue,
       length = this.statusBarFields.length;
     for(i = 0; i < length; i++) {
       item = this.getItem(this.statusBarFields[i]);
+      title = item.getTitle();
+      sourceWindowId = this.view.standardWindow.windowId;
+      refColumnName = item.refColumnName;
+      targetEntity = item.targetEntity;
       value = item.getValue();
-      if(value !== null && value !== '') {
+      displayedValue = item.getValue();
+      if(displayedValue !== null && displayedValue !== '') {
         
         if (item.getDisplayValue()) {
-          value = item.getDisplayValue();
+          displayedValue = item.getDisplayValue();
         }
         
-        if(value === item.getTitle() && typeof item.getValue() === 'boolean') { // Checkbox items return the title as display value
+        if(displayedValue === title && typeof item.getValue() === 'boolean') { // Checkbox items return the title as display value
           if (item.getValue()) {
-            value = OB.I18N.getLabel('OBUIAPP_Yes');
+            displayedValue = OB.I18N.getLabel('OBUIAPP_Yes');
           } else {
-            value = OB.I18N.getLabel('OBUIAPP_No');
+            displayedValue = OB.I18N.getLabel('OBUIAPP_No');
           }
         }
         
@@ -119,13 +124,17 @@
         // status bar field and it has a value then always use that
         // one
         if (item.displayField && this.getValue(item.displayField)) {
-          value = this.getValue(item.displayField);
+          displayedValue = this.getValue(item.displayField);
         } else if (this.getValue(item.name + '._identifier')) {
-          value = this.getValue(item.name + '._identifier');
+          displayedValue = this.getValue(item.name + '._identifier');
         }
         
-        statusBarFields[0].push(item.getTitle());
-        statusBarFields[1].push(value);
+        statusBarFields[0].push(title);
+        statusBarFields[1].push(displayedValue);
+        statusBarFields[2].push(sourceWindowId);
+        statusBarFields[3].push(refColumnName);
+        statusBarFields[4].push(targetEntity);
+        statusBarFields[5].push(value);
       }
     }
     return statusBarFields;
@@ -651,7 +660,11 @@
       }
     }
     
-    if(retHiddenInputs) {
+    if(modeIsNew || request.params.MODE === 'EDIT'){
+      //If a new record is created, or an existing one is opened,
+      //the existing hiddenInputs (which correspond to a different record) should be deleted
+      this.hiddenInputs={};
+    }else if(retHiddenInputs) {
       for(prop in retHiddenInputs) {
         if(retHiddenInputs.hasOwnProperty(prop)){
           this.hiddenInputs[prop] = retHiddenInputs[prop];
@@ -925,7 +938,7 @@
     }
     
     // store the textualvalue so that it is correctly send back to the server
-    typeInstance = SimpleType.getType(field.type);
+    typeInstance = isc.SimpleType.getType(field.type);
     if (columnValue.classicValue && typeInstance.decSeparator) {
       this.setTextualValue(field.name, assignClassicValue, typeInstance);
     }
@@ -933,7 +946,7 @@
   
   setColumnValuesInEditValues: function(columnName, columnValue, editValues){
     // Modifications in this method should go also in processColumnValue because both almost do the same
-    var assignClassicValue, typeInstance, length;
+    var assignClassicValue, typeInstance, length, isDate;
 
     // no editvalues even anymore, go away
     if (!editValues) {
@@ -996,7 +1009,7 @@
       assignClassicValue = (field.typeInstance && field.typeInstance.parseInput && field.typeInstance.editFormatter)
         ? field.typeInstance.editFormatter(field.typeInstance.parseInput(columnValue.classicValue))
         : columnValue.classicValue;
-      typeInstance = SimpleType.getType(field.type);
+      typeInstance = isc.SimpleType.getType(field.type);
       if (columnValue.classicValue && typeInstance.decSeparator) {
         this.setTextualValue(field.name, assignClassicValue, typeInstance, editValues);
       }
@@ -1021,7 +1034,7 @@
   
   // calls setValue and the onchange handling
   setItemValue: function(item, value) {
-    var currentValue;
+    var currentValue, view;
 
     if (isc.isA.String(item)) {
        
@@ -1455,7 +1468,7 @@
   },
   
   getFirstErrorItem: function() {
-    var flds = this.getFields(), errs = this.getErrors();
+    var flds = this.getFields(), errs = this.getErrors(), i;
     if (flds.length) {
       var length = flds.length;
       for (i = 0; i < length; i++) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Sun Oct 23 13:37:42 2011 +0200
@@ -249,8 +249,9 @@
       // overridden for:
       // https://issues.openbravo.com/view.php?id=18509
       editorChanged : function (item) {
-        var prop, same, opDefs, val = item.getElementValue(); 
-          actOnKeypress = item.actOnKeypress === true ? item.actOnKeypress : this.actOnKeypress;                           
+        var prop, same, opDefs, val = item.getElementValue(), 
+          actOnKeypress = item.actOnKeypress === true ? item.actOnKeypress : this.actOnKeypress;
+        
         if (this.sourceWidget.allowFilterExpressions && val && actOnKeypress) {
           // now check if the item element value is only
           // an operator, if so, go away
@@ -441,7 +442,7 @@
       this.filterImage.show(true);
     } else {
       this.filterImage.prompt = OB.I18N.getLabel('OBUIAPP_GridFilterIconToolTip');
-      if (this.view && this.view.messageBar.hasFilterMessage) {
+      if (this.view && this.view.messageBar && this.view.messageBar.hasFilterMessage) {
         this.view.messageBar.hide();
       }
       this.filterImage.hide();
@@ -451,7 +452,7 @@
       var showMessageProperty = OB.PropertyStore.get('OBUIAPP_ShowImplicitFilterMsg'),
           showMessage = (showMessageProperty !== 'N' && showMessageProperty !== '"N"' && noParentOrParentSelected);
       if (showMessage) {
-        this.view.messageBar.setMessage(OBMessageBar.TYPE_INFO, '<div><div style="float: left;">'+
+        this.view.messageBar.setMessage(isc.OBMessageBar.TYPE_INFO, '<div><div style="float: left;">'+
             this.filterName + '<br/>' + OB.I18N.getLabel('OBUIAPP_ClearFilters') + 
             '</div><div style="float: right; padding-top: 15px;"><a href="#" style="font-weight:normal; color:inherit;" onclick="' +
             'window[\'' + this.view.messageBar.ID + '\'].hide(); OB.PropertyStore.set(\'OBUIAPP_ShowImplicitFilterMsg\', \'N\');">'+
@@ -527,6 +528,11 @@
   exportData: function(exportProperties, data){
     var d = data || {}, expProp = exportProperties || {}, dsURL = this.dataSource.dataURL;
     var sortCriteria;
+    var lcriteria = this.getCriteria();
+    var gdata = this.getData();
+    if(gdata && gdata.dataSource){
+      lcriteria = gdata.dataSource.convertRelativeDates(lcriteria);
+    }
     
     isc.addProperties(d, {
       _dataSource: this.dataSource.ID,
@@ -537,7 +543,7 @@
       tab: expProp.tab,
       exportToFile: true,
       _textMatchStyle: 'substring'
-    }, this.getCriteria(), this.getFetchRequestParams());
+    }, lcriteria, this.getFetchRequestParams());
     if(this.getSortField()){
       sortCriteria=this.getSort();
       if(sortCriteria && sortCriteria.length > 0){
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Sun Oct 23 13:37:42 2011 +0200
@@ -170,7 +170,8 @@
     neverDropUpdatedRows: true,
     useClientFiltering: false,
     useClientSorting: false,
-    
+    criteriaPolicy: 'dropOnChange',
+
     // overridden to update the context/request properties for the fetch
     fetchRemoteData : function (serverCriteria, startRow, endRow) {
       var requestProperties = this.context;
@@ -298,7 +299,8 @@
   // see why this needs to be done in the 
   // documentation of canvas.contextMenu in Canvas.js
   destroy: function () {
-    var i, field, fields = this.getFields(), len = fields.length, ds, dataSources = [];
+    var i, field, fields = this.getFields(), 
+      editorProperties, len = fields.length, ds, dataSources = [];
 
     for(i = 0; i < len; i++) {
       field = fields[i];
@@ -337,8 +339,10 @@
   },
 
   draw: function() {
-    var drawnBefore = this.isDrawn(), form, item, length;
+    var drawnBefore = this.isDrawn(), i, form, item, items, length;
+
     this.Super('draw', arguments);
+    
     // set the focus in the filter editor
     if (this.view && this.view.isActiveView() && !drawnBefore && this.isVisible() &&
         this.getFilterEditor() && this.getFilterEditor().getEditForm()) {
@@ -465,7 +469,7 @@
   },
  
   setView: function(view){
-    var dataPageSizeaux, length;
+    var dataPageSizeaux, length, i;
     
     this.view = view;
     this.editFormDefaults.view = view;
@@ -651,7 +655,7 @@
     OB.KeyboardManager.Shortcuts.set('ViewGrid_EditInForm', 'OBViewGrid.body', ksAction_EditInForm);
 
     var ksAction_CancelChanges = function() {
-      grid.view.undo();
+      me.view.undo();
       return false;
     };
     OB.KeyboardManager.Shortcuts.set('ViewGrid_CancelChanges', 'OBViewGrid.body', ksAction_CancelChanges);
@@ -719,6 +723,8 @@
   },
   
   refreshContents: function(callback){
+    var selectedValues;
+    
     this.resetEmptyMessage();
     this.view.updateTabTitle();
     
@@ -2017,7 +2023,7 @@
     // nothing changed just fire the calback and bail
     if (!ficCallDone && this.getEditForm() && !this.getEditForm().hasChanged && !this.getEditForm().isNew) {
       if (saveCallback) {
-        this.fireCallback(saveCallback, "rowNum,colNum,editCompletionEvent,success", [rowNum, colNum, editCompletionEvent, success]);
+        this.fireCallback(saveCallback, "rowNum,colNum,editCompletionEvent,success", [rowNum, colNum, editCompletionEvent]);
       }
       return true;
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Sun Oct 23 13:37:42 2011 +0200
@@ -295,7 +295,8 @@
   // handles different ways by which an error can be passed from the 
   // system, translates this to an object with a type, title and message
   setErrorMessageFromResponse: function(resp, data, req){
-    var errorCode;
+    var errorCode, index1, index2;
+    
     // only handle it once
     if (resp._errorMessageHandled) {
       return true;
@@ -527,7 +528,7 @@
   // this
   // parent.
   addChildView: function(childView){
-    var length;
+    var length, i, actionButton;
     
     if ((childView.isTrlTab && OB.PropertyStore.get('ShowTrl', this.windowId) !== 'Y') ||
         (childView.isAcctTab && OB.PropertyStore.get('ShowAcct', this.windowId) !== 'Y')){
@@ -537,7 +538,6 @@
     this.standardWindow.addView(childView);
     
     // Add buttons in parent to child. Note that currently it is only added one level.
-    var i;
     if (this.actionToolbarButtons && this.actionToolbarButtons.length>0 && childView.showParentButtons){
       length = this.actionToolbarButtons.length;
       for (i = 0; i < length; i++) {
@@ -792,7 +792,8 @@
   },
 
   refreshChildViews: function() {
-    var i, length;
+    var i, length, tabViewPane;
+    
     if (this.childTabSet) {
       length = this.childTabSet.tabs.length;
       for (i = 0; i < length; i++) {
@@ -1078,7 +1079,7 @@
 
   // set childs to refresh when they are made visible
   setChildsToRefresh: function() {
-    var length;
+    var length, i;
     
     if (this.childTabSet) {
       length = this.childTabSet.tabs.length;
@@ -1289,7 +1290,8 @@
     if (!this.viewGrid.getSelectedRecord()) {
       return;
     }
-    var record = this.viewGrid.getSelectedRecord();
+    var record = this.viewGrid.getSelectedRecord(), criteria;
+    
     criteria = {
         operator: 'and', 
         _constructor: "AdvancedCriteria", 
@@ -1386,7 +1388,7 @@
     
       var callback = function(ok){
         var i, doUpdateTotalRows, data, deleteData, error, 
-          recordInfos = [], 
+          recordInfos = [], length,
           removeCallBack = function(resp, data, req){
             var length,
               localData = resp.dataObject || resp.data || data, 
@@ -1792,7 +1794,7 @@
     var tabId = forcedTabId || this.tabId;
     var callback = function(resp, data, req){
       if (req.clientContext && data.type && (data.text || data.title)) {
-        req.clientContext.messageBar.setMessage(OBMessageBar[data.type], data.title, data.text);
+        req.clientContext.messageBar.setMessage(isc.OBMessageBar[data.type], data.title, data.text);
       }
     };
     
@@ -1820,7 +1822,7 @@
   },
   
   prepareFormFields: function(fields) {
-    var i, length = fields.length, result = [];
+    var i, length = fields.length, result = [], fld;
     
     for (i = 0; i < length; i++) {
       fld = isc.shallowClone(fields[i]);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Sun Oct 23 13:37:42 2011 +0200
@@ -127,7 +127,7 @@
   },
   
   setPersonalization: function(personalization) {
-    var i, defaultView, persDefaultValue;
+    var i, defaultView, persDefaultValue, views, length;
     
     if (personalization.forms) {
       OB.Personalization.personalizeWindow(personalization.forms, this);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js	Sun Oct 23 13:37:42 2011 +0200
@@ -618,6 +618,8 @@
   },
 
   makeTabVisible: function(tab){
+    var pane;
+    
     if (tab === this.getSelectedTab()) {
       pane = this.getTabPane(tab);
       pane.show();
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quickrun-widget.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quickrun-widget.js	Sun Oct 23 13:37:42 2011 +0200
@@ -39,7 +39,7 @@
     if (isc.OBQuickRun.currentQuickRun &&
     isc.OBQuickRun.currentQuickRun.showing) {
       var tempQuickRun = isc.OBQuickRun.currentQuickRun;
-      currentQuickRun = null;
+      this.currentQuickRun = null;
       tempQuickRun.doHide();
     }
   }
@@ -160,7 +160,7 @@
   // ** {{{ keyPress }}} **
   // handle the escape and enter keys, these should hide the layout.
   keyPress: function(){
-    var key = EventHandler.getKey();
+    var key = isc.EventHandler.getKey();
     if (key === 'Escape' || key === 'Enter') {
       if (isc.OBQuickRun.currentQuickRun) {
         isc.OBQuickRun.currentQuickRun.doHide();
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js	Sun Oct 23 13:37:42 2011 +0200
@@ -95,7 +95,7 @@
     var me = this, formLayout, newPasswordField, passwordForm, 
      confirmPasswordField, buttonLayout, currentPasswordField, 
      roleForm, widgetInstance, comboBoxFieldProperties, roleField, 
-     orgField, warehouseField, languageField,
+     orgField, warehouseField, languageField, checkboxFieldProperties,
      defaultField, clientField, tabSet, pwdButtonLayout, 
      pwdFormLayout, pwdSaveButton, textFieldProperties, 
      passwordFieldProperties;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js	Sun Oct 23 13:37:42 2011 +0200
@@ -136,7 +136,7 @@
   toggleSave: false,
  
   getFields: function() {
-    var value, personalization = this.standardWindow.getClass().personalization, 
+    var i, value, personalization = this.standardWindow.getClass().personalization, 
       views = personalization && personalization.views ? personalization.views : [], 
       valueMap = {}, flds = [], 
       standardWindow = this.standardWindow, length;
@@ -186,7 +186,7 @@
   // creates one combo with the viewdefinitions which can
   // be deleted by the current user
   getFields: function() {
-    var personalization = this.standardWindow.getClass().personalization, 
+    var i, personalization = this.standardWindow.getClass().personalization, 
       views = personalization && personalization.views ? personalization.views : [], 
       valueMap = {}, flds = [], 
       standardWindow = this.standardWindow, length;
@@ -227,7 +227,7 @@
 OB.Personalization.ManageViewsPopupPropertiesSave = {
   title: OB.I18N.getLabel('OBUIAPP_SaveView'),
   
-  actionLabel: OB.I18N.getLabel('OBUIAPP_Apply'),
+  actionLabel: OB.I18N.getLabel('OBUIAPP_Save'),
   
   // 3 combo fields are created: views, level and level value
   // the last 2 are only created if the user is allowed to
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js	Sun Oct 23 13:37:42 2011 +0200
@@ -59,7 +59,7 @@
     // shows the menu with the available views and the save 
     // and delete option
     action: function() {
-      var data = [], icon, i, undef, view,
+      var data = [], icon, i, undef, view, formData,
         standardWindow = this.view.standardWindow,
         adminLevel = false, length,
         personalization = standardWindow.getClass().personalization, 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js	Sun Oct 23 13:37:42 2011 +0200
@@ -304,7 +304,7 @@
       },
       function(resp, data, req){
         var personalization = standardWindow.getClass().personalization, 
-          length,
+          length, i,
           views = personalization && personalization.views ? personalization.views : [];
         
         if (views) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js	Sun Oct 23 13:37:42 2011 +0200
@@ -256,8 +256,8 @@
   // the menu entries when right clicking a field, different menu
   // entries are shown for status bar or normal fields
   createCellContextItems: function(record){
-    var menuItems = [], updatePropertyFunction, me = this,
-      personalizeForm = this.personalizeForm, length;
+    var i, menuItems = [], updatePropertyFunction, me = this,
+      personalizeForm = this.personalizeForm, length, allNodes;
     
     updatePropertyFunction = function(record, property, value) {
       record[property] = value;
@@ -265,7 +265,7 @@
       // make sure only one record has first focus
       if (record.firstFocus) {
         allNodes = personalizeForm.fieldsTreeGrid.data.getAllNodes();
-        length = allNode.length;
+        length = allNodes.length;
         for (i = 0; i < length; i++) {
           if (allNodes[i].firstFocus) {
             allNodes[i].firstFocus = false;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js	Sun Oct 23 13:37:42 2011 +0200
@@ -40,7 +40,7 @@
 // used as the basis. This can be used to make sure that the 
 // personalizationData used is up-to-date with the current form fields.
 OB.Personalization.getPersonalizationDataFromForm = function(form) {
-  var i, dataFields = [], statusBarFields, length,
+  var i, dataFields = [], statusBarFields, length, record,
     origPersonalizationData = form && form.view ? form.view.getFormPersonalization(true) : null;
 
   // just use the personalization data which was used on the 
@@ -98,7 +98,7 @@
 // of new fields in the AD, changes in required and the title and removal of
 // fields.
 OB.Personalization.updatePersonalizationDataFromFields = function(dataFields, fields, statusBarFields) {
-  var fld, j, record, i, dataField, undef;
+  var fld, j, record, i, dataField, undef, length;
   
   // required and title and removal of fields
   // length is recomputed every time as fields can be removed
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js	Sun Oct 23 13:37:42 2011 +0200
@@ -26,6 +26,7 @@
 
   personalizationButtonProperties = {
     action: function() {
+      var tabIdentifier, personalizeForm;
       
       if (!OB.Utilities.checkProfessionalLicense(
           OB.I18N.getLabel('OBUIAPP_ActivateMessagePersonalization'))) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js	Sun Oct 23 13:37:42 2011 +0200
@@ -645,7 +645,7 @@
 
   // called when the delete button is called
   deletePersonalization: function(confirmed) {
-    var me = this;
+    var me = this, callback;
     
     // only delete if we have a personalization id
     // this should always be the case
@@ -672,6 +672,8 @@
           action: 'delete'
         },
         function(resp, data, req){
+          var personalization;
+          
           me.hasBeenDeleted = true;
           // close when returned
           me.doClose(true);
@@ -684,7 +686,7 @@
   
   // the undo action, resets everything to the loaded, last-saved state
   cancel: function(confirmed) {
-    var me = this;
+    var me = this, callback;
     if (!confirmed) {
       callback = function(ok) {
         if (ok) {
@@ -1020,7 +1022,7 @@
 
   // called by the buttons in the toolbar of the standard maintenance form/grid
   doOpen: function(retrievedInitialData) {
-    var me = this, window, i, j, persField, fld;
+    var me = this, window, i, j, persField, fld, tabSet, tab;
     
     // first get the preview form data, continue after receiving it
     if (!retrievedInitialData) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-clone-order.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-clone-order.js	Sun Oct 23 13:37:42 2011 +0200
@@ -25,6 +25,8 @@
   cloneButtonProps.action = function (){
     var view = this.view;
     var callback = function(ok){
+      var requestParams;
+      
       if (ok) {
         requestParams = {
             orderId:view.viewGrid.getSelectedRecord().id
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Sun Oct 23 13:37:42 2011 +0200
@@ -538,7 +538,7 @@
   // NOTE: new buttons should implement the updateState method.
   //
   updateButtonState: function(noSetSession, changeEvent){
-    var length = this.leftMembers.length;
+    var length = this.leftMembers.length, i;
     
     for (i = 0; i < length; i++) {
       if (this.leftMembers[i].updateState) {
@@ -1050,7 +1050,7 @@
     // This is needed to prevent JSLint complaining about "Don't make functions within a loop.
     var callbackHandler = function (currentContext, me) {
       return function(response, data, request) {
-        var noneOrMultipleRecordsSelected = currentContext.viewGrid.getSelectedRecords().length !== 1 && !isNew;
+        var noneOrMultipleRecordsSelected = currentContext.viewGrid.getSelectedRecords().length !== 1;
         var sessionAttributes = data.sessionAttributes, auxInputs = data.auxiliaryInputValues, attachmentExists = data.attachmentExists, prop;
         if (sessionAttributes) {
           currentContext.viewForm.sessionAttributes = sessionAttributes;
@@ -1070,7 +1070,7 @@
       };
     };
 
-    var currentTabCalled = false, me = this;
+    var currentTabCalled = false, me = this, requestParams;
     length = buttonContexts.length;
     for (iButtonContext = 0; iButtonContext < length; iButtonContext++) {
       currentContext = buttonContexts[iButtonContext];
@@ -1233,7 +1233,7 @@
   },
   
   enableShortcuts: function(){
-    var length;
+    var length, i;
     if (this.leftMembers) {
       length = this.leftMembers.length;
       for (i = 0; i < length; i++) {
@@ -1254,7 +1254,7 @@
   },
   
   disableShortcuts: function(){
-    var length;
+    var length, i;
     if (this.leftMembers) {
       length = this.leftMembers.length;
       for (i = 0; i < length; i++) {
@@ -1416,7 +1416,7 @@
     length = selectedRecords.length;
 
   if (length === 0) {
-    view.messageBar.setMessage(OBMessageBar.TYPE_WARNING, '', OB.I18N.getLabel('OBUIAPP_PrintNoRecordSelected'));
+    view.messageBar.setMessage(isc.OBMessageBar.TYPE_WARNING, '', OB.I18N.getLabel('OBUIAPP_PrintNoRecordSelected'));
     return;
   }
 
@@ -1460,7 +1460,7 @@
   if (selectedRecords.length > 1) {
     var setWarning = {
       set: function(label){
-        view.messageBar.setMessage(OBMessageBar.TYPE_WARNING, '', label);
+        view.messageBar.setMessage(isc.OBMessageBar.TYPE_WARNING, '', label);
       }
     };
     OB.I18N.getLabel('JS28', null, setWarning, 'set');
@@ -1479,15 +1479,14 @@
 };
 
 OB.ToolbarUtils.showTree = function(view){
+  var tabId = view.tabId;
+
   function openPopupTree() {
-    // Open tree through menu to have hidden vertical menu which is needed to show old JS messages
-    var popupParams = 'url=/utility/WindowTree.html';
-    popupParams += '&Command=DEFAULT';
+    var popupParams = 'Command=DEFAULT';
     popupParams += '&inpTabId=' + tabId;
     popupParams += '&hideMenu=true&noprefs=true';
-    OB.Layout.ClassicOBCompatibility.Popup.open('tree', 750, 625, OB.Application.contextUrl + 'security/Menu.html?' + popupParams, '', window, false, false, true);
+    OB.Layout.ClassicOBCompatibility.Popup.open('tree', 750, 625, OB.Application.contextUrl + 'utility/WindowTree.html?' + popupParams, '', window, false, false, true);
   }
-  var tabId = view.tabId;
   
   view.setContextInfo(view.getContextInfo(true, true, true, true), openPopupTree, true);
 };
@@ -1541,7 +1540,7 @@
 		  // and pick them up in the correct order
 		  // the return should be an array of button instances created by doing 
 		  //  btnDefinitionClass.create(btnDefinitionProperties);
-		  var result = [], resultIndex = 0, i, validTabId, 
+		  var result = [], j, resultIndex = 0, i, validTabId, 
 		    tabIds, length = this.buttonDefinitions.length,
 		    tabIdsLength;	
 		  for (i = 0; i < length; i++) {	
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js	Sun Oct 23 13:37:42 2011 +0200
@@ -55,7 +55,7 @@
     //
     updateHistory: function() {
 
-      var state = {}, stateStr, data;
+      var state = {}, stateStr, data, i, tabsLength, tab, tabObject;
 
       if (L.ViewManager.inStateHandling) {
         return;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Sun Oct 23 13:37:42 2011 +0200
@@ -750,7 +750,7 @@
   var encodeProperties = {
     // prevents timezone issues
     encodeDate: function(dt) {
-      var oldXMLSchemaMode = isc.Comm.xmlSchemaMode;
+      var ret, oldXMLSchemaMode = isc.Comm.xmlSchemaMode;
       isc.Comm.xmlSchemaMode = true;
       ret = dt.toSerializeableDate();
       isc.Comm.xmlSchemaMode = oldXMLSchemaMode;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js	Sun Oct 23 13:37:42 2011 +0200
@@ -144,6 +144,8 @@
     },
 
     createTab: function(viewName, viewTabId, viewInstance, params) {
+      var tabTitle;
+      
       if (params.i18nTabTitle) {
         // note call to I18N is done below after the tab
         // has been created
@@ -428,7 +430,8 @@
 
     restoreState: function(newState, data) {
 
-      var tabSet = OB.MainView.TabSet, tabsLength, i, tabObject, hasChanged = false, stateData;
+      var viewId, tabSet = OB.MainView.TabSet, tabsLength, i, tabObject, 
+        hasChanged = false, stateData, requestViewsRestoreState;
 
       if (vmgr.inStateHandling) {
         return;
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-messagebar-styles.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-messagebar-styles.js	Sun Oct 23 13:37:42 2011 +0200
@@ -24,6 +24,8 @@
   height: 40,
   overflow: 'visible',
   setTypeStyle: function(type) {
+    this.mainIcon.setSrc('');
+    this.closeIcon.setSrc('');
     this.setStyleName('OBMessageBar_' + type);
     this.mainIcon.setSrc(OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/messagebar/mainIcon-' + type + '.png');
     this.text.setStyleName('OBMessageBarDescriptionText OBMessageBarDescriptionText_' + type);
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-statusbar-styles.css	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-statusbar-styles.css	Sun Oct 23 13:37:42 2011 +0200
@@ -40,6 +40,29 @@
   font-weight: bold;
 }
 
+.OBStatusBarTextLink_Title {
+  text-decoration: none;
+  font-weight: bold;
+  cursor: pointer;
+}
+
+.OBStatusBarTextLink_TitleOver,
+.OBStatusBarTextLink_Title:hover {
+  color: #58A618;
+}
+
+.OBStatusBarTextLink_TitleDown,
+.OBStatusBarTextLink_Title:active {
+  color: #004E27;
+}
+
+.OBStatusBarTextLink_TitleFocused,
+.OBStatusBarTextLink_TitleFocusedOver,
+.OBStatusBarTextLink_TitleFocusedDown,
+.OBStatusBarTextLink_Title:focus {
+  color: #fa962f;
+}
+
 .OBStatusBarTextLabel_Field {
   font-weight: normal;
 }
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-statusbar-styles.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-statusbar-styles.js	Sun Oct 23 13:37:42 2011 +0200
@@ -27,6 +27,10 @@
 
   statusLabelStyle: 'OBStatusBarTextLabel_Status',
   titleLabelStyle: 'OBStatusBarTextLabel_Title',
+  titleLinkStyle: 'OBStatusBarTextLink_Title',
+  titleLinkImageSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/form/ico-to-new-tab.png',
+  titleLinkImageWidth: 8,
+  titleLinkImageHeight: 8,
   fieldLabelStyle: 'OBStatusBarTextLabel_Field',
   separatorLabelStyle: 'OBStatusBarTextLabel_Separator',
   labelOverflowHidden: true,
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -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.13994]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.14048]]></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>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -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.13994]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -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.13994]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.14048]]></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>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -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.13994]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.14048]]></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.13994]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.14048]]></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.13994]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.14048]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java	Sun Oct 23 13:37:42 2011 +0200
@@ -46,10 +46,6 @@
 
   @Override
   public String getGridFieldProperties(Field field) {
-    Long length = field.getDisplayedLength();
-    if (length == null || length == 0) {
-      length = field.getColumn().getLength();
-    }
     final Property prop = KernelUtils.getInstance().getPropertyFromColumn(field.getColumn());
 
     // only output when really needed
@@ -57,8 +53,8 @@
     if (getDisplayFieldName(field, prop) != null) {
       displayField = ", displayField: '" + getDisplayFieldName(field, prop) + "'";
     }
-    return ", length:" + length + displayField + ",fkField: true"
-        + super.getGridFieldProperties(field) + getShowHoverGridFieldSettings(field);
+    return displayField + ",fkField: true" + super.getGridFieldProperties(field)
+        + getShowHoverGridFieldSettings(field);
   }
 
   /**
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java	Sun Oct 23 13:37:42 2011 +0200
@@ -44,14 +44,13 @@
 
   @Override
   public String getGridFieldProperties(Field field) {
-    Long length = field.getDisplayedLength();
-    if (length == null || length == 0) {
-      length = field.getColumn().getLength();
-    }
+    Long length = field.getColumn().getLength();
+
     // custom override
     if (field.getColumn().getDBColumnName().compareToIgnoreCase("documentno") == 0) {
       length = new Long(20);
     }
-    return getShowHoverGridFieldSettings(field) + super.getGridFieldProperties(field);
+    return getShowHoverGridFieldSettings(field) + (length != null ? ", length:" + length : "")
+        + super.getGridFieldProperties(field);
   }
 }
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -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.13994]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.14048]]></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>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -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.13994]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.14048]]></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.13994]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/form/formitem/ob-formitem-widgetinform.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/form/formitem/ob-formitem-widgetinform.js	Sun Oct 23 13:37:42 2011 +0200
@@ -19,10 +19,12 @@
 
 // == OBWidgetInFormItem ==
 // Allows placing of workspace widget into a generated form
-isc.ClassFactory.defineClass('OBWidgetInFormItem', CanvasItem);
+isc.ClassFactory.defineClass('OBWidgetInFormItem', isc.CanvasItem);
 
 isc.OBWidgetInFormItem.addProperties({
   widgetInstance : null,
+  autoDestroy: true,
+  
   cellStyle: 'OBFormField',
   titleStyle: 'OBFormFieldLabel',
   widgetProperties: {
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-about-popup.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-about-popup.js	Sun Oct 23 13:37:42 2011 +0200
@@ -35,7 +35,7 @@
 	    
   initWidget: function(args){
 	
-    aboutFieldDefinitions = args.aboutFieldDefinitions;
+    var aboutFieldDefinitions = args.aboutFieldDefinitions;
     this.aboutPopupWindowLayout = this.createPopupWindowLayout();
     this.items = [this.aboutPopupWindowLayout];
         
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Sun Oct 23 13:37:42 2011 +0200
@@ -321,7 +321,7 @@
         },
 
         getTotalHeight: function(){
-          var rows = this.getMembers(), i, height = 0, row;
+          var rows = this.getMembers(), widget, i, height = 0, row;
           for (i = 0; i < rows.length; i++) {
             row = rows[i];
             widget = row.getMembers()[0];
@@ -355,7 +355,7 @@
   },
 
   setRecentList: function(layout){
-    var recentList, newRecent,  
+    var recentList, newRecent, handleClickFunction,
       recentIndex = 0, recent, lbl, newIcon, entryLayout, icon;
     
     // start with a fresh content
@@ -450,7 +450,7 @@
   
   setRecentDocumentsList: function(layout){
     var recentList, newRecent, recentIndex = 0, recent, 
-      lbl, newIcon, entryLayout, icon;
+      lbl, newIcon, entryLayout, icon, handleClickFunction;
     
     // start with a fresh content
     layout.destroyAndRemoveMembers(layout.members);
@@ -504,7 +504,8 @@
   // * {{{widgetProperties}}}: properties used to create an instance of the widget
   // like the widgetClassName, height and title 
   addWidget: function(widgetProperties){
-    var i;
+    var i,widgetInstance;
+    
     // if not there yet load it
     if (!isc.ClassFactory.getClass(widgetProperties.widgetClassName)) {
       var rpcMgr = isc.RPCManager;
@@ -586,7 +587,8 @@
   },
   
   eventResponseHandler: function(rpcResponse, data, rpcRequest){
-    var i, j, adminLevel, adminLevelValue, publishMessage, levelKey;
+    var i, j, adminLevel, adminLevelValue, publishMessage, 
+      levelKey, levelValueKey;
     
     if (!data || !data.message || !data.context || !data.widgets) {
       isc.Log.logError('Response does not contain required data for processing');
@@ -681,7 +683,8 @@
   // The widgets cache is refreshed before sending the event notification to the backend
   //
   updateWidgetsCache: function(eventType, responseWidgets){
-    var columns = this.portalLayout.getMembers(), i, j, k, col, rows, row, widget, newObj;
+    var columns = this.portalLayout.getMembers(), i, j, k, 
+      newWidget, col, rows, row, widget, newObj;
 
     this.widgets = []; // clear cache
     if (eventType === 'RELOAD_WIDGETS' && isc.isAn.Array(responseWidgets)) {
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js	Sun Oct 23 13:37:42 2011 +0200
@@ -50,7 +50,7 @@
 //
 // == OBWidgetMenuItem ==
 //
-isc.defineClass('OBWidgetMenuItem', IMenuButton).addProperties({
+isc.defineClass('OBWidgetMenuItem', isc.IMenuButton).addProperties({
   widget: null,
   menu: null,
 
@@ -367,7 +367,7 @@
   },
   
   allRequiredParametersSet: function() {
-    var i;
+    var i, fieldDefinition;
     for (i = 0; i < this.fieldDefinitions.length; i++) {
       fieldDefinition = this.fieldDefinitions[i];
       if (fieldDefinition.required && !this.parameters[fieldDefinition.name] &&
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -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.13994]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.14048]]></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>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -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.13994]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -63,7 +63,40 @@
 <!--F5DEE669DD8047FB831A12064BB277BE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F5DEE669DD8047FB831A12064BB277BE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F5DEE669DD8047FB831A12064BB277BE-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[8267FB3F59D7401980DDDEFF51FE55C3]]></OBKMO_WIDGET_CLASS_ID>
-<!--F5DEE669DD8047FB831A12064BB277BE-->  <HQL><![CDATA[select ol.salesOrder.id as orderId, ol.salesOrder.organization.name as organizationName, ol.salesOrder.orderDate as dateordered,  ol.salesOrder.scheduledDeliveryDate as plannedDeliveryDate, ol.salesOrder.documentNo as salesorder, ol.salesOrder.businessPartner.name as bpartner, ol.product.name as productname, ol.attributeSetValue.description as attribute, ol.uOM.name as uom, ol.orderedQuantity as totalqty,     (select coalesce(sum(po.quantity),0)      from ProcurementPOInvoiceMatch po     where po.goodsShipmentLine is not null     and po.salesOrderLine = ol) as qtyReceived,     (select ol.orderedQuantity-coalesce(sum(po2.quantity),0) from ProcurementPOInvoiceMatch po2     where po2.goodsShipmentLine is not null     and po2.salesOrderLine = ol) as qtyPending from OrderLine as ol left join ol.attributeSetValue where ol.salesOrder.client.id =:client and ol.salesOrder.organization.id in (:organizationList) and ol.salesOrder.documentStatus='CO' and ol.salesOrder.salesTransaction=false and ol.orderedQuantity <> (select coalesce(sum(po3.quantity),0)                              from ProcurementPOInvoiceMatch po3                             where po3.goodsShipmentLine is not null                             and po3.salesOrderLine = ol) and ol.salesOrder.scheduledDeliveryDate<=now() and ol.product.name like :productname and ol.salesOrder.businessPartner.name like :suppliername and ol.salesOrder.documentNo like :documentno and ol.salesOrder.organization.name like :organizationName and @optional_filters@ order by ol.salesOrder.scheduledDeliveryDate, ol.salesOrder.documentNo]]></HQL>
+<!--F5DEE669DD8047FB831A12064BB277BE-->  <HQL><![CDATA[select ol.salesOrder.id as orderId, 
+       ol.salesOrder.organization.name as organizationName, 
+       ol.salesOrder.orderDate as dateordered,  
+       ol.salesOrder.scheduledDeliveryDate as plannedDeliveryDate, 
+       ol.salesOrder.documentNo as salesorder, 
+       ol.salesOrder.businessPartner.name as bpartner, 
+       ol.product.name as productname, 
+       attr.description as attribute, 
+       ol.uOM.name as uom, 
+       ol.orderedQuantity as totalqty,     
+       (select coalesce(sum(po.quantity),0)      
+          from ProcurementPOInvoiceMatch po     
+         where po.goodsShipmentLine is not null     
+           and po.salesOrderLine = ol) as qtyReceived,     
+       (select ol.orderedQuantity-coalesce(sum(po2.quantity),0) 
+          from ProcurementPOInvoiceMatch po2     
+         where po2.goodsShipmentLine is not null     
+           and po2.salesOrderLine = ol) as qtyPending 
+   from OrderLine as ol left join ol.attributeSetValue attr 
+  where ol.salesOrder.client.id =:client 
+    and ol.salesOrder.organization.id in (:organizationList) 
+    and ol.salesOrder.documentStatus='CO' 
+    and ol.salesOrder.salesTransaction=false 
+    and ol.orderedQuantity <> (select coalesce(sum(po3.quantity),0)                              
+                                 from ProcurementPOInvoiceMatch po3                             
+                                where po3.goodsShipmentLine is not null                             
+                                  and po3.salesOrderLine = ol) 
+    and ol.salesOrder.scheduledDeliveryDate<=now() 
+    and ol.product.name like :productname 
+    and ol.salesOrder.businessPartner.name like :suppliername 
+    and ol.salesOrder.documentNo like :documentno 
+    and ol.salesOrder.organization.name like :organizationName 
+    and @optional_filters@ 
+  order by ol.salesOrder.scheduledDeliveryDate, ol.salesOrder.documentNo]]></HQL>
 <!--F5DEE669DD8047FB831A12064BB277BE--></OBCQL_WIDGET_QUERY>
 
 <!--F94AEB4680AD4AD48255071903000A43--><OBCQL_WIDGET_QUERY>
--- a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListWidgetProvider.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListWidgetProvider.java	Sun Oct 23 13:37:42 2011 +0200
@@ -76,9 +76,11 @@
         + "', isc.OBQueryListWidget).addProperties({widgetId: '"
         + getWidgetClass().getId()
         + "', "
-        + "gridDataSource: "
+        + "gridDataSource: null,"
+        + "createGridDataSource: function() {"
+        + "return "
         + getDataSourceJavaScript()
-        + ", fields:"
+        + ";}, fields:"
         + QueryListUtils
             .getWidgetClassFields(getWidgetClass(), QueryListUtils.IncludeIn.WidgetView)
         + ", maximizedFields:"
--- a/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js	Sun Oct 23 13:37:42 2011 +0200
@@ -50,6 +50,9 @@
         })
     ]
     });
+    
+    this.gridDataSource = this.createGridDataSource();
+
     this.Super('initWidget', arguments);
     this.widgetTitle = this.title;
     // refresh if the dbInstanceId is set
@@ -228,7 +231,7 @@
     }
     this.Super('initWidget', arguments);
   },
-
+  
   filterData: function(criteria, callback, requestProperties){
     var crit = criteria || {},
     reqProperties = requestProperties || {};
@@ -275,6 +278,14 @@
     return params;
   },
   
+  destroy: function() {
+    if (this.dataSource) {
+      this.dataSource.destroy();
+      this.dataSource = null;
+    }
+    this.Super('destroy', arguments);
+  },
+  
   fetchData: function(criteria, callback, requestProperties){
     var crit = criteria || {},
     reqProperties = requestProperties || {};
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.13994]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.14048]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/web/org.openbravo.client.widgets/js/ob-gcal.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.widgets/web/org.openbravo.client.widgets/js/ob-gcal.js	Sun Oct 23 13:37:42 2011 +0200
@@ -18,7 +18,7 @@
  */
 
 // == OBGCalWidget ==
-isc.defineClass('OBGCalWidget', OBUrlWidget);
+isc.defineClass('OBGCalWidget', isc.OBUrlWidget);
 
 isc.OBGCalWidget.addProperties({
   initWidget: function() {
--- a/modules/org.openbravo.client.widgets/web/org.openbravo.client.widgets/js/ob-twitter.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.client.widgets/web/org.openbravo.client.widgets/js/ob-twitter.js	Sun Oct 23 13:37:42 2011 +0200
@@ -16,7 +16,7 @@
  * Contributor(s):  ______________________________________.
  ************************************************************************
  */
-isc.defineClass('OBTwitterWidget', OBUrlWidget);
+isc.defineClass('OBTwitterWidget', isc.OBUrlWidget);
 
 isc.OBTwitterWidget.addProperties({
   initWidget: function() {
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.13994]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.14048]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.13994]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.14048]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.13994]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.14048]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.13994]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.14048]]></STARTVERSION>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.13994]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.14048]]></STARTVERSION>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.13994]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.14048]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Sun Oct 23 13:37:42 2011 +0200
@@ -52,6 +52,7 @@
 import org.openbravo.base.model.domaintype.EnumerateDomainType;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.session.OBPropertiesProvider;
+import org.openbravo.client.application.window.OBViewUtil;
 import org.openbravo.client.kernel.BaseKernelServlet;
 import org.openbravo.client.kernel.KernelUtils;
 import org.openbravo.client.kernel.OBUserException;
@@ -68,6 +69,7 @@
 import org.openbravo.erpCommon.utility.PropertyNotFoundException;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.datamodel.Column;
+import org.openbravo.model.ad.ui.Element;
 import org.openbravo.model.ad.ui.Field;
 import org.openbravo.model.ad.ui.FieldTrl;
 import org.openbravo.model.ad.ui.Tab;
@@ -326,7 +328,25 @@
               continue;
             }
             Column col = OBDal.getInstance().get(Column.class, prop.getColumnId());
-            if (parameters.get("tab") != null && !parameters.get("tab").equals("")) {
+
+            if (prop.isAuditInfo()) {
+              Element element = null;
+              if ("creationDate".equals(prop.getName())) {
+                element = OBViewUtil.createdElement;
+              } else if ("createdBy".equals(prop.getName())) {
+                element = OBViewUtil.createdByElement;
+              } else if ("updated".equals(prop.getName())) {
+                element = OBViewUtil.updatedElement;
+              } else if ("updatedBy".equals(prop.getName())) {
+                element = OBViewUtil.updatedByElement;
+              }
+              if (element != null) {
+                niceFieldProperties.put(prop.getName(),
+                    OBViewUtil.getLabel(element, element.getADElementTrlList()));
+              } else {
+                niceFieldProperties.put(prop.getName(), col.getName());
+              }
+            } else if (parameters.get("tab") != null && !parameters.get("tab").equals("")) {
               Tab tab = OBDal.getInstance().get(Tab.class, parameters.get("tab"));
               for (Field field : tab.getADFieldList()) {
                 if (!field.getColumn().getId().equals(col.getId())) {
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,8 +6,9 @@
 <!--FF808081316ACC4501316ADAA4FB0006-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF808081316ACC4501316ADAA4FB0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF808081316ACC4501316ADAA4FB0006-->  <VALUE><![CDATA[OBSEIG_AssociateAccount]]></VALUE>
-<!--FF808081316ACC4501316ADAA4FB0006-->  <MSGTEXT><![CDATA[This process links your Openbravo User with your Google Account. After completion if you access the system using your Google Account you will be logged in with you current User.
-Do yo want to continue?]]></MSGTEXT>
+<!--FF808081316ACC4501316ADAA4FB0006-->  <MSGTEXT><![CDATA[This process associates your Google account with your Openbravo user id. After completion, if you access the system using your Google account, you will be logged in with your currently active user.
+
+Do you want to continue?]]></MSGTEXT>
 <!--FF808081316ACC4501316ADAA4FB0006-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--FF808081316ACC4501316ADAA4FB0006-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF808081316ACC4501316ADAA4FB0006--></AD_MESSAGE>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.13994]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.14048]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.13994]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.14048]]></STARTVERSION>
 <!--FF8080813141B198013141BA0F7D0012-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.13994]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.14048]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.13994]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.14048]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Sun Oct 23 13:37:42 2011 +0200
@@ -490,7 +490,8 @@
           || operator.equals(OPERATOR_INOTCONTAINS) || operator.equals(OPERATOR_ICONTAINS)
           || operator.equals(OPERATOR_CONTAINSFIELD)) {
         return "%" + escapeLike(value.toString().toUpperCase()).replaceAll(" ", "%") + "%";
-      } else if (operator.equals(OPERATOR_NOTSTARTSWITH) || operator.equals(OPERATOR_STARTSWITH)
+      } else if (operator.equals(OPERATOR_NOTSTARTSWITH)
+          || operator.equals(OPERATOR_INOTSTARTSWITH) || operator.equals(OPERATOR_STARTSWITH)
           || operator.equals(OPERATOR_ISTARTSWITH) || operator.equals(OPERATOR_STARTSWITHFIELD)) {
         return escapeLike(value.toString().toUpperCase()).replaceAll(" ", "%") + "%";
       } else {
@@ -644,6 +645,7 @@
         || operator.equals(OPERATOR_ENDSWITH) || operator.equals(OPERATOR_STARTSWITH)
         || operator.equals(OPERATOR_NOTCONTAINS) || operator.equals(OPERATOR_INOTCONTAINS)
         || operator.equals(OPERATOR_NOTENDSWITH) || operator.equals(OPERATOR_NOTSTARTSWITH)
+        || operator.equals(OPERATOR_INOTENDSWITH) || operator.equals(OPERATOR_INOTSTARTSWITH)
         || operator.equals(OPERATOR_CONTAINSFIELD) || operator.equals(OPERATOR_ENDSWITHFIELD)
         || operator.equals(OPERATOR_STARTSWITHFIELD);
   }
@@ -688,6 +690,7 @@
     return operator.equals(OPERATOR_IEQUALS) || operator.equals(OPERATOR_INOTEQUAL)
         || operator.equals(OPERATOR_CONTAINS) || operator.equals(OPERATOR_ENDSWITH)
         || operator.equals(OPERATOR_STARTSWITH) || operator.equals(OPERATOR_ICONTAINS)
+        || operator.equals(OPERATOR_INOTSTARTSWITH) || operator.equals(OPERATOR_INOTENDSWITH)
         || operator.equals(OPERATOR_NOTSTARTSWITH) || operator.equals(OPERATOR_NOTCONTAINS)
         || operator.equals(OPERATOR_INOTCONTAINS) || operator.equals(OPERATOR_NOTENDSWITH)
         || operator.equals(OPERATOR_IENDSWITH) || operator.equals(OPERATOR_ISTARTSWITH)
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Sun Oct 23 13:37:42 2011 +0200
@@ -26,11 +26,13 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.codec.binary.Base64;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.ObjectNotFoundException;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.Property;
+import org.openbravo.base.model.domaintype.BinaryDomainType;
 import org.openbravo.base.model.domaintype.EncryptedStringDomainType;
 import org.openbravo.base.model.domaintype.HashedStringDomainType;
 import org.openbravo.base.model.domaintype.TimestampDomainType;
@@ -272,6 +274,8 @@
     } else if (property.getDomainType() instanceof HashedStringDomainType
         || property.getDomainType() instanceof EncryptedStringDomainType) {
       return "***";
+    } else if (property.getDomainType() instanceof BinaryDomainType && value instanceof byte[]) {
+      return Base64.encodeBase64String((byte[]) value);
     }
     return value;
   }
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Sun Oct 23 13:37:42 2011 +0200
@@ -33,6 +33,7 @@
 
 import javax.servlet.ServletException;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
@@ -41,6 +42,7 @@
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.Property;
 import org.openbravo.base.model.domaintype.BigDecimalDomainType;
+import org.openbravo.base.model.domaintype.BinaryDomainType;
 import org.openbravo.base.model.domaintype.EncryptedStringDomainType;
 import org.openbravo.base.model.domaintype.HashedStringDomainType;
 import org.openbravo.base.model.domaintype.TimestampDomainType;
@@ -204,6 +206,8 @@
           // TODO: translate error message
           throw new Error("Could not encrypt password", e);
         }
+      } else if (value instanceof String && property.getDomainType() instanceof BinaryDomainType) {
+        return Base64.decodeBase64((String) value);
       }
       return value;
     } catch (Exception e) {
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.13994]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.14048]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.13994]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.14048]]></STARTVERSION>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.13994]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.14048]]></STARTVERSION>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java	Sun Oct 23 13:37:42 2011 +0200
@@ -35,6 +35,9 @@
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
 import org.openbravo.client.application.ParameterUtils;
+import org.openbravo.client.kernel.reference.StringUIDefinition;
+import org.openbravo.client.kernel.reference.UIDefinition;
+import org.openbravo.client.kernel.reference.UIDefinitionController;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
@@ -114,6 +117,7 @@
     if (value == null) {
       return;
     }
+    boolean isCustomQuerySelector = sel.getHQL() != null;
     String filteredCriteria = "";
     String fieldName;
     Entity entity = ModelProvider.getInstance().getEntityByTableName(
@@ -124,7 +128,7 @@
       if (value.contains(JsonConstants.IN_PARAMETER_SEPARATOR)) {
         final String[] separatedValues = value.split(JsonConstants.IN_PARAMETER_SEPARATOR);
         for (String separatedValue : separatedValues) {
-	  cEntity = entity;
+          cEntity = entity;
           JSONObject jSONObject = new JSONObject(separatedValue);
           fieldName = (String) jSONObject.get("fieldName");
           if (fieldName.contains("_dummy") || fieldName.contains("_identifier")
@@ -132,20 +136,42 @@
             filteredCriteria += jSONObject.toString() + JsonConstants.IN_PARAMETER_SEPARATOR;
             continue;
           }
-          String[] fieldNameSplit = fieldName.split("\\.");
-          Property fProp = null;
-          if (fieldNameSplit.length == 1) {
-            fProp = entity.getProperty(fieldName);
-          } else {
-            for (int i = 0; i < fieldNameSplit.length; i++) {
-              fProp = cEntity.getProperty(fieldNameSplit[i]);
-              if (i != fieldNameSplit.length - 1) {
-                cEntity = fProp.getReferencedProperty().getEntity();
+          boolean filterParameter = false;
+          if (isCustomQuerySelector) {
+            // This is a custom query selector. We cannot filter parameters by linking them to
+            // entity properties
+            // Instead, we will do it by checking the references of the fields
+            for (SelectorField field : sel.getOBUISELSelectorFieldList()) {
+              if (field.isSearchinsuggestionbox()) {
+                if (field.getDisplayColumnAlias().equals(fieldName)) {
+                  UIDefinition uiDef = UIDefinitionController.getInstance().getUIDefinition(
+                      field.getReference());
+                  if (!(uiDef instanceof StringUIDefinition)) {
+                    filterParameter = true;
+                  }
+                }
               }
             }
+          } else {
+            // A property in the entity is searched for this fieldName
+            // If the property is numeric or date, then it is filtered
+            String[] fieldNameSplit = fieldName.split("\\.");
+            Property fProp = null;
+            if (fieldNameSplit.length == 1) {
+              fProp = entity.getProperty(fieldName);
+            } else {
+              for (int i = 0; i < fieldNameSplit.length; i++) {
+                fProp = cEntity.getProperty(fieldNameSplit[i]);
+                if (i != fieldNameSplit.length - 1) {
+                  cEntity = fProp.getReferencedProperty().getEntity();
+                }
+              }
+            }
+            if (fProp.isNumericType() || fProp.isDate()) {
+              filterParameter = true;
+            }
           }
-
-          if (fProp.isNumericType() || fProp.isDate()) {
+          if (filterParameter) {
             try {
               jSONObject.put("operator", "equals");
               BigDecimal valueJSONObject = new BigDecimal(jSONObject.get("value").toString());
--- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java	Sun Oct 23 13:37:42 2011 +0200
@@ -99,10 +99,6 @@
 
   @Override
   protected String getDisplayFieldName(Field field, Property prop) {
-    Long length = field.getDisplayedLength();
-    if (length == null || length == 0) {
-      length = field.getColumn().getLength();
-    }
     final Selector selector = getSelector(field);
     final SelectorField displayField = selector.getDisplayfield();
     String displayFieldName = JsonConstants.IDENTIFIER;
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js	Sun Oct 23 13:37:42 2011 +0200
@@ -16,7 +16,7 @@
  * Contributor(s):  ______________________________________.
  ************************************************************************
  */
-isc.ClassFactory.defineClass('OBSelectorFilterSelectItem', SelectItem);
+isc.ClassFactory.defineClass('OBSelectorFilterSelectItem', isc.SelectItem);
 
 isc.OBSelectorFilterSelectItem.addProperties({
   operator: 'equals',
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Sun Oct 23 13:37:42 2011 +0200
@@ -182,8 +182,8 @@
         gridField.filterEditorType = type.filterEditorType;
       }
       
-      gridField.canFilter = (fld.canFilter === false ? false : true);
-      gridField.filterOnKeypress = (fld.filterOnKeypress === false ? false : true); 
+      gridField.canFilter = (gridField.canFilter === false ? false : true);
+      gridField.filterOnKeypress = (gridField.filterOnKeypress === false ? false : true); 
 
       if (!gridField.filterEditorProperties) {
         gridField.filterEditorProperties = {
@@ -280,7 +280,7 @@
 // 1) a combo box with a picker icon
 // 2) a popup window showing a search grid with data
 //
-isc.ClassFactory.defineClass('OBSelectorItem', ComboBoxItem);
+isc.ClassFactory.defineClass('OBSelectorItem', isc.ComboBoxItem);
 
 isc.ClassFactory.mixInInterface('OBSelectorItem', 'OBLinkTitleItem');
 
@@ -472,7 +472,7 @@
               continue;
             }
             if (isc.isA.Number(value)) {
-              if(outFields[i].formatType && outFioutFields[i].formatType!==''){
+              if(outFields[i].formatType && outFields[i].formatType !== ''){
                 value = OB.Utilities.Number.JSToOBMasked(value, OB.Format.formats[outFields[i].formatType],
                   OB.Format.defaultDecimalSymbol, OB.Format.defaultGroupingSymbol,
                    OB.Format.defaultGroupingSize);
@@ -640,7 +640,7 @@
   }
 });
 
-isc.ClassFactory.defineClass('OBSelectorLinkItem', StaticTextItem);
+isc.ClassFactory.defineClass('OBSelectorLinkItem', isc.StaticTextItem);
 
 isc.ClassFactory.mixInInterface('OBSelectorLinkItem', 'OBLinkTitleItem');
 
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js	Sun Oct 23 13:37:42 2011 +0200
@@ -622,7 +622,7 @@
               editorType : 'comboBox',
               displayField : this.displayField,
               focus : function(form, item) {
-                currentWindowElementType = 'custom'; // To
+                var currentWindowElementType = 'custom'; // To
                 if (typeof setWindowElementFocus === 'function') {
                   // To sync with Openbravo focus logic
                   setWindowElementFocus(document
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.13994]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.14048]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.13994]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.14048]]></VERSION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <DESCRIPTION><![CDATA[Smartclient libraries for use within Openbravo]]></DESCRIPTION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HELP><![CDATA[This module contains the Smartclient libraries for usage by other modules. It also contains some simple test pages to validate that Smartclient is working correctly. Also contains generic Openbravo Smartclient components]]></HELP>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.13994]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.14048]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.13994]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.14048]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.13994]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.14048]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.13994]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.14048]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--025B181F63CA47B48A920F6983242390-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--025B181F63CA47B48A920F6983242390-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_DEPENDENT_MODULE_ID>
-<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.13994]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.14048]]></STARTVERSION>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDANT_MODULE_NAME><![CDATA[Query/List Widget]]></DEPENDANT_MODULE_NAME>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--5B72D24032DD4879A950194139D961B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--5B72D24032DD4879A950194139D961B6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_DEPENDENT_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_DEPENDENT_MODULE_ID>
-<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.13994]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.14048]]></STARTVERSION>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDANT_MODULE_NAME><![CDATA[HTML Widget]]></DEPENDANT_MODULE_NAME>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.13994]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.14048]]></STARTVERSION>
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_DEPENDENT_MODULE_ID>
-<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.13994]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.14048]]></STARTVERSION>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDANT_MODULE_NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></DEPENDANT_MODULE_NAME>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.13994]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.14048]]></STARTVERSION>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -161,7 +161,7 @@
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.13994]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.14048]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.13994]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.14048]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -7,7 +7,7 @@
 <!--4D11E3A70650475381139522373CD191-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D11E3A70650475381139522373CD191-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--4D11E3A70650475381139522373CD191-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.13994]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.14048]]></STARTVERSION>
 <!--4D11E3A70650475381139522373CD191-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_DEPENDENT_MODULE_ID>
-<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--60834727BB114764ACEF019F40A34562-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.13994]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.14048]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--8418885E97D643138B6D907671351E3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_DEPENDENT_MODULE_ID>
-<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.13994]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.14048]]></STARTVERSION>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--FF8080813189932B013189B45B59003A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B45B59003A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.13994]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.14048]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--FF8080813189932B013189B4C00F003D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.13994]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.14048]]></STARTVERSION>
 <!--FF8080813189932B013189B4C00F003D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDANT_MODULE_NAME><![CDATA[Integration with Google APIs]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.13994]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.14048]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/referencedata/sampledata/F_B_International_Group.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/referencedata/sampledata/F_B_International_Group.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -2785,7 +2785,7 @@
   <FIN_Payment_ScheduleDetail id="8A64B71A2B68AAA5012B7D0843640020">
     <id>8A64B71A2B68AAA5012B7D0843640020</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
+    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
     <paymentDetails id="8A64B71A2B68AAA5012B7D08C3D90022"/>
     <orderPaymentSchedule id="EB46F1A9A0F143DC81BB151F35C4646C"/>
     <invoicePaymentSchedule id="B4F5DC620DEE40A2897FC30543322DB3"/>
@@ -2947,7 +2947,7 @@
   <FIN_Payment_ScheduleDetail id="9CCFA240DCEF40618DC3E385A1565D42">
     <id>9CCFA240DCEF40618DC3E385A1565D42</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
+    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
     <paymentDetails id="8A64B71A2B68AAA5012B7D0843720021"/>
     <orderPaymentSchedule id="EB46F1A9A0F143DC81BB151F35C4646C"/>
     <invoicePaymentSchedule id="B4F5DC620DEE40A2897FC30543322DB3"/>
@@ -3721,7 +3721,7 @@
   <FIN_Payment_ScheduleDetail id="FEC1BD38C0B2412C8F55F594267641A6">
     <id>FEC1BD38C0B2412C8F55F594267641A6</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
+    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
     <paymentDetails xsi:nil="true"/>
     <orderPaymentSchedule id="28B93921F4294DDFAC383CAD931C6285"/>
     <invoicePaymentSchedule id="9978F1109DAC470CB336099A6F422D0A"/>
@@ -3739,7 +3739,7 @@
   <FIN_Payment_ScheduleDetail id="FF807E1B3AEE42269C97E242D8892758">
     <id>FF807E1B3AEE42269C97E242D8892758</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
+    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
     <paymentDetails xsi:nil="true"/>
     <orderPaymentSchedule id="5C979C5290D9441FB8A24ED21AD92E39"/>
     <invoicePaymentSchedule id="9978F1109DAC470CB336099A6F422D0A"/>
--- a/src-db/database/model/functions/AD_TABLE_IMPORT.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/src-db/database/model/functions/AD_TABLE_IMPORT.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -198,6 +198,10 @@
         v_FieldLength:=19;
       ELSIF(Cur_Column.Data_Type IN('NUMBER')) THEN
         v_FieldLength:=COALESCE(Cur_Column.Data_Precision, 10) +2;
+      ELSIF(Cur_Column.Data_Type IN ('BYTEA', 'BLOB')) THEN
+        v_FieldLength:=4000;
+      ELSIF(Cur_Column.Data_Type IN ('TEXT', 'CLOB')) THEN
+        v_FieldLength:=1000000;
       ELSE
         v_FieldLength:=Cur_Column.Data_Length;
       END IF;
@@ -218,6 +222,10 @@
           v_AD_Reference_ID:='22';
         ELSIF(Cur_Column.Data_Type IN ('DATE', 'TIMESTAMP')) THEN
           v_AD_Reference_ID:='15';
+	ELSIF(Cur_Column.Data_Type IN ('BYTEA', 'BLOB')) THEN
+	  v_AD_Reference_ID:='23';
+	ELSIF(Cur_Column.Data_Type IN ('TEXT', 'CLOB')) THEN
+	  v_AD_Reference_ID:='14';
         ELSE
           v_AD_Reference_ID:='10'; -- if not found, use String
           v_CorrectType:='N';
--- a/src-db/database/model/functions/C_INVOICE_POST.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/src-db/database/model/functions/C_INVOICE_POST.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -607,7 +607,7 @@
         C_INVOICE_POST(NULL, v_RInvoice_ID) ;
         -- Reversal Transaction is closed
         UPDATE C_INVOICE
-        SET DocStatus='VO', -- the reversal transaction
+        SET DocStatus='CO', -- the reversal transaction (issue 18633)
             DocAction='--',
             Processed='Y'
         WHERE C_Invoice_ID=v_RInvoice_ID;
--- a/src-db/database/model/functions/M_INOUT_CREATE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/src-db/database/model/functions/M_INOUT_CREATE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -522,13 +522,17 @@
                         ELSIF (Cur_order.deliveryrule = 'L') THEN
                           DBMS_OUTPUT.PUT_LINE('Not enough stocked products, delivery type Line');
                           v_lines := v_lines - v_lines_per_orderline;
-                          v_resultlinesstr := COALESCE(v_resultlinesstr, '') || '<br>@OrderLine@: ' || ol.Line || ' @ForProduct@ ' || ol.name || ': @notEnoughStockDeliveryRuleLine@.' ;
+                          IF (LENGTH(v_resultlinesstr || '<br>@OrderLine@: ' || ol.Line || ' @ForProduct@ ' || ol.name || ': @notEnoughStockDeliveryRuleLine@.') <= 1800 ) THEN
+			    v_resultlinesstr := COALESCE(v_resultlinesstr, '') || '<br>@OrderLine@: ' || ol.Line || ' @ForProduct@ ' || ol.name || ': @notEnoughStockDeliveryRuleLine@.' ;
+			  END IF;
                           v_hasPartial := true;
                           DELETE FROM M_INOUTLINE
                           WHERE M_INOUT_ID = p_InOut_ID
                             AND C_ORDERLINE_ID = ol.C_ORDERLINE_ID;
                         ELSE
-                          v_resultlinesstr := COALESCE(v_resultlinesstr, '') || '<br>@OrderLine@: ' || ol.Line || ' @ForProduct@ ' || ol.name || ': @notEnoughStockPartial@' || '.' ;
+                          IF (LENGTH(v_resultlinesstr || '<br>@OrderLine@: ' || ol.Line || ' @ForProduct@ ' || ol.name || ': @notEnoughStockPartial@' || '.') <= 1800 ) THEN
+			    v_resultlinesstr := COALESCE(v_resultlinesstr, '') || '<br>@OrderLine@: ' || ol.Line || ' @ForProduct@ ' || ol.name || ': @notEnoughStockPartial@' || '.' ;
+			  END IF;
                           v_hasPartial := true;
                         END IF;
                       END IF;
--- a/src-db/database/model/tables/AD_COLUMN.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/src-db/database/model/tables/AD_COLUMN.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -185,7 +185,7 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
       </column>
-      <column name="IMAGESIZEVALUESACTION" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+      <column name="IMAGESIZEVALUESACTION" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
         <default/>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
       </column>
--- a/src-db/database/model/triggers/AD_ALERTRULE_TRG.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/src-db/database/model/triggers/AD_ALERTRULE_TRG.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -55,7 +55,7 @@
       --insert permissions
       FOR Cur_Role in (SELECT DISTINCT AD_Role_ID, AD_CLIENT_ID, AD_ORG_ID
                         FROM AD_Role
-                       WHERE isManual='N') loop
+                       WHERE isManual='N' and ad_role.ad_client_id=:new.AD_Client_ID) loop
         Ad_Sequence_Next('AD_AlertRecipient', Cur_Role.AD_Org_Id, recipient_id) ;
         INSERT INTO AD_AlertRecipient
             (AD_AlertRule_ID, AD_Role_ID, AD_Client_ID,
--- a/src-db/database/model/triggers/C_INVOICE_TRG.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/src-db/database/model/triggers/C_INVOICE_TRG.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -81,7 +81,7 @@
        END IF;
      END IF;
 
-   IF ((COALESCE(:OLD.DATEACCT,  TO_DATE('31-12-9999', 'DD-MM-YYYY')) <> COALESCE(:NEW.DATEACCT, TO_DATE('31-12-9999', 'DD-MM-YYYY'))) AND :new.DOCSTATUS NOT IN ('DR', 'RE')) THEN
+   IF ((COALESCE(:OLD.DATEACCT,  TO_DATE('31-12-9999', 'DD-MM-YYYY')) <> COALESCE(:NEW.DATEACCT, TO_DATE('31-12-9999', 'DD-MM-YYYY'))) AND :new.DOCSTATUS NOT IN ('RE')) THEN
 		SELECT COUNT(*) INTO V_COUNT FROM M_MATCHINV M WHERE M.C_INVOICELINE_ID IN (SELECT C.C_INVOICELINE_ID FROM C_INVOICELINE C WHERE C.C_INVOICE_ID = :old.C_INVOICE_ID)
 							AND M.M_INOUTLINE_ID IN (SELECT C.M_INOUTLINE_ID FROM C_INVOICELINE C WHERE C.C_INVOICE_ID = :old.C_INVOICE_ID)
 							AND M.POSTED = 'Y'; 
--- a/src-db/database/model/views/M_PRODUCT_STOCK_V.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/src-db/database/model/views/M_PRODUCT_STOCK_V.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -1,18 +1,15 @@
 <?xml version="1.0"?>
   <database name="VIEW M_PRODUCT_STOCK_V">
-    <view name="M_PRODUCT_STOCK_V"><![CDATA[SELECT p.m_product_id || COALESCE(sd.m_storage_detail_id, '') AS m_product_stock_v_id, p.ad_client_id, COALESCE(sd.ad_org_id, p.ad_org_id) AS ad_org_id, COALESCE(sd.isactive, p.isactive) AS isactive, p.created, p.createdby, p.updated, p.updatedby, p.m_product_id, COALESCE(sd.qtyonhand, 0) AS qtyonhand, sd.qtyorderonhand, COALESCE(sd.preqtyonhand, 0) AS preqtyonhand, sd.preqtyorderonhand, p.c_uom_id, sd.m_product_uom_id, COALESCE(sd.m_attributesetinstance_id, 
+    <view name="M_PRODUCT_STOCK_V"><![CDATA[SELECT p.m_product_id || sd.m_storage_detail_id AS m_product_stock_v_id, l.ad_client_id, l.ad_org_id, l.isactive, sd.created, sd.createdby, sd.updated, sd.updatedby, sd.m_product_id, sd.qtyonhand, sd.qtyorderonhand, sd.preqtyonhand, sd.preqtyorderonhand, sd.c_uom_id, sd.m_product_uom_id, sd.m_attributesetinstance_id, sd.m_locator_id, 'Y' AS stocked
+FROM m_storage_detail sd
+JOIN m_locator l ON sd.m_locator_id = l.m_locator_id
+JOIN m_product p ON sd.m_product_id = p.m_product_id AND p.isactive = 'Y'
+WHERE sd.qtyonhand <> 0 OR COALESCE(sd.qtyorderonhand, 0) <> 0
+UNION ALL 
+SELECT p.m_product_id AS m_product_stock_v_id, p.ad_client_id, p.ad_org_id, p.isactive, p.created, p.createdby, p.updated, p.updatedby, p.m_product_id, 0 AS qtyonhand, NULL AS qtyorderonhand, 0 AS preqtyonhand, NULL AS preqtyorderonhand, p.c_uom_id, NULL AS m_product_uom_id, 
 CASE p.attrsetvaluetype
 WHEN 'D' THEN p.m_attributesetinstance_id
 ELSE NULL
-END) AS m_attributesetinstance_id, sd.m_locator_id, 
-CASE
-WHEN sd.m_storage_detail_id IS NOT NULL THEN 'Y'
-ELSE 'N'
-END AS stocked
-FROM m_product p
-LEFT JOIN (SELECT p.m_product_id || sdd.m_storage_detail_id AS m_product_stock_v_id, sdd.m_storage_detail_id, l.ad_client_id, l.ad_org_id, l.isactive, sdd.created, sdd.createdby, sdd.updated, sdd.updatedby, sdd.m_product_id, sdd.qtyonhand, sdd.qtyorderonhand, sdd.preqtyonhand, sdd.preqtyorderonhand, sdd.c_uom_id, sdd.m_product_uom_id, sdd.m_attributesetinstance_id, sdd.m_locator_id, 'Y' AS stocked
-FROM m_storage_detail sdd
-JOIN m_locator l ON sdd.m_locator_id = l.m_locator_id
-JOIN m_product p ON sdd.m_product_id = p.m_product_id AND p.isactive = 'Y'
-WHERE sdd.qtyonhand <> 0 OR COALESCE(sdd.qtyorderonhand, 0) <> 0) sd ON p.m_product_id = sd.m_product_id]]></view>
+END AS m_attributesetinstance_id, NULL AS m_locator_id, 'N' AS stocked
+FROM m_product p]]></view>
   </database>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -200186,6 +200186,7 @@
 <!--803851-->  <COLUMNNAME><![CDATA[AD_Role_ID]]></COLUMNNAME>
 <!--803851-->  <AD_TABLE_ID><![CDATA[592]]></AD_TABLE_ID>
 <!--803851-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--803851-->  <AD_VAL_RULE_ID><![CDATA[158]]></AD_VAL_RULE_ID>
 <!--803851-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
 <!--803851-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--803851-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -218031,6 +218032,7 @@
 <!--3AE62A8262C1481EB0AA36315B026371-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--3AE62A8262C1481EB0AA36315B026371-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--3AE62A8262C1481EB0AA36315B026371-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3AE62A8262C1481EB0AA36315B026371-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--3AE62A8262C1481EB0AA36315B026371--></AD_COLUMN>
 
 <!--3B0B06935CE4426AB45EA841B598C5CB--><AD_COLUMN>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[Core]]></NAME>
-<!--0-->  <VERSION><![CDATA[3.0.13994]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.14048]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/src/org/openbravo/base/structure/IdentifierProvider.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/src/org/openbravo/base/structure/IdentifierProvider.java	Sun Oct 23 13:37:42 2011 +0200
@@ -72,7 +72,9 @@
    * @return the identifier
    */
   public String getIdentifier(Object o) {
-    return getIdentifier(o, true, OBContext.getOBContext().getLanguage());
+    final Language lang = OBContext.getOBContext() != null ? OBContext.getOBContext().getLanguage()
+        : null;
+    return getIdentifier(o, true, lang);
   }
 
   // identifyDeep determines if refered to objects are used
--- a/src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql	Sun Oct 23 11:13:08 2011 +0000
+++ b/src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql	Sun Oct 23 13:37:42 2011 +0200
@@ -164,7 +164,6 @@
                u.email as mailto, c.ad_language, c.ad_client_id
           from ad_alertrecipient  ar, ad_user u, ad_client c
           where ar.ad_alertrule_id = ?
-            and ar.ad_client_id = u.ad_client_id
             and u.ad_client_id = c.ad_client_id
             and ar.ad_user_id = u.ad_user_id
             and c.requestuser is not null
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html	Sun Oct 23 11:13:08 2011 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html	Sun Oct 23 13:37:42 2011 +0200
@@ -56,6 +56,12 @@
 	frm.inpdocbasetype.value = docbasetype;
 	return submitCommandForm(Command, false, frm, null, null, false, true);
 }
+function openJournalEntry(tabId, recordId){
+	var myframe = getFrame('LayoutMDI') || top.opener;
+	if (myframe) {
+		myframe.OB.Utilities.openDirectTab(tabId, recordId);
+    }
+}
 function imprimir()
 {
 	openPDFFiltered("ReportGeneralLedgerJournalPDF.pdf?Command=PDF","PDF");
@@ -436,7 +442,7 @@
                   <div id="sectionJournal"> 
                     <table cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;">
                       <tr class="DataGrid_Body_Row">
-                        <th class="DataGrid_Header_Cell"> <a href="#" onclick="submitPage('DEFAULT', document.frmSecondary, 'xx', 'yy', 'zz');return false;" onmouseover="window.status='General Ledger Journal';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="fieldId"> 
+                        <th class="DataGrid_Header_Cell"> <a href="#" onclick="openJournalEntry('ww', 'xx');return false;" onmouseover="window.status='General Ledger Journal';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="fieldId"> 
                           Journal Entry&nbsp;<span id="functionCalculateOrderJournal">xx123</span><!--span id="functionCalculateOrderJournalWithInitial">xx123</span--></a>
                           <input type="hidden" name="inpordenJournal" id="functionOrderJournal" value=""></input>
                         </th>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml	Sun Oct 23 11:13:08 2011 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml	Sun Oct 23 13:37:42 2011 +0200
@@ -85,6 +85,7 @@
     <FIELD id="fieldId" attribute="onclick" replace="xx">id</FIELD>
     <FIELD id="fieldId" attribute="onclick" replace="yy">adTableId</FIELD>
     <FIELD id="fieldId" attribute="onclick" replace="zz">docbasetype</FIELD>
+    <FIELD id="fieldId" attribute="onclick" replace="ww">tabId</FIELD>
     <FUNCTION id="functionOrderJournal" name="ORDER" attribute="value">identifier</FUNCTION>
     <FUNCTION id="functionCalculateOrderJournal" name="ADD" arg1="functionOrderJournal" arg2="paramGroupId" format="integerInform"/>
     <FUNCTION id="functionCalculateOrderJournalWithInitial" name="ADD" arg1="functionCalculateOrderJournal" arg2="paramEntryNo" format="integerInform"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql	Sun Oct 23 11:13:08 2011 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql	Sun Oct 23 13:37:42 2011 +0200
@@ -28,15 +28,15 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
     <![CDATA[
-      SELECT SCHEMA_ID, SCHEMA_NAME, IDENTIFIER, DATEACCT, VALUE, NAME, ID, AD_TABLE_ID, DOCBASETYPE, SEQNO, '' AS TOTAL, '' AS DESCRIPTION,
-      (CASE FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3 ELSE 4 END) AS FACTACCTTYPE2,
-      (CASE AMTACCTDR WHEN 0 THEN NULL ELSE AMTACCTDR END) AS AMTACCTDR, (CASE AMTACCTCR WHEN 0 THEN NULL ELSE AMTACCTCR END) AS AMTACCTCR, 
-      '' AS GROUPEDLINES, '' AS TAXID
+      SELECT AA.SCHEMA_ID, AA.SCHEMA_NAME, AA.IDENTIFIER, AA.DATEACCT, AA.VALUE, AA.NAME, AA.ID, AA.AD_TABLE_ID, AA.DOCBASETYPE, AA.SEQNO, '' AS TOTAL, '' AS DESCRIPTION,
+      (CASE AA.FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3 ELSE 4 END) AS FACTACCTTYPE2,
+      (CASE AA.AMTACCTDR WHEN 0 THEN NULL ELSE AA.AMTACCTDR END) AS AMTACCTDR, (CASE AA.AMTACCTCR WHEN 0 THEN NULL ELSE AA.AMTACCTCR END) AS AMTACCTCR, 
+      '' AS GROUPEDLINES, '' AS TAXID, TB.AD_TAB_ID TAB_ID
       FROM 
       (SELECT F.C_ACCTSCHEMA_ID AS SCHEMA_ID, SC.NAME AS SCHEMA_NAME, F.FACT_ACCT_GROUP_ID AS IDENTIFIER, F.DATEACCT,
       F.ACCTVALUE AS VALUE, F.ACCTDESCRIPTION AS NAME,F.RECORD_ID AS ID, F.AD_TABLE_ID, F.DOCBASETYPE,
-      sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO) AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE
-      FROM FACT_ACCT F, C_ACCTSCHEMA SC  
+      sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO) AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE, F.AD_CLIENT_ID
+      FROM FACT_ACCT F, C_ACCTSCHEMA SC
       WHERE F.AD_CLIENT_ID IN ('1')
       AND F.AD_ORG_ID IN('1')
       AND 1=1
@@ -45,7 +45,16 @@
       AND f.C_ACCTSCHEMA_ID = SC.C_ACCTSCHEMA_ID
       GROUP BY f.C_ACCTSCHEMA_ID, SC.NAME, F.AD_TABLE_ID, F.DATEACCT, F.ACCTDESCRIPTION, F.ACCTVALUE, F.DOCBASETYPE, F.RECORD_ID, 
       F.FACT_ACCT_GROUP_ID, F.ACCOUNT_ID,F.FACTACCTTYPE,
-      (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1 ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END)) AA
+      (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1 ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END), F.AD_CLIENT_ID) AA,
+      AD_TABLE T, AD_TAB TB, AD_WINDOW W, AD_COLUMN C
+      WHERE T.AD_TABLE_ID = AA.AD_TABLE_ID
+      AND AA.AD_TABLE_ID = TB.AD_TABLE_ID
+      AND TB.AD_WINDOW_ID = W.AD_WINDOW_ID
+      AND C.AD_TABLE_ID = AA.AD_TABLE_ID
+      AND (CASE (SELECT MAX(ISSOTRX) FROM C_DOCTYPE D
+                  WHERE D.DOCBASETYPE = AA.DOCBASETYPE
+                  AND D.AD_CLIENT_ID = AA.AD_CLIENT_ID) WHEN 'N' THEN COALESCE(T.PO_WINDOW_ID, T.AD_WINDOW_ID) ELSE T.AD_WINDOW_ID END) = W.AD_WINDOW_ID
+      AND C.ISKEY = 'Y'
       ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, SEQNO
       ]]></Sql>
     <Field name="rownum" value="count"/>
@@ -150,13 +159,13 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
     <![CDATA[
-      SELECT SCHEMA_ID, SCHEMA_NAME, IDENTIFIER, DATEACCT, VALUE, NAME, ID, AD_TABLE_ID, DOCBASETYPE, SEQNO, '' AS TOTAL, '' AS DESCRIPTION,
-      (CASE FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3 ELSE 4 END) AS FACTACCTTYPE2,
-      (CASE AMTACCTDR WHEN 0 THEN NULL ELSE AMTACCTDR END) AS AMTACCTDR, (CASE AMTACCTCR WHEN 0 THEN NULL ELSE AMTACCTCR END) AS AMTACCTCR
+      SELECT AA.SCHEMA_ID, AA.SCHEMA_NAME, AA.IDENTIFIER, AA.DATEACCT, AA.VALUE, AA.NAME, AA.ID, AA.AD_TABLE_ID, AA.DOCBASETYPE, AA.SEQNO, '' AS TOTAL, '' AS DESCRIPTION,
+      (CASE AA.FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3 ELSE 4 END) AS FACTACCTTYPE2,
+      (CASE AA.AMTACCTDR WHEN 0 THEN NULL ELSE AA.AMTACCTDR END) AS AMTACCTDR, (CASE AA.AMTACCTCR WHEN 0 THEN NULL ELSE AA.AMTACCTCR END) AS AMTACCTCR, TB.AD_TAB_ID AS TAB_ID
       FROM 
       (SELECT F.C_ACCTSCHEMA_ID AS SCHEMA_ID, SC.NAME AS SCHEMA_NAME, F.FACT_ACCT_GROUP_ID AS IDENTIFIER, F.DATEACCT,
       F.ACCTVALUE AS VALUE, F.ACCTDESCRIPTION AS NAME,F.RECORD_ID AS ID, F.AD_TABLE_ID, F.DOCBASETYPE,
-      sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO) AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE
+      sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO) AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE, F.AD_CLIENT_ID
       FROM FACT_ACCT F, C_ACCTSCHEMA SC 
       WHERE F.AD_CLIENT_ID IN ('1')
       AND F.AD_ORG_ID IN('1')
@@ -164,7 +173,16 @@
       AND f.C_ACCTSCHEMA_ID = SC.C_ACCTSCHEMA_ID
       GROUP BY f.C_ACCTSCHEMA_ID, SC.NAME, F.AD_TABLE_ID, F.DATEACCT, F.ACCTDESCRIPTION, F.ACCTVALUE, F.DOCBASETYPE, F.RECORD_ID, 
       F.FACT_ACCT_GROUP_ID, F.ACCOUNT_ID,F.FACTACCTTYPE,
-      (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1 ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END)) AA
+      (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1 ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END), F.AD_CLIENT_ID) AA,
+      AD_TABLE T, AD_TAB TB, AD_WINDOW W, AD_COLUMN C
+      WHERE T.AD_TABLE_ID = AA.AD_TABLE_ID
+      AND AA.AD_TABLE_ID = TB.AD_TABLE_ID
+      AND TB.AD_WINDOW_ID = W.AD_WINDOW_ID
+      AND C.AD_TABLE_ID = AA.AD_TABLE_ID
+      AND (CASE (SELECT MAX(ISSOTRX) FROM C_DOCTYPE D
+                  WHERE D.DOCBASETYPE = AA.DOCBASETYPE
+                  AND D.AD_CLIENT_ID = AA.AD_CLIENT_ID) WHEN 'N' THEN COALESCE(T.PO_WINDOW_ID, T.AD_WINDOW_ID) ELSE T.AD_WINDOW_ID END) = W.AD_WINDOW_ID
+      AND C.ISKEY = 'Y'
       ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, SEQNO
       ]]></Sql>
     <Field name="rownum" value="count"/>
@@ -209,13 +227,13 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
     <![CDATA[
-      SELECT SCHEMA_ID, SCHEMA_NAME, IDENTIFIER, DATEACCT, VALUE, NAME, ID, AD_TABLE_ID, DOCBASETYPE, SEQNO, '' AS TOTAL, '' AS DESCRIPTION,
-      (CASE FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3 ELSE 4 END) AS FACTACCTTYPE2,
-      (CASE AMTACCTDR WHEN 0 THEN NULL ELSE AMTACCTDR END) AS AMTACCTDR, (CASE AMTACCTCR WHEN 0 THEN NULL ELSE AMTACCTCR END) AS AMTACCTCR
+      SELECT AA.SCHEMA_ID, AA.SCHEMA_NAME, AA.IDENTIFIER, AA.DATEACCT, AA.VALUE, AA.NAME, AA.ID, AA.AD_TABLE_ID, AA.DOCBASETYPE, AA.SEQNO, '' AS TOTAL, '' AS DESCRIPTION,
+      (CASE AA.FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3 ELSE 4 END) AS FACTACCTTYPE2,
+      (CASE AA.AMTACCTDR WHEN 0 THEN NULL ELSE AA.AMTACCTDR END) AS AMTACCTDR, (CASE AA.AMTACCTCR WHEN 0 THEN NULL ELSE AA.AMTACCTCR END) AS AMTACCTCR, TB.AD_TAB_ID TAB_ID
       FROM 
       (SELECT F.C_ACCTSCHEMA_ID AS SCHEMA_ID, SC.NAME AS SCHEMA_NAME, F.FACT_ACCT_GROUP_ID AS IDENTIFIER, F.DATEACCT,
       F.ACCTVALUE AS VALUE, F.ACCTDESCRIPTION AS NAME,F.RECORD_ID AS ID, F.AD_TABLE_ID, F.DOCBASETYPE,
-      sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO) AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE
+      sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO) AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE, F.AD_CLIENT_ID
       FROM FACT_ACCT F, C_ACCTSCHEMA SC 
       WHERE F.AD_CLIENT_ID IN ('1')
       AND F.AD_ORG_ID IN('1')
@@ -223,7 +241,16 @@
       AND F.Fact_Acct_Group_ID = ?
       GROUP BY f.C_ACCTSCHEMA_ID, SC.NAME, F.AD_TABLE_ID, F.DATEACCT, F.ACCTDESCRIPTION, F.ACCTVALUE, F.DOCBASETYPE, F.RECORD_ID, 
       F.FACT_ACCT_GROUP_ID, F.ACCOUNT_ID,F.FACTACCTTYPE,
-      (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1 ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END)) AA
+      (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1 ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END), F.AD_CLIENT_ID) AA,
+      AD_TABLE T, AD_TAB TB, AD_WINDOW W, AD_COLUMN C
+      WHERE T.AD_TABLE_ID = AA.AD_TABLE_ID
+      AND AA.AD_TABLE_ID = TB.AD_TABLE_ID
+      AND TB.AD_WINDOW_ID = W.AD_WINDOW_ID
+      AND C.AD_TABLE_ID = AA.AD_TABLE_ID
+      AND (CASE (SELECT MAX(ISSOTRX) FROM C_DOCTYPE D
+                  WHERE D.DOCBASETYPE = AA.DOCBASETYPE
+                  AND D.AD_CLIENT_ID = AA.AD_CLIENT_ID) WHEN 'N' THEN COALESCE(T.PO_WINDOW_ID, T.AD_WINDOW_ID) ELSE T.AD_WINDOW_ID END) = W.AD_WINDOW_ID
+      AND C.ISKEY = 'Y'
       ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, SEQNO
       ]]></Sql>
     <Field name="rownum" value="count"/>
--- a/src/org/openbravo/erpCommon/security/Login.html	Sun Oct 23 11:13:08 2011 +0000
+++ b/src/org/openbravo/erpCommon/security/Login.html	Sun Oct 23 13:37:42 2011 +0200
@@ -416,58 +416,58 @@
 
       <div class="Login_LogForm">
         <form method="post" action="../secureApp/LoginHandler.html" name="frmIdentificacion" id="frmFormulario" autocomplete="off">
-            <input type="hidden" name="Command" value="" />
+          <input type="hidden" name="Command" value="" />
 
-            <div class="Login_LogForm_CompanyLogo_Container">
-              <div class="Login_LogForm_CompanyLogo" id="CompanyLogo_Container" style="display: none;"><img class="Login_Logo_Company" src="../../../../../web/images/blank.gif" /></div>
+          <div class="Login_LogForm_CompanyLogo_Container">
+            <div class="Login_LogForm_CompanyLogo" id="CompanyLogo_Container" style="display: none;"><img class="Login_Logo_Company" src="../../../../../web/images/blank.gif" /></div>
+          </div>
+          <div class="Login_LogForm_Input_Container">
+            <dl>
+              <dt>
+                <label for="user" class="LabelText Login_LabelText">User Name</label>
+              </dt>
+              <dd>
+                <input class="dojoValidateValid Login_TextBox" type="text" maxlength="60" name="user" id="user" />
+              </dd>
+              <dt>
+                <label for="password" class="LabelText Login_LabelText">Password</label>
+              </dt>
+              <dd>
+                <input class="dojoValidateValid Login_TextBox" type="password" maxlength="40" name="password" id="password" />
+              </dd>
+            </dl>
+            <div id="errorMsg" class="LabelText Login_ErrorMsg_Container" style="display:none;">
+              <span id="errorMsgTitle_Container"><span id="errorMsgTitle" class="Login_ErrorMsg_Title">xx</span><br></span><span id="errorMsgContent" class="Login_ErrorMsg_Content">xx</span>
             </div>
-            <div class="Login_LogForm_Input_Container">
-              <dl>
-                <dt>
-                  <label for="user" class="LabelText Login_LabelText">User Name</label>
-                </dt>
-                <dd>
-                  <input class="dojoValidateValid Login_TextBox" type="text" maxlength="60" name="user" id="user"/>
-                </dd>
-                <dt>
-                  <label for="password" class="LabelText Login_LabelText">Password</label>
-                </dt>
-                <dd>
-                  <input class="dojoValidateValid Login_TextBox" type="password" maxlength="40" name="password" id="password"/>
-                </dd>
-              </dl>
-              <div id="errorMsg" class="LabelText Login_ErrorMsg_Container" style="display:none;">
-                <span id="errorMsgTitle_Container"><span id="errorMsgTitle" class="Login_ErrorMsg_Title">xx</span><br></span><span id="errorMsgContent" class="Login_ErrorMsg_Content">xx</span>
-              </div>
-            </div>
-            <div class="Login_LogForm_Button_Container">
-              <div class="Login_LogForm_Button">
-                <button type="button" 
-                  id="buttonOK" 
-                  class="ButtonLink" 
-                  onclick="buttonOK_click();" 
-                  onfocus="buttonEvent('onfocus', this); window.status='Login'; return true;" 
-                  onblur="buttonEvent('onblur', this);" 
-                  onkeyup="buttonEvent('onkeyup', this);" 
-                  onkeydown="buttonEvent('onkeydown', this);" 
-                  onkeypress="buttonEvent('onkeypress', this);" 
-                  onmouseup="buttonEvent('onmouseup', this);" 
-                  onmousedown="buttonEvent('onmousedown', this);" 
-                  onmouseover="buttonEvent('onmouseover', this); window.status='Login'; return true;" 
-                  onmouseout="buttonEvent('onmouseout', this);">
-                  <table class="Button" id="fieldTable">
-                    <tr>
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="Login" title="Login" src="../../../../../web/images/blank.gif" border="0" id="fieldButton" /></td>
-                      <td class="Button_text Button_width">Log in</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </button>
-              </div>
-              <div id="sign-in" style="margin-top:12px;">xxxSignIn</div>
-            </div>
+          </div>
+        </form>
+        <div class="Login_LogForm_Button_Container">
+          <div class="Login_LogForm_Button">
+            <button type="button" 
+              id="buttonOK" 
+              class="ButtonLink" 
+              onclick="buttonOK_click();" 
+              onfocus="buttonEvent('onfocus', this); window.status='Login'; return true;" 
+              onblur="buttonEvent('onblur', this);" 
+              onkeyup="buttonEvent('onkeyup', this);" 
+              onkeydown="buttonEvent('onkeydown', this);" 
+              onkeypress="buttonEvent('onkeypress', this);" 
+              onmouseup="buttonEvent('onmouseup', this);" 
+              onmousedown="buttonEvent('onmousedown', this);" 
+              onmouseover="buttonEvent('onmouseover', this); window.status='Login'; return true;" 
+              onmouseout="buttonEvent('onmouseout', this);">
+              <table class="Button" id="fieldTable">
+                <tr>
+                  <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="Login" title="Login" src="../../../../../web/images/blank.gif" border="0" id="fieldButton" /></td>
+                  <td class="Button_text Button_width">Log in</td>
+                  <td class="Button_right"></td>
+                </tr>
+              </table>
+            </button>
+          </div>
+          <div id="sign-in" style="margin-top:12px;">xxxSignIn</div>
+        </div>
 
-        </form>
       </div>
 
       <div class="Login_TopLogos_Container_Support_Forge" id="TopLogos_Container" style="display: none;">
--- a/src/org/openbravo/erpCommon/utility/ReferencedLink.java	Sun Oct 23 11:13:08 2011 +0000
+++ b/src/org/openbravo/erpCommon/utility/ReferencedLink.java	Sun Oct 23 13:37:42 2011 +0200
@@ -222,9 +222,13 @@
         if (data == null || data.length == 0)
           throw new ServletException("Window not found");
 
-        strWindowId = data[0].adWindowId;
-        if (!isSOTrx && !data[0].poWindowId.equals(""))
+        // only in case an adWindowId is returned
+        if (!data[0].adWindowId.equals("")) {
+          strWindowId = data[0].adWindowId;
+        }
+        if (!isSOTrx && !data[0].poWindowId.equals("")) {
           strWindowId = data[0].poWindowId;
+        }
       }
     }
     ReferencedLinkData[] data = ReferencedLinkData.select(this, strWindowId, strTableReferenceId);
--- a/src/org/openbravo/erpCommon/utility/WindowTree.html	Sun Oct 23 11:13:08 2011 +0000
+++ b/src/org/openbravo/erpCommon/utility/WindowTree.html	Sun Oct 23 13:37:42 2011 +0200
@@ -44,7 +44,12 @@
 </script>
   <script language="JavaScript" type="text/javascript">
     function dblClickItem(nodeID) {
-      top.opener.submitCommandForm("EDIT", false, null, document.forms[0].myAction.value + "?Command=EDIT&" + getKeyField().name + "=" + nodeID, '_self');
+      var layoutMDI = getFrame('LayoutMDI');
+      if (layoutMDI) {
+        layoutMDI.OB.Utilities.openDirectTab(document.frmMain.inpTabId.value, nodeID);
+      } else {
+        top.opener.submitCommandForm("EDIT", false, null, document.forms[0].myAction.value + "?Command=EDIT&" + getKeyField().name + "=" + nodeID, '_self');
+      }
       return true;
     }
   </script>
@@ -196,11 +201,7 @@
   }
   
   function closeThis(){
-    if (isWindowInMDIPopup) {
-      getFrame('mainParent').frames[1].getFrame('LayoutMDI').OB.Layout.ClassicOBCompatibility.Popup.close(MDIPopupId);
-    } else {
-      window.close();    
-    }
+    closePage();
   }
 </script>  
 </head>