[calendar] Merge from pi
authorDavid Baz Fayos <david.baz@openbravo.com>
Sat, 26 Jan 2013 21:59:59 +0100
changeset 19516 76fd8a0d8eee
parent 19515 9099bfe9ed8f (current diff)
parent 19456 603290cb6a8a (diff)
child 19517 0c2c4a07c751
[calendar] Merge from pi
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
--- a/.hgsigs	Wed Jan 23 11:23:30 2013 +0100
+++ b/.hgsigs	Sat Jan 26 21:59:59 2013 +0100
@@ -96,4 +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	Wed Jan 23 11:23:30 2013 +0100
+++ b/.hgtags	Sat Jan 26 21:59:59 2013 +0100
@@ -107,4 +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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Sat Jan 26 21:59:59 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_MESSAGE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -11,6 +11,17 @@
 <!--0267A646C8BD4042AE2422BCB83B4610-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--0267A646C8BD4042AE2422BCB83B4610--></AD_MESSAGE>
 
+<!--02E1AA15BFCB420C8F618A14ED80F33E--><AD_MESSAGE>
+<!--02E1AA15BFCB420C8F618A14ED80F33E-->  <AD_MESSAGE_ID><![CDATA[02E1AA15BFCB420C8F618A14ED80F33E]]></AD_MESSAGE_ID>
+<!--02E1AA15BFCB420C8F618A14ED80F33E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--02E1AA15BFCB420C8F618A14ED80F33E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--02E1AA15BFCB420C8F618A14ED80F33E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--02E1AA15BFCB420C8F618A14ED80F33E-->  <VALUE><![CDATA[APRM_JSZEROUNDERPAYMENT]]></VALUE>
+<!--02E1AA15BFCB420C8F618A14ED80F33E-->  <MSGTEXT><![CDATA[A zero amount Payment cannot be left as an underpayment.]]></MSGTEXT>
+<!--02E1AA15BFCB420C8F618A14ED80F33E-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--02E1AA15BFCB420C8F618A14ED80F33E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--02E1AA15BFCB420C8F618A14ED80F33E--></AD_MESSAGE>
+
 <!--0AF37AC554DE441DB213BA944147E82C--><AD_MESSAGE>
 <!--0AF37AC554DE441DB213BA944147E82C-->  <AD_MESSAGE_ID><![CDATA[0AF37AC554DE441DB213BA944147E82C]]></AD_MESSAGE_ID>
 <!--0AF37AC554DE441DB213BA944147E82C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.19451]]></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/ad_actionbutton/AddOrderOrInvoice.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Sat Jan 26 21:59:59 2013 +0100
@@ -276,7 +276,7 @@
                   (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" : "D", payment);
             }
             if (strDifferenceAction.equals("refund")
-                && !"Error".equalsIgnoreCase(message.getType())) {
+                && (message == null || !"Error".equalsIgnoreCase(message.getType()))) {
               Boolean newPayment = !payment.getFINPaymentDetailList().isEmpty();
               FIN_Payment refundPayment = FIN_AddPayment.createRefundPayment(this, vars, payment,
                   refundAmount.negate(), exchangeRate);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournalLine.java	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Sat Jan 26 21:59:59 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.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js	Sat Jan 26 21:59:59 2013 +0100
@@ -326,7 +326,7 @@
   // Only possible to pay 0 in case of a write off
   if (selectedAction !== "writeoff" && compare(amount, '==', 0)) {
     setWindowElementFocus(frm.elements["inpPaymentAmount" + recordID]);
-    showJSMessage(9);
+    showJSMessage('APRM_JSZEROUNDERPAYMENT');
     return false;
   }
   if (existsPendingAmount && compare(amount, '<', pendingAmount)) {
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.19451]]></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/model/tables/OBUIAPP_PARAMETER.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PARAMETER.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -105,6 +105,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
       </column>
+      <column name="DISPLAYLOGIC" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_PARAMETER_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -1630,7 +1630,7 @@
 <!--4983D4CEABA94A208017768A1CEAA032-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4983D4CEABA94A208017768A1CEAA032-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4983D4CEABA94A208017768A1CEAA032-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--4983D4CEABA94A208017768A1CEAA032-->  <POSITION><![CDATA[26]]></POSITION>
+<!--4983D4CEABA94A208017768A1CEAA032-->  <POSITION><![CDATA[25]]></POSITION>
 <!--4983D4CEABA94A208017768A1CEAA032-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4983D4CEABA94A208017768A1CEAA032-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4983D4CEABA94A208017768A1CEAA032-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -2279,6 +2279,41 @@
 <!--6B89B4DC342B48F989E55D70BB2CC9B0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--6B89B4DC342B48F989E55D70BB2CC9B0--></AD_COLUMN>
 
+<!--6D0A663C73C646E3808A2D00D63BC55E--><AD_COLUMN>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <AD_COLUMN_ID><![CDATA[6D0A663C73C646E3808A2D00D63BC55E]]></AD_COLUMN_ID>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <NAME><![CDATA[Display Logic]]></NAME>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <DESCRIPTION><![CDATA[A specification of statements which, when evaluated as false, cause the field to appear hidden.]]></DESCRIPTION>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <HELP><![CDATA[A specification of statements which, when evaluated as false, cause the field to appear hidden.]]></HELP>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <COLUMNNAME><![CDATA[Displaylogic]]></COLUMNNAME>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <AD_TABLE_ID><![CDATA[30123B1001FC4E82BB4CB9725E069B48]]></AD_TABLE_ID>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <FIELDLENGTH><![CDATA[2000]]></FIELDLENGTH>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <SEQNO><![CDATA[280]]></SEQNO>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <AD_ELEMENT_ID><![CDATA[283]]></AD_ELEMENT_ID>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <POSITION><![CDATA[28]]></POSITION>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6D0A663C73C646E3808A2D00D63BC55E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6D0A663C73C646E3808A2D00D63BC55E--></AD_COLUMN>
+
 <!--6DCC7505E5C04403A7AA24E1A45824DA--><AD_COLUMN>
 <!--6DCC7505E5C04403A7AA24E1A45824DA-->  <AD_COLUMN_ID><![CDATA[6DCC7505E5C04403A7AA24E1A45824DA]]></AD_COLUMN_ID>
 <!--6DCC7505E5C04403A7AA24E1A45824DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5865,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>
@@ -6824,7 +6859,7 @@
 <!--FB975B710F5544CC8BC99F981F63C1CD-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--FB975B710F5544CC8BC99F981F63C1CD-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--FB975B710F5544CC8BC99F981F63C1CD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--FB975B710F5544CC8BC99F981F63C1CD-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--FB975B710F5544CC8BC99F981F63C1CD-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--FB975B710F5544CC8BC99F981F63C1CD-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
 <!--FB975B710F5544CC8BC99F981F63C1CD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--FB975B710F5544CC8BC99F981F63C1CD-->  <SEQNO><![CDATA[190]]></SEQNO>
@@ -6871,7 +6906,7 @@
 <!--FC60C911562841BEADBC6715FA919941-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--FC60C911562841BEADBC6715FA919941-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FC60C911562841BEADBC6715FA919941-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--FC60C911562841BEADBC6715FA919941-->  <POSITION><![CDATA[27]]></POSITION>
+<!--FC60C911562841BEADBC6715FA919941-->  <POSITION><![CDATA[26]]></POSITION>
 <!--FC60C911562841BEADBC6715FA919941-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--FC60C911562841BEADBC6715FA919941-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--FC60C911562841BEADBC6715FA919941-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -2122,7 +2122,7 @@
 <!--865E6707D439406D8F3C60819C372B9E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--865E6707D439406D8F3C60819C372B9E-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--865E6707D439406D8F3C60819C372B9E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--865E6707D439406D8F3C60819C372B9E-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--865E6707D439406D8F3C60819C372B9E-->  <SEQNO><![CDATA[190]]></SEQNO>
 <!--865E6707D439406D8F3C60819C372B9E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--865E6707D439406D8F3C60819C372B9E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--865E6707D439406D8F3C60819C372B9E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -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>
@@ -3055,6 +3057,34 @@
 <!--CCED14831FE14A749725EF00A2DC5FC6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--CCED14831FE14A749725EF00A2DC5FC6--></AD_FIELD>
 
+<!--CD0E9652F46441AA9A75A0A2FC467706--><AD_FIELD>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <AD_FIELD_ID><![CDATA[CD0E9652F46441AA9A75A0A2FC467706]]></AD_FIELD_ID>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <NAME><![CDATA[Display Logic]]></NAME>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <DESCRIPTION><![CDATA[A specification of statements which, when evaluated as false, cause the field to appear hidden.]]></DESCRIPTION>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <HELP><![CDATA[A specification of statements which, when evaluated as false, cause the field to appear hidden.]]></HELP>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <AD_TAB_ID><![CDATA[FF80818132D8C36D0132D8C4936F0006]]></AD_TAB_ID>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <AD_COLUMN_ID><![CDATA[6D0A663C73C646E3808A2D00D63BC55E]]></AD_COLUMN_ID>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <DISPLAYLENGTH><![CDATA[2000]]></DISPLAYLENGTH>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--CD0E9652F46441AA9A75A0A2FC467706-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--CD0E9652F46441AA9A75A0A2FC467706--></AD_FIELD>
+
 <!--D6FC282E5E614AED8C301C8FEC0436FB--><AD_FIELD>
 <!--D6FC282E5E614AED8C301C8FEC0436FB-->  <AD_FIELD_ID><![CDATA[D6FC282E5E614AED8C301C8FEC0436FB]]></AD_FIELD_ID>
 <!--D6FC282E5E614AED8C301C8FEC0436FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -66,6 +66,17 @@
 <!--04A912EBB5154048961E21EF15380D4A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--04A912EBB5154048961E21EF15380D4A--></AD_MESSAGE>
 
+<!--04E5DFD5293748308CF3ED2848CE8AE4--><AD_MESSAGE>
+<!--04E5DFD5293748308CF3ED2848CE8AE4-->  <AD_MESSAGE_ID><![CDATA[04E5DFD5293748308CF3ED2848CE8AE4]]></AD_MESSAGE_ID>
+<!--04E5DFD5293748308CF3ED2848CE8AE4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--04E5DFD5293748308CF3ED2848CE8AE4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--04E5DFD5293748308CF3ED2848CE8AE4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--04E5DFD5293748308CF3ED2848CE8AE4-->  <VALUE><![CDATA[OBUIAPP_Print]]></VALUE>
+<!--04E5DFD5293748308CF3ED2848CE8AE4-->  <MSGTEXT><![CDATA[Print]]></MSGTEXT>
+<!--04E5DFD5293748308CF3ED2848CE8AE4-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--04E5DFD5293748308CF3ED2848CE8AE4-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--04E5DFD5293748308CF3ED2848CE8AE4--></AD_MESSAGE>
+
 <!--07272FCDEEA64054AF2F983D9814EE00--><AD_MESSAGE>
 <!--07272FCDEEA64054AF2F983D9814EE00-->  <AD_MESSAGE_ID><![CDATA[07272FCDEEA64054AF2F983D9814EE00]]></AD_MESSAGE_ID>
 <!--07272FCDEEA64054AF2F983D9814EE00-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -253,6 +264,17 @@
 <!--2052DF26669F4864B295C17502F53E38-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--2052DF26669F4864B295C17502F53E38--></AD_MESSAGE>
 
+<!--20EBBDD0DE864992AD7B8090D1126A06--><AD_MESSAGE>
+<!--20EBBDD0DE864992AD7B8090D1126A06-->  <AD_MESSAGE_ID><![CDATA[20EBBDD0DE864992AD7B8090D1126A06]]></AD_MESSAGE_ID>
+<!--20EBBDD0DE864992AD7B8090D1126A06-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--20EBBDD0DE864992AD7B8090D1126A06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--20EBBDD0DE864992AD7B8090D1126A06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--20EBBDD0DE864992AD7B8090D1126A06-->  <VALUE><![CDATA[OBUIAPP_RestrictedUser]]></VALUE>
+<!--20EBBDD0DE864992AD7B8090D1126A06-->  <MSGTEXT><![CDATA[This user doesn't have access to the backend. To be able to access Openbravo, a user needs a role with access to the backend.]]></MSGTEXT>
+<!--20EBBDD0DE864992AD7B8090D1126A06-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--20EBBDD0DE864992AD7B8090D1126A06-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--20EBBDD0DE864992AD7B8090D1126A06--></AD_MESSAGE>
+
 <!--2C8A8843F1E04317AD38623A3C52F978--><AD_MESSAGE>
 <!--2C8A8843F1E04317AD38623A3C52F978-->  <AD_MESSAGE_ID><![CDATA[2C8A8843F1E04317AD38623A3C52F978]]></AD_MESSAGE_ID>
 <!--2C8A8843F1E04317AD38623A3C52F978-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -530,6 +552,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>
@@ -541,6 +574,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>
@@ -663,6 +707,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>
@@ -708,6 +763,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 +939,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 +1006,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 +1149,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>
@@ -1083,6 +1182,17 @@
 <!--D514BC49ED374B7288B215D94DAC3177-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--D514BC49ED374B7288B215D94DAC3177--></AD_MESSAGE>
 
+<!--D71BBF4693BD45329F17355A907B9D39--><AD_MESSAGE>
+<!--D71BBF4693BD45329F17355A907B9D39-->  <AD_MESSAGE_ID><![CDATA[D71BBF4693BD45329F17355A907B9D39]]></AD_MESSAGE_ID>
+<!--D71BBF4693BD45329F17355A907B9D39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D71BBF4693BD45329F17355A907B9D39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D71BBF4693BD45329F17355A907B9D39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D71BBF4693BD45329F17355A907B9D39-->  <VALUE><![CDATA[OBUIAPP_RestrictedUserTitle]]></VALUE>
+<!--D71BBF4693BD45329F17355A907B9D39-->  <MSGTEXT><![CDATA[Access Restricted]]></MSGTEXT>
+<!--D71BBF4693BD45329F17355A907B9D39-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--D71BBF4693BD45329F17355A907B9D39-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--D71BBF4693BD45329F17355A907B9D39--></AD_MESSAGE>
+
 <!--DAC8C406FB1D497CAF91619E6B8A5458--><AD_MESSAGE>
 <!--DAC8C406FB1D497CAF91619E6B8A5458-->  <AD_MESSAGE_ID><![CDATA[DAC8C406FB1D497CAF91619E6B8A5458]]></AD_MESSAGE_ID>
 <!--DAC8C406FB1D497CAF91619E6B8A5458-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1138,6 +1248,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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Sat Jan 26 21:59:59 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));
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Sat Jan 26 21:59:59 2013 +0100
@@ -65,6 +65,7 @@
   }
 
   private List<Field> fieldsInExpression = new ArrayList<Field>();
+  private List<Parameter> parametersInExpression = new ArrayList<Parameter>();
   private List<AuxiliaryInput> auxInputsInExpression = new ArrayList<AuxiliaryInput>();
   private List<String> sessionAttributesInExpression = new ArrayList<String>();
 
@@ -73,8 +74,18 @@
   private Field field;
   private StringBuffer jsCode;
   private boolean tabLevelDisplayLogic = false;
+  private boolean parameterDisplayLogic = false;
+  Process process;
+
   private ApplicationDictionaryCachedStructures cachedStructures;
 
+  public DynamicExpressionParser(String code, Process process, boolean parameterDisplayLogic) {
+    this.code = code;
+    this.process = process;
+    this.parameterDisplayLogic = parameterDisplayLogic;
+    parse();
+  }
+
   public DynamicExpressionParser(String code, Tab tab, boolean tabLevelDisplayLogic) {
     this.code = code;
     this.tab = tab;
@@ -198,6 +209,14 @@
   }
 
   /**
+   * Returns the list of Parameters used in the dynamic expression
+   * 
+   */
+  public List<Parameter> getParameters() {
+    return parametersInExpression;
+  }
+
+  /**
    * Returns the list of session attribute names used in the dynamic expression
    * 
    */
@@ -276,37 +295,52 @@
       return new DisplayLogicElement("", false);
     List<Field> fields;
     List<AuxiliaryInput> auxIns;
