[pw] merged back display logic in param windows
authorAsier Lostalé <asier.lostale@openbravo.com>
Fri, 25 Jan 2013 14:23:32 +0100
changeset 19449 17b59edeb944
parent 19448 2188907844eb (current diff)
parent 19439 87bffc7d1561 (diff)
child 19450 d0d2ca046bbb
[pw] merged back display logic in param windows
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
--- a/.hgsigs	Fri Jan 25 14:20:51 2013 +0100
+++ b/.hgsigs	Fri Jan 25 14:23:32 2013 +0100
@@ -96,5 +96,7 @@
 9fd46b5349c522407c7fe4eaedeed678487e02a2 0 iEYEABECAAYFAlDK72cACgkQCX/oGf+2qkNv1gCfYsphl/F7dyNNh+u046YI9RwEdD4AoMPAoXJFhg9rV8gF6tZgeSMSAOV3
 73102dce4ea86f1b3fab97709f1832f39f89d227 0 iEYEABECAAYFAlDYYXMACgkQCX/oGf+2qkNpJQCg09+Ojgco2TaKN6BlNC4888yhLCgAoJfCfQ/93ePShFci2Fic/lzeg/wL
 1b9cd3d88a74c309ec1f97f4cf93ca161e1d6e7f 0 iEYEABECAAYFAlDvi2QACgkQCX/oGf+2qkMOhwCgvmcBpIUpUJH8otzrM3ZOu8uUgFEAoIdvXKVCLQKM5znHtX9Il/HJgzxO
+0de4d6a8de6d8676576cd03417b6e3cab9a7b78d 0 iEYEABECAAYFAlD+H7EACgkQCX/oGf+2qkMMSwCbBFZ24/VJnVdauBgZ4gIebPe9tB8AnA9F03aZPEkc27RXoFC7NfVSxt3B
 21ee53026babfbaa1acea42273889c2d292eb5b6 0 iEYEABECAAYFAlD2CwAACgkQCX/oGf+2qkMs8QCePue6nyUSbeurM9ltNo/cb3k0vA0An2JJzndMdd/1MAurX6DfEGCTo9Uj
 9fe1637c98a6cc490582445af850cc06b3e34a8e 0 iEYEABECAAYFAlD39dUACgkQCX/oGf+2qkMB5gCg/czNu6dng2nZxXKFiyTiuXHl0/IAoPKktgGNoj8crEuTaYuCrpYCtLTA
+b495316d385b5256fb3384d0c00d05e6e2eacf18 0 iEYEABECAAYFAlD/hhQACgkQCX/oGf+2qkNLsQCg5D7WvT3vF3tzs+LFk/nUZ6tSKHgAnjxJmaE7z0f0LWCD+ejguy0eDBJf
--- a/.hgtags	Fri Jan 25 14:20:51 2013 +0100
+++ b/.hgtags	Fri Jan 25 14:23:32 2013 +0100
@@ -107,5 +107,7 @@
 43986bd34e503950718f87d719d70fccfc8607fe 3.0MP18
 26a81bd13b9118ce8591e58ed7d04533469708f0 3.0MP18.1
 f4f500d33fc0161856f8e4b0ed737053f318313d 3.0MP18.2
+4023ea37e5619c3cd75559e1795a2609a5f97088 3.0MP18.3
 f6d77303909a01da297ca96e5c23f8de1106eb0b 3.0MP19
 964842f76d10b1752cfa63b69c370deb668abe4c 3.0MP19.1
+aaf6f469e183fe0ecaacc003f08d7c1879e64357 3.0MP19.2
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -427,7 +427,7 @@
 
               --When difference amount is not 0 the payment schedule detail of the order has to be split. The difference
               --amount is the amount of the new psd that is not related to any invoice.
-              IF (v_differenceamount <> 0) THEN
+              IF (v_differenceamount > 0) THEN
                 v_new_scheduledetailid := get_uuid();
                 INSERT INTO fin_payment_scheduledetail
                 (
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.19250]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.19250]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.19434]]></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/process/FIN_AddPaymentFromJournalLine.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java	Fri Jan 25 14:23:32 2013 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2012 Openbravo SLU
+ * All portions are Copyright (C) 2013 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -92,11 +92,11 @@
         throw new OBException("@FIN_NoMultiCurrencyAllowed@");
       }
       if (journalLine.getDebit().subtract(journalLine.getCredit()).compareTo(BigDecimal.ZERO) > 0
-          && !bPartner.isCustomer()) {
+          && bPartner != null && !bPartner.isCustomer()) {
         throw new OBException("@FIN_NoCustomer@");
       }
       if (journalLine.getDebit().subtract(journalLine.getCredit()).compareTo(BigDecimal.ZERO) < 0
-          && !bPartner.isVendor()) {
+          && bPartner != null && !bPartner.isVendor()) {
         throw new OBException("@FIN_NoVendor@");
       }
 
@@ -130,7 +130,8 @@
 
       // Print result
       if (message.getType().equals("Error")) {
-        String exceptionMessage = payment.getBusinessPartner().getName();
+        String exceptionMessage = payment.getBusinessPartner() != null ? payment
+            .getBusinessPartner().getName() : "";
         exceptionMessage += ": " + message.getMessage();
         throw new OBException(exceptionMessage);
       } else if (message.getType().equals("Warning")) {
@@ -141,7 +142,11 @@
         strMessageType = "Success";
       }
       strMessageResult.append("@Payment@ ").append(payment.getDocumentNo());
-      strMessageResult.append(" (").append(payment.getBusinessPartner().getName()).append(")");
+      strMessageResult
+          .append(" (")
+          .append(
+              payment.getBusinessPartner() != null ? payment.getBusinessPartner().getName() : "")
+          .append(")");
       if (!"".equals(message.getMessage()))
         strMessageResult.append(": ").append(message.getMessage());
       strMessageResult.append("<br>");
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java	Fri Jan 25 14:23:32 2013 +0100
@@ -30,6 +30,7 @@
 import org.openbravo.advpaymentmngt.utility.Value;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.client.kernel.RequestContext;
+import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.database.ConnectionProvider;
 import org.openbravo.erpCommon.utility.OBError;
@@ -110,24 +111,32 @@
             return error;
           }
         } else {
-          for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) {
-            for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
-              BusinessPartner bPartner;
-              if (psd.getInvoicePaymentSchedule() == null) {
-                bPartner = psd.getOrderPaymentSchedule().getOrder().getBusinessPartner();
-              } else {
-                bPartner = psd.getInvoicePaymentSchedule().getInvoice().getBusinessPartner();
-              }
-              if (FIN_Utility.isBlockedBusinessPartner(bPartner.getId(), payment.isReceipt(), 4)) {
-                // If the Business Partner is blocked for Payments, the Payment will not be
-                // completed.
-                OBError error = new OBError();
-                error.setType("Error");
-                error.setMessage(strmessage1 + " " + bPartner.getIdentifier() + " " + strmessage2);
-                OBDal.getInstance().rollbackAndClose();
-                return error;
+          OBContext.setAdminMode(true);
+          try {
+            for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) {
+              for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
+                BusinessPartner bPartner = null;
+                if (psd.getInvoicePaymentSchedule() != null) {
+                  bPartner = psd.getInvoicePaymentSchedule().getInvoice().getBusinessPartner();
+                } else if (psd.getOrderPaymentSchedule() != null) {
+                  bPartner = psd.getOrderPaymentSchedule().getOrder().getBusinessPartner();
+                }
+                if (bPartner != null
+                    && FIN_Utility.isBlockedBusinessPartner(bPartner.getId(), payment.isReceipt(),
+                        4)) {
+                  // If the Business Partner is blocked for Payments, the Payment will not be
+                  // completed.
+                  OBError error = new OBError();
+                  error.setType("Error");
+                  error
+                      .setMessage(strmessage1 + " " + bPartner.getIdentifier() + " " + strmessage2);
+                  OBDal.getInstance().rollbackAndClose();
+                  return error;
+                }
               }
             }
+          } finally {
+            OBContext.restorePreviousMode();
           }
         }
       }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Fri Jan 25 14:23:32 2013 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2012 Openbravo SLU
+ * All portions are Copyright (C) 2010-2013 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -96,27 +96,34 @@
             return;
           }
         } else {
-          for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) {
-            for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
-              BusinessPartner bPartner;
-              if (psd.getInvoicePaymentSchedule() == null) {
-                bPartner = psd.getOrderPaymentSchedule().getOrder().getBusinessPartner();
-              } else {
-                bPartner = psd.getInvoicePaymentSchedule().getInvoice().getBusinessPartner();
-              }
-              if (FIN_Utility.isBlockedBusinessPartner(bPartner.getId(), payment.isReceipt(), 4)) {
-                // If the Business Partner is blocked for Payments, the Payment will not be
-                // completed.
-                msg.setType("Error");
-                msg.setTitle(Utility.messageBD(conProvider, "Error", language));
-                msg.setMessage(OBMessageUtils.messageBD("ThebusinessPartner") + " "
-                    + bPartner.getIdentifier() + " "
-                    + OBMessageUtils.messageBD("BusinessPartnerBlocked"));
-                bundle.setResult(msg);
-                OBDal.getInstance().rollbackAndClose();
-                return;
+          OBContext.setAdminMode(true);
+          try {
+            for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) {
+              for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
+                BusinessPartner bPartner = null;
+                if (psd.getInvoicePaymentSchedule() != null) {
+                  bPartner = psd.getInvoicePaymentSchedule().getInvoice().getBusinessPartner();
+                } else if (psd.getOrderPaymentSchedule() != null) {
+                  bPartner = psd.getOrderPaymentSchedule().getOrder().getBusinessPartner();
+                }
+                if (bPartner != null
+                    && FIN_Utility.isBlockedBusinessPartner(bPartner.getId(), payment.isReceipt(),
+                        4)) {
+                  // If the Business Partner is blocked for Payments, the Payment will not be
+                  // completed.
+                  msg.setType("Error");
+                  msg.setTitle(Utility.messageBD(conProvider, "Error", language));
+                  msg.setMessage(OBMessageUtils.messageBD("ThebusinessPartner") + " "
+                      + bPartner.getIdentifier() + " "
+                      + OBMessageUtils.messageBD("BusinessPartnerBlocked"));
+                  bundle.setResult(msg);
+                  OBDal.getInstance().rollbackAndClose();
+                  return;
+                }
               }
             }
+          } finally {
+            OBContext.restorePreviousMode();
           }
         }
       }
@@ -257,7 +264,7 @@
               description.append(strRefundCredit).append("\n");
 
             String truncateDescription = (description.length() > 255) ? description
-                .substring(0, 252).concat("...").toString() : description.toString();
+                .substring(0, 251).concat("...").toString() : description.toString();
             payment.setDescription(truncateDescription);
           }
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Fri Jan 25 14:23:32 2013 +0100
@@ -51,6 +51,7 @@
 import org.openbravo.dal.security.OrganizationStructureProvider;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.dal.service.OBQuery;
 import org.openbravo.data.FieldProvider;
 import org.openbravo.erpCommon.utility.FieldProviderFactory;
 import org.openbravo.erpCommon.utility.OBDateUtils;
@@ -67,6 +68,7 @@
 import org.openbravo.model.common.invoice.Invoice;
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentProposal;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
@@ -1165,4 +1167,34 @@
       OBContext.restorePreviousMode();
     }
   }
+
+  /**
+   * Returns Payment Details from a Payment ordered by Invoice and Order
+   */
+  public static List<FIN_PaymentDetail> getOrderedPaymentDetailList(FIN_Payment payment) {
+
+    List<FIN_PaymentDetail> pdList = null;
+
+    OBContext.setAdminMode();
+    try {
+      final StringBuilder whereClause = new StringBuilder();
+      whereClause.append(" as pd ");
+      whereClause.append(" left join pd." + FIN_PaymentDetail.PROPERTY_FINPAYMENTSCHEDULEDETAILLIST
+          + " as psd");
+      whereClause.append(" where pd." + FIN_PaymentDetail.PROPERTY_FINPAYMENT + ".id = '"
+          + payment.getId() + "'");
+      whereClause.append(" order by psd."
+          + FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE);
+      whereClause.append(", psd." + FIN_PaymentScheduleDetail.PROPERTY_ORDERPAYMENTSCHEDULE);
+
+      OBQuery<FIN_PaymentDetail> query = OBDal.getInstance().createQuery(FIN_PaymentDetail.class,
+          whereClause.toString());
+      pdList = query.list();
+
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+
+    return pdList;
+  }
 }
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.19250]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.19250]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -5900,7 +5900,7 @@
 <!--CD3A95C8A05D45A0A2B6D250E9C83170-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--CD3A95C8A05D45A0A2B6D250E9C83170-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--CD3A95C8A05D45A0A2B6D250E9C83170-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--CD3A95C8A05D45A0A2B6D250E9C83170-->  <POSITION><![CDATA[51]]></POSITION>
+<!--CD3A95C8A05D45A0A2B6D250E9C83170-->  <POSITION><![CDATA[52]]></POSITION>
 <!--CD3A95C8A05D45A0A2B6D250E9C83170-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--CD3A95C8A05D45A0A2B6D250E9C83170-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--CD3A95C8A05D45A0A2B6D250E9C83170-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -2148,7 +2148,8 @@
 <!--87DDE03149A94326BE55DC158625D244-->  <AD_COLUMN_ID><![CDATA[B2DDC4BECBF24431AB1940C2A38F9C54]]></AD_COLUMN_ID>
 <!--87DDE03149A94326BE55DC158625D244-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--87DDE03149A94326BE55DC158625D244-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--87DDE03149A94326BE55DC158625D244-->  <DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ = 'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ = '14']]></DISPLAYLOGIC>
+<!--87DDE03149A94326BE55DC158625D244-->  <DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ = 'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ = '14' | 
+@OBUIAPP_Field_Reference@ = '7CB371C13D204EB69BF370217F692999']]></DISPLAYLOGIC>
 <!--87DDE03149A94326BE55DC158625D244-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--87DDE03149A94326BE55DC158625D244-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--87DDE03149A94326BE55DC158625D244-->  <SEQNO><![CDATA[62]]></SEQNO>
@@ -2682,7 +2683,8 @@
 <!--B79252A201AA41C091F9498DF820A0AC-->  <AD_COLUMN_ID><![CDATA[1A96C47A27AC49D7BEA41E57BBD59948]]></AD_COLUMN_ID>
 <!--B79252A201AA41C091F9498DF820A0AC-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--B79252A201AA41C091F9498DF820A0AC-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--B79252A201AA41C091F9498DF820A0AC-->  <DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ = 'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ = '14']]></DISPLAYLOGIC>
+<!--B79252A201AA41C091F9498DF820A0AC-->  <DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ = 'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ = '14'|
+@OBUIAPP_Field_Reference@ = '7CB371C13D204EB69BF370217F692999' ]]></DISPLAYLOGIC>
 <!--B79252A201AA41C091F9498DF820A0AC-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--B79252A201AA41C091F9498DF820A0AC-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--B79252A201AA41C091F9498DF820A0AC-->  <SEQNO><![CDATA[64]]></SEQNO>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -541,6 +541,17 @@
 <!--6504DF0738A142D599C824644653BA88-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--6504DF0738A142D599C824644653BA88--></AD_MESSAGE>
 
+<!--66D4232BC6894DCEB71DAB06F9757BB3--><AD_MESSAGE>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->  <AD_MESSAGE_ID><![CDATA[66D4232BC6894DCEB71DAB06F9757BB3]]></AD_MESSAGE_ID>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->  <VALUE><![CDATA[OBUIAPP_MakeSelectionBold]]></VALUE>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->  <MSGTEXT><![CDATA[Make Selection Bold]]></MSGTEXT>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--66D4232BC6894DCEB71DAB06F9757BB3-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--66D4232BC6894DCEB71DAB06F9757BB3--></AD_MESSAGE>
+
 <!--675524506E80458799E39F8CC309CBFD--><AD_MESSAGE>
 <!--675524506E80458799E39F8CC309CBFD-->  <AD_MESSAGE_ID><![CDATA[675524506E80458799E39F8CC309CBFD]]></AD_MESSAGE_ID>
 <!--675524506E80458799E39F8CC309CBFD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -552,6 +563,17 @@
 <!--675524506E80458799E39F8CC309CBFD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--675524506E80458799E39F8CC309CBFD--></AD_MESSAGE>
 