-    try {
-      if (cachedStructures == null) {
-        cachedStructures = WeldUtils
-            .getInstanceFromStaticBeanManager(ApplicationDictionaryCachedStructures.class);
+    if (parameterDisplayLogic) {
+      List<Parameter> parameters = process.getOBUIAPPParameterList();
+      for (Parameter parameter : parameters) {
+        if (token.equalsIgnoreCase(parameter.getDBColumnName())) {
+          parametersInExpression.add(parameter);
+          UIDefinition uiDef = UIDefinitionController.getInstance().getUIDefinition(
+              parameter.getReference());
+
+          return new DisplayLogicElement("OB.Utilities.getValue(currentValues,'" + token + "')",
+              uiDef instanceof YesNoUIDefinition);
+        }
       }
-      fields = cachedStructures.getFieldsOfTab(tab.getId());
-      auxIns = cachedStructures.getAuxiliarInputList(tab.getId());
-    } catch (NullPointerException e) {
-      fields = tab.getADFieldList();
-      auxIns = tab.getADAuxiliaryInputList();
-    }
-    for (Field field : fields) {
-      if (field.getColumn() == null) {
-        continue;
+    } else {
+      try {
+        if (cachedStructures == null) {
+          cachedStructures = WeldUtils
+              .getInstanceFromStaticBeanManager(ApplicationDictionaryCachedStructures.class);
+        }
+        fields = cachedStructures.getFieldsOfTab(tab.getId());
+        auxIns = cachedStructures.getAuxiliarInputList(tab.getId());
+      } catch (NullPointerException e) {
+        fields = tab.getADFieldList();
+        auxIns = tab.getADAuxiliaryInputList();
       }
-      if (token.equalsIgnoreCase(field.getColumn().getDBColumnName())) {
-        fieldsInExpression.add(field);
-        final String fieldName = KernelUtils.getInstance().getPropertyFromColumn(field.getColumn())
-            .getName();
+      for (Field field : fields) {
+        if (field.getColumn() == null) {
+          continue;
+        }
+        if (token.equalsIgnoreCase(field.getColumn().getDBColumnName())) {
+          fieldsInExpression.add(field);
+          final String fieldName = KernelUtils.getInstance()
+              .getPropertyFromColumn(field.getColumn()).getName();
 
-        UIDefinition uiDef = UIDefinitionController.getInstance().getUIDefinition(
-            field.getColumn().getId());
+          UIDefinition uiDef = UIDefinitionController.getInstance().getUIDefinition(
+              field.getColumn().getId());
 
-        return new DisplayLogicElement("OB.Utilities.getValue(currentValues,'" + fieldName + "')",
-            uiDef instanceof YesNoUIDefinition);
+          return new DisplayLogicElement(
+              "OB.Utilities.getValue(currentValues,'" + fieldName + "')",
+              uiDef instanceof YesNoUIDefinition);
+        }
       }
-    }
-    for (AuxiliaryInput auxIn : auxIns) {
-      if (token.equalsIgnoreCase(auxIn.getName())) {
-        auxInputsInExpression.add(auxIn);
-        return new DisplayLogicElement(TOKEN_PREFIX + auxIn.getName(), false);
+      for (AuxiliaryInput auxIn : auxIns) {
+        if (token.equalsIgnoreCase(auxIn.getName())) {
+          auxInputsInExpression.add(auxIn);
+          return new DisplayLogicElement(TOKEN_PREFIX + auxIn.getName(), false);
+        }
       }
     }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/WindowPersonalizationEventHandler.java	Sat Jan 26 21:59:59 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/navigationbarcomponents/UserInfoWidgetActionHandler.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java	Sat Jan 26 21:59:59 2013 +0100
@@ -308,7 +308,7 @@
     // "        AND A_U_R.AD_USER_ID = ?" +
     // "        ORDER BY A_R.NAME";
     final OBQuery<UserRoles> rolesQuery = OBDal.getInstance().createQuery(UserRoles.class,
-        " userContact.id=? and role.active=true");
+        " userContact.id=? and role.active=true and role.isrestrictbackend=false");
     rolesQuery.setFilterOnReadableClients(false);
     rolesQuery.setFilterOnReadableOrganization(false);
     rolesQuery.setParameters(Collections.singletonList((Object) OBContext.getOBContext().getUser()
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java	Sat Jan 26 21:59:59 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/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl	Sat Jan 26 21:59:59 2013 +0100
@@ -26,6 +26,14 @@
     title: '${param.title?js_string}',
     name: '${param.name?js_string}',
     width: '*',
+    <#if param.redrawOnChange>
+      redrawOnChange: true,
+    </#if>
+    <#if param.showIf != "" >
+      showIf: function(item, value, form, currentValues, context) {
+        return (${param.showIf});
+      },
+    </#if>
     required: ${param.required?string}
     ${param.parameterProperties}
 }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl	Sat Jan 26 21:59:59 2013 +0100
@@ -47,7 +47,7 @@
       <@createParameter param/><#if param_has_next>,</#if>
       </#if>
     </#list>    
-    ],
+     ]
     }
 });
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java	Sat Jan 26 21:59:59 2013 +0100
@@ -19,9 +19,12 @@
 package org.openbravo.client.application.window;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.log4j.Logger;
+import org.openbravo.client.application.DynamicExpressionParser;
 import org.openbravo.client.application.Parameter;
 import org.openbravo.client.application.Process;
 import org.openbravo.client.kernel.reference.UIDefinition;
@@ -40,13 +43,39 @@
   }
 
   public List<OBViewParameter> getParameters() {
+
+    List<Parameter> parametersInExpression = new ArrayList<Parameter>();
+    Map<Parameter, String> paramToJSExpression = new HashMap<Parameter, String>();
+    // Computes the display logic of the parameters
+    // It has to be done in advance in order to determine the dynamic parameters
+    for (Parameter param : process.getOBUIAPPParameterList()) {
+      if (param.isActive()) {
+        if (param.getDisplayLogic() != null && !param.getDisplayLogic().isEmpty()) {
+          boolean parameterDisplayLogic = true;
+          final DynamicExpressionParser parser = new DynamicExpressionParser(
+              param.getDisplayLogic(), param.getObuiappProcess(), parameterDisplayLogic);
+          paramToJSExpression.put(param, parser.getJSExpression());
+          for (Parameter parameterExpression : parser.getParameters()) {
+            if (!parametersInExpression.contains(parameterExpression)) {
+              parametersInExpression.add(parameterExpression);
+            }
+          }
+        }
+      }
+    }
+
     List<OBViewParameter> params = new ArrayList<OBViewParameterHandler.OBViewParameter>();
     for (Parameter param : process.getOBUIAPPParameterList()) {
       if (param.isActive()
           && (!param.isFixed() || param.getReference().getId().equals(WINDOW_REFERENCE_ID))
           && (!param.getReference().getId()
               .equals(ParameterWindowComponent.BUTTON_LIST_REFERENCE_ID))) {
-        params.add(new OBViewParameter(param));
+        OBViewParameter parameter = new OBViewParameter(param);
+        parameter.setRedrawOnChange(parametersInExpression.contains(param));
+        if (paramToJSExpression.containsKey(param)) {
+          parameter.setShowIf(paramToJSExpression.get(param));
+        }
+        params.add(parameter);
       }
     }
     return params;
@@ -55,6 +84,8 @@
   public class OBViewParameter {
     UIDefinition uiDefinition;
     Parameter parameter;
+    String showIf = "";
+    boolean redrawOnChange = false;
 
     public OBViewParameter(Parameter param) {
       uiDefinition = UIDefinitionController.getInstance().getUIDefinition(param.getReference());
@@ -112,12 +143,30 @@
       // strip the first and last { }
       if (jsonString.startsWith("{") && jsonString.endsWith("}")) {
         // note -2 is done because the first substring takes of 1 already
-        return "," + jsonString.substring(1).substring(0, jsonString.length() - 2) + ",";
+        return "," + jsonString.substring(1).substring(0, jsonString.length() - 2);
       } else if (jsonString.equals("{}")) {
         return "";
       }
       // be lenient just return the string as it is...
-      return "," + jsonString + (jsonString.trim().endsWith(",") ? "" : ",");
+      return ","
+          + (jsonString.trim().endsWith(",") ? jsonString.substring(0, jsonString.length() - 2)
+              : jsonString);
+    }
+
+    public void setShowIf(String showIf) {
+      this.showIf = showIf;
+    }
+
+    public String getShowIf() {
+      return showIf;
+    }
+
+    public boolean getRedrawOnChange() {
+      return redrawOnChange;
+    }
+
+    public void setRedrawOnChange(boolean redrawOnChange) {
+      this.redrawOnChange = redrawOnChange;
     }
   }
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Sat Jan 26 21:59:59 2013 +0100
@@ -838,12 +838,10 @@
     }
   }
 