+<!--67995E233DA64EDE9029395E900C21ED--><AD_MESSAGE>
+<!--67995E233DA64EDE9029395E900C21ED-->  <AD_MESSAGE_ID><![CDATA[67995E233DA64EDE9029395E900C21ED]]></AD_MESSAGE_ID>
+<!--67995E233DA64EDE9029395E900C21ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--67995E233DA64EDE9029395E900C21ED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--67995E233DA64EDE9029395E900C21ED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--67995E233DA64EDE9029395E900C21ED-->  <VALUE><![CDATA[OBUIAPP_MakeSelectionItalic]]></VALUE>
+<!--67995E233DA64EDE9029395E900C21ED-->  <MSGTEXT><![CDATA[Make Selection Italic]]></MSGTEXT>
+<!--67995E233DA64EDE9029395E900C21ED-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--67995E233DA64EDE9029395E900C21ED-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--67995E233DA64EDE9029395E900C21ED--></AD_MESSAGE>
+
 <!--6831E84EB2124F08B3FCEF6F50CF8AD1--><AD_MESSAGE>
 <!--6831E84EB2124F08B3FCEF6F50CF8AD1-->  <AD_MESSAGE_ID><![CDATA[6831E84EB2124F08B3FCEF6F50CF8AD1]]></AD_MESSAGE_ID>
 <!--6831E84EB2124F08B3FCEF6F50CF8AD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -674,6 +696,17 @@
 <!--7ACEA04C52F349C08E1157F64262ECC9-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--7ACEA04C52F349C08E1157F64262ECC9--></AD_MESSAGE>
 
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7--><AD_MESSAGE>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->  <AD_MESSAGE_ID><![CDATA[7E82DFE4E6964861B0B9A8AA968E5AC7]]></AD_MESSAGE_ID>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->  <VALUE><![CDATA[OBUIAPP_SetFontSize]]></VALUE>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->  <MSGTEXT><![CDATA[Set Font Size]]></MSGTEXT>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7E82DFE4E6964861B0B9A8AA968E5AC7--></AD_MESSAGE>
+
 <!--7E8A12D43C0D404F868CE36DB349C9FC--><AD_MESSAGE>
 <!--7E8A12D43C0D404F868CE36DB349C9FC-->  <AD_MESSAGE_ID><![CDATA[7E8A12D43C0D404F868CE36DB349C9FC]]></AD_MESSAGE_ID>
 <!--7E8A12D43C0D404F868CE36DB349C9FC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -719,6 +752,17 @@
 <!--822D5C3E1A014738B4D39BF2BF568C7C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--822D5C3E1A014738B4D39BF2BF568C7C--></AD_MESSAGE>
 
+<!--839DDEEC373B4151BC1C721AB90FB5AC--><AD_MESSAGE>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->  <AD_MESSAGE_ID><![CDATA[839DDEEC373B4151BC1C721AB90FB5AC]]></AD_MESSAGE_ID>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->  <VALUE><![CDATA[OBUIAPP_SetFont]]></VALUE>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->  <MSGTEXT><![CDATA[Set Font]]></MSGTEXT>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--839DDEEC373B4151BC1C721AB90FB5AC-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--839DDEEC373B4151BC1C721AB90FB5AC--></AD_MESSAGE>
+
 <!--888D0AF770AE4037B85120FB775FE038--><AD_MESSAGE>
 <!--888D0AF770AE4037B85120FB775FE038-->  <AD_MESSAGE_ID><![CDATA[888D0AF770AE4037B85120FB775FE038]]></AD_MESSAGE_ID>
 <!--888D0AF770AE4037B85120FB775FE038-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -873,6 +917,17 @@
 <!--A57B3DD733264DB1BB3D6F84EA104931-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--A57B3DD733264DB1BB3D6F84EA104931--></AD_MESSAGE>
 
+<!--A62959A6990A43089EEBDF89CE8FCC48--><AD_MESSAGE>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->  <AD_MESSAGE_ID><![CDATA[A62959A6990A43089EEBDF89CE8FCC48]]></AD_MESSAGE_ID>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->  <VALUE><![CDATA[OBUIAPP_MakeSelectionUnderlined]]></VALUE>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->  <MSGTEXT><![CDATA[Make Selection Underlined]]></MSGTEXT>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--A62959A6990A43089EEBDF89CE8FCC48-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--A62959A6990A43089EEBDF89CE8FCC48--></AD_MESSAGE>
+
 <!--ABFDBB83F58841EA9545D9ED8637513B--><AD_MESSAGE>
 <!--ABFDBB83F58841EA9545D9ED8637513B-->  <AD_MESSAGE_ID><![CDATA[ABFDBB83F58841EA9545D9ED8637513B]]></AD_MESSAGE_ID>
 <!--ABFDBB83F58841EA9545D9ED8637513B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -929,6 +984,17 @@
 <!--B355D5A55A734B61B57A6AEBF3B96863-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--B355D5A55A734B61B57A6AEBF3B96863--></AD_MESSAGE>
 
+<!--B378B800C798460590A117DFC76498F4--><AD_MESSAGE>
+<!--B378B800C798460590A117DFC76498F4-->  <AD_MESSAGE_ID><![CDATA[B378B800C798460590A117DFC76498F4]]></AD_MESSAGE_ID>
+<!--B378B800C798460590A117DFC76498F4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B378B800C798460590A117DFC76498F4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B378B800C798460590A117DFC76498F4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B378B800C798460590A117DFC76498F4-->  <VALUE><![CDATA[OBUIAPP_WindowFieldMandatory]]></VALUE>
+<!--B378B800C798460590A117DFC76498F4-->  <MSGTEXT><![CDATA[If the personalization type is 'Window' then the Window field is mandatory and cannot be left empty.]]></MSGTEXT>
+<!--B378B800C798460590A117DFC76498F4-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--B378B800C798460590A117DFC76498F4-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--B378B800C798460590A117DFC76498F4--></AD_MESSAGE>
+
 <!--B5B5ECA6E070496D8A773F264B200208--><AD_MESSAGE>
 <!--B5B5ECA6E070496D8A773F264B200208-->  <AD_MESSAGE_ID><![CDATA[B5B5ECA6E070496D8A773F264B200208]]></AD_MESSAGE_ID>
 <!--B5B5ECA6E070496D8A773F264B200208-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1061,6 +1127,17 @@
 <!--CE3E9A8711D54E719F02630BE8D5E2FB-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--CE3E9A8711D54E719F02630BE8D5E2FB--></AD_MESSAGE>
 
+<!--CF668C49E43D4FA799A43191EA10C17A--><AD_MESSAGE>
+<!--CF668C49E43D4FA799A43191EA10C17A-->  <AD_MESSAGE_ID><![CDATA[CF668C49E43D4FA799A43191EA10C17A]]></AD_MESSAGE_ID>
+<!--CF668C49E43D4FA799A43191EA10C17A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CF668C49E43D4FA799A43191EA10C17A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CF668C49E43D4FA799A43191EA10C17A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CF668C49E43D4FA799A43191EA10C17A-->  <VALUE><![CDATA[OBUIAPP_SetHyperlinkURL]]></VALUE>
+<!--CF668C49E43D4FA799A43191EA10C17A-->  <MSGTEXT><![CDATA[Set Hyperlink URL]]></MSGTEXT>
+<!--CF668C49E43D4FA799A43191EA10C17A-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--CF668C49E43D4FA799A43191EA10C17A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--CF668C49E43D4FA799A43191EA10C17A--></AD_MESSAGE>
+
 <!--D109B6F7D8BF4F5C9D84463CD36BF434--><AD_MESSAGE>
 <!--D109B6F7D8BF4F5C9D84463CD36BF434-->  <AD_MESSAGE_ID><![CDATA[D109B6F7D8BF4F5C9D84463CD36BF434]]></AD_MESSAGE_ID>
 <!--D109B6F7D8BF4F5C9D84463CD36BF434-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1149,6 +1226,17 @@
 <!--E20A23145D554996A09BC927B847F3BB-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--E20A23145D554996A09BC927B847F3BB--></AD_MESSAGE>
 
+<!--E25F7BC6017747E08BDBAD4DD01DD316--><AD_MESSAGE>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->  <AD_MESSAGE_ID><![CDATA[E25F7BC6017747E08BDBAD4DD01DD316]]></AD_MESSAGE_ID>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->  <VALUE><![CDATA[OBUIAPP_StrikeThroughSelection]]></VALUE>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->  <MSGTEXT><![CDATA[Strike Through Selection]]></MSGTEXT>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--E25F7BC6017747E08BDBAD4DD01DD316-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--E25F7BC6017747E08BDBAD4DD01DD316--></AD_MESSAGE>
+
 <!--E4446D7FB74A4C57A9C715B4DDACC3E9--><AD_MESSAGE>
 <!--E4446D7FB74A4C57A9C715B4DDACC3E9-->  <AD_MESSAGE_ID><![CDATA[E4446D7FB74A4C57A9C715B4DDACC3E9]]></AD_MESSAGE_ID>
 <!--E4446D7FB74A4C57A9C715B4DDACC3E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.19250]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.19250]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.19434]]></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/src/org/openbravo/client/application/ApplicationComponentProvider.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Fri Jan 25 14:23:32 2013 +0100
@@ -146,6 +146,8 @@
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js", true));
     globalResources.add(createStaticResource(
+        "web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js", true));
+    globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js", true));
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js", true));
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/WindowPersonalizationEventHandler.java	Fri Jan 25 14:23:32 2013 +0100
@@ -0,0 +1,61 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2013 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.client.application.event;
+
+import javax.enterprise.event.Observes;
+
+import org.apache.log4j.Logger;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.client.application.UIPersonalization;
+import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
+import org.openbravo.client.kernel.event.EntityUpdateEvent;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.ad.ui.Window;
+import org.openbravo.service.db.DalConnectionProvider;
+
+public class WindowPersonalizationEventHandler extends EntityPersistenceEventObserver {
+
+  private static Entity[] entities = { ModelProvider.getInstance().getEntity(
+      UIPersonalization.ENTITY_NAME) };
+  protected Logger logger = Logger.getLogger(this.getClass());
+
+  @Override
+  protected Entity[] getObservedEntities() {
+    return entities;
+  }
+
+  public void onUpdate(@Observes EntityUpdateEvent event) {
+    if (!isValidEvent(event)) {
+      return;
+    }
+    final UIPersonalization uiPersonalization = (UIPersonalization) event.getTargetInstance();
+    String personalizationType = uiPersonalization.getType();
+    Window personalizationWindow = uiPersonalization.getWindow();
+    if ("Window".equals(personalizationType) && (personalizationWindow == null)) {
+      String language = OBContext.getOBContext().getLanguage().getLanguage();
+      ConnectionProvider conn = new DalConnectionProvider(false);
+      throw new OBException(Utility.messageBD(conn, "OBUIAPP_WindowFieldMandatory", language));
+    }
+  }
+}
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java	Fri Jan 25 14:23:32 2013 +0100
@@ -142,7 +142,7 @@
     if (uiPersonalization.getVisibleAtOrganization() != null) {
       final String orgId = (String) DalUtil.getId(uiPersonalization.getVisibleAtOrganization());
       for (RoleOrganization roleOrg : adminOrgs) {
-        if (DalUtil.getId(roleOrg).equals(orgId)) {
+        if (DalUtil.getId(roleOrg.getOrganization()).equals(orgId)) {
           return true;
         }
       }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js	Fri Jan 25 14:23:32 2013 +0100
@@ -590,7 +590,7 @@
     }
     if (!isc.isA.String(value)) {
       // on purpose no grouping symbol
-      return OB.Utilities.Number.JSToOBMasked(value, OB.Format.defaultNumericMask, OB.Format.defaultDecimalSymbol, null, OB.Format.defaultGroupingSize);
+      return OB.Utilities.Number.JSToOBMasked(value, type.maskNumeric, type.decSeparator, null, type.groupInterval);
     }
     return value;
   },
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js	Fri Jan 25 14:23:32 2013 +0100
@@ -0,0 +1,155 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use. this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2013 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+// == 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('OBRichTextItem', isc.RichTextItem);
+isc.ClassFactory.defineClass('OBRichTextEditor', isc.RichTextEditor);
+
+isc.OBRichTextItem.addProperties({
+  operator: 'iContains',
+  validateOnExit: true,
+  canvasConstructor: 'OBRichTextEditor',
+  canvasProperties: {
+    canFocus: true,
+    editAreaBackgroundColor: 'transparent',
+
+    // "fontControls", "formatControls", "styleControls" and "colorControls"
+    initialControlGroups: ["fontControls", "styleControls", "formatControls"],
+    controlGroups: ["fontControls", "styleControls", "formatControls"],
+
+    keyDown: function (event, eventInfo) {
+      var response = OB.KeyboardManager.Shortcuts.monitor('OBViewForm');
+      if (response !== false) {
+        response = this.Super('keyDown', arguments);
+      }
+      return response;
+    },
+
+    handleFocus: function (hasFocus) {
+      if (hasFocus) {
+        this.setStyleName(this.styleName + 'Focused');
+      } else if (this.styleName.endsWith('Focused')) {
+        this.setStyleName(this.styleName.substring(0, this.styleName.length - 'Focused'.length));
+      }
+      if (hasFocus && !this.hasFocus) {
+        this.setFocus(true);
+      }
+    },
+
+    setDisabled: function (disabled) {
+      if (disabled) {
+        this.previousStyleName = this.styleName;
+        this.setStyleName(this.editorStyleName + 'Disabled');
+        this.editArea.setStyleName(this.editAreaStyleName + 'Disabled');
+        this.toolbar.hide();
+      } else {
+        this.setStyleName(this.previousStyleName || this.editorStyleName);
+        delete this.previousStyleName;
+        this.editArea.setStyleName(this.editAreaStyleName);
+        this.toolbar.show();
+      }
+      this.Super('setDisabled', arguments);
+    },
+
+    // autochilds
+    editAreaProperties: {
+      canFocus: true,
+      styleName: 'OBFormFieldStatic',
+
+      keyDown: function (event, eventInfo) {
+        var response = OB.KeyboardManager.Shortcuts.monitor('OBViewForm');
+        if (response !== false) {
+          response = this.Super('keyDown', arguments);
+        }
+        return response;
+      },
+
+      focusChanged: function (hasFocus) {
+        this.parentElement.handleFocus(hasFocus);
+      }
+    },
+    toolbarProperties: {
+      canFocus: true,
+
+      keyDown: function (event, eventInfo) {
+        var response = OB.KeyboardManager.Shortcuts.monitor('OBViewForm');
+        if (response !== false) {
+          response = this.Super('keyDown', arguments);
+        }
+        return response;
+      },
+
+      focusChanged: function (hasFocus) {
+        this.parentElement.handleFocus(hasFocus);
+      },
+
+      // autochild of the autochild
+      buttonProperties: {
+        keyDown: function (event, eventInfo) {
+          var response = OB.KeyboardManager.Shortcuts.monitor('OBViewForm');
+          if (response !== false) {
+            response = this.Super('keyDown', arguments);
+          }
+          return response;
+        },
+
+        focusChanged: function (hasFocus) {
+          this.parentElement.parentElement.handleFocus(hasFocus);
+        }
+      }
+    }
+  },
+  selectOnFocus: false,
+  showFocused: true,
+  showTitle: true,
+  rowSpan: 2,
+  init: function () {
+    if (this.initStyle) {
+      this.initStyle();
+    }
+    this.Super('init', arguments);
+  },
+
+  itemHoverHTML: function (item, form) {
+    if (this.isDisabled()) {
+      return this.getValue();
+    }
+  }
+});
+
+isc.OBRichTextEditor.addProperties({
+  fontPrompt: OB.I18N.getLabel('OBUIAPP_SetFont'),
+  fontSizePrompt: OB.I18N.getLabel('OBUIAPP_SetFontSize'),
+  linkUrlTitle: OB.I18N.getLabel('OBUIAPP_SetHyperlinkURL'),
+
+  initWidget: function () {
+    this.boldSelectionDefaults.prompt = OB.I18N.getLabel('OBUIAPP_MakeSelectionBold');
+
+    this.italicSelectionDefaults.prompt = OB.I18N.getLabel('OBUIAPP_MakeSelectionItalic');
+    this.underlineSelectionDefaults.prompt = OB.I18N.getLabel('OBUIAPP_MakeSelectionUnderlined');
+    this.strikethroughSelectionDefaults.prompt = OB.I18N.getLabel('OBUIAPP_StrikeThroughSelection');
+
+    this.Super('initWidget', arguments);
+  }
+});
+
+// used in the grid
+isc.ClassFactory.defineClass('OBPopUpRichTextItem', isc.PopUpTextAreaItem);
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js	Fri Jan 25 14:23:32 2013 +0100
@@ -25,9 +25,12 @@
 isc.OBTextItem.addProperties({
   operator: 'iContains',
   validateOnExit: true,
+  maskSaveLiterals: true,
   itemHoverHTML: function (item, form) {
     if (this.isDisabled()) {
       return this.getValue();
+    } else if (this.mask) {
+      return this.mask;
     }
   }
 });
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Fri Jan 25 14:23:32 2013 +0100
@@ -2233,7 +2233,7 @@
         return !(this.hiddenInForm && !this.statusBarField) && context && originalShowIfValue;
       };
       if (fld.statusBarField) {
-        fld.showIf = '';
+        fld.showIf = null;
         fld.statusBarShowIf = newShowIf;
       } else {
         fld.showIf = newShowIf;
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Fri Jan 25 14:23:32 2013 +0100
@@ -82,6 +82,41 @@
   }
 });
 
+isc.OBRichTextItem.addProperties(isc.addProperties({}, OB.Styles.OBFormField.DefaultTextItem));
+
+isc.OBRichTextItem.addProperties({
+  styleCanvasProperties: {
+    styleName: 'OBFormFieldInput',
+    editorStyleName: 'OBFormFieldInput',
+    editAreaStyleName: 'OBFormFieldStatic',
+    editAreaBackgroundColor: 'transparent'
+  }
+});
+
+isc.OBRichTextItem.addProperties({
+  initStyle: function () {
+    var rowSpan = 4;
+    var singleRowHeight = this.height;
+    var multipleRowHeight = singleRowHeight + 24; // 24px = title height + form item padding defined in CSS
+    this.canvasProperties = isc.addProperties({}, this.canvasProperties || {}, this.styleCanvasProperties);
+
+    if (this.rowSpan) {
+      rowSpan = this.rowSpan;
+    }
+    var newHeight = singleRowHeight + (rowSpan - 1) * multipleRowHeight;
+    if (!this.colSpan) {
+      this.colSpan = 2;
+    }
+    this.height = newHeight;
+    this.overflow = "hidden";
+    this.showEdges = true;
+    // Standard control group options include
+    // "fontControls", "formatControls", "styleControls" and "colorControls"
+    this.controlGroups = ["fontControls", "styleControls"];
+
+  }
+});
+
 isc.OBSpinnerItem.addProperties(isc.addProperties({}, OB.Styles.OBFormField.DefaultTextItem));
 isc.OBSpinnerItem.INCREASE_ICON = isc.addProperties(isc.OBSpinnerItem.INCREASE_ICON, {
   width: 21,
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.19250]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.19250]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.19434]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_REF_MASK.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+  <database name="TABLE OBCLKER_REF_MASK">
+    <table name="OBCLKER_REF_MASK" primaryKey="AD_REF_MASK_KEY">
+      <column name="AD_REF_MASK_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_REFERENCE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="NAME" primaryKey="false" required="true" type="NVARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DESCRIPTION" primaryKey="false" required="false" type="NVARCHAR" size="255" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_REFERENCE" name="AD_REF_AD_REF_KEY">
+        <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_CLIENT" name="AD_REF_CLIENT_KEY">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_REF_ORG_KEY">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <check name="OBCLKER_REF_MASK_ISCTV_CHCK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -73,6 +73,44 @@
 <!--06E9B50BBF2D4869B028F51D11D432F6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--06E9B50BBF2D4869B028F51D11D432F6--></AD_COLUMN>
 
+<!--09CE64A2B0FE4D99A5E49476E3F51549--><AD_COLUMN>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <AD_COLUMN_ID><![CDATA[09CE64A2B0FE4D99A5E49476E3F51549]]></AD_COLUMN_ID>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <NAME><![CDATA[Active]]></NAME>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <POSITION><![CDATA[9]]></POSITION>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--09CE64A2B0FE4D99A5E49476E3F51549-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--09CE64A2B0FE4D99A5E49476E3F51549--></AD_COLUMN>
+
 <!--10AE04F83EE340D0B33A1181F85C8095--><AD_COLUMN>
 <!--10AE04F83EE340D0B33A1181F85C8095-->  <AD_COLUMN_ID><![CDATA[10AE04F83EE340D0B33A1181F85C8095]]></AD_COLUMN_ID>
 <!--10AE04F83EE340D0B33A1181F85C8095-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -468,6 +506,39 @@
 <!--40B5E49D23C643678921446DDC7AA2B0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--40B5E49D23C643678921446DDC7AA2B0--></AD_COLUMN>
 
+<!--4DCFCE4CF21748888C8031E975640486--><AD_COLUMN>
+<!--4DCFCE4CF21748888C8031E975640486-->  <AD_COLUMN_ID><![CDATA[4DCFCE4CF21748888C8031E975640486]]></AD_COLUMN_ID>
+<!--4DCFCE4CF21748888C8031E975640486-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4DCFCE4CF21748888C8031E975640486-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4DCFCE4CF21748888C8031E975640486-->  <NAME><![CDATA[Commercial Name]]></NAME>
+<!--4DCFCE4CF21748888C8031E975640486-->  <COLUMNNAME><![CDATA[Name]]></COLUMNNAME>
+<!--4DCFCE4CF21748888C8031E975640486-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--4DCFCE4CF21748888C8031E975640486-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--4DCFCE4CF21748888C8031E975640486-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--4DCFCE4CF21748888C8031E975640486-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4DCFCE4CF21748888C8031E975640486-->  <AD_ELEMENT_ID><![CDATA[1E20B2070A5447D6A31B4A3C95EBD941]]></AD_ELEMENT_ID>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4DCFCE4CF21748888C8031E975640486-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4DCFCE4CF21748888C8031E975640486-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--4DCFCE4CF21748888C8031E975640486-->  <POSITION><![CDATA[10]]></POSITION>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4DCFCE4CF21748888C8031E975640486-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4DCFCE4CF21748888C8031E975640486-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4DCFCE4CF21748888C8031E975640486-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4DCFCE4CF21748888C8031E975640486--></AD_COLUMN>
+
 <!--5506EF5A70A840CF8C8AA08B2E505CBA--><AD_COLUMN>
 <!--5506EF5A70A840CF8C8AA08B2E505CBA-->  <AD_COLUMN_ID><![CDATA[5506EF5A70A840CF8C8AA08B2E505CBA]]></AD_COLUMN_ID>
 <!--5506EF5A70A840CF8C8AA08B2E505CBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -539,6 +610,41 @@
 <!--5DB5D6C458AC4D0E8132D4C9DB8099C5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--5DB5D6C458AC4D0E8132D4C9DB8099C5--></AD_COLUMN>
 
+<!--603AA4B5A028459FA3542BC96C303FE3--><AD_COLUMN>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <AD_COLUMN_ID><![CDATA[603AA4B5A028459FA3542BC96C303FE3]]></AD_COLUMN_ID>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <POSITION><![CDATA[7]]></POSITION>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--603AA4B5A028459FA3542BC96C303FE3-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--603AA4B5A028459FA3542BC96C303FE3--></AD_COLUMN>
+
 <!--617A60FCE6C04C8E9A176AC40CD0A7FD--><AD_COLUMN>
 <!--617A60FCE6C04C8E9A176AC40CD0A7FD-->  <AD_COLUMN_ID><![CDATA[617A60FCE6C04C8E9A176AC40CD0A7FD]]></AD_COLUMN_ID>
 <!--617A60FCE6C04C8E9A176AC40CD0A7FD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -576,6 +682,42 @@
 <!--617A60FCE6C04C8E9A176AC40CD0A7FD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--617A60FCE6C04C8E9A176AC40CD0A7FD--></AD_COLUMN>
 
+<!--61FD663388464D068C757C144BF4717B--><AD_COLUMN>
+<!--61FD663388464D068C757C144BF4717B-->  <AD_COLUMN_ID><![CDATA[61FD663388464D068C757C144BF4717B]]></AD_COLUMN_ID>
+<!--61FD663388464D068C757C144BF4717B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--61FD663388464D068C757C144BF4717B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--61FD663388464D068C757C144BF4717B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--61FD663388464D068C757C144BF4717B-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--61FD663388464D068C757C144BF4717B-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--61FD663388464D068C757C144BF4717B-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--61FD663388464D068C757C144BF4717B-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--61FD663388464D068C757C144BF4717B-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--61FD663388464D068C757C144BF4717B-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--61FD663388464D068C757C144BF4717B-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--61FD663388464D068C757C144BF4717B-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--61FD663388464D068C757C144BF4717B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--61FD663388464D068C757C144BF4717B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--61FD663388464D068C757C144BF4717B-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--61FD663388464D068C757C144BF4717B-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--61FD663388464D068C757C144BF4717B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--61FD663388464D068C757C144BF4717B-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--61FD663388464D068C757C144BF4717B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--61FD663388464D068C757C144BF4717B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--61FD663388464D068C757C144BF4717B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--61FD663388464D068C757C144BF4717B-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--61FD663388464D068C757C144BF4717B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--61FD663388464D068C757C144BF4717B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--61FD663388464D068C757C144BF4717B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--61FD663388464D068C757C144BF4717B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--61FD663388464D068C757C144BF4717B-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--61FD663388464D068C757C144BF4717B-->  <POSITION><![CDATA[6]]></POSITION>
+<!--61FD663388464D068C757C144BF4717B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--61FD663388464D068C757C144BF4717B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--61FD663388464D068C757C144BF4717B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--61FD663388464D068C757C144BF4717B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--61FD663388464D068C757C144BF4717B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--61FD663388464D068C757C144BF4717B--></AD_COLUMN>
+
 <!--685B66C88A03478F92A88A278D8A81AE--><AD_COLUMN>
 <!--685B66C88A03478F92A88A278D8A81AE-->  <AD_COLUMN_ID><![CDATA[685B66C88A03478F92A88A278D8A81AE]]></AD_COLUMN_ID>
 <!--685B66C88A03478F92A88A278D8A81AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -684,6 +826,39 @@
 <!--7BC06432DC3C4422B36A4D2E0FFD66BF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--7BC06432DC3C4422B36A4D2E0FFD66BF--></AD_COLUMN>
 
+<!--7FE24B86832049928F111EDD45F216C7--><AD_COLUMN>
+<!--7FE24B86832049928F111EDD45F216C7-->  <AD_COLUMN_ID><![CDATA[7FE24B86832049928F111EDD45F216C7]]></AD_COLUMN_ID>
+<!--7FE24B86832049928F111EDD45F216C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7FE24B86832049928F111EDD45F216C7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7FE24B86832049928F111EDD45F216C7-->  <NAME><![CDATA[AD_Ref_Mask_ID]]></NAME>
+<!--7FE24B86832049928F111EDD45F216C7-->  <COLUMNNAME><![CDATA[AD_Ref_Mask_ID]]></COLUMNNAME>
+<!--7FE24B86832049928F111EDD45F216C7-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--7FE24B86832049928F111EDD45F216C7-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--7FE24B86832049928F111EDD45F216C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7FE24B86832049928F111EDD45F216C7-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7FE24B86832049928F111EDD45F216C7-->  <AD_ELEMENT_ID><![CDATA[2EA11B0C11DD465C896EA8D54D6492DB]]></AD_ELEMENT_ID>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7FE24B86832049928F111EDD45F216C7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7FE24B86832049928F111EDD45F216C7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--7FE24B86832049928F111EDD45F216C7-->  <POSITION><![CDATA[1]]></POSITION>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7FE24B86832049928F111EDD45F216C7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7FE24B86832049928F111EDD45F216C7-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7FE24B86832049928F111EDD45F216C7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7FE24B86832049928F111EDD45F216C7--></AD_COLUMN>
+
 <!--83756C850F774F748ECEAD93A6955E3B--><AD_COLUMN>
 <!--83756C850F774F748ECEAD93A6955E3B-->  <AD_COLUMN_ID><![CDATA[83756C850F774F748ECEAD93A6955E3B]]></AD_COLUMN_ID>
 <!--83756C850F774F748ECEAD93A6955E3B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -933,6 +1108,76 @@
 <!--9C0F861CBCA342BC8C081A91721F1A8D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--9C0F861CBCA342BC8C081A91721F1A8D--></AD_COLUMN>
 
+<!--9FFE28034391477B930B612FBFA9CDA0--><AD_COLUMN>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <AD_COLUMN_ID><![CDATA[9FFE28034391477B930B612FBFA9CDA0]]></AD_COLUMN_ID>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <NAME><![CDATA[Description]]></NAME>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <COLUMNNAME><![CDATA[Description]]></COLUMNNAME>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <POSITION><![CDATA[11]]></POSITION>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9FFE28034391477B930B612FBFA9CDA0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9FFE28034391477B930B612FBFA9CDA0--></AD_COLUMN>
+
+<!--A4A2EC59D98C4F84A25B8D0C92C88304--><AD_COLUMN>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <AD_COLUMN_ID><![CDATA[A4A2EC59D98C4F84A25B8D0C92C88304]]></AD_COLUMN_ID>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <NAME><![CDATA[Created By]]></NAME>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <POSITION><![CDATA[5]]></POSITION>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A4A2EC59D98C4F84A25B8D0C92C88304--></AD_COLUMN>
+
 <!--A6E0046C8D084D7DA86CAE79D8DA5594--><AD_COLUMN>
 <!--A6E0046C8D084D7DA86CAE79D8DA5594-->  <AD_COLUMN_ID><![CDATA[A6E0046C8D084D7DA86CAE79D8DA5594]]></AD_COLUMN_ID>
 <!--A6E0046C8D084D7DA86CAE79D8DA5594-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1075,6 +1320,77 @@
 <!--B6F3A92EAF52455CAC3ACA31573573C8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B6F3A92EAF52455CAC3ACA31573573C8--></AD_COLUMN>
 