-  public class PrintButton extends IconButton {
-    public boolean hasEmail;
-
-    public PrintButton() {
-      Process process = tab.getProcess();
-      String processUrl = "";
+  public static String getPrintUrl(Tab myTab) {
+    String processUrl = "";
+    if (myTab.getProcess() != null) {
+      Process process = myTab.getProcess();
       for (ModelImplementation mo : process.getADModelImplementationList()) {
         if (mo.isDefault() && ("P".equals(mo.getAction()) || "R".equals(mo.getAction()))) {
           for (ModelImplementationMapping mom : mo.getADModelImplementationMappingList()) {
@@ -861,6 +859,16 @@
       if (processUrl.indexOf("/") == -1) {
         processUrl = "/" + FormatUtilities.replace(processUrl);
       }
+    }
+    return processUrl;
+  }
+
+  public class PrintButton extends IconButton {
+    public boolean hasEmail;
+
+    public PrintButton() {
+      Process process = tab.getProcess();
+      String processUrl = getPrintUrl(tab);
 
       hasEmail = processUrl.contains("orders") || processUrl.contains("invoices")
           || processUrl.contains("payments");
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Sat Jan 26 21:59:59 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) 2011-2012 Openbravo SLU
+ * All portions are Copyright (C) 2011-2013 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -93,7 +93,7 @@
     title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Record'),
     canFilter: true,
     canEdit: false,
-    isLink: true,
+    clientClass: 'OBAlertGridCanvasItem_Link',
     filterOnKeypress: true,
     filterEditorType: 'OBTextItem',
     type: '_id_10',
@@ -212,19 +212,6 @@
     return this.Super('headerClick', arguments);
   },
 
-  cellClick: function (record, rowNum, colNum) {
-    var i, tabId, field = this.getField(colNum),
-        length = OB.AlertManagement.alertRules.length;
-    for (i = 0; i < length; i++) {
-      if (OB.AlertManagement.alertRules[i].alertRuleId === record.alertRule) {
-        tabId = OB.AlertManagement.alertRules[i].tabId;
-      }
-    }
-    if (field.isLink && tabId && tabId !== '') {
-      OB.Utilities.openDirectTab(tabId, record.referenceSearchKey);
-    }
-  },
-
   recordClick: function (viewer, record, recordNum, field, fieldNum, value, rawValue) {
     this.handleRecordSelection(viewer, record, recordNum, field, fieldNum, value, rawValue, false, true);
   },
@@ -519,4 +506,23 @@
     this.Super('draw', arguments);
   }
 
+});
+
+isc.defineClass('OBAlertGridCanvasItem_Link', isc.OBGridLinkItem);
+
+isc.OBAlertGridCanvasItem_Link.addProperties({
+  setRecord: function () {
+    this.setTitle(this.grid.formatLinkValue(this.record, this.field, this.colNum, this.rowNum, this.record[this.field.name]));
+  },
+  doAction: function () {
+    var i, tabId, length = OB.AlertManagement.alertRules.length;
+    for (i = 0; i < length; i++) {
+      if (OB.AlertManagement.alertRules[i].alertRuleId === this.record.alertRule) {
+        tabId = OB.AlertManagement.alertRules[i].tabId;
+      }
+    }
+    if (tabId && tabId !== '') {
+      OB.Utilities.openDirectTab(tabId, this.record.referenceSearchKey);
+    }
+  }
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Sat Jan 26 21:59:59 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):  ______________________________________.
  ************************************************************************
@@ -356,9 +356,10 @@
       // * {{{showCloseControl}}} type: Boolean - to specify if the popup should show the close control or not. The default value is "true" if it is not specified
       // * {{{postParams}}} type: Object - parameters to be sent to the url using POST instead of GET
       // * {{{isModal}}} type: Boolean - to specify if the popup should be modal or not. The default value is "true" if it is not specified
+      // * {{{show}}} type: Boolean - to specify if the popup should be shown or not. The default value is "true" if it is not specified
       // 
       // returns the created OBClassicPopupWindow
-      open: function (name, width, height, url, title, theOpener, showMinimizeControl, showMaximizeControl, showCloseControl, postParams, isModal) {
+      open: function (name, width, height, url, title, theOpener, showMinimizeControl, showMaximizeControl, showCloseControl, postParams, isModal, show) {
         var urlCharacter = (url && url.indexOf('?') !== -1) ? '&' : '?';
 
         if (showMinimizeControl !== false) {
@@ -373,6 +374,9 @@
         if (isModal !== false) {
           isModal = true;
         }
+        if (show !== false) {
+          show = true;
+        }
         var _htmlCode, _navUserAgent = navigator.userAgent.toUpperCase();
         if (OB.Utilities.isIE9Strict || _navUserAgent.indexOf("MSIE") === -1) { // IE >= 9 (Strict) or any other browser
           _htmlCode = '<html><head></head><body style="margin: 0; padding: 0; border: none;">' + '<iframe id="MDIPopupContainer" name="MDIPopupContainer" style="margin: 0; padding: 0; border: none; width: 100%; height: 100%;"></iframe>' + '<iframe name="frameMenu" scrolling="no" src="' + OB.Application.contextUrl + 'utility/VerticalMenu.html?Command=HIDE" id="paramFrameMenuLoading" style="margin: 0px; padding: 0px; border: 0px; height: 0px; width: 0px;"></iframe>' + '</body></html>';
@@ -396,6 +400,9 @@
           popupURL: url + urlCharacter + 'IsPopUpCall=1'
         });
         cPopup.show();
+        if (!show) {
+          cPopup.hide();
+        }
         if (cPopup.getIframeHtmlObj) {
           cPopup.getIframeHtmlObj().name = 'OBClassicPopup_iframe'; //To be used in automated tests: https://issues.openbravo.com/view.php?id=16786
         }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js	Sat Jan 26 21:59:59 2013 +0100
@@ -93,12 +93,11 @@
   overflow: 'visible',
 
   setRecord: function (record) {
-    var fld = this.grid.getField(this.fieldName),
-        val = record[this.fieldName];
-    if (fld && fld.type && isc.SimpleType.getType(fld.type).normalDisplayFormatter) {
-      this.showValue(isc.SimpleType.getType(fld.type).normalDisplayFormatter(val), val);
+    var val = record[this.field.name];
+    if (this.field && this.field.type && isc.SimpleType.getType(this.field.type).normalDisplayFormatter) {
+      this.showValue(isc.SimpleType.getType(this.field.type).normalDisplayFormatter(val), val);
     } else {
-      this.showValue(String(record[this.fieldName]));
+      this.showValue(String(record[this.field.name]));
     }
   },
 
@@ -124,12 +123,11 @@
   overflow: 'visible',
 
   setRecord: function (record) {
-    var fld = this.grid.getField(this.fieldName),
-        val = record[this.fieldName];
-    if (fld && fld.type && isc.SimpleType.getType(fld.type).normalDisplayFormatter) {
-      this.showValue(isc.SimpleType.getType(fld.type).normalDisplayFormatter(val), val);
+    var val = record[this.field.name];
+    if (this.field && this.field.type && isc.SimpleType.getType(this.field.type).normalDisplayFormatter) {
+      this.showValue(isc.SimpleType.getType(this.field.type).normalDisplayFormatter(val), val);
     } else {
-      this.showValue(String(record[this.fieldName]));
+      this.showValue(String(record[this.field.name]));
     }
   },
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Sat Jan 26 21:59:59 2013 +0100
@@ -343,6 +343,7 @@
     if (this.singleDateMode) {
       dateValue = OB.Utilities.Date.OBToJS(newValue, this.dateFormat);
       if (isc.isA.Date(dateValue)) {
+        dateValue.logicalDate = true;
         this.singleDateValue = dateValue;
         this.singleDateDisplayValue = newValue;
         this.singleDateMode = true;
@@ -467,9 +468,27 @@
       };
     }
     var criteria = this.rangeItem ? this.rangeItem.getCriterion() : null;
+    criteria = this.makeLogicalDates(criteria);
     return criteria;
   },
 
+  // Sets the logicalDate property to true to the date values contained in the criteria.
+  // This way the dates will always be serialized as a Date, and not as a DateTime
+  // See issue https://issues.openbravo.com/view.php?id=22885
+  makeLogicalDates: function (criteria) {
+    var criteriaCopy = isc.shallowClone(criteria),
+        innerCriteria = criteriaCopy.criteria,
+        i;
+    if (innerCriteria && innerCriteria.length) {
+      for (i = 0; i < innerCriteria.length; i++) {
+        if (isc.isA.Date(innerCriteria[i].value)) {
+          innerCriteria[i].value.logicalDate = true;
+        }
+      }
+    }
+    return criteriaCopy;
+  },
+
   canEditCriterion: function (criterion) {
 
     if (criterion.fieldName === this.name && (criterion.operator === 'isNull' || criterion.operator === 'notNull')) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js	Sat Jan 26 21:59:59 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	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js	Sat Jan 26 21:59:59 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/grid/ob-grid.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Sat Jan 26 21:59:59 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):  ______________________________________.
  ************************************************************************
@@ -169,17 +169,45 @@
 
   createRecordComponent: function (record, colNum) {
     var field = this.getField(colNum),
-        rowNum = this.getRecordIndex(record);
-    if (field.isLink && record[field.name]) {
-      var linkButton = isc.OBGridLinkLayout.create({
+        rowNum = this.getRecordIndex(record),
+        isEditRecord = rowNum === this.getEditRow(),
+        canvas, clientClass, clientClassPropsStartPosition, clientClassProps;
+
+    if (field.isLink && !field.clientClass && record[field.name]) {
+      // To keep compatibility with < 3.0MP20 versions that didn't implement 'clientClass' and only have 'isLink' property
+      field.clientClass = 'OBGridLinkCellClick';
+    }
+
+    if (field.clientClass && !isEditRecord) {
+      clientClass = field.clientClass;
+      clientClassPropsStartPosition = clientClass.indexOf('{');
+      if (clientClassPropsStartPosition > 0) {
+        clientClassProps = clientClass.substring(clientClassPropsStartPosition, clientClass.length);
+        try {
+          clientClassProps = JSON.parse(clientClassProps);
+        } catch (e) {
+          clientClassProps = {};
+        }
+        clientClass = clientClass.substring(0, clientClassPropsStartPosition);
+      } else {
+        clientClassProps = {};
+      }
+      clientClass = clientClass.replace(/\s+/g, '');
+
+      canvas = isc.ClassFactory.newInstance(clientClass, {
         grid: this,
         align: this.getCellAlign(record, rowNum, colNum),
-        title: this.formatLinkValue(record, field, colNum, rowNum, record[field.name]),
+        field: field,
         record: record,
         rowNum: rowNum,
         colNum: colNum
-      });
-      return linkButton;
+      }, clientClassProps);
+      if (canvas) {
+        if (canvas.setRecord) {
+          canvas.setRecord(record);
+        }
+        return canvas;
+      }
     }
     return null;
   },
@@ -187,17 +215,45 @@
   updateRecordComponent: function (record, colNum, component, recordChanged) {
     var field = this.getField(colNum),
         rowNum = this.getRecordIndex(record);
-    if (field.isLink && record[field.name]) {
-      component.setTitle(this.formatLinkValue(record, field, colNum, rowNum, record[field.name]));
+    if (field.clientClass) {
+      component.align = this.getCellAlign(record, rowNum, colNum);
+      component.field = field;
       component.record = record;
       component.rowNum = rowNum;
       component.colNum = colNum;
-      component.align = this.getCellAlign(record, rowNum, colNum);
+      if (component.setRecord) {
+        component.setRecord(record);
+      }
       return component;
     }
     return null;
   },
 
+  // recompute RecordComponents
+  recomputeCanvasComponents: function (rowNum) {
+    var i, fld, length = this.getFields().length;
+
+    // remove client record components in edit mode
+    for (i = 0; i < length; i++) {
+      fld = this.getFields()[i];
+      if (fld.clientClass) {
+        this.refreshRecordComponent(rowNum, i);
+      }
+    }
+  },
+
+  startEditing: function (rowNum, colNum, suppressFocus, eCe, suppressWarning) {
+    var ret = this.Super('startEditing', arguments);
+    this.recomputeCanvasComponents(rowNum);
+    return ret;
+  },
+
+  startEditingNew: function (rowNum) {
+    var ret = this.Super('startEditingNew', arguments);
+    this.recomputeCanvasComponents(rowNum + 1);
+    return ret;
+  },
+
   formatLinkValue: function (record, field, colNum, rowNum, value) {
     if (typeof value === 'undefined' || value === null) {
       return '';
@@ -408,7 +464,7 @@
   },
 
   initWidget: function () {
-    // prevent the value to be displayed in case of a link
+    // prevent the value to be displayed in case of a clientClass
     var i, length, field, formatCellValueFunction;
 
     formatCellValueFunction = function (value, record, rowNum, colNum, grid) {
@@ -430,7 +486,7 @@
           field.filterEditorProperties.criteriaField = field.criteriaField;
         }
 
-        if (field.isLink) {
+        if (field.clientClass) {
           // store the originalFormatCellValue if not already set
           if (field.formatCellValue && !field.formatCellValueFunctionReplaced) {
             field.originalFormatCellValue = field.formatCellValue;
@@ -731,8 +787,8 @@
 
 isc.ClassFactory.defineClass('OBGridHeaderImgButton', isc.ImgButton);
 
-isc.ClassFactory.defineClass('OBGridLinkLayout', isc.HLayout);
-isc.OBGridLinkLayout.addProperties({
+isc.ClassFactory.defineClass('OBGridLinkItem', isc.HLayout);
+isc.OBGridLinkItem.addProperties({
   overflow: 'clip-h',
   btn: null,
   height: 1,
@@ -748,16 +804,7 @@
 
   setTitle: function (title) {
     this.btn.setTitle(title);
-  },
-
-  doAction: function () {
-    if (this.grid && this.grid.doCellClick) {
-      this.grid.doCellClick(this.record, this.rowNum, this.colNum);
-    } else if (this.grid && this.grid.cellClick) {
-      this.grid.cellClick(this.record, this.rowNum, this.colNum);
-    }
   }
-
 });
 
 isc.ClassFactory.defineClass('OBGridLinkButton', isc.Button);
@@ -769,4 +816,21 @@
 });
 
 isc.ClassFactory.defineClass('OBGridFormButton', isc.OBFormButton);
-isc.OBGridFormButton.addProperties({});
\ No newline at end of file
+isc.OBGridFormButton.addProperties({});
+
+
+isc.defineClass('OBGridLinkCellClick', isc.OBGridLinkItem);
+
+isc.OBGridLinkCellClick.addProperties({
+  setRecord: function () {
+    this.setTitle(this.grid.formatLinkValue(this.record, this.field, this.colNum, this.rowNum, this.record[this.field.name]));
+  },
+
+  doAction: function () {
+    if (this.grid && this.grid.doCellClick) {
+      this.grid.doCellClick(this.record, this.rowNum, this.colNum);
+    } else if (this.grid && this.grid.cellClick) {
+      this.grid.cellClick(this.record, this.rowNum, this.colNum);
+    }
+  }
+});
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Sat Jan 26 21:59:59 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):  ______________________________________.
  ************************************************************************
@@ -1873,6 +1873,25 @@
       }
     }
 
+    if (this.view.parentView && !this.view.parentProperty) {
+      // subtabs without an explicit reference to their parent property
+      // result in an empty criteria which is ignored not generating the
+      // request. Forcing load
+      // See issue #22645
+      selectedValues = this.view.parentView.viewGrid.getSelectedRecords();
+      if (selectedValues.length !== 1) {
+        // if there is not a single record selected, always false criterion
+        criteria.criteria.push({
+          fieldName: 'id',
+          operator: 'equals',
+          value: '-1'
+        });
+      } else {
+        // with a single record selected, dummy criterion
+        criteria.criteria.push(isc.OBRestDataSource.getDummyCriterion());
+      }
+    }
+
     this.checkShowFilterFunnelIcon(criteria);
 
     return criteria;
@@ -2462,8 +2481,6 @@
 
     ret = this.Super('startEditing', [rowNum, colNum, suppressFocus, eCe, suppressWarning]);
 
-    this.recomputeCanvasComponents(rowNum);
-
     return ret;
   },
 
@@ -2489,19 +2506,6 @@
     this.view.refreshChildViews();
   },
 
-  // recompute recordcomponents
-  recomputeCanvasComponents: function (rowNum) {
-    var i, fld, length = this.getFields().length;
-
-    // remove client record components in edit mode
-    for (i = 0; i < length; i++) {
-      fld = this.getFields()[i];
-      if (fld.clientClass) {
-        this.refreshRecordComponent(rowNum, i);
-      }
-    }
-  },
-
   initializeEditValues: function (rowNum, colNum) {
     var record = this.getRecord(rowNum);
     // no record create one
@@ -2675,10 +2679,6 @@
     var fld = this.getFields()[colNum],
         index;
 
-    if (fld.clientClass) {
-      return '';
-    }
-
     if (this.inCellHoverHTML || !isc.isA.String(value)) {
       return value;
     }
@@ -3324,21 +3324,8 @@
         layout.showEditOpen();
       }
       return layout;
-    }
-    if (fld.clientClass && !isEditRecord) {
-      canvas = isc.ClassFactory.newInstance(fld.clientClass, {
-        grid: this,
-        fieldName: fld.name,
-        rowNum: rowNum,
-        record: record,
-        colNum: colNum
-      });
-      if (canvas) {
-        if (canvas.setRecord) {
-          canvas.setRecord(record);
-        }
-        return canvas;
-      }
+    } else {
+      return this.Super('createRecordComponent', arguments);
     }
   },
 
@@ -3361,12 +3348,7 @@
     } else if (isEditRecord) {
       return null;
     } else {
-      if (component.setRecord) {
-        component.setRecord(record);
-      } else {
-        component.record = record;
-      }
-      component.rowNum = rowNum;
+      return this.Super('updateRecordComponent', arguments);
     }
     return component;
   },
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Sat Jan 26 21:59:59 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.client.application/js/process/ob-parameter-window-view.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js	Sat Jan 26 21:59:59 2013 +0100
@@ -50,7 +50,8 @@
   initWidget: function () {
     var i, field, items = [],
         buttonLayout = [],
-        okButton, newButton, cancelButton, view = this;
+        okButton, newButton, cancelButton, view = this,
+        newShowIf;
 
     // Buttons
 
@@ -139,6 +140,25 @@
     });
     this.members.push(this.messageBar);
 
+    newShowIf = function (item, value, form, values) {
+      var currentValues = values || form.view.getCurrentValues(),
+          context = {},
+          originalShowIfValue = false;
+
+      OB.Utilities.fixNull250(currentValues);
+
+      try {
+        if (isc.isA.Function(this.originalShowIf)) {
+          originalShowIfValue = this.originalShowIf(item, value, form, currentValues, context);
+        } else {
+          originalShowIfValue = isc.JSON.decode(this.originalShowIf);
+        }
+      } catch (_exception) {
+        isc.warn(_exception + ' ' + _exception.message + ' ' + _exception.stack);
+      }
+      return originalShowIfValue;
+    };
+
     // Parameters
     if (this.viewProperties.fields) {
       for (i = 0; i < this.viewProperties.fields.length; i++) {
@@ -147,6 +167,10 @@
           view: this
         }, field);
 
+        if (field.showIf) {
+          field.originalShowIf = field.showIf;
+          field.showIf = newShowIf;
+        }
         if (field.isGrid) {
           this.grid = isc.OBPickAndExecuteView.create(field);
         } else {
@@ -163,6 +187,7 @@
           autoFocus: true,
           titleOrientation: 'top',
           numCols: 4,
+          showErrorIcons: false,
           colWidths: ['*', '*', '*', '*']
         });
 
@@ -344,19 +369,19 @@
       grid = this.grid.viewGrid;
       selection = grid.getSelectedRecords() || [];
       len = selection.length;
-      allRows = grid.data.allRows || grid.data;
+      allRows = grid.data.allRows || grid.data.localData || grid.data;
       allProperties._selection = [];
       allProperties._allRows = [];
 
       for (i = 0; i < len; i++) {
-        tmp = isc.addProperties({}, selection[i], grid.getEditedRecord(selection[i]));
+        tmp = isc.addProperties({}, selection[i], grid.getEditedRecord(i));
         allProperties._selection.push(tmp);
       }
 
       len = (allRows && allRows.length) || 0;
 
       for (i = 0; i < len; i++) {
-        tmp = isc.addProperties({}, allRows[i], grid.getEditedRecord(allRows[i]));
+        tmp = isc.addProperties({}, allRows[i], grid.getEditedRecord(i));
         allProperties._allRows.push(tmp);
       }
     }
@@ -402,5 +427,7 @@
         }
       }
     }
+    // redraw to execute display logic
+    this.theForm.markForRedraw();
   }
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Sat Jan 26 21:59:59 2013 +0100
@@ -185,6 +185,8 @@
       this.discardEdits(recordIdx);
     }
 
+    this.selectionUpdated(record, this.getSelectedRecords());
+
     this.Super('selectionChanged', arguments);
   },
 
@@ -499,23 +501,30 @@
   },
 
   validateRows: function () {
-    var i, row, field, errors;
+    var i, row, field, errors, editRowIndexes, editRowIDs, rowIndexID;
 
     if (!this.neverValidate) {
       return;
     }
 
+    editRowIndexes = this.getAllEditRows();
+    editRowIDs = this.getAllEditRows(true);
+
     for (i = 0; i < this.fields.length; i++) {
       field = this.fields[i];
 
       if (!field.validationFn) {
         continue;
       }
-
       for (row = 0; row < this.data.length; row++) {
         errors = this.validateCellValue(row, i, this.data[row][field.name]);
         if (!errors || isc.isA.emptyArray(errors)) {
-          this.clearFieldError(row, field.name);
+          if (editRowIndexes.indexOf(row) !== -1) {
+            rowIndexID = editRowIDs[editRowIndexes.indexOf(row)];
+          } else {
+            rowIndexID = row;
+          }
+          this.clearFieldError(editRowIDs[row], field.name);
         } else {
           this.setFieldError(row, field.name, errors[0]);
         }
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Sat Jan 26 21:59:59 2013 +0100
@@ -81,6 +81,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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.19451]]></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	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_ELEMENT.xml	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_FIELD.xml	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.19451]]></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.19217]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_REFERENCE.xml	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TAB.xml	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TABLE.xml	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java	Sat Jan 26 21:59:59 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	Sat Jan 26 21:59:59 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	Sat Jan 26 21:59:59 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.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Sat Jan 26 21:59:59 2013 +0100
@@ -371,7 +371,13 @@
 
   public String getParameterProperties(Parameter parameter) {
     if (parameter.isStartinnewline()) {
-      return "startRow: true";
+      JSONObject o = new JSONObject();
+      try {
+        o.put("startRow", true);
+        return o.toString();
+      } catch (Exception e) {
+        return "";
+      }
     }
     return "";
   }
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.19451]]></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/model/tables/OBCQL_QUERY_COLUMN.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/model/tables/OBCQL_QUERY_COLUMN.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -89,6 +89,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="CLIENTCLASS" primaryKey="false" required="false" type="NVARCHAR" size="255" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_TAB" name="OBCQL_QUERY_COLUMN_ADTAB">
         <reference local="AD_TAB_ID" foreign="AD_TAB_ID"/>
       </foreign-key>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_COLUMN.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_COLUMN.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -1,5 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--7BECD62B817F4D88A19FE84DABD3E15C--><AD_COLUMN>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <AD_COLUMN_ID><![CDATA[7BECD62B817F4D88A19FE84DABD3E15C]]></AD_COLUMN_ID>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <NAME><![CDATA[Client Class]]></NAME>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <COLUMNNAME><![CDATA[Clientclass]]></COLUMNNAME>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <AD_TABLE_ID><![CDATA[8EE7634FA71B40FDB9ADF85374264BF6]]></AD_TABLE_ID>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <SEQNO><![CDATA[230]]></SEQNO>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <AD_ELEMENT_ID><![CDATA[3269E9900D0C45BB9CDA1BF2975242ED]]></AD_ELEMENT_ID>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <POSITION><![CDATA[23]]></POSITION>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7BECD62B817F4D88A19FE84DABD3E15C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7BECD62B817F4D88A19FE84DABD3E15C--></AD_COLUMN>
+
 <!--81001DA1F1D44C10979E937B1754307F--><AD_COLUMN>
 <!--81001DA1F1D44C10979E937B1754307F-->  <AD_COLUMN_ID><![CDATA[81001DA1F1D44C10979E937B1754307F]]></AD_COLUMN_ID>
 <!--81001DA1F1D44C10979E937B1754307F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_FIELD.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_FIELD.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -29,6 +29,33 @@
 <!--82D5C58E310948088A4FE87611B1D84A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--82D5C58E310948088A4FE87611B1D84A--></AD_FIELD>
 
+<!--8D2BF09D6ED74C92A5E107F18E197DD2--><AD_FIELD>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <AD_FIELD_ID><![CDATA[8D2BF09D6ED74C92A5E107F18E197DD2]]></AD_FIELD_ID>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <NAME><![CDATA[Clientclass]]></NAME>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <AD_TAB_ID><![CDATA[15F16613CF764D948B2B2163F7A9CFF8]]></AD_TAB_ID>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <AD_COLUMN_ID><![CDATA[7BECD62B817F4D88A19FE84DABD3E15C]]></AD_COLUMN_ID>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--8D2BF09D6ED74C92A5E107F18E197DD2--></AD_FIELD>
+
 <!--90A30A5448AB4813BECCD8804DFF8592--><AD_FIELD>
 <!--90A30A5448AB4813BECCD8804DFF8592-->  <AD_FIELD_ID><![CDATA[90A30A5448AB4813BECCD8804DFF8592]]></AD_FIELD_ID>
 <!--90A30A5448AB4813BECCD8804DFF8592-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.19451]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListComponentProvider.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListComponentProvider.java	Sat Jan 26 21:59:59 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):  ______________________________________.
  ************************************************************************
@@ -51,6 +51,8 @@
         "web/org.openbravo.client.querylist/js/ob-querylist-widget.js", false));
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.querylist/js/ob-querylist-view.js", false));
+    globalResources.add(createStaticResource(
+        "web/org.openbravo.client.querylist/js/ob-querylist-canvas-item.js", false));
 
     globalResources.add(createStaticResource(
         "web/org.openbravo.userinterface.smartclient/openbravo/skins/"
--- a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java	Sat Jan 26 21:59:59 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-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2013 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -28,6 +28,7 @@
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
+import org.openbravo.client.application.window.OBViewTab;
 import org.openbravo.client.kernel.reference.UIDefinition;
 import org.openbravo.client.kernel.reference.UIDefinitionController;
 import org.openbravo.client.myob.WidgetClass;
@@ -83,6 +84,15 @@
             field.put("showGridSummary", false);
           }
 
+          if (column.getClientClass() != null) {
+            field.put("clientClass", column.getClientClass());
+            if (column.isHasLink()) {
+              final Tab tab = column.getTab();
+              final String printUrl = OBViewTab.getPrintUrl(tab);
+              field.put("OB_printUrl", printUrl);
+            }
+          }
+
           field.put("canExport", true);
           if ("E".equals(column.getIncludeIn())
               || ("M".equals(column.getIncludeIn()) && includeIn.equals(IncludeIn.WidgetView))) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-canvas-item.js	Sat Jan 26 21:59:59 2013 +0100
@@ -0,0 +1,63 @@
+/*
+ *************************************************************************
+ * 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):  ______________________________________.
+ ************************************************************************
+ */
+
+isc.defineClass('OBQLCanvasItem_Link', isc.OBGridLinkItem);
+
+isc.OBQLCanvasItem_Link.addProperties({
+  setRecord: function () {
+    this.setTitle(this.grid.formatLinkValue(this.record, this.field, this.colNum, this.rowNum, this.record[this.field.name]));
+  },
+  doAction: function () {
+    if (this.field.OB_TabId && this.field.OB_LinkExpression) {
+      //To open the tab provided in the widget column. Refer https://issues.openbravo.com/view.php?id=17411.
+      OB.Utilities.openDirectTab(this.field.OB_TabId, this.record[this.field.OB_LinkExpression]);
+    }
+  }
+});
+
+isc.defineClass('OBQLCanvasItem_Print', isc.OBGridLinkItem);
+
+isc.OBQLCanvasItem_Print.addProperties({
+  title: OB.I18N.getLabel('OBUIAPP_Print'),
+  isDirectPDF: true,
+  isDirectAttach: false,
+  blockAction: false,
+  doAction: function () {
+    var postParams = {
+      inpdirectprint: "N",
+      inppdfpath: this.field.OB_printUrl,
+      inpwindowId: this.field.OB_WindowId,
+      inpkeyColumnId: this.field.OB_keyColumnName,
+      inpTabId: this.field.OB_TabId,
+      inphiddenvalue: this.record[this.field.OB_LinkExpression],
+      inpIsDirectPDF: this.isDirectPDF,
+      inpIsDirectAttach: this.isDirectAttach
+    },
+        showPopup = (postParams.inpIsDirectPDF || postParams.inpIsDirectAttach ? false : true),
+        me = this;
+    if (postParams.inppdfpath && !this.blockAction) {
+      // Block action + setTimeout to avoid user double-click the 'Print' button in 4 seconds.
+      this.blockAction = true;
+      OB.Layout.ClassicOBCompatibility.Popup.open('print', 0, 0, OB.Application.contextUrl + 'businessUtility/PrinterReports.html', '', window, false, false, true, postParams, showPopup, showPopup);
+      setTimeout(function () {
+        me.blockAction = false;
+      }, 4000);
+    }
+  }
+});
\ No newline at end of file
--- a/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js	Sat Jan 26 21:59:59 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):  ______________________________________.
  ************************************************************************
@@ -37,6 +37,7 @@
   OBQueryListShowAllLabelHeight: null,
 
   initWidget: function () {
+    var field, i;
     this.showAllLabel = isc.HLayout.create({
       height: this.OBQueryListShowAllLabelHeight,
       members: [
@@ -53,6 +54,16 @@
 
     this.gridDataSource = this.createGridDataSource();
 
+    // To use 'OBQLCanvasItem_Link' clientClass in case we have just a simple 'link' (with no clientClass defined)
+    if (this.fields) {
+      for (i = 0; i < this.fields.length; i++) {
+        field = this.fields[i];
+        if (field.isLink && !field.clientClass) {
+          field.clientClass = 'OBQLCanvasItem_Link';
+        }
+      }
+    }
+
     this.Super('initWidget', arguments);
     this.widgetTitle = this.title;
     // refresh if the dbInstanceId is set
@@ -310,16 +321,6 @@
     return this.Super('fetchData', [crit, newCallBack, reqProperties]);
   },
 
-  cellClick: function (record, rowNum, colNum) {
-    var field = this.getField(colNum);
-    if (field.isLink) {
-      if (field.OB_TabId && field.OB_LinkExpression) {
-        //To open the tab provided in the widget column. Refer https://issues.openbravo.com/view.php?id=17411.
-        OB.Utilities.openDirectTab(field.OB_TabId, record[field.OB_LinkExpression]);
-      }
-    }
-  },
-
   getWidgetTotalRows: function (dsResponse, data, dsRequest) {
     if (this.widget.viewMode === 'widget' && !this.widget.parameters.showAll) {
       var criteria = dsResponse.clientContext.criteria || {},
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.19451]]></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.19217]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.19451]]></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.19217]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.19451]]></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.19217]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.19451]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Sat Jan 26 21:59:59 2013 +0100
@@ -548,6 +548,11 @@
       final Column relatedColumn = OBDal.getInstance().get(Column.class, property.getColumnId());
       final Table relatedTable = relatedColumn.getTable();
 
+      // TODO: this can be improved the left clause computation
+      // correctly uses a || concatenation, so the value clause
+      // can also be made more advanced.
+      // Also filtering by date and number values can be a problem
+      // maybe use a pragmatic approach there
       if (isTableWithMultipleIdentifierColumns(relatedTable)) {
         // if the value consists of multiple parts then filtering won't work
         // only search on the first part then, is pragmatic but very workable
@@ -721,7 +726,7 @@
         && (operator.equals(OPERATOR_GREATERTHAN) || operator.equals(OPERATOR_GREATEROREQUAL)
             || operator.equals(OPERATOR_IGREATERTHAN) || operator.equals(OPERATOR_IGREATEROREQUAL)
             || operator.equals(OPERATOR_GREATERTHANFIElD) || operator
-              .equals(OPERATOR_GREATEROREQUALFIELD));
+            .equals(OPERATOR_GREATEROREQUALFIELD));
   }
 
   private boolean isLesserOperator(String operator) {
@@ -729,7 +734,7 @@
         && (operator.equals(OPERATOR_LESSTHAN) || operator.equals(OPERATOR_LESSOREQUAL)
             || operator.equals(OPERATOR_ILESSTHAN) || operator.equals(OPERATOR_ILESSOREQUAL)
             || operator.equals(OPERATOR_LESSTHANFIELD) || operator
-              .equals(OPERATOR_LESSOREQUALFIElD));
+            .equals(OPERATOR_LESSOREQUALFIElD));
   }
 
   private String computeLeftWhereClauseForIdentifier(Property property, String key,
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.19451]]></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.19217]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.19451]]></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.19217]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java	Sat Jan 26 21:59:59 2013 +0100
@@ -35,6 +35,8 @@
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.Query;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
 import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.domaintype.BigDecimalDomainType;
@@ -97,14 +99,21 @@
       Query selQuery = OBDal.getInstance().getSession().createQuery(HQL);
       String[] queryAliases = selQuery.getReturnAliases();
       if ("true".equals(parameters.get(JsonConstants.NOCOUNT_PARAMETER))) {
-        int num = 0, queryListSize = 0;
-        num = endRow + 2;
-        queryListSize = selQuery.list().size();
+        int totalRows = 0, queryListSize = 0, clearEachLoop = 100;
+        // Defaulted to endRow + 2 to check for more records while scrolling.
+        totalRows = endRow + 2;
+        ScrollableResults queryResults = selQuery.scroll(ScrollMode.FORWARD_ONLY);
+        while (queryResults.next()) {
+          queryListSize++;
+          if (queryListSize % clearEachLoop == 0) {
+            OBDal.getInstance().getSession().clear();
+          }
+        }
         if (startRow < endRow) {
           if (queryListSize < endRow) {
-            num = queryListSize;
+            totalRows = queryListSize;
           }
-          parameters.put(JsonConstants.RESPONSE_TOTALROWS, String.valueOf(num));
+          parameters.put(JsonConstants.RESPONSE_TOTALROWS, String.valueOf(totalRows));
         }
       }
 
@@ -373,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.selector/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.userinterface.selector/ob-selector-item-styles.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.userinterface.selector/ob-selector-item-styles.js	Sat Jan 26 21:59:59 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) 2011-2012 Openbravo SLU
+ * All portions are Copyright (C) 2011-2013 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -77,12 +77,11 @@
   }
 });
 
-//isc.OBMultiSelectorItem.addProperties(isc.addProperties({}, OB.Styles.OBSelectorItem.DefaultComboBox));
 isc.OBMultiSelectorItem.addProperties(isc.addProperties({}, OB.Styles.OBFormField.DefaultComboBox));
 isc.OBMultiSelectorItem.addProperties({
 
   comboBoxProperties: OB.Styles.OBFormField.DefaultComboBox,
-
+  requiredStyle: 'OBFormFieldInputRequired',
 
   popupIconSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/form/search_picker.png',
   popupIconWidth: 21,
@@ -94,6 +93,10 @@
     icon: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/form/clearField.png'
   },
   initStyle: function () {
+    if (this.required) {
+      this.selectionLayout.setStyleName(this.requiredStyle);
+    }
+
     //To adapt the height this code is used because height: '*' doesn't work properly (conflicts with OBSectionItem).
     var rowSpan = 3;
     var singleRowHeight = this.getHeight();
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.19451]]></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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Sat Jan 26 21:59:59 2013 +0100
@@ -503,8 +503,12 @@
     this.clearErrors();
 
     if (this.redrawOnChange) {
-      this.form.onFieldChanged(this.form, item || this, value);
-      this.form.view.toolBar.refreshCustomButtonsView(this.form.view);
+      if (this.form.onFieldChanged) {
+        this.form.onFieldChanged(this.form, item || this, value);
+      }
+      if (this.form && this.form.view && this.form.view.toolBar && this.form.view.toolBar.refreshCustomButtonsView) {
+        this.form.view.toolBar.refreshCustomButtonsView(this.form.view);
+      }
     }
   },
 
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.19451]]></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.19217]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.19451]]></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.19217]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.19451]]></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.19217]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.19451]]></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.19217]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.19451]]></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.19217]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Jan 26 21:59:59 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.19217]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.19451]]></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.19217]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.19451]]></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.19217]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.19451]]></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.19217]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.19451]]></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.19217]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.19451]]></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.19217]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.19451]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/referencedata/sampledata/F_B_International_Group.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/referencedata/sampledata/F_B_International_Group.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -38392,7 +38392,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-04T00:00:00.0Z</expectedDate>
-    <daysOverdue>45</daysOverdue>
+    <daysOverdue>48</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -39064,7 +39064,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2013-01-03T00:00:00.0Z</expectedDate>
-    <daysOverdue>15</daysOverdue>
+    <daysOverdue>18</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -39424,7 +39424,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-03T00:00:00.0Z</expectedDate>
-    <daysOverdue>46</daysOverdue>
+    <daysOverdue>49</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -40072,7 +40072,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-19T00:00:00.0Z</expectedDate>
-    <daysOverdue>30</daysOverdue>
+    <daysOverdue>33</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -40216,7 +40216,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-11T00:00:00.0Z</expectedDate>
-    <daysOverdue>38</daysOverdue>
+    <daysOverdue>41</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -40936,7 +40936,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-11-15T00:00:00.0Z</expectedDate>
-    <daysOverdue>64</daysOverdue>
+    <daysOverdue>67</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -41152,7 +41152,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2013-01-03T00:00:00.0Z</expectedDate>
-    <daysOverdue>15</daysOverdue>
+    <daysOverdue>18</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -42352,7 +42352,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-19T00:00:00.0Z</expectedDate>
-    <daysOverdue>30</daysOverdue>
+    <daysOverdue>33</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -42400,7 +42400,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>44</daysOverdue>
+    <daysOverdue>47</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -42424,7 +42424,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-10-13T00:00:00.0Z</expectedDate>
-    <daysOverdue>97</daysOverdue>
+    <daysOverdue>100</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -42952,7 +42952,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-21T00:00:00.0Z</expectedDate>
-    <daysOverdue>28</daysOverdue>
+    <daysOverdue>31</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -44224,7 +44224,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2013-01-03T00:00:00.0Z</expectedDate>
-    <daysOverdue>15</daysOverdue>
+    <daysOverdue>18</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -44248,7 +44248,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2013-01-03T00:00:00.0Z</expectedDate>
-    <daysOverdue>15</daysOverdue>
+    <daysOverdue>18</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -44272,7 +44272,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-31T00:00:00.0Z</expectedDate>
-    <daysOverdue>18</daysOverdue>
+    <daysOverdue>21</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -44728,7 +44728,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-31T00:00:00.0Z</expectedDate>
-    <daysOverdue>18</daysOverdue>
+    <daysOverdue>21</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -44752,7 +44752,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2013-01-03T00:00:00.0Z</expectedDate>
-    <daysOverdue>15</daysOverdue>
+    <daysOverdue>18</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -45256,7 +45256,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-12T00:00:00.0Z</expectedDate>
-    <daysOverdue>37</daysOverdue>
+    <daysOverdue>40</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -46000,7 +46000,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-13T00:00:00.0Z</expectedDate>
-    <daysOverdue>36</daysOverdue>
+    <daysOverdue>39</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -46456,7 +46456,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-04T00:00:00.0Z</expectedDate>
-    <daysOverdue>45</daysOverdue>
+    <daysOverdue>48</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -46744,7 +46744,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>44</daysOverdue>
+    <daysOverdue>47</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -46816,7 +46816,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-11T00:00:00.0Z</expectedDate>
-    <daysOverdue>38</daysOverdue>
+    <daysOverdue>41</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -46960,7 +46960,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-10-17T00:00:00.0Z</expectedDate>
-    <daysOverdue>93</daysOverdue>
+    <daysOverdue>96</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -47104,7 +47104,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-20T00:00:00.0Z</expectedDate>
-    <daysOverdue>29</daysOverdue>
+    <daysOverdue>32</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -47176,7 +47176,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-11-03T00:00:00.0Z</expectedDate>
-    <daysOverdue>76</daysOverdue>
+    <daysOverdue>79</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -47272,7 +47272,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-11-13T00:00:00.0Z</expectedDate>
-    <daysOverdue>66</daysOverdue>
+    <daysOverdue>69</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -47944,7 +47944,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2013-01-02T00:00:00.0Z</expectedDate>
-    <daysOverdue>16</daysOverdue>
+    <daysOverdue>19</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -48088,7 +48088,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-03T00:00:00.0Z</expectedDate>
-    <daysOverdue>46</daysOverdue>
+    <daysOverdue>49</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -48184,7 +48184,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-21T00:00:00.0Z</expectedDate>
-    <daysOverdue>28</daysOverdue>
+    <daysOverdue>31</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -48664,7 +48664,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-11-09T00:00:00.0Z</expectedDate>
-    <daysOverdue>70</daysOverdue>
+    <daysOverdue>73</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -49024,7 +49024,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-20T00:00:00.0Z</expectedDate>
-    <daysOverdue>29</daysOverdue>
+    <daysOverdue>32</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -49720,7 +49720,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2013-01-03T00:00:00.0Z</expectedDate>
-    <daysOverdue>15</daysOverdue>
+    <daysOverdue>18</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -49864,7 +49864,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-11-16T00:00:00.0Z</expectedDate>
-    <daysOverdue>63</daysOverdue>
+    <daysOverdue>66</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -50392,7 +50392,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-12T00:00:00.0Z</expectedDate>
-    <daysOverdue>37</daysOverdue>
+    <daysOverdue>40</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -50560,7 +50560,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-12-13T00:00:00.0Z</expectedDate>
-    <daysOverdue>36</daysOverdue>
+    <daysOverdue>39</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -51304,7 +51304,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2013-01-02T00:00:00.0Z</expectedDate>
-    <daysOverdue>16</daysOverdue>
+    <daysOverdue>19</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -243201,6 +243201,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="0D4689364DDB473BB3023E4E554C8762">
     <id>0D4689364DDB473BB3023E4E554C8762</id>
@@ -243219,6 +243220,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="19AE26382A674FE8946D2B8070D10122">
     <id>19AE26382A674FE8946D2B8070D10122</id>
@@ -243237,6 +243239,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="1CAE17A7848D4F0BAAF21FEB17045B88">
     <id>1CAE17A7848D4F0BAAF21FEB17045B88</id>
@@ -243255,6 +243258,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="243C59F4085248EB80261A5A3A7257A2">
     <id>243C59F4085248EB80261A5A3A7257A2</id>
@@ -243273,6 +243277,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="332225C1B45C463984B8D14A3B4F15DF">
     <id>332225C1B45C463984B8D14A3B4F15DF</id>
@@ -243291,6 +243296,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="42D0EEB1C66F497A90DD526DC597E6F0">
     <id>42D0EEB1C66F497A90DD526DC597E6F0</id>
@@ -243309,6 +243315,7 @@
     <processNow>false</processNow>
     <clientAdmin>true</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="45C861D70874409D86AE1CC7007AB43A">
     <id>45C861D70874409D86AE1CC7007AB43A</id>
@@ -243327,6 +243334,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="5D0F8E2B29664BE8847BF3C35400E56F">
     <id>5D0F8E2B29664BE8847BF3C35400E56F</id>
@@ -243345,6 +243353,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="5D9DF947C6904FF0AA78AEB1D8E59375">
     <id>5D9DF947C6904FF0AA78AEB1D8E59375</id>