+<!--B8B22101C4494871946D09CF84016C59--><AD_COLUMN>
+<!--B8B22101C4494871946D09CF84016C59-->  <AD_COLUMN_ID><![CDATA[B8B22101C4494871946D09CF84016C59]]></AD_COLUMN_ID>
+<!--B8B22101C4494871946D09CF84016C59-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B8B22101C4494871946D09CF84016C59-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B8B22101C4494871946D09CF84016C59-->  <NAME><![CDATA[Updated]]></NAME>
+<!--B8B22101C4494871946D09CF84016C59-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--B8B22101C4494871946D09CF84016C59-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--B8B22101C4494871946D09CF84016C59-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--B8B22101C4494871946D09CF84016C59-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--B8B22101C4494871946D09CF84016C59-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--B8B22101C4494871946D09CF84016C59-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--B8B22101C4494871946D09CF84016C59-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B8B22101C4494871946D09CF84016C59-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B8B22101C4494871946D09CF84016C59-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B8B22101C4494871946D09CF84016C59-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B8B22101C4494871946D09CF84016C59-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--B8B22101C4494871946D09CF84016C59-->  <POSITION><![CDATA[8]]></POSITION>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B8B22101C4494871946D09CF84016C59-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B8B22101C4494871946D09CF84016C59-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B8B22101C4494871946D09CF84016C59-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B8B22101C4494871946D09CF84016C59--></AD_COLUMN>
+
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB--><AD_COLUMN>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <AD_COLUMN_ID><![CDATA[C7AE53E9F1C6431998C1BFB9E1FB8BDB]]></AD_COLUMN_ID>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <NAME><![CDATA[Reference]]></NAME>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <DESCRIPTION><![CDATA[The data type of this field.]]></DESCRIPTION>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <HELP><![CDATA[The Reference indicates the type of reference field]]></HELP>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <COLUMNNAME><![CDATA[AD_Reference_ID]]></COLUMNNAME>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <AD_ELEMENT_ID><![CDATA[120]]></AD_ELEMENT_ID>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <POSITION><![CDATA[2]]></POSITION>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C7AE53E9F1C6431998C1BFB9E1FB8BDB--></AD_COLUMN>
+
 <!--C8BE75730A82430398F6450986BB8A47--><AD_COLUMN>
 <!--C8BE75730A82430398F6450986BB8A47-->  <AD_COLUMN_ID><![CDATA[C8BE75730A82430398F6450986BB8A47]]></AD_COLUMN_ID>
 <!--C8BE75730A82430398F6450986BB8A47-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1218,6 +1534,78 @@
 <!--D1C5688DBEA44928B39EA4BD3318AC83-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D1C5688DBEA44928B39EA4BD3318AC83--></AD_COLUMN>
 
+<!--D201E9863A2E44FAADB74772790B37E1--><AD_COLUMN>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <AD_COLUMN_ID><![CDATA[D201E9863A2E44FAADB74772790B37E1]]></AD_COLUMN_ID>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <NAME><![CDATA[Client]]></NAME>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <POSITION><![CDATA[3]]></POSITION>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D201E9863A2E44FAADB74772790B37E1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D201E9863A2E44FAADB74772790B37E1--></AD_COLUMN>
+
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A--><AD_COLUMN>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <AD_COLUMN_ID><![CDATA[D5E13D8DCCC448FDB9807C91EB23BC1A]]></AD_COLUMN_ID>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <NAME><![CDATA[Organization]]></NAME>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <POSITION><![CDATA[4]]></POSITION>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D5E13D8DCCC448FDB9807C91EB23BC1A--></AD_COLUMN>
+
 <!--E17D4EE6F1E44063A90AD7EA8C99E4E9--><AD_COLUMN>
 <!--E17D4EE6F1E44063A90AD7EA8C99E4E9-->  <AD_COLUMN_ID><![CDATA[E17D4EE6F1E44063A90AD7EA8C99E4E9]]></AD_COLUMN_ID>
 <!--E17D4EE6F1E44063A90AD7EA8C99E4E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -14,6 +14,31 @@
 <!--1663D48FCF45475FB6AF23DE940BF7B4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--1663D48FCF45475FB6AF23DE940BF7B4--></AD_ELEMENT>
 
+<!--1E20B2070A5447D6A31B4A3C95EBD941--><AD_ELEMENT>
+<!--1E20B2070A5447D6A31B4A3C95EBD941-->  <AD_ELEMENT_ID><![CDATA[1E20B2070A5447D6A31B4A3C95EBD941]]></AD_ELEMENT_ID>
+<!--1E20B2070A5447D6A31B4A3C95EBD941-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1E20B2070A5447D6A31B4A3C95EBD941-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1E20B2070A5447D6A31B4A3C95EBD941-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1E20B2070A5447D6A31B4A3C95EBD941-->  <COLUMNNAME><![CDATA[Name]]></COLUMNNAME>
+<!--1E20B2070A5447D6A31B4A3C95EBD941-->  <NAME><![CDATA[Input Mask]]></NAME>
+<!--1E20B2070A5447D6A31B4A3C95EBD941-->  <PRINTNAME><![CDATA[Input Mask]]></PRINTNAME>
+<!--1E20B2070A5447D6A31B4A3C95EBD941-->  <PO_NAME><![CDATA[Input Mask]]></PO_NAME>
+<!--1E20B2070A5447D6A31B4A3C95EBD941-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--1E20B2070A5447D6A31B4A3C95EBD941-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--1E20B2070A5447D6A31B4A3C95EBD941--></AD_ELEMENT>
+
+<!--2EA11B0C11DD465C896EA8D54D6492DB--><AD_ELEMENT>
+<!--2EA11B0C11DD465C896EA8D54D6492DB-->  <AD_ELEMENT_ID><![CDATA[2EA11B0C11DD465C896EA8D54D6492DB]]></AD_ELEMENT_ID>
+<!--2EA11B0C11DD465C896EA8D54D6492DB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2EA11B0C11DD465C896EA8D54D6492DB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2EA11B0C11DD465C896EA8D54D6492DB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2EA11B0C11DD465C896EA8D54D6492DB-->  <COLUMNNAME><![CDATA[AD_Ref_Mask_ID]]></COLUMNNAME>
+<!--2EA11B0C11DD465C896EA8D54D6492DB-->  <NAME><![CDATA[AD_Ref_Mask_ID]]></NAME>
+<!--2EA11B0C11DD465C896EA8D54D6492DB-->  <PRINTNAME><![CDATA[AD_Ref_Mask_ID]]></PRINTNAME>
+<!--2EA11B0C11DD465C896EA8D54D6492DB-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--2EA11B0C11DD465C896EA8D54D6492DB-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--2EA11B0C11DD465C896EA8D54D6492DB--></AD_ELEMENT>
+
 <!--6F1CAC3037204B29AA6A1BEEEB322DEC--><AD_ELEMENT>
 <!--6F1CAC3037204B29AA6A1BEEEB322DEC-->  <AD_ELEMENT_ID><![CDATA[6F1CAC3037204B29AA6A1BEEEB322DEC]]></AD_ELEMENT_ID>
 <!--6F1CAC3037204B29AA6A1BEEEB322DEC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_FIELD.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_FIELD.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -118,6 +118,36 @@
 <!--32CE4A00B8A742A18E062912D074B959-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--32CE4A00B8A742A18E062912D074B959--></AD_FIELD>
 
+<!--344AF17DE6E64BD1A321DD033F3DBD73--><AD_FIELD>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <AD_FIELD_ID><![CDATA[344AF17DE6E64BD1A321DD033F3DBD73]]></AD_FIELD_ID>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <NAME><![CDATA[Active]]></NAME>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <AD_TAB_ID><![CDATA[33550B504F454C518E487AF4BC81376F]]></AD_TAB_ID>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <AD_COLUMN_ID><![CDATA[09CE64A2B0FE4D99A5E49476E3F51549]]></AD_COLUMN_ID>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--344AF17DE6E64BD1A321DD033F3DBD73-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--344AF17DE6E64BD1A321DD033F3DBD73--></AD_FIELD>
+
 <!--3A2223A7C6FA48E2B9E5FE3F4CF50BBE--><AD_FIELD>
 <!--3A2223A7C6FA48E2B9E5FE3F4CF50BBE-->  <AD_FIELD_ID><![CDATA[3A2223A7C6FA48E2B9E5FE3F4CF50BBE]]></AD_FIELD_ID>
 <!--3A2223A7C6FA48E2B9E5FE3F4CF50BBE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -292,6 +322,32 @@
 <!--5FCB19D79E454B9BB8053995417750EB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5FCB19D79E454B9BB8053995417750EB--></AD_FIELD>
 
+<!--6257E278F6C5475EBD4A313565AF25F7--><AD_FIELD>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <AD_FIELD_ID><![CDATA[6257E278F6C5475EBD4A313565AF25F7]]></AD_FIELD_ID>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <NAME><![CDATA[Input Mask]]></NAME>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <AD_TAB_ID><![CDATA[33550B504F454C518E487AF4BC81376F]]></AD_TAB_ID>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <AD_COLUMN_ID><![CDATA[4DCFCE4CF21748888C8031E975640486]]></AD_COLUMN_ID>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6257E278F6C5475EBD4A313565AF25F7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6257E278F6C5475EBD4A313565AF25F7--></AD_FIELD>
+
 <!--76CEB34769FA40CBB7219C246A8EAC89--><AD_FIELD>
 <!--76CEB34769FA40CBB7219C246A8EAC89-->  <AD_FIELD_ID><![CDATA[76CEB34769FA40CBB7219C246A8EAC89]]></AD_FIELD_ID>
 <!--76CEB34769FA40CBB7219C246A8EAC89-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -433,6 +489,33 @@
 <!--86D6DB34779F4CA9AC47EE5AFA7C2702-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--86D6DB34779F4CA9AC47EE5AFA7C2702--></AD_FIELD>
 
+<!--8BD9E6B24097471EAD5B8274E27D4D21--><AD_FIELD>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <AD_FIELD_ID><![CDATA[8BD9E6B24097471EAD5B8274E27D4D21]]></AD_FIELD_ID>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <NAME><![CDATA[Client]]></NAME>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <AD_TAB_ID><![CDATA[33550B504F454C518E487AF4BC81376F]]></AD_TAB_ID>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <AD_COLUMN_ID><![CDATA[D201E9863A2E44FAADB74772790B37E1]]></AD_COLUMN_ID>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--8BD9E6B24097471EAD5B8274E27D4D21-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--8BD9E6B24097471EAD5B8274E27D4D21--></AD_FIELD>
+
 <!--8CBD0C02476942F9AD2C9B69FFAEE0FB--><AD_FIELD>
 <!--8CBD0C02476942F9AD2C9B69FFAEE0FB-->  <AD_FIELD_ID><![CDATA[8CBD0C02476942F9AD2C9B69FFAEE0FB]]></AD_FIELD_ID>
 <!--8CBD0C02476942F9AD2C9B69FFAEE0FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -489,6 +572,34 @@
 <!--93538F5FCA2A496F83B4B1097B35EC43-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--93538F5FCA2A496F83B4B1097B35EC43--></AD_FIELD>
 
+<!--9E807407BEB6443D9C4FBDBC22566024--><AD_FIELD>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <AD_FIELD_ID><![CDATA[9E807407BEB6443D9C4FBDBC22566024]]></AD_FIELD_ID>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <NAME><![CDATA[Description]]></NAME>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <AD_TAB_ID><![CDATA[33550B504F454C518E487AF4BC81376F]]></AD_TAB_ID>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <AD_COLUMN_ID><![CDATA[9FFE28034391477B930B612FBFA9CDA0]]></AD_COLUMN_ID>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9E807407BEB6443D9C4FBDBC22566024-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9E807407BEB6443D9C4FBDBC22566024--></AD_FIELD>
+
 <!--A284D9608240419F9273BA77FFF2A84E--><AD_FIELD>
 <!--A284D9608240419F9273BA77FFF2A84E-->  <AD_FIELD_ID><![CDATA[A284D9608240419F9273BA77FFF2A84E]]></AD_FIELD_ID>
 <!--A284D9608240419F9273BA77FFF2A84E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -520,6 +631,34 @@
 <!--A284D9608240419F9273BA77FFF2A84E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A284D9608240419F9273BA77FFF2A84E--></AD_FIELD>
 
+<!--B1AA506751B644CDBEF5455E2690BEC3--><AD_FIELD>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <AD_FIELD_ID><![CDATA[B1AA506751B644CDBEF5455E2690BEC3]]></AD_FIELD_ID>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <NAME><![CDATA[Organization]]></NAME>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <AD_TAB_ID><![CDATA[33550B504F454C518E487AF4BC81376F]]></AD_TAB_ID>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <AD_COLUMN_ID><![CDATA[D5E13D8DCCC448FDB9807C91EB23BC1A]]></AD_COLUMN_ID>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B1AA506751B644CDBEF5455E2690BEC3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B1AA506751B644CDBEF5455E2690BEC3--></AD_FIELD>
+
 <!--B88E3DEC8216422D8ECB1AE5C3603F43--><AD_FIELD>
 <!--B88E3DEC8216422D8ECB1AE5C3603F43-->  <AD_FIELD_ID><![CDATA[B88E3DEC8216422D8ECB1AE5C3603F43]]></AD_FIELD_ID>
 <!--B88E3DEC8216422D8ECB1AE5C3603F43-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -547,6 +686,34 @@
 <!--B88E3DEC8216422D8ECB1AE5C3603F43-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B88E3DEC8216422D8ECB1AE5C3603F43--></AD_FIELD>
 
+<!--C125887401E34C3EA58D29A985D2AD1D--><AD_FIELD>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <AD_FIELD_ID><![CDATA[C125887401E34C3EA58D29A985D2AD1D]]></AD_FIELD_ID>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <NAME><![CDATA[Reference]]></NAME>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <DESCRIPTION><![CDATA[The data type of this field.]]></DESCRIPTION>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <HELP><![CDATA[The Reference indicates the type of reference field]]></HELP>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <AD_TAB_ID><![CDATA[33550B504F454C518E487AF4BC81376F]]></AD_TAB_ID>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <AD_COLUMN_ID><![CDATA[C7AE53E9F1C6431998C1BFB9E1FB8BDB]]></AD_COLUMN_ID>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--C125887401E34C3EA58D29A985D2AD1D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--C125887401E34C3EA58D29A985D2AD1D--></AD_FIELD>
+
 <!--C29C122C389B41889AA380B6D4E5F211--><AD_FIELD>
 <!--C29C122C389B41889AA380B6D4E5F211-->  <AD_FIELD_ID><![CDATA[C29C122C389B41889AA380B6D4E5F211]]></AD_FIELD_ID>
 <!--C29C122C389B41889AA380B6D4E5F211-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -653,6 +820,31 @@
 <!--D8910FF94A8E4EE097B2E52E33A47246-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--D8910FF94A8E4EE097B2E52E33A47246--></AD_FIELD>
 
+<!--ED8A6F6532A5418390B2D111E7CDAC6E--><AD_FIELD>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <AD_FIELD_ID><![CDATA[ED8A6F6532A5418390B2D111E7CDAC6E]]></AD_FIELD_ID>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <NAME><![CDATA[AD_Ref_Mask_ID]]></NAME>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <AD_TAB_ID><![CDATA[33550B504F454C518E487AF4BC81376F]]></AD_TAB_ID>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <AD_COLUMN_ID><![CDATA[7FE24B86832049928F111EDD45F216C7]]></AD_COLUMN_ID>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--ED8A6F6532A5418390B2D111E7CDAC6E--></AD_FIELD>
+
 <!--EFAE32CFCF25457A86257665037AD7AF--><AD_FIELD>
 <!--EFAE32CFCF25457A86257665037AD7AF-->  <AD_FIELD_ID><![CDATA[EFAE32CFCF25457A86257665037AD7AF]]></AD_FIELD_ID>
 <!--EFAE32CFCF25457A86257665037AD7AF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.19250]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.19250]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.19434]]></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.19250]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.19434]]></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-db/database/sourcedata/AD_REFERENCE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_REFERENCE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -16,6 +16,53 @@
 <!--405408C120EE473FBB07EA49919DF0F7-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--405408C120EE473FBB07EA49919DF0F7--></AD_REFERENCE>
 
+<!--52529102938F41D5B84D3DE1F8892249--><AD_REFERENCE>
+<!--52529102938F41D5B84D3DE1F8892249-->  <AD_REFERENCE_ID><![CDATA[52529102938F41D5B84D3DE1F8892249]]></AD_REFERENCE_ID>
+<!--52529102938F41D5B84D3DE1F8892249-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--52529102938F41D5B84D3DE1F8892249-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--52529102938F41D5B84D3DE1F8892249-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--52529102938F41D5B84D3DE1F8892249-->  <NAME><![CDATA[Masked String]]></NAME>
+<!--52529102938F41D5B84D3DE1F8892249-->  <HELP><![CDATA[Overview of available mask characters
+Char Description
+0	Digit (0 through 9) or plus [+] or minus [-] signs
+9	Digit or space
+#	Digit
+L	Letter (A through Z)
+?	Letter (A through Z) or space
+A	Letter or digit
+a	Letter or digit
+C	Any character or space
+ 
+<	Causes all characters that follow to be converted to lowercase
+>	Causes all characters that follow to be converted to uppercase
+
+Any character not matching one of the above mask characters or that is escaped with a backslash (\) is considered to be a literal.
+
+Custom mask characters can be defined by standard regular expression character set or range. For example, a hexadecimal color code mask could be:
+
+Color: \#>[0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]]]></HELP>
+<!--52529102938F41D5B84D3DE1F8892249-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--52529102938F41D5B84D3DE1F8892249-->  <ISBASEREFERENCE><![CDATA[Y]]></ISBASEREFERENCE>
+<!--52529102938F41D5B84D3DE1F8892249-->  <MODEL_IMPL><![CDATA[org.openbravo.base.model.domaintype.StringDomainType]]></MODEL_IMPL>
+<!--52529102938F41D5B84D3DE1F8892249-->  <WAD_IMPL><![CDATA[org.openbravo.wad.controls.WADString]]></WAD_IMPL>
+<!--52529102938F41D5B84D3DE1F8892249-->  <UI_IMPL><![CDATA[org.openbravo.reference.ui.UIString]]></UI_IMPL>
+<!--52529102938F41D5B84D3DE1F8892249-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--52529102938F41D5B84D3DE1F8892249--></AD_REFERENCE>
+
+<!--7CB371C13D204EB69BF370217F692999--><AD_REFERENCE>
+<!--7CB371C13D204EB69BF370217F692999-->  <AD_REFERENCE_ID><![CDATA[7CB371C13D204EB69BF370217F692999]]></AD_REFERENCE_ID>
+<!--7CB371C13D204EB69BF370217F692999-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7CB371C13D204EB69BF370217F692999-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7CB371C13D204EB69BF370217F692999-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7CB371C13D204EB69BF370217F692999-->  <NAME><![CDATA[Rich Text Area]]></NAME>
+<!--7CB371C13D204EB69BF370217F692999-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--7CB371C13D204EB69BF370217F692999-->  <ISBASEREFERENCE><![CDATA[Y]]></ISBASEREFERENCE>
+<!--7CB371C13D204EB69BF370217F692999-->  <MODEL_IMPL><![CDATA[org.openbravo.base.model.domaintype.StringDomainType]]></MODEL_IMPL>
+<!--7CB371C13D204EB69BF370217F692999-->  <WAD_IMPL><![CDATA[org.openbravo.wad.controls.WADText]]></WAD_IMPL>
+<!--7CB371C13D204EB69BF370217F692999-->  <UI_IMPL><![CDATA[org.openbravo.reference.ui.UIText]]></UI_IMPL>
+<!--7CB371C13D204EB69BF370217F692999-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--7CB371C13D204EB69BF370217F692999--></AD_REFERENCE>
+
 <!--808852664FCF4615A2A901308737F81F--><AD_REFERENCE>
 <!--808852664FCF4615A2A901308737F81F-->  <AD_REFERENCE_ID><![CDATA[808852664FCF4615A2A901308737F81F]]></AD_REFERENCE_ID>
 <!--808852664FCF4615A2A901308737F81F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TAB.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TAB.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -28,6 +28,32 @@
 <!--0424D6B4F7FF46A6A4B4960F410144B6-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--0424D6B4F7FF46A6A4B4960F410144B6--></AD_TAB>
 
+<!--33550B504F454C518E487AF4BC81376F--><AD_TAB>
+<!--33550B504F454C518E487AF4BC81376F-->  <AD_TAB_ID><![CDATA[33550B504F454C518E487AF4BC81376F]]></AD_TAB_ID>
+<!--33550B504F454C518E487AF4BC81376F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--33550B504F454C518E487AF4BC81376F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--33550B504F454C518E487AF4BC81376F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--33550B504F454C518E487AF4BC81376F-->  <NAME><![CDATA[Mask Reference]]></NAME>
+<!--33550B504F454C518E487AF4BC81376F-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--33550B504F454C518E487AF4BC81376F-->  <AD_WINDOW_ID><![CDATA[101]]></AD_WINDOW_ID>
+<!--33550B504F454C518E487AF4BC81376F-->  <SEQNO><![CDATA[170]]></SEQNO>
+<!--33550B504F454C518E487AF4BC81376F-->  <TABLEVEL><![CDATA[1]]></TABLEVEL>
+<!--33550B504F454C518E487AF4BC81376F-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
+<!--33550B504F454C518E487AF4BC81376F-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
+<!--33550B504F454C518E487AF4BC81376F-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
+<!--33550B504F454C518E487AF4BC81376F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--33550B504F454C518E487AF4BC81376F-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--33550B504F454C518E487AF4BC81376F-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--33550B504F454C518E487AF4BC81376F-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
+<!--33550B504F454C518E487AF4BC81376F-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--33550B504F454C518E487AF4BC81376F-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--33550B504F454C518E487AF4BC81376F-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--33550B504F454C518E487AF4BC81376F-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--33550B504F454C518E487AF4BC81376F-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--33550B504F454C518E487AF4BC81376F-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
+<!--33550B504F454C518E487AF4BC81376F-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--33550B504F454C518E487AF4BC81376F--></AD_TAB>
+
 <!--9BC8881FA26C4609BEC7571F55CA053C--><AD_TAB>
 <!--9BC8881FA26C4609BEC7571F55CA053C-->  <AD_TAB_ID><![CDATA[9BC8881FA26C4609BEC7571F55CA053C]]></AD_TAB_ID>
 <!--9BC8881FA26C4609BEC7571F55CA053C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TABLE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TABLE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -44,6 +44,26 @@
 <!--457C2166008B451093B2DA54A0F7E2EC-->  <AD_PACKAGE_ID><![CDATA[08DD12A80BB942E79C0F3BD94FD3A249]]></AD_PACKAGE_ID>
 <!--457C2166008B451093B2DA54A0F7E2EC--></AD_TABLE>
 
+<!--558721361A024C3D8156095BD7C2716D--><AD_TABLE>
+<!--558721361A024C3D8156095BD7C2716D-->  <AD_TABLE_ID><![CDATA[558721361A024C3D8156095BD7C2716D]]></AD_TABLE_ID>
+<!--558721361A024C3D8156095BD7C2716D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--558721361A024C3D8156095BD7C2716D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--558721361A024C3D8156095BD7C2716D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--558721361A024C3D8156095BD7C2716D-->  <NAME><![CDATA[OBCLKER_REF_MASK]]></NAME>
+<!--558721361A024C3D8156095BD7C2716D-->  <TABLENAME><![CDATA[OBCLKER_REF_MASK]]></TABLENAME>
+<!--558721361A024C3D8156095BD7C2716D-->  <CLASSNAME><![CDATA[ReferencedMask]]></CLASSNAME>
+<!--558721361A024C3D8156095BD7C2716D-->  <ISVIEW><![CDATA[N]]></ISVIEW>
+<!--558721361A024C3D8156095BD7C2716D-->  <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL>
+<!--558721361A024C3D8156095BD7C2716D-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
+<!--558721361A024C3D8156095BD7C2716D-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
+<!--558721361A024C3D8156095BD7C2716D-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
+<!--558721361A024C3D8156095BD7C2716D-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
+<!--558721361A024C3D8156095BD7C2716D-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
+<!--558721361A024C3D8156095BD7C2716D-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--558721361A024C3D8156095BD7C2716D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--558721361A024C3D8156095BD7C2716D-->  <AD_PACKAGE_ID><![CDATA[08DD12A80BB942E79C0F3BD94FD3A249]]></AD_PACKAGE_ID>
+<!--558721361A024C3D8156095BD7C2716D--></AD_TABLE>
+
 <!--AB51D583178F4F4EB6B8DB44C64654BE--><AD_TABLE>
 <!--AB51D583178F4F4EB6B8DB44C64654BE-->  <AD_TABLE_ID><![CDATA[AB51D583178F4F4EB6B8DB44C64654BE]]></AD_TABLE_ID>
 <!--AB51D583178F4F4EB6B8DB44C64654BE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -110,6 +110,16 @@
 <!--39E287640048477A929A6702222281F1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39E287640048477A929A6702222281F1--></OBCLKER_UIDEFINITION>
 
+<!--39E45ABD8C41444BBD685B57F702B4D7--><OBCLKER_UIDEFINITION>
+<!--39E45ABD8C41444BBD685B57F702B4D7-->  <OBCLKER_UIDEFINITION_ID><![CDATA[39E45ABD8C41444BBD685B57F702B4D7]]></OBCLKER_UIDEFINITION_ID>
+<!--39E45ABD8C41444BBD685B57F702B4D7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--39E45ABD8C41444BBD685B57F702B4D7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--39E45ABD8C41444BBD685B57F702B4D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--39E45ABD8C41444BBD685B57F702B4D7-->  <AD_REFERENCE_ID><![CDATA[7CB371C13D204EB69BF370217F692999]]></AD_REFERENCE_ID>
+<!--39E45ABD8C41444BBD685B57F702B4D7-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.reference.RichTextUIDefinition]]></CLASSNAME>
+<!--39E45ABD8C41444BBD685B57F702B4D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--39E45ABD8C41444BBD685B57F702B4D7--></OBCLKER_UIDEFINITION>
+
 <!--3C4713015FD148DEAAFAD01193640AA1--><OBCLKER_UIDEFINITION>
 <!--3C4713015FD148DEAAFAD01193640AA1-->  <OBCLKER_UIDEFINITION_ID><![CDATA[3C4713015FD148DEAAFAD01193640AA1]]></OBCLKER_UIDEFINITION_ID>
 <!--3C4713015FD148DEAAFAD01193640AA1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -130,6 +140,16 @@
 <!--3EC1C4A2708A458DBE340A57CA36E0DA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3EC1C4A2708A458DBE340A57CA36E0DA--></OBCLKER_UIDEFINITION>
 
+<!--41AB03E72C8445C293D098F836C3B2FF--><OBCLKER_UIDEFINITION>
+<!--41AB03E72C8445C293D098F836C3B2FF-->  <OBCLKER_UIDEFINITION_ID><![CDATA[41AB03E72C8445C293D098F836C3B2FF]]></OBCLKER_UIDEFINITION_ID>
+<!--41AB03E72C8445C293D098F836C3B2FF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--41AB03E72C8445C293D098F836C3B2FF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--41AB03E72C8445C293D098F836C3B2FF-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--41AB03E72C8445C293D098F836C3B2FF-->  <AD_REFERENCE_ID><![CDATA[52529102938F41D5B84D3DE1F8892249]]></AD_REFERENCE_ID>
+<!--41AB03E72C8445C293D098F836C3B2FF-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.reference.MaskedStringUIDefinition]]></CLASSNAME>
+<!--41AB03E72C8445C293D098F836C3B2FF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--41AB03E72C8445C293D098F836C3B2FF--></OBCLKER_UIDEFINITION>
+
 <!--4C51FDC958034C00BF2067AB74E665F5--><OBCLKER_UIDEFINITION>
 <!--4C51FDC958034C00BF2067AB74E665F5-->  <OBCLKER_UIDEFINITION_ID><![CDATA[4C51FDC958034C00BF2067AB74E665F5]]></OBCLKER_UIDEFINITION_ID>
 <!--4C51FDC958034C00BF2067AB74E665F5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java	Fri Jan 25 14:23:32 2013 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2009-2012 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2013 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -21,7 +21,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Instance;
@@ -39,6 +41,8 @@
 
   private Module module;
 
+  private static Map<String, List<String>> appDependencies = new HashMap<String, List<String>>();
+
   @Inject
   @Any
   private Instance<Component> components;
@@ -62,6 +66,10 @@
     return module;
   }
 
+  public static void setAppDependencies(String app, List<String> dependencies) {
+    appDependencies.put(app, dependencies);
+  }
+
   /**
    * Computes parameters to add to a link of a resource. The parameters include the version and
    * language of the user.
@@ -284,7 +292,19 @@
     }
 
     public boolean isValidForApp(String app) {
-      return this.validForAppList.contains(app);
+      boolean valid = this.validForAppList.contains(app);
+      if (valid) {
+        return true;
+      }
+      if (appDependencies.containsKey(app)) {
+        for (String dep : appDependencies.get(app)) {
+          valid = isValidForApp(dep);
+          if (valid) {
+            return true;
+          }
+        }
+      }
+      return false;
     }
 
   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/MaskedStringUIDefinition.java	Fri Jan 25 14:23:32 2013 +0100
@@ -0,0 +1,43 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SLU 
+ * All portions are Copyright (C) 2013 Openbravo SLU 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.client.kernel.reference;
+
+import java.util.List;
+
+import org.openbravo.client.kernel.ReferencedMask;
+import org.openbravo.model.ad.domain.Reference;
+import org.openbravo.model.ad.ui.Field;
+
+public class MaskedStringUIDefinition extends StringUIDefinition {
+  public String getFieldProperties(Field field) {
+    if (field.getColumn().getReferenceSearchKey() != null) {
+      Reference adReferenceSearch = field.getColumn().getReferenceSearchKey();
+      List<ReferencedMask> adReferenceSearchList = adReferenceSearch.getOBCLKERREFMASKList();
+      ReferencedMask adReferenceMask;
+      if (adReferenceSearchList != null && adReferenceSearchList.size() > 0) {
+        adReferenceMask = adReferenceSearchList.get(0);
+        return "{mask: '" + adReferenceMask.getCommercialName() + "'}";
+      } else {
+        return "{mask: '" + "'}";
+      }
+    } else {
+      return "{mask: '" + "'}";
+    }
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/RichTextUIDefinition.java	Fri Jan 25 14:23:32 2013 +0100
@@ -0,0 +1,57 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.client.kernel.reference;
+
+import org.openbravo.model.ad.ui.Field;
+
+/**
+ * Implements Rich Text UI Definition
+ * 
+ * 
+ */
+public class RichTextUIDefinition extends TextUIDefinition {
+
+  // don't support sorting on large text fields
+
+  @Override
+  public String getParentType() {
+    return "RichTextEditor";
+  }
+
+  @Override
+  public String getFormEditorType() {
+    return "OBRichTextItem";
+  }
+
+  @Override
+  public String getGridFieldProperties(Field field) {
+    Long rowSpan = field.getObuiappRowspan();
+    Long colSpan = field.getObuiappColspan();
+    if ((colSpan == null) || (colSpan < 2))
+      colSpan = 2L;
+    if ((rowSpan == null) || (rowSpan < 2))
+      rowSpan = 2L;
+
+    return super.getGridFieldProperties(field)
+        + ",  escapeHTML: false , canEdit: false , rowSpan : " + rowSpan + " , colSpan : "
+        + colSpan;
+  }
+
+}
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.19250]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.19250]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.19434]]></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.querylist/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.19250]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.19250]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.19434]]></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.widgets/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.19434]]></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.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.19250]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.19434]]></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.19250]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.19434]]></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.19250]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.19434]]></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.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.19434]]></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.19250]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.19434]]></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.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.19434]]></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.19250]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.19434]]></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.19250]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.19434]]></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/CustomQuerySelectorDatasource.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java	Fri Jan 25 14:23:32 2013 +0100
@@ -382,23 +382,44 @@
    */
   private String getSortClause(String sortBy, Selector sel) {
     StringBuffer sortByClause = new StringBuffer();
+    boolean sortByDesc = false;
+    if (sortBy != null && sortBy.startsWith("-")) {
+      sortByDesc = true;
+    }
     // If grid is manually filtered sortBy is not empty
     if (StringUtils.isNotEmpty(sortBy)) {
       if (sortBy.contains(JsonConstants.IN_PARAMETER_SEPARATOR)) {
         final String[] fieldNames = sortBy.split(JsonConstants.IN_PARAMETER_SEPARATOR);
         for (String fieldName : fieldNames) {
+          if (sortByDesc) {
+            fieldName = fieldName.substring(1, fieldName.length());
+          }
           int fieldSortIndex = getFieldSortIndex(fieldName, sel);
           if (fieldSortIndex > 0) {
             if (sortByClause.length() > 0) {
               sortByClause.append(", ");
             }
-            sortByClause.append(fieldSortIndex);
+            if (sortByDesc) {
+              sortByClause.append(fieldSortIndex + " desc");
+            } else {
+              sortByClause.append(fieldSortIndex);
+            }
           }
         }
       } else {
-        int fieldSortIndex = getFieldSortIndex(sortBy, sel);
+        String fieldName = null;
+        if (sortByDesc) {
+          fieldName = sortBy.substring(1, sortBy.length());
+        } else {
+          fieldName = sortBy;
+        }
+        int fieldSortIndex = getFieldSortIndex(fieldName, sel);
         if (fieldSortIndex > 0) {
-          sortByClause.append(fieldSortIndex);
+          if (sortByDesc) {
+            sortByClause.append(fieldSortIndex + " desc");
+          } else {
+            sortByClause.append(fieldSortIndex);
+          }
         }
       }
     }
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.19434]]></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.19250]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.19434]]></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.19250]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.19434]]></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.19250]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.19434]]></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.19250]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.19434]]></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.19250]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.19434]]></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	Fri Jan 25 14:20:51 2013 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.19434]]></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.19250]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.19434]]></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.19250]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.19434]]></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.19250]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.19434]]></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.19250]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.19434]]></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.19250]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.19434]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/src-db/database/model/functions/M_INOUT_POST.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/model/functions/M_INOUT_POST.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -472,7 +472,7 @@
                   v_pendingqty          NUMBER;
                   v_qtyaux              NUMBER;
                   v_res_stock_id        VARCHAR2(32);