@@ -243363,6 +243372,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="6DCC4F942CE944F997596B9EA51A4FEB">
     <id>6DCC4F942CE944F997596B9EA51A4FEB</id>
@@ -243381,6 +243391,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="8CB7726D1DCD435FAF7D1654C9560F81">
     <id>8CB7726D1DCD435FAF7D1654C9560F81</id>
@@ -243399,6 +243410,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="9A2D4EC760704A79BAFF8FF244FE0273">
     <id>9A2D4EC760704A79BAFF8FF244FE0273</id>
@@ -243417,6 +243429,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="9D320A774FCD4E47801DF5E03AA11F2D">
     <id>9D320A774FCD4E47801DF5E03AA11F2D</id>
@@ -243435,6 +243448,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="A7D3E2858FD6407FA72019946D9D26E6">
     <id>A7D3E2858FD6407FA72019946D9D26E6</id>
@@ -243453,6 +243467,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="C7E9112E632348F396B4967517E62805">
     <id>C7E9112E632348F396B4967517E62805</id>
@@ -243471,6 +243486,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="D615084948E046E3A439915008F464A6">
     <id>D615084948E046E3A439915008F464A6</id>
@@ -243489,6 +243505,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="DB6660F6713A4DCFA320A502B4A0E670">
     <id>DB6660F6713A4DCFA320A502B4A0E670</id>
@@ -243507,6 +243524,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="E03ED4A0056340678C3D6A3BA183F941">
     <id>E03ED4A0056340678C3D6A3BA183F941</id>
@@ -243525,6 +243543,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="E669860946664B24BD1AE1ACDF2F5FC3">
     <id>E669860946664B24BD1AE1ACDF2F5FC3</id>
@@ -243543,6 +243562,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="E9B2A72F01FE492B8C844E4FAD3A29CF">
     <id>E9B2A72F01FE492B8C844E4FAD3A29CF</id>
@@ -243561,6 +243581,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="F1CE850DBEE7499F8926F07DB9DCF849">
     <id>F1CE850DBEE7499F8926F07DB9DCF849</id>
@@ -243579,6 +243600,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="F3196A30B53A42778727B2852FF90C24">
     <id>F3196A30B53A42778727B2852FF90C24</id>
@@ -243597,6 +243619,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="F77D70601AD549B19DE47965F6D48D12">
     <id>F77D70601AD549B19DE47965F6D48D12</id>
@@ -243615,6 +243638,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADUserRoles id="00F752501D4746D8B1A99AB821B78321">
     <id>00F752501D4746D8B1A99AB821B78321</id>
--- a/referencedata/sampledata/QA_Testing.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/referencedata/sampledata/QA_Testing.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -4843,7 +4843,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-02-15T00:00:00.0Z</expectedDate>
-    <daysOverdue>703</daysOverdue>
+    <daysOverdue>706</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -4915,7 +4915,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-02-25T00:00:00.0Z</expectedDate>
-    <daysOverdue>693</daysOverdue>
+    <daysOverdue>696</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -4939,7 +4939,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-05-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>624</daysOverdue>
+    <daysOverdue>627</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5155,7 +5155,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-01-18T00:00:00.0Z</expectedDate>
-    <daysOverdue>731</daysOverdue>
+    <daysOverdue>734</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5203,7 +5203,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-04-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>654</daysOverdue>
+    <daysOverdue>657</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5323,7 +5323,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-04-12T00:00:00.0Z</expectedDate>
-    <daysOverdue>647</daysOverdue>
+    <daysOverdue>650</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5347,7 +5347,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-04-03T00:00:00.0Z</expectedDate>
-    <daysOverdue>656</daysOverdue>
+    <daysOverdue>659</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5371,7 +5371,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-06-23T00:00:00.0Z</expectedDate>
-    <daysOverdue>575</daysOverdue>
+    <daysOverdue>578</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5419,7 +5419,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-06-15T00:00:00.0Z</expectedDate>
-    <daysOverdue>583</daysOverdue>
+    <daysOverdue>586</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5515,7 +5515,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-04-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>654</daysOverdue>
+    <daysOverdue>657</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5563,7 +5563,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-01-25T00:00:00.0Z</expectedDate>
-    <daysOverdue>724</daysOverdue>
+    <daysOverdue>727</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5587,7 +5587,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-01-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>379</daysOverdue>
+    <daysOverdue>382</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5683,7 +5683,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-01-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>379</daysOverdue>
+    <daysOverdue>382</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5731,7 +5731,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-06-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>593</daysOverdue>
+    <daysOverdue>596</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5779,7 +5779,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-01-18T00:00:00.0Z</expectedDate>
-    <daysOverdue>731</daysOverdue>
+    <daysOverdue>734</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5803,7 +5803,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-04-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>654</daysOverdue>
+    <daysOverdue>657</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5851,7 +5851,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-04-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>654</daysOverdue>
+    <daysOverdue>657</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5875,7 +5875,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-01-15T00:00:00.0Z</expectedDate>
-    <daysOverdue>734</daysOverdue>
+    <daysOverdue>737</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5899,7 +5899,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-04-21T00:00:00.0Z</expectedDate>
-    <daysOverdue>638</daysOverdue>
+    <daysOverdue>641</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5923,7 +5923,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-01-03T00:00:00.0Z</expectedDate>
-    <daysOverdue>746</daysOverdue>
+    <daysOverdue>749</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -5947,7 +5947,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-09-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>501</daysOverdue>
+    <daysOverdue>504</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -6043,7 +6043,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-05-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>624</daysOverdue>
+    <daysOverdue>627</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -6067,7 +6067,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-04-04T00:00:00.0Z</expectedDate>
-    <daysOverdue>655</daysOverdue>
+    <daysOverdue>658</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -6091,7 +6091,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-03-13T00:00:00.0Z</expectedDate>
-    <daysOverdue>677</daysOverdue>
+    <daysOverdue>680</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -6211,7 +6211,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2012-01-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>379</daysOverdue>
+    <daysOverdue>382</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -6283,7 +6283,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-01-14T00:00:00.0Z</expectedDate>
-    <daysOverdue>735</daysOverdue>
+    <daysOverdue>738</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -6307,7 +6307,7 @@
     <aprmModifPaymentINPlan>false</aprmModifPaymentINPlan>
     <aprmModifPaymentOUTPlan>false</aprmModifPaymentOUTPlan>
     <expectedDate>2011-04-05T00:00:00.0Z</expectedDate>
-    <daysOverdue>654</daysOverdue>
+    <daysOverdue>657</daysOverdue>
     <lastPaymentDate xsi:nil="true"/>
     <numberOfPayments>0</numberOfPayments>
   </FIN_Payment_Schedule>
@@ -13005,6 +13005,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="4028E6C72959682B01295A071429011E">
     <id>4028E6C72959682B01295A071429011E</id>
@@ -13023,6 +13024,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="CC6AB5B4C4B54CB79103C96AD2B90750">
     <id>CC6AB5B4C4B54CB79103C96AD2B90750</id>
@@ -13041,6 +13043,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADRole id="FA057013C10148828D2430F66F42EF1A">
     <id>FA057013C10148828D2430F66F42EF1A</id>
@@ -13059,6 +13062,7 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
     <advanced>true</advanced>
+    <isrestrictbackend>false</isrestrictbackend>
   </ADRole>
   <ADUserRoles id="4028E6C72959682B01295A0736280121">
     <id>4028E6C72959682B01295A0736280121</id>
--- a/src-db/database/model/functions/M_INOUT_POST.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/model/functions/M_INOUT_POST.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -407,7 +407,7 @@
                     END LOOP;
                   END IF;
                 END;
-              ELSIF (cur_inout.issotrx = 'N') THEN
+              ELSIF (cur_inout.issotrx = 'N' AND cur_inoutline.canceled_inoutline_id IS NULL) THEN
                 -- Manage pre-reserves
                 DECLARE
                   cur_reserve_stock RECORD;
@@ -422,22 +422,22 @@
                       WHERE rs.c_orderline_id = cur_inoutline.c_orderline_id
                         AND rs.quantity <> COALESCE(rs.releasedqty, 0)
                         AND rs.m_locator_id IS NULL
-                        AND r.res_status != 'CL'
+                        AND r.res_status NOT IN ('DR', 'CL')
                   ) LOOP
                     v_qtyaux := LEAST(cur_reserve_stock.quantity - COALESCE(cur_reserve_stock.releasedqty, 0), v_pendingqty);
                     -- Check if exists a reserved stock for the same orderline, attributes and locator in the reservation
                     SELECT count(*), max(m_reservation_stock_id) INTO v_aux, v_res_stock_id
                     FROM m_reservation_stock
-                      WHERE c_orderline_id = cur_inoutline.c_orderline_id
-                        AND m_locator_id = cur_inoutline.m_locator_id
-                        AND m_reservation_id = cur_reserve_stock.m_reservation_id
-                        AND isallocated = 'Y'
-                        AND COALESCE(m_attributesetinstance_id, '0') = COALESCE(Cur_InOutLine.M_AttributeSetInstance_ID, '0');
-                    -- UPDATE EXISTING PRERESERVED STOCK TO DECREASE RESERVED QTY
+                    WHERE c_orderline_id = cur_inoutline.c_orderline_id
+                      AND m_locator_id = cur_inoutline.m_locator_id
+                      AND m_reservation_id = cur_reserve_stock.m_reservation_id
+                      AND isallocated = 'Y'
+                      AND COALESCE(m_attributesetinstance_id, '0') = COALESCE(Cur_InOutLine.M_AttributeSetInstance_ID, '0');
+                    -- Update existing prereserved stock to decrease reserved qty
                     UPDATE m_reservation_stock
                     SET quantity = quantity - v_qtyaux
                     WHERE m_reservation_stock_id = cur_reserve_stock.m_reservation_stock_id;
-                    -- INSERT OR UPDATE RESERVED STOCK BY SAME QUANTITY
+                    -- Insert or update reserved stock by same quantity
                     IF (v_aux > 0) THEN
                       UPDATE m_reservation_stock
                       SET quantity = quantity + v_qtyaux
@@ -465,6 +465,72 @@
                     AND quantity = 0
                     AND COALESCE(releasedqty, 0) = 0;
                 END;
+              ELSIF (cur_inout.issotrx = 'N' AND cur_inoutline.canceled_inoutline_id IS NOT NULL AND v_qty < 0) THEN
+                -- Revert to pre-reservations
+                DECLARE
+                  cur_reserve_stock     RECORD;
+                  v_pendingqty          NUMBER;
+                  v_qtyaux              NUMBER;
+                  v_res_stock_id        VARCHAR2(32);
+                  v_aux_released NUMBER:= 0;
+                BEGIN
+                  v_pendingqty := -v_qty;
+                  FOR cur_reserve_stock IN (
+                      SELECT rs.quantity, COALESCE(rs.releasedqty,0) AS releasedqty, rs.m_reservation_stock_id, rs.m_reservation_id,
+                          rs.ad_org_id, rs.ad_client_id
+                      FROM m_reservation_stock rs JOIN m_reservation r ON rs.m_reservation_id = r.m_reservation_id
+                      WHERE rs.c_orderline_id = cur_inoutline.c_orderline_id
+                        AND rs.m_locator_id = cur_inoutline.m_locator_id
+                        AND r.res_status NOT IN ('DR', 'CL')
+                  ) LOOP
+                    v_qtyaux := LEAST((cur_reserve_stock.quantity - COALESCE(cur_reserve_stock.releasedqty, 0)), v_pendingqty);
+                    v_aux_released := v_aux_released + COALESCE(cur_reserve_stock.releasedqty, 0);
+                    IF (cur_reserve_stock.quantity = COALESCE(cur_reserve_stock.releasedqty, 0)) THEN
+                      -- Reservation is completely released do not convert to pre-reserve.
+                      CONTINUE;
+                    END IF;
+                    -- Check if exists a prereservation for the same orderline, attributes and locator in the reservation
+                    SELECT count(*), max(m_reservation_stock_id) INTO v_aux, v_res_stock_id
+                    FROM m_reservation_stock
+                    WHERE c_orderline_id = cur_inoutline.c_orderline_id
+                      AND m_locator_id IS NULL
+                      AND m_reservation_id = cur_reserve_stock.m_reservation_id;
+                    -- Update existing prereserved stock to decrease reserved qty
+                    UPDATE m_reservation_stock
+                    SET quantity = quantity - v_qtyaux
+                    WHERE m_reservation_stock_id = cur_reserve_stock.m_reservation_stock_id;
+                    -- Insert or update reserved stock by same quantity
+                    IF (v_aux > 0) THEN
+                      UPDATE m_reservation_stock
+                      SET quantity = quantity + v_qtyaux
+                      WHERE m_reservation_stock_id = v_res_stock_id;
+                    ELSE
+                      INSERT INTO m_reservation_stock (
+                        m_reservation_stock_id, ad_client_id, ad_org_id, isactive,
+                        created, createdby, updated, updatedby,
+                        m_reservation_id, m_attributesetinstance_id, m_locator_id, c_orderline_id,
+                        quantity, releasedqty, isallocated
+                      ) VALUES (
+                        get_uuid(), cur_reserve_stock.ad_client_id, cur_reserve_stock.ad_org_id, 'Y',
+                        now(), v_user, now(), v_user,
+                        cur_reserve_stock.m_reservation_id, '0', NULL, cur_inoutline.c_orderline_id,
+                        v_qtyaux, 0, 'Y'
+                      );
+                    END IF;
+                    v_pendingqty := v_pendingqty - v_qtyaux;
+                    IF (v_pendingqty <= 0) THEN
+                      EXIT;
+                    END IF;
+                  END LOOP;
+                  IF (v_pendingqty > 0 AND v_aux_released > 0) THEN
+                    -- Not all quantity has been reverted to pre-reservation having released quantity.
+                    RAISE_APPLICATION_ERROR(-20000, '@ReceiptVoidReleasedQtyFound@');
+                  END IF;
+                  DELETE FROM m_reservation_stock
+                  WHERE c_orderline_id = cur_inoutline.c_orderline_id
+                    AND quantity = 0
+                    AND COALESCE(releasedqty, 0) = 0;
+                END;
               END IF;
               
               v_ResultStr:='CreateTransaction';
@@ -799,6 +865,7 @@
               v_NextNo, MI.C_INVOICELINE_ID, MI.M_PRODUCT_ID, MI.DATETRX, -MI.QTY, 'N', 'Y', 'N'
             FROM M_MATCHINV MI
             WHERE MI.M_INOUTLINE_ID = Cur_InOutLine.M_InOutLine_ID;
+
           END LOOP;
           -- Close Order
           v_ResultStr:='CloseInOut';
--- a/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml	Sat Jan 26 21:59:59 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/M_RESERVATION_POST.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/model/functions/M_RESERVATION_POST.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -41,6 +41,8 @@
   v_orderline_id    VARCHAR2(32);
   v_product_id      VARCHAR2(32);
   v_uom_id          VARCHAR2(32);
+  v_client_id       VARCHAR2(32);
+  v_org_id          VARCHAR2(32);
   v_count           NUMBER;
   v_quantity        NUMBER;
   v_reservedqty     NUMBER;
@@ -78,9 +80,9 @@
 
 BEGIN
   SELECT res_status, c_orderline_id, quantity, reservedqty,
-        m_product_id, c_uom_id
+        m_product_id, c_uom_id, ad_client_id, ad_org_id
     INTO v_resstatus, v_orderline_id, v_quantity, v_reservedqty,
-        v_product_id, v_uom_id
+        v_product_id, v_uom_id, v_client_id, v_org_id
   FROM m_reservation
   WHERE m_reservation_id = v_reservation_id;
   
@@ -91,13 +93,86 @@
     DECLARE
       v_sales_order_id        VARCHAR2(32);
       cur_not_available       RECORD;
+      cur_prereserve          RECORD;
+      cur_receipt             RECORD;
       v_linecount             NUMBER;
       v_creservedcount        NUMBER;
       v_preservedcount        NUMBER;
+      v_reservedqty           NUMBER;
+      v_qtytoreserve          NUMBER;
+      v_aux                   NUMBER;
+      v_res_stock_id          VARCHAR2(32);
     BEGIN
       IF (v_resstatus != 'DR') THEN
         RAISE_APPLICATION_ERROR(-20000, '@ActionNotSupported@');
       END IF;
+      -- Convert prereservation to reserve if purchase order is receipt.
+      FOR cur_prereserve IN (
+          SELECT rs.m_reservation_stock_id, rs.quantity, COALESCE(rs.releasedqty, 0) AS releasedqty, rs.c_orderline_id
+          FROM m_reservation_stock rs
+          WHERE rs.m_reservation_id = v_reservation_id
+            AND rs.quantity - COALESCE(rs.releasedqty, 0) > 0
+            AND rs.c_orderline_id IS NOT NULL
+      ) LOOP
+        v_qtytoreserve := cur_prereserve.quantity - cur_prereserve.releasedqty;
+        FOR cur_receipt IN (
+            SELECT SUM(mp.qty) AS receiptqty, iol.m_locator_id,
+                COALESCE(iol.m_attributesetinstance_id, '0') AS m_attributesetinstance_id
+            FROM m_matchpo mp
+                JOIN m_inoutline iol ON mp.m_inoutline_id = iol.m_inoutline_id
+            WHERE mp.c_orderline_id = cur_prereserve.c_orderline_id
+            GROUP BY iol.m_locator_id, COALESCE(iol.m_attributesetinstance_id, '0')
+        ) LOOP
+          SELECT SUM(rs.quantity) INTO v_reservedqty
+          FROM m_reservation_stock rs
+               JOIN m_reservation r ON rs.m_reservation_id = r.m_reservation_id
+          WHERE rs.c_orderline_id = cur_prereserve.c_orderline_id
+            AND r.res_status NOT IN ('DR', 'CL')
+            AND rs.m_locator_id = cur_receipt.m_locator_id
+            AND COALESCE(rs.m_attributesetinstance_id, '0') = cur_receipt.m_attributesetinstance_id;
+          IF (cur_receipt.receiptqty > v_reservedqty) THEN
+            v_aux := LEAST(v_qtytoreserve, cur_receipt.receiptqty - v_reservedqty);
+            -- Check if exists a reserved stock for the same orderline, attributes and locator in the reservation
+            SELECT count(*), max(m_reservation_stock_id) INTO v_count, v_res_stock_id
+            FROM m_reservation_stock
+            WHERE c_orderline_id = cur_prereserve.c_orderline_id
+              AND m_locator_id = cur_receipt.m_locator_id
+              AND m_reservation_id = v_reservation_id
+              AND isallocated = 'Y'
+              AND COALESCE(m_attributesetinstance_id, '0') = cur_receipt.m_attributesetinstance_id;
+            -- Update existing prereserved stock to decrease reserved qty
+            UPDATE m_reservation_stock
+            SET quantity = quantity - v_aux
+            WHERE m_reservation_stock_id = cur_prereserve.m_reservation_stock_id;
+            IF (v_count > 0) THEN
+              UPDATE m_reservation_stock
+              SET quantity = quantity + v_aux
+              WHERE m_reservation_stock_id = v_res_stock_id;
+            ELSE
+              -- Insert reserved stock by same quantity
+              INSERT INTO m_reservation_stock(
+                m_reservation_stock_id, ad_client_id, ad_org_id, isactive,
+                created, createdby, updated, updatedby,
+                m_reservation_id, m_attributesetinstance_id, m_locator_id, c_orderline_id,
+                quantity, releasedqty, isallocated
+              ) VALUES (
+                get_uuid(), v_client_id, v_org_id, 'Y',
+                now(), v_user_id, now(), v_user_id,
+                v_reservation_id, cur_receipt.m_attributesetinstance_id, cur_receipt.m_locator_id, cur_prereserve.c_orderline_id,
+                v_aux, 0, 'Y'
+              );
+              v_qtytoreserve := v_qtytoreserve - v_aux;
+            END IF;
+            IF (v_qtytoreserve = 0) THEN
+              EXIT;
+            END IF;
+          END IF;
+        END LOOP;
+        DELETE FROM m_reservation_stock
+        WHERE c_orderline_id = cur_prereserve.c_orderline_id
+          AND quantity = 0
+          AND COALESCE(releasedqty, 0) = 0;
+      END LOOP;
       -- Check that stock is still available
       FOR cur_not_available IN (
         SELECT AD_COLUMN_IDENTIFIER('M_Locator', rs.m_locator_id, 'en_US') as locatorName,
@@ -216,6 +291,8 @@
     DECLARE
       v_sales_order_id        VARCHAR2(32);
       v_reservedcount         NUMBER;
+      cur_prereserve          RECORD;
+      v_res_stock_id          VARCHAR2(32);
     BEGIN
 
       IF (v_resstatus NOT IN ('CO', 'CL')) THEN
@@ -233,6 +310,49 @@
       FROM c_orderline
       WHERE c_order_id = v_sales_order_id
         AND so_res_status <> 'NR';
+      
+      -- Convert to pre-reserve reservations related to purchase orders that are not released.
+      FOR cur_prereserve IN (
+          SELECT m_reservation_stock_id, quantity - COALESCE(releasedqty, 0) AS reservedqty, c_orderline_id
+          FROM m_reservation_stock
+          WHERE m_reservation_id = v_reservation_id
+            AND c_orderline_id IS NOT NULL
+            AND m_locator_id IS NOT NULL
+            AND quantity - COALESCE(releasedqty, 0) > 0
+      ) LOOP
+        -- Check if exists a pre-reserve for the purchase order line.
+        SELECT COUNT(*), MAX(m_reservation_stock_id)
+          INTO v_count, v_res_stock_id
+        FROM m_reservation_stock
+        WHERE m_reservation_id = v_reservation_id
+          AND c_orderline_id IS NOT NULL
+          AND m_locator_id IS NULL;
+        UPDATE m_reservation_stock
+        SET quantity = quantity - cur_prereserve.reservedqty
+        WHERE m_reservation_stock_id = cur_prereserve.m_reservation_stock_id;
+        IF (v_count > 0) THEN
+          UPDATE m_reservation_stock
+          SET quantity = quantity + cur_prereserve.reservedqty
+          WHERE m_reservation_stock_id = v_res_stock_id;
+        ELSE
+          -- Insert reserved stock by same quantity
+          INSERT INTO m_reservation_stock(
+            m_reservation_stock_id, ad_client_id, ad_org_id, isactive,
+            created, createdby, updated, updatedby,
+            m_reservation_id, m_attributesetinstance_id, m_locator_id, c_orderline_id,
+            quantity, releasedqty, isallocated
+          ) VALUES (
+            get_uuid(), v_client_id, v_org_id, 'Y',
+            now(), v_user_id, now(), v_user_id,
+            v_reservation_id, '0', NULL, cur_prereserve.c_orderline_id,
+            cur_prereserve.reservedqty, 0, 'Y'
+          );
+        END IF;
+      END LOOP;
+      DELETE FROM m_reservation_stock
+      WHERE m_reservation_id = v_reservation_id
+        AND quantity = 0
+        AND COALESCE(releasedqty, 0) = 0;
 
       UPDATE c_order
       SET so_res_status = CASE WHEN v_reservedcount > 0 THEN 'PR'
--- a/src-db/database/model/functions/S_TIMEEXPENSE_POST.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/model/functions/S_TIMEEXPENSE_POST.xml	Sat Jan 26 21:59:59 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/AD_ROLE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/model/tables/AD_ROLE.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -81,6 +81,10 @@
         <default><![CDATA[Y]]></default>
         <onCreateDefault><![CDATA['Y']]></onCreateDefault>
       </column>
+      <column name="ISRESTRICTBACKEND" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_TREE" name="AD_ROLE_AD_TREE_MENU">
         <reference local="AD_TREE_MENU_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
@@ -100,5 +104,6 @@
       <check name="AD_ROLE_ADV_CHECK"><![CDATA[ISADVANCED IN ('Y', 'N')]]></check>
       <check name="AD_ROLE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_ROLE_ISCLIENTADMIN_CHECK"><![CDATA[IS_CLIENT_ADMIN IN ('Y', 'N')]]></check>
+      <check name="AD_ROLE_RESTRICTBACKEND"><![CDATA[ISRESTRICTBACKEND IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/src-db/database/model/tables/FIN_RECONCILIATION.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/model/tables/FIN_RECONCILIATION.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -101,6 +101,9 @@
       <foreign-key foreignTable="FIN_FINANCIAL_ACCOUNT" name="FIN_RECONCIL_FINFINANCIALACC">
         <reference local="FIN_FINANCIAL_ACCOUNT_ID" foreign="FIN_FINANCIAL_ACCOUNT_ID"/>
       </foreign-key>
+      <index name="FIN_RECONCILE_FINACCOUNT" unique="false">
+        <index-column name="FIN_FINANCIAL_ACCOUNT_ID"/>
+      </index>
       <check name="FIN_RECONCIL_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="FIN_RECONCIL_PRINTDETAILED_CHK"><![CDATA[PRINTDETAILED IN ('Y', 'N')]]></check>
       <check name="FIN_RECONCIL_PRINTSUMMARY_CHK"><![CDATA[PRINTSUMMARY IN ('Y', 'N')]]></check>
--- a/src-db/database/model/tables/GL_JOURNALLINE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/model/tables/GL_JOURNALLINE.xml	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Sat Jan 26 21:59:59 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>
@@ -294692,7 +294693,8 @@
 <!--B7AC5B839A864B7EB99DCF53390E5F89-->  <HELP><![CDATA[Payment event]]></HELP>
 <!--B7AC5B839A864B7EB99DCF53390E5F89-->  <COLUMNNAME><![CDATA[FIN_Payment_ID]]></COLUMNNAME>
 <!--B7AC5B839A864B7EB99DCF53390E5F89-->  <AD_TABLE_ID><![CDATA[226]]></AD_TABLE_ID>
-<!--B7AC5B839A864B7EB99DCF53390E5F89-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--B7AC5B839A864B7EB99DCF53390E5F89-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--B7AC5B839A864B7EB99DCF53390E5F89-->  <AD_REFERENCE_VALUE_ID><![CDATA[4BEF5D0691664A939E8710FA9EB0BAF5]]></AD_REFERENCE_VALUE_ID>
 <!--B7AC5B839A864B7EB99DCF53390E5F89-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--B7AC5B839A864B7EB99DCF53390E5F89-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--B7AC5B839A864B7EB99DCF53390E5F89-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -297886,8 +297888,8 @@
 <!--C0B0C57D6210C545E040007F01005E8C-->  <HELP><![CDATA[Payment which reverses current payment]]></HELP>
 <!--C0B0C57D6210C545E040007F01005E8C-->  <COLUMNNAME><![CDATA[FIN_Rev_Payment_ID]]></COLUMNNAME>
 <!--C0B0C57D6210C545E040007F01005E8C-->  <AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
-<!--C0B0C57D6210C545E040007F01005E8C-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
-<!--C0B0C57D6210C545E040007F01005E8C-->  <AD_REFERENCE_VALUE_ID><![CDATA[5E77652CBFEB4F03A3A0629642D024DD]]></AD_REFERENCE_VALUE_ID>
+<!--C0B0C57D6210C545E040007F01005E8C-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--C0B0C57D6210C545E040007F01005E8C-->  <AD_REFERENCE_VALUE_ID><![CDATA[4BEF5D0691664A939E8710FA9EB0BAF5]]></AD_REFERENCE_VALUE_ID>
 <!--C0B0C57D6210C545E040007F01005E8C-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--C0B0C57D6210C545E040007F01005E8C-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--C0B0C57D6210C545E040007F01005E8C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -305380,6 +305382,41 @@
 <!--D44EC8E368A74AEA8AD7EFF13B1FBA6A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D44EC8E368A74AEA8AD7EFF13B1FBA6A--></AD_COLUMN>
 
+<!--D45692C2890144AFBB6F139CDC38457A--><AD_COLUMN>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <AD_COLUMN_ID><![CDATA[D45692C2890144AFBB6F139CDC38457A]]></AD_COLUMN_ID>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <NAME><![CDATA[Isrestrictbackend]]></NAME>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <DESCRIPTION><![CDATA[If checked, this role will not have access to the backend (ERP). It will however have access to other applications (such as the WebPOS)]]></DESCRIPTION>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <HELP><![CDATA[If checked, this role will not have access to the backend (ERP). It will however have access to other applications (such as the WebPOS)]]></HELP>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <COLUMNNAME><![CDATA[Isrestrictbackend]]></COLUMNNAME>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <AD_TABLE_ID><![CDATA[156]]></AD_TABLE_ID>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <SEQNO><![CDATA[51]]></SEQNO>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <AD_ELEMENT_ID><![CDATA[9C8C7BB9DEB84E3A9B8E4A1C3F200F99]]></AD_ELEMENT_ID>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <POSITION><![CDATA[21]]></POSITION>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D45692C2890144AFBB6F139CDC38457A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D45692C2890144AFBB6F139CDC38457A--></AD_COLUMN>
+
 <!--D463F52ACB6611DD87FACF0742499ECD--><AD_COLUMN>
 <!--D463F52ACB6611DD87FACF0742499ECD-->  <AD_COLUMN_ID><![CDATA[D463F52ACB6611DD87FACF0742499ECD]]></AD_COLUMN_ID>
 <!--D463F52ACB6611DD87FACF0742499ECD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -28243,6 +28243,20 @@
 <!--9C8C523F49F4BD9DE040007F0100646F-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C8C523F49F4BD9DE040007F0100646F--></AD_ELEMENT>
 
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99--><AD_ELEMENT>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99-->  <AD_ELEMENT_ID><![CDATA[9C8C7BB9DEB84E3A9B8E4A1C3F200F99]]></AD_ELEMENT_ID>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99-->  <COLUMNNAME><![CDATA[Isrestrictbackend]]></COLUMNNAME>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99-->  <NAME><![CDATA[Restrict backend access]]></NAME>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99-->  <PRINTNAME><![CDATA[Restrict backend access]]></PRINTNAME>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99-->  <DESCRIPTION><![CDATA[If checked, this role will not have access to the backend (ERP). It will however have access to other applications (such as the WebPOS)]]></DESCRIPTION>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99-->  <HELP><![CDATA[If checked, this role will not have access to the backend (ERP). It will however have access to other applications (such as the WebPOS)]]></HELP>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--9C8C7BB9DEB84E3A9B8E4A1C3F200F99--></AD_ELEMENT>
+
 <!--9D15D8B5B341423585BC661594C01822--><AD_ELEMENT>
 <!--9D15D8B5B341423585BC661594C01822-->  <AD_ELEMENT_ID><![CDATA[9D15D8B5B341423585BC661594C01822]]></AD_ELEMENT_ID>
 <!--9D15D8B5B341423585BC661594C01822-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Sat Jan 26 21:59:59 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>
@@ -189817,6 +189816,35 @@
 <!--4B09CBC5D0D54D36A585EA8F863D9CF1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4B09CBC5D0D54D36A585EA8F863D9CF1--></AD_FIELD>
 
+<!--4B110273A12A48FD8E4952044C628050--><AD_FIELD>
+<!--4B110273A12A48FD8E4952044C628050-->  <AD_FIELD_ID><![CDATA[4B110273A12A48FD8E4952044C628050]]></AD_FIELD_ID>
+<!--4B110273A12A48FD8E4952044C628050-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4B110273A12A48FD8E4952044C628050-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4B110273A12A48FD8E4952044C628050-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4B110273A12A48FD8E4952044C628050-->  <NAME><![CDATA[Restrict backend access]]></NAME>
+<!--4B110273A12A48FD8E4952044C628050-->  <DESCRIPTION><![CDATA[If checked, this role will not have access to the backend (ERP). It will however have access to other applications (such as the WebPOS)]]></DESCRIPTION>
+<!--4B110273A12A48FD8E4952044C628050-->  <HELP><![CDATA[If checked, this role will not have access to the backend (ERP). It will however have access to other applications (such as the WebPOS)]]></HELP>
+<!--4B110273A12A48FD8E4952044C628050-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4B110273A12A48FD8E4952044C628050-->  <AD_TAB_ID><![CDATA[119]]></AD_TAB_ID>
+<!--4B110273A12A48FD8E4952044C628050-->  <AD_COLUMN_ID><![CDATA[D45692C2890144AFBB6F139CDC38457A]]></AD_COLUMN_ID>
+<!--4B110273A12A48FD8E4952044C628050-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--4B110273A12A48FD8E4952044C628050-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4B110273A12A48FD8E4952044C628050-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--4B110273A12A48FD8E4952044C628050-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--4B110273A12A48FD8E4952044C628050-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--4B110273A12A48FD8E4952044C628050-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4B110273A12A48FD8E4952044C628050-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4B110273A12A48FD8E4952044C628050-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4B110273A12A48FD8E4952044C628050-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4B110273A12A48FD8E4952044C628050-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4B110273A12A48FD8E4952044C628050-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4B110273A12A48FD8E4952044C628050-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
+<!--4B110273A12A48FD8E4952044C628050-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4B110273A12A48FD8E4952044C628050-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4B110273A12A48FD8E4952044C628050-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4B110273A12A48FD8E4952044C628050-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4B110273A12A48FD8E4952044C628050--></AD_FIELD>
+
 <!--4B536D8ED0CB480BA1A0D5526FCE202F--><AD_FIELD>
 <!--4B536D8ED0CB480BA1A0D5526FCE202F-->  <AD_FIELD_ID><![CDATA[4B536D8ED0CB480BA1A0D5526FCE202F]]></AD_FIELD_ID>
 <!--4B536D8ED0CB480BA1A0D5526FCE202F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -253930,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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Sat Jan 26 21:59:59 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>
@@ -16797,6 +16819,17 @@
 <!--4B01F0CD52ED45D78AD503199D5AB1C6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4B01F0CD52ED45D78AD503199D5AB1C6--></AD_MESSAGE>
 
+<!--4C2EF2784FD449D3A09E71D41F7AD8E6--><AD_MESSAGE>
+<!--4C2EF2784FD449D3A09E71D41F7AD8E6-->  <AD_MESSAGE_ID><![CDATA[4C2EF2784FD449D3A09E71D41F7AD8E6]]></AD_MESSAGE_ID>
+<!--4C2EF2784FD449D3A09E71D41F7AD8E6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4C2EF2784FD449D3A09E71D41F7AD8E6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4C2EF2784FD449D3A09E71D41F7AD8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4C2EF2784FD449D3A09E71D41F7AD8E6-->  <VALUE><![CDATA[NON_RESTRICTED_ROLE_TITLE]]></VALUE>
+<!--4C2EF2784FD449D3A09E71D41F7AD8E6-->  <MSGTEXT><![CDATA[Access Restricted]]></MSGTEXT>
+<!--4C2EF2784FD449D3A09E71D41F7AD8E6-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--4C2EF2784FD449D3A09E71D41F7AD8E6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4C2EF2784FD449D3A09E71D41F7AD8E6--></AD_MESSAGE>
+
 <!--4C38766399D14E4C96A65E71A5D85F06--><AD_MESSAGE>
 <!--4C38766399D14E4C96A65E71A5D85F06-->  <AD_MESSAGE_ID><![CDATA[4C38766399D14E4C96A65E71A5D85F06]]></AD_MESSAGE_ID>
 <!--4C38766399D14E4C96A65E71A5D85F06-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19018,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>
@@ -19652,6 +19685,17 @@
 <!--ABD032F57AAF4F3FA6DB4DDD192D0990-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--ABD032F57AAF4F3FA6DB4DDD192D0990--></AD_MESSAGE>
 
+<!--AC2294296D884281A8851BCAE8733524--><AD_MESSAGE>
+<!--AC2294296D884281A8851BCAE8733524-->  <AD_MESSAGE_ID><![CDATA[AC2294296D884281A8851BCAE8733524]]></AD_MESSAGE_ID>
+<!--AC2294296D884281A8851BCAE8733524-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AC2294296D884281A8851BCAE8733524-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AC2294296D884281A8851BCAE8733524-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AC2294296D884281A8851BCAE8733524-->  <VALUE><![CDATA[ReceiptVoidReleasedQtyFound]]></VALUE>
+<!--AC2294296D884281A8851BCAE8733524-->  <MSGTEXT><![CDATA[There are related Pre Reservations linked with this Goods Receipt that are released. Please void the needed shipments to undo the release before voiding this Receipt.]]></MSGTEXT>
+<!--AC2294296D884281A8851BCAE8733524-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--AC2294296D884281A8851BCAE8733524-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AC2294296D884281A8851BCAE8733524--></AD_MESSAGE>
+
 <!--AC63454AE63A49CDA0EB25806B656B6D--><AD_MESSAGE>
 <!--AC63454AE63A49CDA0EB25806B656B6D-->  <AD_MESSAGE_ID><![CDATA[AC63454AE63A49CDA0EB25806B656B6D]]></AD_MESSAGE_ID>
 <!--AC63454AE63A49CDA0EB25806B656B6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22126,6 +22170,17 @@
 <!--FE88E1D0FB204477983A77FE42C1297A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--FE88E1D0FB204477983A77FE42C1297A--></AD_MESSAGE>
 
+<!--FE92320A1F4D4569A3AF41C6F263E786--><AD_MESSAGE>
+<!--FE92320A1F4D4569A3AF41C6F263E786-->  <AD_MESSAGE_ID><![CDATA[FE92320A1F4D4569A3AF41C6F263E786]]></AD_MESSAGE_ID>
+<!--FE92320A1F4D4569A3AF41C6F263E786-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FE92320A1F4D4569A3AF41C6F263E786-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FE92320A1F4D4569A3AF41C6F263E786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FE92320A1F4D4569A3AF41C6F263E786-->  <VALUE><![CDATA[NON_RESTRICTED_ROLE]]></VALUE>
+<!--FE92320A1F4D4569A3AF41C6F263E786-->  <MSGTEXT><![CDATA[This user doesn't have access to the backend. To be able to access Openbravo, a user needs a role with access to the backend.]]></MSGTEXT>
+<!--FE92320A1F4D4569A3AF41C6F263E786-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FE92320A1F4D4569A3AF41C6F263E786-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FE92320A1F4D4569A3AF41C6F263E786--></AD_MESSAGE>
+
 <!--FEC463B86D204D7982180B6C134F1E8A--><AD_MESSAGE>
 <!--FEC463B86D204D7982180B6C134F1E8A-->  <AD_MESSAGE_ID><![CDATA[FEC463B86D204D7982180B6C134F1E8A]]></AD_MESSAGE_ID>
 <!--FEC463B86D204D7982180B6C134F1E8A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Sat Jan 26 21:59:59 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.19217]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.19451]]></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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/sourcedata/AD_PROCESS.xml	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -4608,6 +4608,19 @@
 <!--4AA6C3BE9D3B4D84A3B80489505A23E5-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--4AA6C3BE9D3B4D84A3B80489505A23E5--></AD_REFERENCE>
 
+<!--4BEF5D0691664A939E8710FA9EB0BAF5--><AD_REFERENCE>
+<!--4BEF5D0691664A939E8710FA9EB0BAF5-->  <AD_REFERENCE_ID><![CDATA[4BEF5D0691664A939E8710FA9EB0BAF5]]></AD_REFERENCE_ID>
+<!--4BEF5D0691664A939E8710FA9EB0BAF5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4BEF5D0691664A939E8710FA9EB0BAF5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4BEF5D0691664A939E8710FA9EB0BAF5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4BEF5D0691664A939E8710FA9EB0BAF5-->  <NAME><![CDATA[Payment Selector]]></NAME>
+<!--4BEF5D0691664A939E8710FA9EB0BAF5-->  <DESCRIPTION><![CDATA[Payment Selector]]></DESCRIPTION>
+<!--4BEF5D0691664A939E8710FA9EB0BAF5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4BEF5D0691664A939E8710FA9EB0BAF5-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--4BEF5D0691664A939E8710FA9EB0BAF5-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--4BEF5D0691664A939E8710FA9EB0BAF5-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--4BEF5D0691664A939E8710FA9EB0BAF5--></AD_REFERENCE>
+
 <!--4C36DC179A5F40DC80B3F3798E121152--><AD_REFERENCE>
 <!--4C36DC179A5F40DC80B3F3798E121152-->  <AD_REFERENCE_ID><![CDATA[4C36DC179A5F40DC80B3F3798E121152]]></AD_REFERENCE_ID>
 <!--4C36DC179A5F40DC80B3F3798E121152-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5028,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/AD_REF_LIST.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -8496,6 +8496,18 @@
 <!--26BD84560ADA416E8D00B7A07BAB2B23-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--26BD84560ADA416E8D00B7A07BAB2B23--></AD_REF_LIST>
 
+<!--2726618D177C401C8D764380FD6DA765--><AD_REF_LIST>
+<!--2726618D177C401C8D764380FD6DA765-->  <AD_REF_LIST_ID><![CDATA[2726618D177C401C8D764380FD6DA765]]></AD_REF_LIST_ID>
+<!--2726618D177C401C8D764380FD6DA765-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2726618D177C401C8D764380FD6DA765-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2726618D177C401C8D764380FD6DA765-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2726618D177C401C8D764380FD6DA765-->  <VALUE><![CDATA[RESTR]]></VALUE>
+<!--2726618D177C401C8D764380FD6DA765-->  <NAME><![CDATA[All available roles restricted]]></NAME>
+<!--2726618D177C401C8D764380FD6DA765-->  <DESCRIPTION><![CDATA[User doesn't have non-restricted roles]]></DESCRIPTION>
+<!--2726618D177C401C8D764380FD6DA765-->  <AD_REFERENCE_ID><![CDATA[86086D70DDBC42B09E2BEB51D25C159F]]></AD_REFERENCE_ID>
+<!--2726618D177C401C8D764380FD6DA765-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2726618D177C401C8D764380FD6DA765--></AD_REF_LIST>
+
 <!--28F1C8DD5F5746C5928626525EC81BB2--><AD_REF_LIST>
 <!--28F1C8DD5F5746C5928626525EC81BB2-->  <AD_REF_LIST_ID><![CDATA[28F1C8DD5F5746C5928626525EC81BB2]]></AD_REF_LIST_ID>
 <!--28F1C8DD5F5746C5928626525EC81BB2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TAB.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/sourcedata/AD_TAB.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -13570,7 +13570,7 @@
 <!--7580F9AE37704571BB0D3935252CAC5A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7580F9AE37704571BB0D3935252CAC5A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7580F9AE37704571BB0D3935252CAC5A-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
-<!--7580F9AE37704571BB0D3935252CAC5A-->  <NAME><![CDATA[Org Schema]]></NAME>
+<!--7580F9AE37704571BB0D3935252CAC5A-->  <NAME><![CDATA[General Ledgers]]></NAME>
 <!--7580F9AE37704571BB0D3935252CAC5A-->  <DESCRIPTION><![CDATA[It is used for configuring the accounting schemas attached to the organization]]></DESCRIPTION>
 <!--7580F9AE37704571BB0D3935252CAC5A-->  <HELP><![CDATA[Org Schema tabs allows to add or to review the accounting schema/s of the organization.]]></HELP>
 <!--7580F9AE37704571BB0D3935252CAC5A-->  <AD_TABLE_ID><![CDATA[088ED0B6930847508865BCB06E75228A]]></AD_TABLE_ID>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -1,5 +1,40 @@
 <?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>
+<!--0E1E9236E2FE471FB946F8DA2803C537-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0E1E9236E2FE471FB946F8DA2803C537-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0E1E9236E2FE471FB946F8DA2803C537-->  <NAME><![CDATA[Payment Selector]]></NAME>
+<!--0E1E9236E2FE471FB946F8DA2803C537-->  <AD_REFERENCE_ID><![CDATA[4BEF5D0691664A939E8710FA9EB0BAF5]]></AD_REFERENCE_ID>
+<!--0E1E9236E2FE471FB946F8DA2803C537-->  <AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
+<!--0E1E9236E2FE471FB946F8DA2803C537-->  <AD_COLUMN_ID><![CDATA[7891269C83D0655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--0E1E9236E2FE471FB946F8DA2803C537-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--0E1E9236E2FE471FB946F8DA2803C537-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0E1E9236E2FE471FB946F8DA2803C537-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--0E1E9236E2FE471FB946F8DA2803C537-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--0E1E9236E2FE471FB946F8DA2803C537-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--0E1E9236E2FE471FB946F8DA2803C537--></OBUISEL_SELECTOR>
+
 <!--2E64F551C7C4470C80C29DBA24B34A5F--><OBUISEL_SELECTOR>
 <!--2E64F551C7C4470C80C29DBA24B34A5F-->  <OBUISEL_SELECTOR_ID><![CDATA[2E64F551C7C4470C80C29DBA24B34A5F]]></OBUISEL_SELECTOR_ID>
 <!--2E64F551C7C4470C80C29DBA24B34A5F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -66,6 +66,50 @@
 <!--09443D24F490441BA12AFB6490481875-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--09443D24F490441BA12AFB6490481875--></OBUISEL_SELECTOR_FIELD>
 
+<!--0EE172E722774F0398B83152B48DAB8D--><OBUISEL_SELECTOR_FIELD>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[0EE172E722774F0398B83152B48DAB8D]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <OBUISEL_SELECTOR_ID><![CDATA[0E1E9236E2FE471FB946F8DA2803C537]]></OBUISEL_SELECTOR_ID>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <AD_COLUMN_ID><![CDATA[7891269C83E0655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <NAME><![CDATA[Document No.]]></NAME>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <DESCRIPTION><![CDATA[An often automatically generated identifier for all documents.]]></DESCRIPTION>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <HELP><![CDATA[The document number is usually automatically generated by the system and determined by the document type of the document. If the document is not saved, the preliminary number is displayed in "<>". If the document type of your document has no automatic document sequence defined, the field will be empty when creating a new document. This is for documents which usually have an external number (like vendor invoice).  If you leave the field empty, the system will generate a document number for you. The document sequence used for this fallback number is defined in the "Document Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table inside the database (e.g. C_Order).]]></HELP>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <PROPERTY><![CDATA[_identifier]]></PROPERTY>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <SORT><![CDATA[Y]]></SORT>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0EE172E722774F0398B83152B48DAB8D-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--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>
@@ -1054,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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient_data.xsql	Sat Jan 26 21:59:59 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/index.jsp	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/index.jsp	Sat Jan 26 21:59:59 2013 +0100
@@ -1,3 +1,4 @@
+
 <%@ page import="java.util.Properties" %>
 <%@ page import="org.openbravo.base.HttpBaseServlet" %>
 <%@ page import="org.openbravo.dal.core.OBContext"%>
@@ -8,6 +9,10 @@
 <%@ page import="org.openbravo.dal.core.OBContext" %>
 <%@ page import="org.openbravo.model.ad.module.Module" %>
 <%@ page import="org.apache.log4j.Logger" %>
+<%@ page import="org.openbravo.model.ad.access.Role" %>
+<%@ page import="org.openbravo.model.ad.access.User" %>
+<%@ page import="org.openbravo.dal.service.OBDal" %>
+<%@ page import="org.openbravo.base.secureApp.VariablesSecureApp" %>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%
   /*
@@ -160,6 +165,29 @@
 
 // starts the application is called as the last statement in the StaticResources part
 function OBStartApplication() {
+<%
+//If the role has its access to the backend restricted, an error message will be shown
+final VariablesSecureApp vars1 = new VariablesSecureApp(request, false);
+OBContext.setAdminMode();
+try{
+  String roleId=vars1.getRole();
+  Role role;
+  if(roleId==null || roleId.equals("")){
+    role=OBDal.getInstance().get(User.class, userId).getDefaultRole();
+  }else{
+    role = OBDal.getInstance().get(Role.class, vars1.getRole());
+  }
+if(role.isRestrictbackend()){
+%>
+  document.body.removeChild(document.getElementById('OBLoadingDiv'));
+  isc.Dialog.create({message: OB.I18N.getLabel('OBUIAPP_RestrictedUser'), title: OB.I18N.getLabel('OBUIAPP_RestrictedUserTitle'), showCloseButton: false}).show();
+  return;
+<%
+}
+ }finally{
+  OBContext.restorePreviousMode();
+}
+%>
   OB.Layout.initialize();
   OB.Layout.draw();
   OB.Layout.ViewManager.createAddStartTab();
--- a/src/org/openbravo/base/secureApp/DefaultOptions_data.xsql	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/base/secureApp/DefaultOptions_data.xsql	Sat Jan 26 21:59:59 2013 +0100
@@ -37,7 +37,7 @@
             INNER JOIN AD_ROLE role ON users.DEFAULT_AD_ROLE_ID = role.AD_ROLE_ID
          WHERE users.AD_USER_ID = ?
            AND NOT users.DEFAULT_AD_ROLE_ID IS NULL
-           AND role.ISACTIVE = 'Y'
+           AND role.ISACTIVE = 'Y' and role.isrestrictbackend='N'
            ]]></Sql>
       <Parameter name="aduserid"/>
    </SqlMethod>
@@ -127,7 +127,7 @@
             INNER JOIN AD_ROLE role
               ON userRoles.AD_ROLE_ID = role.AD_ROLE_ID
          WHERE userRoles.AD_USER_ID = ?
-           AND role.ISACTIVE = 'Y'
+           AND role.ISACTIVE = 'Y' and role.isrestrictbackend='N'
            ]]></Sql>
       <Parameter name="aduserid"/>
    </SqlMethod>
--- a/src/org/openbravo/base/secureApp/LoginHandler.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/base/secureApp/LoginHandler.java	Sat Jan 26 21:59:59 2013 +0100
@@ -33,6 +33,8 @@
 import org.openbravo.erpCommon.utility.OBVersion;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.access.Session;
+import org.openbravo.model.ad.access.User;
+import org.openbravo.model.ad.access.UserRoles;
 import org.openbravo.model.ad.module.Module;
 import org.openbravo.model.ad.system.Client;
 import org.openbravo.model.ad.system.SystemInformation;
@@ -63,7 +65,7 @@
     final VariablesSecureApp vars = new VariablesSecureApp(req);
 
     // Empty session
-    vars.removeSessionValue("#Authenticated_user");
+    req.getSession().removeAttribute("#Authenticated_user");
     vars.removeSessionValue("#AD_Role_ID");
     vars.setSessionObject("#loggingIn", "Y");
 
@@ -228,6 +230,21 @@
         break;
       }
 
+      boolean hasNonRestrictedRole = false;
+      User user = OBDal.getInstance().get(User.class, strUserAuth);
+      for (UserRoles userrole : user.getADUserRolesList()) {
+        if (!userrole.getRole().isRestrictbackend()) {
+          hasNonRestrictedRole = true;
+        }
+      }
+      if (!hasNonRestrictedRole) {
+        String msg = Utility.messageBD(myPool, "NON_RESTRICTED_ROLE", vars.getLanguage());
+        String title = Utility.messageBD(myPool, "NON_RESTRICTED_ROLE_TITLE", vars.getLanguage());
+        updateDBSession(sessionId, false, "RESTR");
+        goToRetry(res, vars, msg, title, "Error", action, doRedirect);
+        return;
+      }
+
       // Build checks
       SystemInformation sysInfo = OBDal.getInstance().get(SystemInformation.class, "0");
       if (sysInfo.getSystemStatus() == null || sysInfo.getSystemStatus().equals("RB70")
--- a/src/org/openbravo/base/structure/IdentifierProvider.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/base/structure/IdentifierProvider.java	Sat Jan 26 21:59:59 2013 +0100
@@ -129,14 +129,15 @@
         value = dob.get(identifier.getName());
       }
 
-      // TODO: add number formatting...
-      if (property.isDate() || property.isDatetime()) {
-        value = formatDate(property, (Date) value);
-      }
-
       if (value instanceof Identifiable && identifyDeep) {
         sb.append(getIdentifier(value, false, language));
       } else if (value != null) {
+
+        // TODO: add number formatting...
+        if (property.isDate() || property.isDatetime()) {
+          value = formatDate(property, (Date) value);
+        }
+
         sb.append(value);
       }
     }
--- a/src/org/openbravo/base/validation/StringPropertyValidator.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/base/validation/StringPropertyValidator.java	Sat Jan 26 21:59:59 2013 +0100
@@ -19,6 +19,7 @@
 
 package org.openbravo.base.validation;
 
+import org.apache.log4j.Logger;
 import org.openbravo.base.model.Property;
 import org.openbravo.base.util.Check;
 
@@ -31,6 +32,7 @@
 public class StringPropertyValidator extends BasePropertyValidator {
 
   private int fieldLength = -1;
+  private static final Logger log = Logger.getLogger(StringPropertyValidator.class);
 
   static boolean isValidationRequired(Property p) {
     if (p.isPrimitive() && p.getPrimitiveType() == String.class) {
@@ -56,9 +58,12 @@
   }
 
   public void initialize() {
-    Check.isTrue(getProperty().getFieldLength() > 0,
-        "Fieldlength should be larger than 0 for validation");
-    setFieldLength(getProperty().getFieldLength());
+    if (getProperty().getFieldLength() <= 0) {
+      log.error("Fieldlength of property " + getProperty().getName()
+          + " should be larger than 0 for validation");
+    } else {
+      setFieldLength(getProperty().getFieldLength());
+    }
   }
 
   @Override
--- a/src/org/openbravo/costing/CostingRuleProcess.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/costing/CostingRuleProcess.java	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.xml	Sat Jan 26 21:59:59 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/GeneralAccountingReports.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java	Sat Jan 26 21:59:59 2013 +0100
@@ -29,6 +29,8 @@
 
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.businessUtility.AccountTree;
 import org.openbravo.erpCommon.businessUtility.AccountTreeData;
 import org.openbravo.erpCommon.businessUtility.AccountingSchemaMiscData;
@@ -42,6 +44,7 @@
 import org.openbravo.erpCommon.utility.ToolBar;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.erpCommon.utility.WindowTreeData;
+import org.openbravo.model.ad.access.Role;
 import org.openbravo.xmlEngine.XmlDocument;
 
 public class GeneralAccountingReports extends HttpSecureAppServlet {
@@ -450,10 +453,24 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    
+    String strOrgList = "";
+    String[] orgList = OBContext.getOBContext().getReadableOrganizations();
+    int i = 0;
+    for (String org : orgList ){
+    	if(i==0){
+        	strOrgList += "'"+org+"'";
+    	}
+    	else{
+    		strOrgList += ",'"+org+"'";
+    	}
+    	i++;
+    }
+    
     xmlDocument.setParameter(
         "orgs",
         Utility.arrayDobleEntrada("arrOrgs",
-            GeneralAccountingReportsData.selectOrgsDouble(this, vars.getClient())));
+            GeneralAccountingReportsData.selectOrgsDouble(this, vars.getClient(), strOrgList)));
     xmlDocument.setParameter(
         "accountingReports",
         Utility.arrayDobleEntrada("arrAccountingReports",
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql	Sat Jan 26 21:59:59 2013 +0100
@@ -278,6 +278,7 @@
         AND O.BALANCED = 'Y' 
         AND AD_ISORGINCLUDED(O.AD_ORG_ID, ORG.AD_ORG_ID, S.AD_CLIENT_ID) <> -1
         AND ORG.AD_ORG_ID <> '0'
+        AND ORG.AD_ORG_ID IN ('1')
       UNION
       SELECT S.C_ACCTSCHEMA_ID||R.C_ACCT_RPT_ID AS PADRE, O.AD_ORG_ID AS ID, O.NAME AS NAME
       FROM C_ACCT_RPT R, AD_ORG_ACCTSCHEMA S, (
@@ -295,10 +296,13 @@
         AND S.AD_CLIENT_ID = ?
         AND R.ISORGBALANCED = 'N' 
         AND COALESCE(R.REPORTTYPE,'N') = 'N'
+        AND O.AD_ORG_ID IN ('1')
       ORDER BY NAME,PADRE
         ]]></Sql>
         <Parameter name="adClient"/>
+        <Parameter name="adOrg" optional="false" type="replace" after="AND ORG.AD_ORG_ID IN (" text="'1'"/>
         <Parameter name="adClient"/>
+        <Parameter name="adOrg" optional="false" type="replace" after="AND O.AD_ORG_ID IN (" text="'1'"/>
    </SqlMethod>
    <SqlMethod name="selectYearsDouble" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java	Sat Jan 26 21:59:59 2013 +0100
@@ -609,7 +609,8 @@
   private ReportGeneralLedgerJournalData[] notshow(ReportGeneralLedgerJournalData[] data,
       VariablesSecureApp vars) {
     for (int i = 0; i < data.length - 1; i++) {
-      if (data[i].identifier.toString().equals(data[i + 1].identifier.toString())) {
+      if ((data[i].identifier.toString().equals(data[i + 1].identifier.toString()))
+          && (data[i].dateacct.toString().equals(data[i + 1].dateacct.toString()))) {
         data[i + 1].newstyle = "visibility: hidden";
       }
     }
--- a/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java	Sat Jan 26 21:59:59 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	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java	Sat Jan 26 21:59:59 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;
   }
 
--- a/src/org/openbravo/erpCommon/businessUtility/PrinterReports.html	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/PrinterReports.html	Sat Jan 26 21:59:59 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) 2001-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2013 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -25,6 +25,16 @@
 <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
 <script language="JavaScript" src="../../../../../web/js/messages.js" type="text/javascript"></script>
 <script language="JavaScript" type="text/javascript" id="paramLanguage">    defaultLang = "en_US";</script>
+<script language="JavaScript" type="text/javascript">
+  var isDirectPDF = false;
+  var isDirectAttach = false;
+</script>
+<script language="JavaScript" type="text/javascript" id="paramIsDirectPDF">
+  isDirectPDF = false;
+</script>
+<script language="JavaScript" type="text/javascript" id="paramIsDirectAttach">
+  isDirectAttach = false;
+</script>
 <script language="JavaScript" type="text/javascript" id="isPrintPreview">
 function printReport(pagina) {
     if (isWindowInMDIContext) {
@@ -32,7 +42,9 @@
       if (pagina.indexOf('../') === 0) {
         pagina = pagina.substring(3, pagina.length);
       }
-      LayoutMDI.OB.Layout.ClassicOBCompatibility.Popup.open('printpdf', 600, 300, LayoutMDI.OB.Application.contextUrl + pagina + "?Commnad=PDF", '', window, false, false, true);
+      var params = "?Commnad=PDF" + (isDirectPDF ? "&isDirectPDF=true" : "") + (isDirectAttach ? "&isDirectAttach=true" : "");
+      var showPopup = (isDirectPDF || isDirectAttach ? false : true)
+      LayoutMDI.OB.Layout.ClassicOBCompatibility.Popup.open('printpdf', 600, 300, LayoutMDI.OB.Application.contextUrl + pagina + params, '', window, false, false, true, null, showPopup, showPopup);
     } else {
       openPDF(pagina, 'PDF');
     }
--- a/src/org/openbravo/erpCommon/businessUtility/PrinterReports.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/PrinterReports.java	Sat Jan 26 21:59:59 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) 2001-2010 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2013 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -29,6 +29,7 @@
 import org.openbravo.base.filter.IsIDFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.data.Sqlc;
 import org.openbravo.utils.FormatUtilities;
 import org.openbravo.xmlEngine.XmlDocument;
 
@@ -46,20 +47,34 @@
     if (vars.commandIn("DEFAULT")) {
       String strDirectPrint = vars.getStringParameter("inpdirectprint", "N");
       String strPDFPath = vars.getStringParameter("inppdfpath");
+      String strKeyColumnId = vars.getStringParameter("inpkeyColumnId");
       String strHiddenKey = vars.getStringParameter("inphiddenkey");
+      if (strHiddenKey == null || "".equals(strHiddenKey)) {
+        strHiddenKey = "inp" + Sqlc.TransformaNombreColumna(strKeyColumnId);
+      }
       String strWindowId = vars.getStringParameter("inpwindowId");
-      String strKeyColumnId = vars.getStringParameter("inpkeyColumnId");
       String inptabId = vars.getStringParameter("inpTabId");
       String strHiddenValue = vars.getGlobalVariable("inphiddenvalue", strWindowId + "|"
           + strKeyColumnId);
-      printPage(response, vars, strDirectPrint, strPDFPath, strHiddenKey, strHiddenValue, inptabId);
+      String strIsDirectPDF = vars.getStringParameter("inpIsDirectPDF");
+      if (strIsDirectPDF == null || "".equals(strIsDirectPDF)) {
+        strIsDirectPDF = "false";
+      }
+      String strIsDirectAttach = vars.getStringParameter("inpIsDirectAttach");
+      if (strIsDirectAttach == null || "".equals(strIsDirectAttach)) {
+        strIsDirectAttach = "false";
+      }
+
+      printPage(response, vars, strDirectPrint, strPDFPath, strHiddenKey, strHiddenValue, inptabId,
+          strIsDirectPDF, strIsDirectAttach);
     } else
       pageError(response);
   }
 
   private void printPage(HttpServletResponse response, VariablesSecureApp vars,
       String strDirectPrint, String strPDFPath, String strHiddenKey, String strHiddenValue,
-      String inptabId) throws IOException, ServletException {
+      String inptabId, String strIsDirectPDF, String strIsDirectAttach) throws IOException,
+      ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("Output: dataSheet");
     String[] discard = { "isPrintPreview" };
@@ -79,6 +94,8 @@
     xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";");
     xmlDocument.setParameter("pdfPath", mapping);
     xmlDocument.setParameter("directPrint", strDirectPrint);
+    xmlDocument.setParameter("isDirectPDF", "isDirectPDF = " + strIsDirectPDF + ";\r\n");
+    xmlDocument.setParameter("isDirectAttach", "isDirectAttach = " + strIsDirectAttach + ";\r\n");
     // if (strPDFPath.startsWith("..")) strPDFPath =
     // strPDFPath.substring(2);
 
--- a/src/org/openbravo/erpCommon/businessUtility/PrinterReports.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/PrinterReports.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -12,7 +12,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) 2001-2010 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2013 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -21,6 +21,8 @@
 	<template file="PrinterReports.html"/>
 	<PARAMETER id="paramDirectory" name="directory" default=""/>
 	<PARAMETER id="paramLanguage" name="language" default=""/>
+	<PARAMETER id="paramIsDirectPDF" name="isDirectPDF" default=""/>
+	<PARAMETER id="paramIsDirectAttach" name="isDirectAttach" default=""/>
 	<PARAMETER id="fieldPDFPath" name="pdfPath" attribute="onload" replace="xx"/>
 	<PARAMETER id="fieldIsDirectPrint" name="directPrint" attribute="value"/>
 	<PARAMETER id="Pdf1" name="pdfPath" attribute="src" replace="xx"/>
--- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Sat Jan 26 21:59:59 2013 +0100
@@ -8,7 +8,7 @@
  * 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) 2008-2012 Openbravo SLU All Rights Reserved.
+ * portions are Copyright (C) 2008-2013 Openbravo SLU All Rights Reserved.
  * Contributor(s): ______________________________________.
  */
 package org.openbravo.erpCommon.utility.reporting.printing;
@@ -802,11 +802,21 @@
 
     // Get additional document information
     final String draftDocumentIds = "";
+    String strIsDirectPDF = vars.getStringParameter("isDirectPDF");
+    if (strIsDirectPDF == null || "".equals(strIsDirectPDF)) {
+      strIsDirectPDF = "false";
+    }
+    String strIsDirectAttach = vars.getStringParameter("isDirectAttach");
+    if (strIsDirectAttach == null || "".equals(strIsDirectAttach)) {
+      strIsDirectAttach = "false";
+    }
     xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\r\n");
     xmlDocument.setParameter("language", vars.getLanguage());
     xmlDocument.setParameter("theme", vars.getTheme());
     xmlDocument.setParameter("description", "");
     xmlDocument.setParameter("help", "");
+    xmlDocument.setParameter("isDirectPDF", "isDirectPDF = " + strIsDirectPDF + ";\r\n");
+    xmlDocument.setParameter("isDirectAttach", "isDirectAttach = " + strIsDirectAttach + ";\r\n");
     response.setContentType("text/html; charset=UTF-8");
     final PrintWriter out = response.getWriter();
     out.println(xmlDocument.print());
--- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.html	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.html	Sat Jan 26 21:59:59 2013 +0100
@@ -13,7 +13,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) 2008-2011 Openbravo SLU
+ * All portions are Copyright (C) 2008-2013 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -31,6 +31,16 @@
       <script language="JavaScript" type="text/javascript" id="paramLanguage">
         var defaultLang = "en_US";
       </script>
+      <script language="JavaScript" type="text/javascript">
+        var isDirectPDF = false;
+        var isDirectAttach = false;
+      </script>
+      <script language="JavaScript" type="text/javascript" id="paramIsDirectPDF">
+        isDirectPDF = false;
+      </script>
+      <script language="JavaScript" type="text/javascript" id="paramIsDirectAttach">
+        isDirectAttach = false;
+      </script>
       <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
       <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
       <script language="JavaScript" src="../../../../../web/js/messages.js" type="text/javascript"></script>
@@ -46,16 +56,19 @@
     }
 
     function submitThisPage(strCommand) {
-       if (!isWindowInMDIPopup || getFrame('LayoutMDI').OB.MainView.TabSet.getSelectedTab().pane.getClassName()==='OBClassicWindow') {
+      if (!isWindowInMDIPopup || getFrame('LayoutMDI').OB.MainView.TabSet.getSelectedTab().pane.getClassName()==='OBClassicWindow') {
         // If opening in 2.50 layout, do it in hidden frame
         submitCommandForm(strCommand, false, null, null, "hiddenFrame");
       } else {
           //In OB 3, we submit the form in the OB 3 background_target hidden iframe
         submitCommandForm(strCommand, false, null, null, "background_target");
           //We refresh the main view to ensure that the attachments counter is updated
-        getFrame('LayoutMDI').OB.MainView.TabSet.getSelectedTab().pane.view.refresh();
+        var tabSet = getFrame('LayoutMDI').OB.MainView.TabSet;
+        if (tabSet && tabSet.getSelectedTab() && tabSet.getSelectedTab().pane.view && tabSet.getSelectedTab().pane.view.refresh) {
+          tabSet.getSelectedTab().pane.view.refresh();
+        }
       }
-       closePage();
+      closePage();
       return true;
     }
 
@@ -65,16 +78,20 @@
 	}
 	
 	function onLoadDo(){
-		
+		if (isDirectAttach) {
+			document.getElementById('linkButtonAttach').click();
+		} else if (isDirectPDF) {
+			document.getElementById('linkButtonPrint').click();
+		}
 		this.windowTables = new Array(
-		  new windowTableId('client', 'buttonOK')
+			new windowTableId('client', 'linkButtonPrint')
 		);
 		setWindowTableParentElement();
 		enableShortcuts('popup');
 		setBrowserAutoComplete(false);
 
 		setWindowElementFocus('firstElement');
-        resizeWindow();
+			resizeWindow();
 	}
 
 	function onResizeDo(){
@@ -288,7 +305,7 @@
 		                <td class="Button_RightAlign_ContentCell">
 		                  <div>
                         <button type="button" 
-                          id="linkButtonOk" 
+                          id="linkButtonAttach" 
                           class="ButtonLink" 
                           onclick="submitThisPage('ARCHIVE');return false;" 
                           onfocus="buttonEvent('onfocus', this); window.status='Print and Archive'; return true;" 
@@ -313,6 +330,7 @@
 		                <td class="Button_LeftAlign_ContentCell">
 		                  <div>
                         <button type="button" 
+                          id="linkButtonPrint" 
                           class="ButtonLink" 
                           onclick="submitThisPage('PRINT');return false;" 
                           onfocus="buttonEvent('onfocus', this); window.status='Print'; return true;" 
--- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.xml	Wed Jan 23 11:23:30 2013 +0100
+++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.xml	Sat Jan 26 21:59:59 2013 +0100
@@ -12,7 +12,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) 2001-2008 Openbravo SLU 
+* All portions are Copyright (C) 2001-2013 Openbravo SLU 
 * All Rights Reserved. 
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -26,6 +26,8 @@
   <PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
 	<PARAMETER id="processDescription" name="description" replaceCharacters="htmlHelp" default=""/>
 	<PARAMETER id="processHelp" name="help" replaceCharacters="htmlHelp" default=""/>
+  <PARAMETER id="paramIsDirectPDF" name="isDirectPDF" default=""/>
+  <PARAMETER id="paramIsDirectAttach" name="isDirectAttach" default=""/>
 	<PARAMETER id="messageBoxID" name="messageType" attribute="class" replace="yy" default="HIDDEN"/>
 	<PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
 	<PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>