-                  v_aux_released        NUMBER:= 0;
+                  v_aux_released NUMBER:= 0;
                 BEGIN
                   v_pendingqty := -v_qty;
                   FOR cur_reserve_stock IN (
--- a/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -104,6 +104,16 @@
   IF (v_Count <> 0) THEN
     RAISE_APPLICATION_ERROR(-20000, '@Inline@'||' '||v_line||' '||'@productWithoutAttributeSet@') ;
   END IF;
+
+  --Checking if the Internal consumption has lines
+  SELECT count(*)
+  INTO v_Count
+  FROM M_Internal_ConsumptionLine
+  WHERE M_Internal_Consumption_ID=Record_ID;
+  IF (v_Count = 0) THEN
+    RAISE_APPLICATION_ERROR(-20000, '@InternalConsuptionNoLines@') ;
+  END IF;
+  
   IF (v_action IN ('CO')) THEN
     /**
     * Complete action: Create records on m_transaction and update status
--- a/src-db/database/model/functions/S_TIMEEXPENSE_POST.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/model/functions/S_TIMEEXPENSE_POST.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -101,7 +101,7 @@
   GROUP BY S_TimeExpense.PROCESSED;
   IF (v_Processed = 'Y') THEN
     IF (v_CInvoicelineId IS NULL AND v_COrderlineId IS NULL) THEN
-        UPDATE S_TimeExpense SET Processed = 'N' WHERE S_TimeExpense_ID = v_Record_ID;
+        UPDATE S_TimeExpense SET Processed = 'N',Processing = 'N' WHERE S_TimeExpense_ID = v_Record_ID;
     ELSE
         v_Message:='@DocumentAssociated@';
      v_Result:=0;
@@ -121,7 +121,7 @@
        -- Checks come here
        -- Complete
          UPDATE S_TimeExpense
-           SET Processed='Y',
+           SET Processed='Y',processing = 'Y',
            Updated=now(),
            UpdatedBy=v_AD_User_ID
          WHERE S_TimeExpense_ID=CUR_te.S_TimeExpense_ID;
--- a/src-db/database/model/tables/GL_JOURNALLINE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/model/tables/GL_JOURNALLINE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -241,6 +241,6 @@
       <check name="GL_JOURNALLINE_C_TAX_ID_CHK"><![CDATA[(C_TAX_ID IS NULL) OR (C_WITHHOLDING_ID IS NULL)]]></check>
       <check name="GL_JOURNALLINE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="GL_JOURNALLINE_ISGENERATED_CHK"><![CDATA[ISGENERATED IN ('Y', 'N')]]></check>
-      <check name="GL_JOURNALLINE_OPENITEM_CHECK"><![CDATA[(OPEN_ITEMS = 'N') OR ((((((OPEN_ITEMS = 'Y') AND (FIN_FINANCIAL_ACCOUNT_ID IS NOT NULL)) AND (FIN_PAYMENTMETHOD_ID IS NOT NULL)) AND (C_GLITEM_ID IS NOT NULL)) AND (C_BPARTNER_ID IS NOT NULL)) AND (PAYMENTDATE IS NOT NULL))]]></check>
+      <check name="GL_JOURNALLINE_OPENITEM_CHECK"><![CDATA[(OPEN_ITEMS = 'N') OR (((((OPEN_ITEMS = 'Y') AND (FIN_FINANCIAL_ACCOUNT_ID IS NOT NULL)) AND (FIN_PAYMENTMETHOD_ID IS NOT NULL)) AND (C_GLITEM_ID IS NOT NULL)) AND (PAYMENTDATE IS NOT NULL))]]></check>
     </table>
   </database>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -287878,7 +287878,8 @@
 <!--A7F1531510444244E040007F010064A6-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
 <!--A7F1531510444244E040007F010064A6-->  <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME>
 <!--A7F1531510444244E040007F010064A6-->  <AD_TABLE_ID><![CDATA[226]]></AD_TABLE_ID>
-<!--A7F1531510444244E040007F010064A6-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--A7F1531510444244E040007F010064A6-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--A7F1531510444244E040007F010064A6-->  <AD_REFERENCE_VALUE_ID><![CDATA[84BD487714B04B838A8D562A30E8792C]]></AD_REFERENCE_VALUE_ID>
 <!--A7F1531510444244E040007F010064A6-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--A7F1531510444244E040007F010064A6-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--A7F1531510444244E040007F010064A6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -11039,7 +11039,7 @@
 <!--883-->  <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID>
 <!--883-->  <AD_COLUMN_ID><![CDATA[1792]]></AD_COLUMN_ID>
 <!--883-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--883-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--883-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--883-->  <DISPLAYLOGIC><![CDATA[@C_Currency_ID@!@batchCurrency@]]></DISPLAYLOGIC>
 <!--883-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--883-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
@@ -11047,10 +11047,9 @@
 <!--883-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--883-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--883-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--883-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--883-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--883-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--883-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--883-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
 <!--883-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--883-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--883-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -67564,7 +67563,7 @@
 <!--5441-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5441-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--5441-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--5441-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--5441-->  <ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR>
 <!--5441-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5441--></AD_FIELD>
 
@@ -67573,9 +67572,9 @@
 <!--5442-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--5442-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5442-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5442-->  <NAME><![CDATA[Process Expenses]]></NAME>
-<!--5442-->  <DESCRIPTION><![CDATA[Process Expenses]]></DESCRIPTION>
-<!--5442-->  <HELP><![CDATA[Process expense sheet.]]></HELP>
+<!--5442-->  <NAME><![CDATA[Process/Unprocess Expenses]]></NAME>
+<!--5442-->  <DESCRIPTION><![CDATA[Process/Unprocess Expenses]]></DESCRIPTION>
+<!--5442-->  <HELP><![CDATA[Process/Unprocess expense sheet.]]></HELP>
 <!--5442-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--5442-->  <AD_TAB_ID><![CDATA[412]]></AD_TAB_ID>
 <!--5442-->  <AD_COLUMN_ID><![CDATA[6836]]></AD_COLUMN_ID>
@@ -253959,8 +253958,8 @@
 <!--E28A115E25D44BB181D8D34CB55E0A1B-->  <NAME><![CDATA[Purchase Order Line]]></NAME>
 <!--E28A115E25D44BB181D8D34CB55E0A1B-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
 <!--E28A115E25D44BB181D8D34CB55E0A1B-->  <AD_TAB_ID><![CDATA[38D83B9AB72D42F1BFED48911E49F6CD]]></AD_TAB_ID>
-<!--E28A115E25D44BB181D8D34CB55E0A1B-->  <AD_COLUMN_ID><![CDATA[2169]]></AD_COLUMN_ID>
-<!--E28A115E25D44BB181D8D34CB55E0A1B-->  <PROPERTY><![CDATA[reservationStock.salesOrderLine.salesOrder.documentNo]]></PROPERTY>
+<!--E28A115E25D44BB181D8D34CB55E0A1B-->  <AD_COLUMN_ID><![CDATA[CA9E5C38D2F47E11E040007F010067A6]]></AD_COLUMN_ID>
+<!--E28A115E25D44BB181D8D34CB55E0A1B-->  <PROPERTY><![CDATA[reservationStock.salesOrderLine]]></PROPERTY>
 <!--E28A115E25D44BB181D8D34CB55E0A1B-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
 <!--E28A115E25D44BB181D8D34CB55E0A1B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--E28A115E25D44BB181D8D34CB55E0A1B-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -15759,6 +15759,17 @@
 <!--29DA6D865A87411FB7808B2B075E5A73-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--29DA6D865A87411FB7808B2B075E5A73--></AD_MESSAGE>
 
+<!--2A2237A7F19A4B908536870F4CB418A1--><AD_MESSAGE>
+<!--2A2237A7F19A4B908536870F4CB418A1-->  <AD_MESSAGE_ID><![CDATA[2A2237A7F19A4B908536870F4CB418A1]]></AD_MESSAGE_ID>
+<!--2A2237A7F19A4B908536870F4CB418A1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2A2237A7F19A4B908536870F4CB418A1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2A2237A7F19A4B908536870F4CB418A1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2A2237A7F19A4B908536870F4CB418A1-->  <VALUE><![CDATA[WarehouseNotInLE]]></VALUE>
+<!--2A2237A7F19A4B908536870F4CB418A1-->  <MSGTEXT><![CDATA[The warehouse is defined in an organization with no parent Legal Entity. You cannot execute this report for an organization that has no Legal Entity parent.]]></MSGTEXT>
+<!--2A2237A7F19A4B908536870F4CB418A1-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--2A2237A7F19A4B908536870F4CB418A1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2A2237A7F19A4B908536870F4CB418A1--></AD_MESSAGE>
+
 <!--2A9296C2545E44BB9D90729FBD17FD23--><AD_MESSAGE>
 <!--2A9296C2545E44BB9D90729FBD17FD23-->  <AD_MESSAGE_ID><![CDATA[2A9296C2545E44BB9D90729FBD17FD23]]></AD_MESSAGE_ID>
 <!--2A9296C2545E44BB9D90729FBD17FD23-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16232,6 +16243,17 @@
 <!--36DE1B1B3A8643C38DA099FD57D00235-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--36DE1B1B3A8643C38DA099FD57D00235--></AD_MESSAGE>
 
+<!--36DEFB2B2AC7469B80B2873B3A907B33--><AD_MESSAGE>
+<!--36DEFB2B2AC7469B80B2873B3A907B33-->  <AD_MESSAGE_ID><![CDATA[36DEFB2B2AC7469B80B2873B3A907B33]]></AD_MESSAGE_ID>
+<!--36DEFB2B2AC7469B80B2873B3A907B33-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--36DEFB2B2AC7469B80B2873B3A907B33-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--36DEFB2B2AC7469B80B2873B3A907B33-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--36DEFB2B2AC7469B80B2873B3A907B33-->  <VALUE><![CDATA[InternalConsuptionNoLines]]></VALUE>
+<!--36DEFB2B2AC7469B80B2873B3A907B33-->  <MSGTEXT><![CDATA[It is not possible to process an Internal Consuption without line.]]></MSGTEXT>
+<!--36DEFB2B2AC7469B80B2873B3A907B33-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--36DEFB2B2AC7469B80B2873B3A907B33-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--36DEFB2B2AC7469B80B2873B3A907B33--></AD_MESSAGE>
+
 <!--37B25D3CE4344D7CA0E2452CEE985BAF--><AD_MESSAGE>
 <!--37B25D3CE4344D7CA0E2452CEE985BAF-->  <AD_MESSAGE_ID><![CDATA[37B25D3CE4344D7CA0E2452CEE985BAF]]></AD_MESSAGE_ID>
 <!--37B25D3CE4344D7CA0E2452CEE985BAF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19029,7 +19051,7 @@
 <!--96B02DEA21084AD28903E48E2612C52A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96B02DEA21084AD28903E48E2612C52A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96B02DEA21084AD28903E48E2612C52A-->  <VALUE><![CDATA[gl_journalline_openitem_check]]></VALUE>
-<!--96B02DEA21084AD28903E48E2612C52A-->  <MSGTEXT><![CDATA[If Open Items is checked, Business Partner, Financial Account, Payment Method, GL Item and Payment Date fields must be filled.]]></MSGTEXT>
+<!--96B02DEA21084AD28903E48E2612C52A-->  <MSGTEXT><![CDATA[If Open Items is checked, Financial Account, Payment Method, GL Item and Payment Date fields must be filled.]]></MSGTEXT>
 <!--96B02DEA21084AD28903E48E2612C52A-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--96B02DEA21084AD28903E48E2612C52A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--96B02DEA21084AD28903E48E2612C52A--></AD_MESSAGE>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -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.19250]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.19434]]></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-db/database/sourcedata/AD_PROCESS.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/sourcedata/AD_PROCESS.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -1334,9 +1334,9 @@
 <!--184-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--184-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--184-->  <VALUE><![CDATA[S_TimeExpense_Post]]></VALUE>
-<!--184-->  <NAME><![CDATA[Process Expenses]]></NAME>
-<!--184-->  <DESCRIPTION><![CDATA[Process Expenses]]></DESCRIPTION>
-<!--184-->  <HELP><![CDATA[Process expense sheet.]]></HELP>
+<!--184-->  <NAME><![CDATA[Process/Unprocess Expenses]]></NAME>
+<!--184-->  <DESCRIPTION><![CDATA[Process/Unprocess Expenses]]></DESCRIPTION>
+<!--184-->  <HELP><![CDATA[Process/Unprocess expense sheet.]]></HELP>
 <!--184-->  <ACCESSLEVEL><![CDATA[1]]></ACCESSLEVEL>
 <!--184-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--184-->  <PROCEDURENAME><![CDATA[S_TimeExpense_Post]]></PROCEDURENAME>
@@ -1344,6 +1344,7 @@
 <!--184-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--184-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--184-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--184-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--184-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--184-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--184-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -5041,6 +5041,20 @@
 <!--83AD04A0C49E4801BF276B690265A3D1-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--83AD04A0C49E4801BF276B690265A3D1--></AD_REFERENCE>
 
+<!--84BD487714B04B838A8D562A30E8792C--><AD_REFERENCE>
+<!--84BD487714B04B838A8D562A30E8792C-->  <AD_REFERENCE_ID><![CDATA[84BD487714B04B838A8D562A30E8792C]]></AD_REFERENCE_ID>
+<!--84BD487714B04B838A8D562A30E8792C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--84BD487714B04B838A8D562A30E8792C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--84BD487714B04B838A8D562A30E8792C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--84BD487714B04B838A8D562A30E8792C-->  <NAME><![CDATA[Products]]></NAME>
+<!--84BD487714B04B838A8D562A30E8792C-->  <DESCRIPTION><![CDATA[Generic Product Selector]]></DESCRIPTION>
+<!--84BD487714B04B838A8D562A30E8792C-->  <HELP><![CDATA[This selector shows all the available products]]></HELP>
+<!--84BD487714B04B838A8D562A30E8792C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--84BD487714B04B838A8D562A30E8792C-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--84BD487714B04B838A8D562A30E8792C-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--84BD487714B04B838A8D562A30E8792C-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--84BD487714B04B838A8D562A30E8792C--></AD_REFERENCE>
+
 <!--86086D70DDBC42B09E2BEB51D25C159F--><AD_REFERENCE>
 <!--86086D70DDBC42B09E2BEB51D25C159F-->  <AD_REFERENCE_ID><![CDATA[86086D70DDBC42B09E2BEB51D25C159F]]></AD_REFERENCE_ID>
 <!--86086D70DDBC42B09E2BEB51D25C159F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -1,5 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--00A9109E64DD404CA95719D20A9BBBF0--><OBUISEL_SELECTOR>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <OBUISEL_SELECTOR_ID><![CDATA[00A9109E64DD404CA95719D20A9BBBF0]]></OBUISEL_SELECTOR_ID>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <NAME><![CDATA[Products]]></NAME>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <DESCRIPTION><![CDATA[This selector shows all the available products]]></DESCRIPTION>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <HELP><![CDATA[This selector shows all the available products]]></HELP>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <AD_REFERENCE_ID><![CDATA[84BD487714B04B838A8D562A30E8792C]]></AD_REFERENCE_ID>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <AD_TABLE_ID><![CDATA[208]]></AD_TABLE_ID>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <AD_COLUMN_ID><![CDATA[1402]]></AD_COLUMN_ID>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <VALUEFIELD_ID><![CDATA[8283EB51255943B3B92B421AE14E8661]]></VALUEFIELD_ID>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <POPUPTEXTMATCHSTYLE><![CDATA[substring]]></POPUPTEXTMATCHSTYLE>
+<!--00A9109E64DD404CA95719D20A9BBBF0-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--00A9109E64DD404CA95719D20A9BBBF0--></OBUISEL_SELECTOR>
+
 <!--0E1E9236E2FE471FB946F8DA2803C537--><OBUISEL_SELECTOR>
 <!--0E1E9236E2FE471FB946F8DA2803C537-->  <OBUISEL_SELECTOR_ID><![CDATA[0E1E9236E2FE471FB946F8DA2803C537]]></OBUISEL_SELECTOR_ID>
 <!--0E1E9236E2FE471FB946F8DA2803C537-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -88,6 +88,28 @@
 <!--0EE172E722774F0398B83152B48DAB8D-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--0EE172E722774F0398B83152B48DAB8D--></OBUISEL_SELECTOR_FIELD>
 
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9--><OBUISEL_SELECTOR_FIELD>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[0F4AEA7AAB7D4D2AA913B5B5976BA0E9]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <OBUISEL_SELECTOR_ID><![CDATA[00A9109E64DD404CA95719D20A9BBBF0]]></OBUISEL_SELECTOR_ID>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <AD_COLUMN_ID><![CDATA[1410]]></AD_COLUMN_ID>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <NAME><![CDATA[Name]]></NAME>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <DESCRIPTION><![CDATA[A non-unique identifier for a record/document often used as a search tool.]]></DESCRIPTION>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <HELP><![CDATA[A more descriptive identifier (that does need to be unique) of a record/document that is used as a default search option along with the search key (that is unique and mostly shorter). It is up to 60 characters in length.]]></HELP>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <PROPERTY><![CDATA[name]]></PROPERTY>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <SORT><![CDATA[Y]]></SORT>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--0F4AEA7AAB7D4D2AA913B5B5976BA0E9--></OBUISEL_SELECTOR_FIELD>
+
 <!--190E45B61635477BBC0799229F889FD6--><OBUISEL_SELECTOR_FIELD>
 <!--190E45B61635477BBC0799229F889FD6-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[190E45B61635477BBC0799229F889FD6]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--190E45B61635477BBC0799229F889FD6-->  <OBUISEL_SELECTOR_ID><![CDATA[B748F356A65641D4974E5C349A16FB27]]></OBUISEL_SELECTOR_ID>
@@ -1076,6 +1098,25 @@
 <!--7F415E2D50A041CB83BF79EA460DB884-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--7F415E2D50A041CB83BF79EA460DB884--></OBUISEL_SELECTOR_FIELD>
 
+<!--8283EB51255943B3B92B421AE14E8661--><OBUISEL_SELECTOR_FIELD>
+<!--8283EB51255943B3B92B421AE14E8661-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[8283EB51255943B3B92B421AE14E8661]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--8283EB51255943B3B92B421AE14E8661-->  <OBUISEL_SELECTOR_ID><![CDATA[00A9109E64DD404CA95719D20A9BBBF0]]></OBUISEL_SELECTOR_ID>
+<!--8283EB51255943B3B92B421AE14E8661-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8283EB51255943B3B92B421AE14E8661-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8283EB51255943B3B92B421AE14E8661-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8283EB51255943B3B92B421AE14E8661-->  <NAME><![CDATA[ProductID]]></NAME>
+<!--8283EB51255943B3B92B421AE14E8661-->  <PROPERTY><![CDATA[id]]></PROPERTY>
+<!--8283EB51255943B3B92B421AE14E8661-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8283EB51255943B3B92B421AE14E8661-->  <SORT><![CDATA[Y]]></SORT>
+<!--8283EB51255943B3B92B421AE14E8661-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--8283EB51255943B3B92B421AE14E8661-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--8283EB51255943B3B92B421AE14E8661-->  <SHOWINGRID><![CDATA[N]]></SHOWINGRID>
+<!--8283EB51255943B3B92B421AE14E8661-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--8283EB51255943B3B92B421AE14E8661-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8283EB51255943B3B92B421AE14E8661-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--8283EB51255943B3B92B421AE14E8661-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--8283EB51255943B3B92B421AE14E8661--></OBUISEL_SELECTOR_FIELD>
+
 <!--8296CA3FDAB04B698B1EDD4BC76F1512--><OBUISEL_SELECTOR_FIELD>
 <!--8296CA3FDAB04B698B1EDD4BC76F1512-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[8296CA3FDAB04B698B1EDD4BC76F1512]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--8296CA3FDAB04B698B1EDD4BC76F1512-->  <OBUISEL_SELECTOR_ID><![CDATA[4C8BC3E8E56441F4B8C98C684A0C9212]]></OBUISEL_SELECTOR_ID>
--- a/src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient_data.xsql	Fri Jan 25 14:20:51 2013 +0100
+++ b/src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient_data.xsql	Fri Jan 25 14:23:32 2013 +0100
@@ -597,7 +597,7 @@
     </Sql>
      <Parameter name="client"/>
   </SqlMethod>
-SqlMethod name="updateoosoo" type="preparedStatement" return="rowcount">
+<SqlMethod name="updateoosoo" type="preparedStatement" return="rowcount">
        <SqlMethodComment></SqlMethodComment>
     <Sql>
       <![CDATA[
@@ -607,4 +607,4 @@
     </Sql>
      <Parameter name="client"/>
   </SqlMethod>
-</SqlClass>
\ No newline at end of file
+</SqlClass>
--- a/src/org/openbravo/costing/CostingRuleProcess.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/src/org/openbravo/costing/CostingRuleProcess.java	Fri Jan 25 14:23:32 2013 +0100
@@ -176,8 +176,8 @@
     where.append("   and p." + Product.PROPERTY_STOCKED + " = true");
     where.append("   and p." + Product.PROPERTY_ORGANIZATION + ".id in (:porgs)");
     where.append("   and exists (select 1 from " + MaterialTransaction.ENTITY_NAME);
-    where.append("     where " + MaterialTransaction.PROPERTY_PRODUCT + " = p)");
-    where.append("      and " + MaterialTransaction.PROPERTY_ORGANIZATION + " .id in (:childOrgs)");
+    where.append("     where " + MaterialTransaction.PROPERTY_PRODUCT + " = p");
+    where.append("      and " + MaterialTransaction.PROPERTY_ORGANIZATION + " .id in (:childOrgs))");
 
     OBQuery<Product> pQry = OBDal.getInstance().createQuery(Product.class, where.toString());
     pQry.setFilterOnReadableOrganization(false);
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html	Fri Jan 25 14:20:51 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html	Fri Jan 25 14:23:32 2013 +0100
@@ -154,37 +154,6 @@
       cell.className = cell.className.replace(' DataGrid_Body_Cell_hover', '');
     }
 
-    function validateQuantity(chk) {
-        var invalid = false;
-        var i = 0;
-        var frm = document.frmMain;
-        var defaultValue = 0;
-        var currentValue = 0;
-        do {
-          if(chk.length > 0) {
-            if(chk[i].checked) {
-              defaultValue = frm.elements["inpmovementqty" + chk[i].value].defaultValue;
-              currentValue = frm.elements["inpmovementqty" + chk[i].value].value;   
-            }
-          }
-          else {
-            if(chk.checked) {
-              defaultValue = frm.elements["inpmovementqty" + chk.value].defaultValue;
-              currentValue = frm.elements["inpmovementqty" + chk.value].value;   
-            }
-          }
-          i = i + 1;     
-          if(formattedNumberOp(currentValue, '>', defaultValue)) {
-            invalid = true;
-            showJSMessage('InvalidMovementQty');
-            break;
-          }
-          else
-            continue;
-        } while (i<chk.length);
-        if(!invalid)
-          submitThisPage('SAVE');
-      }
   </script>
   <script language="JavaScript" type="text/javascript">
     function onLoadDo(){
@@ -620,7 +589,7 @@
                   <button type="button" 
                     id="buttonOK" 
                     class="ButtonLink" 
-                    onclick="validateQuantity(document.frmMain.inpId);return false;"
+                    onclick="submitThisPage('SAVE');return false;" 
                     onfocus="buttonEvent('onfocus', this); window.status='Accept'; return true;" 
                     onblur="buttonEvent('onblur', this);" 
                     onkeyup="buttonEvent('onkeyup', this);" 
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java	Fri Jan 25 14:23:32 2013 +0100
@@ -395,8 +395,12 @@
         con = connectionProvider.getTransactionConnection();
         strIDs += data[i].getField("ID") + ", ";
         this.setMessageResult(null);
-        if (!get(AD_Table_ID, AD_Client_ID, AD_Org_ID, connectionProvider).post(
-            data[i].getField("ID"), false, vars, connectionProvider, con)) {
+        AcctServer tempServer = get(AD_Table_ID, AD_Client_ID, AD_Org_ID, connectionProvider);
+        boolean postSuccess = false;
+        postSuccess = tempServer.post(data[i].getField("ID"), false, vars, connectionProvider, con);
+        errors = errors + tempServer.errors;
+        success = success + tempServer.success;
+        if (!postSuccess) {
           connectionProvider.releaseRollbackConnection(con);
           return;
         } else {
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java	Fri Jan 25 14:23:32 2013 +0100
@@ -31,6 +31,7 @@
 
 import org.apache.log4j.Logger;
 import org.hibernate.criterion.Restrictions;
+import org.openbravo.advpaymentmngt.utility.FIN_Utility;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.session.OBPropertiesProvider;
 import org.openbravo.dal.core.OBContext;
@@ -54,6 +55,7 @@
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment_Credit;
 import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
@@ -112,8 +114,9 @@
   public FieldProviderFactory[] loadLinesPaymentDetailsFieldProvider(
       FIN_FinaccTransaction transaction) {
     FIN_Payment payment = transaction.getFinPayment();
-    List<FIN_PaymentDetail> paymentDetails = payment.getFINPaymentDetailList();
+    List<FIN_PaymentDetail> paymentDetails = FIN_Utility.getOrderedPaymentDetailList(payment);
     FieldProviderFactory[] data = new FieldProviderFactory[paymentDetails.size()];
+    FIN_PaymentSchedule ps = null;
     OBContext.setAdminMode();
     try {
       for (int i = 0; i < data.length; i++) {
@@ -122,9 +125,41 @@
          */
         // Details refunded used credit are excluded as the entry will be created using the credit
         // used
-        if (paymentDetails.get(i).isRefund() && paymentDetails.get(i).isPrepayment())
+        if (paymentDetails.get(i).isRefund() && paymentDetails.get(i).isPrepayment()) {
           continue;
+        }
         data[i] = new FieldProviderFactory(null);
+
+        FIN_PaymentSchedule psi = paymentDetails.get(i).getFINPaymentScheduleDetailList().get(0)
+            .getInvoicePaymentSchedule();
+        FIN_PaymentSchedule pso = paymentDetails.get(i).getFINPaymentScheduleDetailList().get(0)
+            .getOrderPaymentSchedule();
+        // If the Payment Detail belongs to the same Invoice of the previous one
+        if (psi != null && psi.equals(ps)) {
+          // If it has no related Order
+          if (pso == null) {
+            // Sum the Amount of this Payment Detail to the Previous one. This line is not going to
+            // be posted.
+            FieldProviderFactory.setField(data[i - 1], "Amount", paymentDetails.get(i).getAmount()
+                .add(new BigDecimal(data[i - 1].getField("Amount"))).toString());
+            data[i] = null;
+            continue;
+          } else {
+            // Sum the Amount of the previous Payment Detail to this one. The previous line is not
+            // going to be posted
+            FieldProviderFactory.setField(
+                data[i],
+                "Amount",
+                paymentDetails.get(i).getAmount()
+                    .add(new BigDecimal(data[i - 1].getField("Amount"))).toString());
+            data[i - 1] = null;
+          }
+        } else {
+          FieldProviderFactory.setField(data[i], "Amount", paymentDetails.get(i).getAmount()
+              .toString());
+        }
+        ps = psi;
+
         FieldProviderFactory.setField(data[i], "FIN_Finacc_Transaction_ID", transaction.getId());
         FieldProviderFactory.setField(data[i], "AD_Client_ID", paymentDetails.get(i).getClient()
             .getId());
@@ -137,8 +172,6 @@
             .toString());
         FieldProviderFactory.setField(data[i], "PaymentAmount", transaction.getPaymentAmount()
             .toString());
-        FieldProviderFactory.setField(data[i], "Amount", paymentDetails.get(i).getAmount()
-            .toString());
         FieldProviderFactory.setField(data[i], "isprepayment",
             paymentDetails.get(i).isPrepayment() ? "Y" : "N");
         // Check if payment against invoice is in a previous date than invoice accounting date
@@ -499,24 +532,32 @@
             DocLine line2 = new DocLine(DocumentType, Record_ID, line.m_TrxLine_ID);
             line2.copyInfo(line);
             line2.m_DateAcct = OBDateUtils.formatDate(invoice.getAccountingDate());
-            fact.createLine(
-                line2,
-                getAccountBPartner((line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID
+            // checking if the prepayment account and ReceivablesNo account in the Business Partner
+            // is the same.In this case we do not need to create more accounting lines
+            if (!getAccountBPartner(
+                (line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID.equals("")) ? this.C_BPartner_ID
+                    : line2.m_C_BPartner_ID, as, isReceipt, true, conn).Account_ID
+                .equals(getAccountBPartner((line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID
                     .equals("")) ? this.C_BPartner_ID : line2.m_C_BPartner_ID, as, isReceipt,
-                    false, conn), paymentCurrency.getId(),
-                (isReceipt ? "" : bpAmountConverted.toString()),
-                (isReceipt ? bpAmountConverted.toString() : ""), Fact_Acct_Group_ID2,
-                nextSeqNo(SeqNo), DocumentType, conn);
-            fact.createLine(
-                line2,
-                getAccountBPartner((line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID
-                    .equals("")) ? this.C_BPartner_ID : line2.m_C_BPartner_ID, as, isReceipt, true,
-                    conn), paymentCurrency.getId(),
-                (!isReceipt ? "" : bpAmountConverted.toString()),
-                (!isReceipt ? bpAmountConverted.toString() : ""), Fact_Acct_Group_ID2,
-                nextSeqNo(SeqNo), DocumentType, conn);
+                    false, conn).Account_ID)) {
+              fact.createLine(
+                  line2,
+                  getAccountBPartner((line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID
+                      .equals("")) ? this.C_BPartner_ID : line2.m_C_BPartner_ID, as, isReceipt,
+                      false, conn), paymentCurrency.getId(),
+                  (isReceipt ? "" : bpAmountConverted.toString()),
+                  (isReceipt ? bpAmountConverted.toString() : ""), Fact_Acct_Group_ID2,
+                  nextSeqNo(SeqNo), DocumentType, conn);
+              fact.createLine(
+                  line2,
+                  getAccountBPartner((line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID
+                      .equals("")) ? this.C_BPartner_ID : line2.m_C_BPartner_ID, as, isReceipt,
+                      true, conn), paymentCurrency.getId(),
+                  (!isReceipt ? "" : bpAmountConverted.toString()),
+                  (!isReceipt ? bpAmountConverted.toString() : ""), Fact_Acct_Group_ID2,
+                  nextSeqNo(SeqNo), DocumentType, conn);
+            }
           }
-
         }
       }
       // Pre-payment is consumed when Used Credit Amount not equals Zero. When consuming Credit no
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java	Fri Jan 25 14:23:32 2013 +0100
@@ -28,6 +28,7 @@
 
 import org.apache.log4j.Logger;
 import org.hibernate.criterion.Restrictions;
+import org.openbravo.advpaymentmngt.utility.FIN_Utility;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.session.OBPropertiesProvider;
 import org.openbravo.dal.core.OBContext;
@@ -49,6 +50,7 @@
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment_Credit;
 import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
@@ -82,19 +84,53 @@
 
   public FieldProviderFactory[] loadLinesFieldProvider(String Id) {
     FIN_Payment payment = OBDal.getInstance().get(FIN_Payment.class, Id);
-    List<FIN_PaymentDetail> paymentDetails = payment.getFINPaymentDetailList();
+    List<FIN_PaymentDetail> paymentDetails = FIN_Utility.getOrderedPaymentDetailList(payment);
     if (paymentDetails == null)
       return null;
 
     FieldProviderFactory[] data = new FieldProviderFactory[paymentDetails.size()];
+    FIN_PaymentSchedule ps = null;
     OBContext.setAdminMode();
     try {
       for (int i = 0; i < data.length; i++) {
         // Details refunded used credit are excluded as the entry will be created using the credit
         // used
-        if (paymentDetails.get(i).isRefund() && paymentDetails.get(i).isPrepayment())
+        if (paymentDetails.get(i).isRefund() && paymentDetails.get(i).isPrepayment()) {
           continue;
+        }
+
         data[i] = new FieldProviderFactory(null);
+
+        FIN_PaymentSchedule psi = paymentDetails.get(i).getFINPaymentScheduleDetailList().get(0)
+            .getInvoicePaymentSchedule();
+        FIN_PaymentSchedule pso = paymentDetails.get(i).getFINPaymentScheduleDetailList().get(0)
+            .getOrderPaymentSchedule();
+        // If the Payment Detail belongs to the same Invoice of the previous one
+        if (psi != null && psi.equals(ps)) {
+          // If it has no related Order
+          if (pso == null) {
+            // Sum the Amount of this Payment Detail to the Previous one. This line is not going to
+            // be posted.
+            FieldProviderFactory.setField(data[i - 1], "Amount", paymentDetails.get(i).getAmount()
+                .add(new BigDecimal(data[i - 1].getField("Amount"))).toString());
+            data[i] = null;
+            continue;
+          } else {
+            // Sum the Amount of the previous Payment Detail to this one. The previous line is not
+            // going to be posted
+            FieldProviderFactory.setField(
+                data[i],
+                "Amount",
+                paymentDetails.get(i).getAmount()
+                    .add(new BigDecimal(data[i - 1].getField("Amount"))).toString());
+            data[i - 1] = null;
+          }
+        } else {
+          FieldProviderFactory.setField(data[i], "Amount", paymentDetails.get(i).getAmount()
+              .toString());
+        }
+        ps = psi;
+
         FieldProviderFactory.setField(data[i], "AD_Client_ID", paymentDetails.get(i).getClient()
             .getId());
         FieldProviderFactory.setField(data[i], "AD_Org_ID", paymentDetails.get(i).getOrganization()
@@ -114,8 +150,6 @@
             .getBusinessPartner())));
         FieldProviderFactory.setField(data[i], "cBpartnerId", bPartner != null ? bPartner.getId()
             : "");
-        FieldProviderFactory.setField(data[i], "Amount", paymentDetails.get(i).getAmount()
-            .toString());
         FieldProviderFactory.setField(data[i], "WriteOffAmt", paymentDetails.get(i)
             .getWriteoffAmount().toString());
         FieldProviderFactory.setField(data[i], "C_GLItem_ID",
@@ -330,20 +364,29 @@
             DocLine line2 = new DocLine(DocumentType, Record_ID, line.m_TrxLine_ID);
             line2.copyInfo(line);
             line2.m_DateAcct = OBDateUtils.formatDate(invoice.getAccountingDate());
-            fact.createLine(
-                line2,
-                getAccountBPartner((line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID
+            // checking if the prepayment account and ReceivablesNo account in the Business Partner
+            // is the same.In this case we do not need to create more accounting lines
+            if (!getAccountBPartner(
+                (line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID.equals("")) ? this.C_BPartner_ID
+                    : line2.m_C_BPartner_ID, as, isReceipt, true, conn).Account_ID
+                .equals(getAccountBPartner((line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID
                     .equals("")) ? this.C_BPartner_ID : line2.m_C_BPartner_ID, as, isReceipt,
-                    false, conn), strcCurrencyId, (isReceipt ? "" : bpAmountConverted),
-                (isReceipt ? bpAmountConverted : ""), Fact_Acct_Group_ID2, nextSeqNo(SeqNo),
-                DocumentType, conn);
-            fact.createLine(
-                line2,
-                getAccountBPartner((line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID
-                    .equals("")) ? this.C_BPartner_ID : line2.m_C_BPartner_ID, as, isReceipt, true,
-                    conn), strcCurrencyId, (!isReceipt ? "" : bpAmountConverted),
-                (!isReceipt ? bpAmountConverted : ""), Fact_Acct_Group_ID2, nextSeqNo(SeqNo),
-                DocumentType, conn);
+                    false, conn).Account_ID)) {
+              fact.createLine(
+                  line2,
+                  getAccountBPartner((line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID
+                      .equals("")) ? this.C_BPartner_ID : line2.m_C_BPartner_ID, as, isReceipt,
+                      false, conn), strcCurrencyId, (isReceipt ? "" : bpAmountConverted),
+                  (isReceipt ? bpAmountConverted : ""), Fact_Acct_Group_ID2, nextSeqNo(SeqNo),
+                  DocumentType, conn);
+              fact.createLine(
+                  line2,
+                  getAccountBPartner((line2.m_C_BPartner_ID == null || line2.m_C_BPartner_ID
+                      .equals("")) ? this.C_BPartner_ID : line2.m_C_BPartner_ID, as, isReceipt,
+                      true, conn), strcCurrencyId, (!isReceipt ? "" : bpAmountConverted),
+                  (!isReceipt ? bpAmountConverted : ""), Fact_Acct_Group_ID2, nextSeqNo(SeqNo),
+                  DocumentType, conn);
+            }
           }
         } else {
           fact.createLine(
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java	Fri Jan 25 14:23:32 2013 +0100
@@ -34,6 +34,7 @@
 
 import org.apache.log4j.Logger;
 import org.hibernate.criterion.Restrictions;
+import org.openbravo.advpaymentmngt.utility.FIN_Utility;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.session.OBPropertiesProvider;
 import org.openbravo.dal.core.OBContext;
@@ -62,6 +63,7 @@
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment_Credit;
 import org.openbravo.model.financialmgmt.payment.FIN_Reconciliation;
@@ -167,16 +169,49 @@
       FIN_FinaccTransaction transaction) {
     FIN_Payment payment = OBDal.getInstance().get(FIN_Payment.class,
         transaction.getFinPayment().getId());
-    List<FIN_PaymentDetail> paymentDetails = payment.getFINPaymentDetailList();
+    List<FIN_PaymentDetail> paymentDetails = FIN_Utility.getOrderedPaymentDetailList(payment);
     FieldProviderFactory[] data = new FieldProviderFactory[paymentDetails.size()];
+    FIN_PaymentSchedule ps = null;
     OBContext.setAdminMode();
     try {
       for (int i = 0; i < data.length; i++) {
         // Details refunded used credit are excluded as the entry will be created using the credit
         // used
-        if (paymentDetails.get(i).isRefund() && paymentDetails.get(i).isPrepayment())
+        if (paymentDetails.get(i).isRefund() && paymentDetails.get(i).isPrepayment()) {
           continue;
+        }
         data[i] = new FieldProviderFactory(null);
+
+        FIN_PaymentSchedule psi = paymentDetails.get(i).getFINPaymentScheduleDetailList().get(0)
+            .getInvoicePaymentSchedule();
+        FIN_PaymentSchedule pso = paymentDetails.get(i).getFINPaymentScheduleDetailList().get(0)
+            .getOrderPaymentSchedule();
+        // If the Payment Detail belongs to the same Invoice of the previous one
+        if (psi != null && psi.equals(ps)) {
+          // If it has no related Order
+          if (pso == null) {
+            // Sum the Amount of this Payment Detail to the Previous one. This line is not going to
+            // be posted.
+            FieldProviderFactory.setField(data[i - 1], "Amount", paymentDetails.get(i).getAmount()
+                .add(new BigDecimal(data[i - 1].getField("Amount"))).toString());
+            data[i] = null;
+            continue;
+          } else {
+            // Sum the Amount of the previous Payment Detail to this one. The previous line is not
+            // going to be posted
+            FieldProviderFactory.setField(
+                data[i],
+                "Amount",
+                paymentDetails.get(i).getAmount()
+                    .add(new BigDecimal(data[i - 1].getField("Amount"))).toString());
+            data[i - 1] = null;
+          }
+        } else {
+          FieldProviderFactory.setField(data[i], "Amount", paymentDetails.get(i).getAmount()
+              .toString());
+        }
+        ps = psi;
+
         FieldProviderFactory.setField(data[i], "FIN_Reconciliation_ID", transaction
             .getReconciliation().getId());
         FieldProviderFactory.setField(data[i], "FIN_Finacc_Transaction_ID", transaction.getId());
@@ -196,8 +231,6 @@
             .toString());
         FieldProviderFactory.setField(data[i], "PaymentAmount", transaction.getPaymentAmount()
             .toString());
-        FieldProviderFactory.setField(data[i], "Amount", paymentDetails.get(i).getAmount()
-            .toString());
         FieldProviderFactory.setField(data[i], "isprepayment",
             paymentDetails.get(i).isPrepayment() ? "Y" : "N");
         // Check if payment against invoice is in a previous date than invoice accounting date
@@ -832,14 +865,19 @@
         DocLine line2 = new DocLine(DocumentType, Record_ID, line.m_TrxLine_ID);
         line2.copyInfo(line);
         line2.m_DateAcct = OBDateUtils.formatDate(invoice.getAccountingDate());
-        fact.createLine(line2, getAccountBPartner(bpartnerId, as, isReceipt, false, conn),
-            paymentCurrency.getId(), !isReceipt ? bpAmountConverted.toString() : "",
-            isReceipt ? bpAmountConverted.toString() : "", Fact_Acct_Group_ID2, nextSeqNo(SeqNo),
-            DocumentType, line2.m_DateAcct, null, conn);
-        fact.createLine(line2, getAccountBPartner(bpartnerId, as, isReceipt, true, conn),
-            paymentCurrency.getId(), isReceipt ? bpAmountConverted.toString() : "",
-            !isReceipt ? bpAmountConverted.toString() : "", Fact_Acct_Group_ID2, nextSeqNo(SeqNo),
-            DocumentType, line2.m_DateAcct, null, conn);
+        // checking if the prepayment account and ReceivablesNo account in the Business Partner
+        // is the same.In this case we do not need to create more accounting lines
+        if (!getAccountBPartner(bpartnerId, as, isReceipt, false, conn).Account_ID
+            .equals(getAccountBPartner(bpartnerId, as, isReceipt, true, conn))) {
+          fact.createLine(line2, getAccountBPartner(bpartnerId, as, isReceipt, false, conn),
+              paymentCurrency.getId(), !isReceipt ? bpAmountConverted.toString() : "",
+              isReceipt ? bpAmountConverted.toString() : "", Fact_Acct_Group_ID2, nextSeqNo(SeqNo),
+              DocumentType, line2.m_DateAcct, null, conn);
+          fact.createLine(line2, getAccountBPartner(bpartnerId, as, isReceipt, true, conn),
+              paymentCurrency.getId(), isReceipt ? bpAmountConverted.toString() : "",
+              !isReceipt ? bpAmountConverted.toString() : "", Fact_Acct_Group_ID2,
+              nextSeqNo(SeqNo), DocumentType, line2.m_DateAcct, null, conn);
+        }
       }
     }
 
--- a/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.xml	Fri Jan 25 14:20:51 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.xml	Fri Jan 25 14:23:32 2013 +0100
@@ -69,7 +69,7 @@
     <FIELD id="fieldRequester">requester</FIELD>
     <FIELD id="fieldVendor">vendor</FIELD>
     <FIELD id="fieldPriceList">pricelistid</FIELD>
-    <FIELD id="fieldPrice" format="euroEdition">price</FIELD>
+    <FIELD id="fieldPrice" format="priceEdition">price</FIELD>
     <SECTION id="sectionLinesDetail"/>
   </structure>
 
@@ -86,12 +86,12 @@
     <FIELD id="fieldMatchedQty" format="euroEdition">matchedqty</FIELD>
     <FIELD id="fieldSelQty" format="euroEdition" attribute="value">lockqty</FIELD>
     <FIELD id="fieldSelQty" attribute="name" replace="xx">mRequisitionlineId</FIELD>
-    <FIELD id="fieldSelPrice" format="euroEdition" attribute="value">lockprice</FIELD>
+    <FIELD id="fieldSelPrice" format="priceEdition" attribute="value">lockprice</FIELD>
     <FIELD id="fieldSelUnit">uomname</FIELD>
     <FIELD id="fieldSelSecQuantity" format="euroEdition">quantityorder</FIELD>
     <FIELD id="fieldSelSecUnit">secuomname</FIELD>
     <FIELD id="fieldSelPrice" attribute="name" replace="xx">mRequisitionlineId</FIELD>
-    <FIELD id="fieldPriceList" format="euroEdition">pricelist</FIELD>
+    <FIELD id="fieldPriceList" format="priceEdition">pricelist</FIELD>
 
     <SECTION id="sectionVendor" field="vendorId"/>
     <SECTION id="sectionPriceList" field="mPricelistId"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java	Fri Jan 25 14:23:32 2013 +0100
@@ -28,7 +28,6 @@
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.costing.CostingStatus;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
@@ -42,7 +41,6 @@
 import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.erpCommon.utility.ToolBar;
 import org.openbravo.erpCommon.utility.Utility;
-import org.openbravo.financial.FinancialUtils;
 import org.openbravo.model.common.enterprise.Locator;
 import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.model.common.enterprise.Warehouse;
@@ -112,9 +110,13 @@
         Organization legalEntity = OBContext.getOBContext()
             .getOrganizationStructureProvider(wh.getClient().getId())
             .getLegalEntity(wh.getOrganization());
+        if (legalEntity == null) {
+          advise(request, response, "ERROR",
+              Utility.messageBD(this, "WarehouseNotInLE", vars.getLanguage()), "");
+        }
         data = ReportValuationStockData.select(this, vars.getLanguage(), strCurrencyId,
-            legalEntity.getId(), DateTimeData.nDaysAfter(this, strDate, "1"), strWarehouse,
-            strCategoryProduct);
+            (legalEntity == null) ? null : legalEntity.getId(),
+            DateTimeData.nDaysAfter(this, strDate, "1"), strWarehouse, strCategoryProduct);
         boolean hasTrxWithNoCost = hasTrxWithNoCost(strDate, strWarehouse, strCategoryProduct);
         if (hasTrxWithNoCost) {
           OBError warning = new OBError();
--- a/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java	Fri Jan 25 14:20:51 2013 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java	Fri Jan 25 14:23:32 2013 +0100
@@ -645,7 +645,12 @@
     if (role != null)
       newUser.setDefaultRole(role);
     OBDal.getInstance().save(newUser);
-    OBDal.getInstance().flush();
+    OBContext.setAdminMode(true);
+    try {
+      OBDal.getInstance().flush();
+    } finally {
+      OBContext.restorePreviousMode();
+    }
     return newUser;
   }