Merge from pi-pne pick and execute development branch
authorGorka Ion Damián <gorkaion.damian@openbravo.com>
Wed, 23 Nov 2011 18:54:57 +0100
changeset 14708 aa9f3fe74669
parent 14703 410e986539d4 (current diff)
parent 14707 506205c37723 (diff)
child 14710 0716faefddcc
Merge from pi-pne pick and execute development branch
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_TABLE.xml
src-db/database/sourcedata/AD_VAL_RULE.xml
--- a/.hgsigs	Wed Nov 23 16:42:43 2011 +0100
+++ b/.hgsigs	Wed Nov 23 18:54:57 2011 +0100
@@ -43,6 +43,9 @@
 819660861fcf70114fd97793de78cec4cc3ef63b 0 iEYEABECAAYFAk6ZYrAACgkQCX/oGf+2qkODfgCeNU807u8Lz0PaEwb/4hkZzwHn8l8AoLwXed7lxTH/jybwSSOGvGMde+M/
 36fbd0e92534c9261754d500e9ef0d1a45744b59 0 iEYEABECAAYFAk6B2kgACgkQCX/oGf+2qkPXrwCghp9G3HStth7Hc4vevflmiJsaL/sAoLKnTFUyu4ZX8mlLusps5zAiWNjT
 851d60ba120c48644beb5b9469acff1dbdb7368c 0 iEYEABECAAYFAk6daREACgkQCX/oGf+2qkN7twCg2ekW1o6w98p9Bvacblx2q3zOBYIAoJihfu3/n4If7/CHg4um1nqYvBvC
+0fb10ae9b5eee53054b228586d8f7314ed2618ae 0 iEYEABECAAYFAk6+i4IACgkQCX/oGf+2qkM0sgCg3d4/9MS1NndfLzLAOZ61YTpWwjsAnjUja/VH9rOSLJK1O/e0Zl0BHkZs
 19fb1243d437ff7490e6ad44018c4e403cf18af4 0 iEYEABECAAYFAk6YPpEACgkQCX/oGf+2qkO6NwCeJdcbggzlqxYL7K1NG98pjnWjH60AoL/aHl5Qi1e2UvFGbAeFcJZmR2AH
 6f5b96ecdf0cb377597c0abad63dc98aacfa3b6d 0 iEYEABECAAYFAk6gfrgACgkQCX/oGf+2qkN7WQCg/WowvRSY1dn1vXn2NRNWg/vL+YIAmwbYIbwrsnLS/rPFsoUDWsEMX2U6
+d6c9101ee9cc4436d57c65ad0520ec8b24917ef0 0 iEYEABECAAYFAk7ClYYACgkQCX/oGf+2qkMNfgCeN69iKR3vkIoXrebAjrJVMGsmlIoAmwRui8P5+KqWtxgz2idZtgDNROdL
 e3386a2cd54020855bb2b3efa1c0afcfdf30a2b4 0 iEYEABECAAYFAk67/uoACgkQCX/oGf+2qkPXfQCg3lQiuBbJnVsPfnL8LWukEVG5CsIAoKsRfoVp93C1SY2N0iMl1LqT7CmB
+9bb62accddbd9114aa4562816ab5b0234b01b1fa 0 iEYEABECAAYFAk7Gf8IACgkQCX/oGf+2qkMwUACfbNSWszDOxciN14aA09Oe8da52TIAn3xc3Kgek0jmetz0q+lzPVxdAjjk
--- a/.hgtags	Wed Nov 23 16:42:43 2011 +0100
+++ b/.hgtags	Wed Nov 23 18:54:57 2011 +0100
@@ -54,6 +54,9 @@
 e67ea53b0101e8a09ede8823ebf90cfb6f01a60c 3.0MP2.4
 c7a189353e46e28e320809a2e8aaaaac8c6f67e2 3.0MP3
 90cf0099c87c7edc0fe925ffc5df21ea55449186 3.0MP3.1
+a3df646af3a532b3a028e65852cbe1ff7ddcd152 3.0MP3.2
 4e9fa8e7edbc01b25ebaa4aefb7b9cff61a91f98 3.0MP4
 f7371a7182533fe4717596b18262d42176fefe40 3.0MP4.1
+4b9a007b2e863b7c914d50ca7abcabf4912c784b 3.0MP4.2
 bee1528a5966a4681a86ed0c9f7129f8f8818ab1 3.0MP5
+5752cade8b792f72e160c7b5870f03b3e5f8bd40 3.0MP5.1
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/LinkCreditPaymentsData.class has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.14359]]></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-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/LinkCreditPayments_data.xsql	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/LinkCreditPayments_data.xsql	Wed Nov 23 18:54:57 2011 +0100
@@ -82,7 +82,12 @@
         FROM C_BPARTNER BP
         WHERE EXISTS (SELECT 1
                       FROM FIN_PAYMENT P
-                      WHERE P.C_BPARTNER_ID = BP.C_BPARTNER_ID)
+                      WHERE P.C_BPARTNER_ID = BP.C_BPARTNER_ID
+            AND USED_CREDIT > 0
+            AND GENERATED_CREDIT = 0
+            AND PROCESSED = 'Y'
+            AND NOT EXISTS(SELECT 1 FROM FIN_PAYMENT_CREDIT
+                    WHERE FIN_PAYMENT_CREDIT.FIN_PAYMENT_ID = P.FIN_PAYMENT_ID))
       ]]>
     </Sql>
   </SqlMethod>
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/LinkCreditPaymentsData.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/LinkCreditPaymentsData.java	Wed Nov 23 18:54:57 2011 +0100
@@ -239,7 +239,12 @@
       "        FROM C_BPARTNER BP" +
       "        WHERE EXISTS (SELECT 1" +
       "                      FROM FIN_PAYMENT P" +
-      "                      WHERE P.C_BPARTNER_ID = BP.C_BPARTNER_ID)";
+      "                      WHERE P.C_BPARTNER_ID = BP.C_BPARTNER_ID" +
+      "            AND USED_CREDIT > 0" +
+      "            AND GENERATED_CREDIT = 0" +
+      "            AND PROCESSED = 'Y'" +
+      "            AND NOT EXISTS(SELECT 1 FROM FIN_PAYMENT_CREDIT" +
+      "                    WHERE FIN_PAYMENT_CREDIT.FIN_PAYMENT_ID = P.FIN_PAYMENT_ID))";
 
     ResultSet result;
     Vector<java.lang.Object> vector = new Vector<java.lang.Object>(0);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Wed Nov 23 18:54:57 2011 +0100
@@ -520,6 +520,8 @@
         FieldProviderFactory.setField(data[i], "bankLineBusinessPartner", FIN_BankStatementLines[i]
             .getBusinessPartner() != null ? FIN_BankStatementLines[i].getBusinessPartner()
             .getIdentifier() : FIN_BankStatementLines[i].getBpartnername());
+        FieldProviderFactory.setField(data[i], "textcolor",
+            FIN_BankStatementLines[i].getBusinessPartner() != null ? "bold" : "normal");
         FieldProviderFactory.setField(data[i], "bankLineReferenceNo",
             FIN_BankStatementLines[i].getReferenceNo());
         // CREDIT - DEBIT
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt	Wed Nov 23 18:54:57 2011 +0100
@@ -23,7 +23,7 @@
     <td class="DataGrid_Body_LineNoCell"></td>
     <!--input type="hidden" id="fieldBLId" name="inpRecordIdxx" value=""></input-->
     <td class="DataGrid_Body_Cell"><span id="fieldBLTransactionDate">xx01-07-2010</span></td>
-    <td class="DataGrid_Body_Cell"><span id="fieldBLBusinessPartner" title="">xxBP Name</span></td>
+    <td class="DataGrid_Body_Cell"><span id="fieldBLBusinessPartner" title="" style="font-weight: xx;">xxBP Name</span></td>
     <td class="DataGrid_Body_Cell"><span id="fieldBLReferenceNo">xx11100011</span></td>
     <td class="DataGrid_Body_Cell_Amount"><span id="fieldAmount">xx12233</span></td>
     <td class="DataGrid_Body_LineNoCell" style="background-color: xx;" id="inpMatchStyle_xx" name="inpMatchStyle_xx">
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.xml	Wed Nov 23 18:54:57 2011 +0100
@@ -31,6 +31,7 @@
     <FIELD id="fieldBLTransactionDate">bankLineTransactionDate</FIELD>
     <FIELD id="fieldBLBusinessPartner">bankLineBusinessPartner</FIELD>
     <FIELD id="fieldBLBusinessPartner" attribute="title">bankLineDescription</FIELD>
+    <FIELD id="fieldBLBusinessPartner" attribute="style" replace="xx">textcolor</FIELD>
     <FIELD id="fieldBLReferenceNo">bankLineReferenceNo</FIELD>
     <FIELD id="inpBSAmount_xx" attribute="value" format="euroEdition">bankLineAmount</FIELD>
     <FIELD id="inpBSAmount_xx" attribute="id" replace="xx">finBankLineId</FIELD>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Wed Nov 23 18:54:57 2011 +0100
@@ -180,7 +180,13 @@
         if ("CO".equals(strdocaction)) {
           // Need to refresh the invoice again from the db
           invoice = dao.getObject(Invoice.class, strC_Invoice_ID);
-          final String invoiceDocCategory = invoice.getDocumentType().getDocumentCategory();
+          OBContext.setAdminMode(false);
+          String invoiceDocCategory = "";
+          try {
+            invoiceDocCategory = invoice.getDocumentType().getDocumentCategory();
+          } finally {
+            OBContext.restorePreviousMode();
+          }
           /*
            * Print a grid popup in case of credit payment
            */
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Wed Nov 23 18:54:57 2011 +0100
@@ -24,13 +24,16 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.StringTokenizer;
 
 import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.lang.StringUtils;
 import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
 import org.openbravo.advpaymentmngt.process.FIN_AddPayment;
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.security.OrganizationStructureProvider;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
 import org.openbravo.database.ConnectionProvider;
@@ -38,6 +41,7 @@
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.common.businesspartner.BusinessPartner;
 import org.openbravo.model.common.enterprise.DocumentType;
+import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.model.financialmgmt.payment.FIN_BankStatement;
 import org.openbravo.model.financialmgmt.payment.FIN_BankStatementLine;
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
@@ -182,8 +186,14 @@
   private int saveFINBankStatementLines(List<FIN_BankStatementLine> bankStatementLines) {
     int counter = 0;
     for (FIN_BankStatementLine bankStatementLine : bankStatementLines) {
-      bankStatementLine
-          .setBusinessPartner(matchBusinessPartner(bankStatementLine.getBpartnername()));
+      BusinessPartner businessPartner;
+      try {
+        businessPartner = matchBusinessPartner(bankStatementLine.getBpartnername(),
+            bankStatementLine.getOrganization(), bankStatementLine.getBankStatement().getAccount());
+      } catch (Exception e) {
+        businessPartner = null;
+      }
+      bankStatementLine.setBusinessPartner(businessPartner);
       OBDal.getInstance().save(bankStatementLine);
       counter++;
     }
@@ -211,16 +221,21 @@
 
   }
 
-  BusinessPartner matchBusinessPartner(String partnername) {
+  private BusinessPartner matchBusinessPartner(String partnername, Organization organization,
+      FIN_FinancialAccount account) {
     // TODO extend with other matching methods. It will make it easier to later reconcile
-    BusinessPartner bp = matchBusinessPartnerByName(partnername);
+    BusinessPartner bp = matchBusinessPartnerByName(partnername, organization, account);
     if (bp == null) {
-      bp = finBPByName(partnername);
+      bp = finBPByName(partnername, organization);
+    }
+    if (bp == null) {
+      bp = matchBusinessPartnerByNameTokens(partnername, organization);
     }
     return bp;
   }
 
-  BusinessPartner matchBusinessPartnerByName(String partnername) {
+  private BusinessPartner matchBusinessPartnerByName(String partnername, Organization organization,
+      FIN_FinancialAccount account) {
     if (partnername == null || "".equals(partnername)) {
       return null;
     }
@@ -232,11 +247,18 @@
       whereClause.append(" where bsl." + FIN_BankStatementLine.PROPERTY_BPARTNERNAME + " = ?");
       whereClause.append(" and bsl." + FIN_BankStatementLine.PROPERTY_BUSINESSPARTNER
           + " is not null");
+      whereClause.append(" and bsl." + FIN_BankStatementLine.PROPERTY_BANKSTATEMENT + ".");
+      whereClause.append(FIN_BankStatement.PROPERTY_ACCOUNT + ".id = ?");
+      parameters.add(account.getId());
+      whereClause.append(" and bsl." + FIN_BankStatementLine.PROPERTY_ORGANIZATION + ".id in (");
+      whereClause.append(FIN_Utility.getInStrSet(new OrganizationStructureProvider()
+          .getNaturalTree(organization.getId())) + ") ");
       whereClause.append(" and bsl.bankStatement.processed = 'Y'");
       whereClause.append(" order by bsl." + FIN_BankStatementLine.PROPERTY_CREATIONDATE + " desc");
       parameters.add(partnername);
       final OBQuery<FIN_BankStatementLine> bsl = OBDal.getInstance().createQuery(
           FIN_BankStatementLine.class, whereClause.toString(), parameters);
+      bsl.setFilterOnReadableOrganization(false);
       List<FIN_BankStatementLine> matchedLines = bsl.list();
       if (matchedLines.size() == 0)
         return null;
@@ -248,7 +270,7 @@
     }
   }
 
-  BusinessPartner finBPByName(String partnername) {
+  private BusinessPartner finBPByName(String partnername, Organization organization) {
     if (partnername == null || "".equals(partnername)) {
       return null;
     }
@@ -260,8 +282,12 @@
       whereClause.append(" as bp ");
       whereClause.append(" where bp." + BusinessPartner.PROPERTY_NAME + " = ?");
       parameters.add(partnername);
+      whereClause.append(" and bp." + BusinessPartner.PROPERTY_ORGANIZATION + ".id in (");
+      whereClause.append(FIN_Utility.getInStrSet(new OrganizationStructureProvider()
+          .getNaturalTree(organization.getId())) + ") ");
       final OBQuery<BusinessPartner> bp = OBDal.getInstance().createQuery(BusinessPartner.class,
           whereClause.toString(), parameters);
+      bp.setFilterOnReadableOrganization(false);
       List<BusinessPartner> matchedBP = bp.list();
       if (matchedBP.size() == 0)
         return null;
@@ -276,4 +302,73 @@
   public abstract List<FIN_BankStatementLine> loadFile(InputStream in,
       FIN_BankStatement targetBankStatement);
 
+  private BusinessPartner matchBusinessPartnerByNameTokens(String partnername,
+      Organization organization) {
+    if (partnername == null || "".equals(partnername)) {
+      return null;
+    }
+    StringTokenizer st = new StringTokenizer(partnername);
+    List<String> list = new ArrayList<String>();
+    while (st.hasMoreTokens()) {
+      String token = st.nextToken();
+      if (token.length() > 3) {
+        list.add(token);
+      }
+    }
+    if (list.isEmpty()) {
+      return null;
+    }
+    final StringBuilder whereClause = new StringBuilder();
+    List<Object> parameters = new ArrayList<Object>();
+    OBContext.setAdminMode();
+    try {
+      whereClause.append(" as b ");
+      whereClause.append(" where (");
+      for (String token : list) {
+        whereClause.append(" lower(b." + BusinessPartner.PROPERTY_NAME + ") like lower(?) or ");
+        parameters.add("%" + token + "%");
+      }
+      whereClause.delete(whereClause.length() - 3, whereClause.length()).append(")");
+      whereClause.append(" and b." + BusinessPartner.PROPERTY_ORGANIZATION + ".id in (");
+      whereClause.append(FIN_Utility.getInStrSet(new OrganizationStructureProvider()
+          .getNaturalTree(organization.getId())) + ") ");
+      final OBQuery<BusinessPartner> bl = OBDal.getInstance().createQuery(BusinessPartner.class,
+          whereClause.toString(), parameters);
+      bl.setFilterOnReadableOrganization(false);
+      List<BusinessPartner> businessPartners = bl.list();
+      if (businessPartners.size() == 0) {
+        return null;
+      } else if (businessPartners.size() == 1) {
+        return businessPartners.get(0);
+      } else {
+        return closest(businessPartners, partnername);
+      }
+
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  private BusinessPartner closest(List<BusinessPartner> businessPartners, String partnername) {
+    BusinessPartner targetBusinessPartner = businessPartners.get(0);
+    int distance = StringUtils.getLevenshteinDistance(partnername, businessPartners.get(0)
+        .getName());
+    for (BusinessPartner bp : businessPartners) {
+      // Calculates distance between two strings meaning number of changes required for a string to
+      // convert in another string
+      int bpDistance = StringUtils.getLevenshteinDistance(partnername, bp.getName());
+      if (bpDistance < distance) {
+        distance = bpDistance;
+        targetBusinessPartner = bp;
+      }
+    }
+    // Tolerance: discard business partners where number of changes needed to match is higher than
+    // half of its length
+    if (distance > (partnername.length() / 2)) {
+      return null;
+    } else {
+      return targetBusinessPartner;
+    }
+  }
+
 }
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.14359]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.14359]]></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/MenuManager.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java	Wed Nov 23 18:54:57 2011 +0100
@@ -39,6 +39,7 @@
 import org.openbravo.erpCommon.obps.ActivationKey;
 import org.openbravo.erpCommon.obps.ActivationKey.FeatureRestriction;
 import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.ad.access.Role;
 import org.openbravo.model.ad.domain.ModelImplementationMapping;
 import org.openbravo.model.ad.ui.Form;
 import org.openbravo.model.ad.ui.Menu;
@@ -339,8 +340,13 @@
   }
 
   private void createInitialMenuList() {
-
-    final Tree tree = OBDal.getInstance().createQuery(Tree.class, "typeArea='MM'").list().get(0);
+    Role role = OBDal.getInstance().get(Role.class, roleId);
+    final Tree tree;
+    if (role.getPrimaryTreeMenu() != null) {
+      tree = role.getPrimaryTreeMenu();
+    } else {
+      tree = OBDal.getInstance().createQuery(Tree.class, "id='10'").list().get(0);
+    }
     menuOptions = new ArrayList<MenuOption>();
     OBCriteria<TreeNode> treeNodes = OBDal.getInstance().createCriteria(TreeNode.class);
     treeNodes.add(Restrictions.eq(TreeNode.PROPERTY_TREE, tree));
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-personalization-form.js.ftl	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-personalization-form.js.ftl	Wed Nov 23 18:54:57 2011 +0100
@@ -25,6 +25,9 @@
         name: '${field.name?js_string}',
         title: '${field.label?js_string}',
         type: '${field.type}',
+        <#if field.clientClass != "">
+            clientClass: '${field.clientClass}',
+        </#if>
         <#if field.type = "text">
             editorType: 'OBTextItem',
         </#if>
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Wed Nov 23 18:54:57 2011 +0100
@@ -164,7 +164,12 @@
     var complementsNS4 = '';
     var auxField = '';
     var hidden, i;
-    
+    var displayedValue = '';
+
+    if (this.valueMap[this.getValue()]) {
+      displayedValue = this.valueMap[this.getValue()];
+    }
+
     if (url.indexOf('Location') !== -1) {
       height = 300;
       width = 600;
@@ -182,7 +187,7 @@
     isc.OBSearchItem.openedWindow = null;
     
     if (strValueID) {
-      auxField = 'inpNameValue=' + encodeURIComponent(this.form.getValue(this.displayField));
+      auxField = 'inpNameValue=' + encodeURIComponent(displayedValue);
     }
     if (parameters) {
       var total = parameters.length;
@@ -235,6 +240,4 @@
     window.onunload = function(){
     };
   }
-});
-
-
+});
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js	Wed Nov 23 18:54:57 2011 +0100
@@ -29,7 +29,31 @@
   selectOnFocus: false,
   
   isDisabled: function() {
-    return this.Super('isDisabled', arguments);
+    var ret = this.Super('isDisabled', arguments);
+    if (ret) {
+      this.readOnly = true;
+      if (this.cellStyle.indexOf('Disabled') === -1 || (this.cellStyle.indexOf('Disabled') !== -1 && this.cellStyle.lastIndexOf('Disabled') !== this.cellStyle.length - 8)) {
+        this.cellStyle = this.cellStyle + 'Disabled';
+      }
+      if (this.titleStyle.indexOf('Disabled') === -1 || (this.titleStyle.indexOf('Disabled') !== -1 && this.titleStyle.lastIndexOf('Disabled') !== this.titleStyle.length - 8)) {
+        this.titleStyle = this.titleStyle + 'Disabled';
+      }
+      if (this.textBoxStyle.indexOf('Disabled') === -1 || (this.textBoxStyle.indexOf('Disabled') !== -1 && this.textBoxStyle.lastIndexOf('Disabled') !== this.textBoxStyle.length - 8)) {
+        this.textBoxStyle = this.textBoxStyle + 'Disabled';
+      }
+    } else {
+      this.readOnly = false;
+      if (this.cellStyle.lastIndexOf('Disabled') === this.cellStyle.length - 8) {
+        this.cellStyle = this.cellStyle.substring(0, this.cellStyle.length - 8);
+      }
+      if (this.titleStyle.lastIndexOf('Disabled') === this.titleStyle.length - 8) {
+        this.titleStyle = this.titleStyle.substring(0, this.titleStyle.length - 8);
+      }
+      if (this.textBoxStyle.lastIndexOf('Disabled') === this.textBoxStyle.length - 8) {
+        this.textBoxStyle = this.textBoxStyle.substring(0, this.textBoxStyle.length - 8);
+      }
+    }
+    return false;
   },
 
   itemHoverHTML: function(item, form) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js	Wed Nov 23 18:54:57 2011 +0100
@@ -64,10 +64,17 @@
   },
   
   setNoteCount: function(lNoteCount) {
+    lNoteCount = parseInt(lNoteCount, 10);
     this.noteCount = lNoteCount;
     if(lNoteCount !== 0) {
+      if (!this.getNotePart().noteListGrid.isVisible()) {
+        this.getNotePart().noteListGrid.show();
+      }
       this.setValue(OB.I18N.getLabel('OBUIAPP_NotesTitle') + ' (' + lNoteCount+')');
     }else{
+      if (this.getNotePart().noteListGrid.isVisible()) {
+        this.getNotePart().noteListGrid.hide();
+      }
       this.setValue(OB.I18N.getLabel('OBUIAPP_NotesTitle'));
     }
   },
@@ -151,6 +158,8 @@
 
     // clean text area
     this.noteDynamicForm.getItem('noteOBTextAreaItem').clearValue();
+    this.saveNoteButton.setDisabled(true);
+    this.noteDynamicForm.focusInItem('noteOBTextAreaItem');
     
     this.parentElement.noteSection.setNoteCount(this.parentElement.noteSection.noteCount + 1);
   },
@@ -205,6 +214,14 @@
         showTitle : false,
         layout : this,
         width : '*',
+        change: function(form, item, value, oldValue) {
+          if (value) {
+            this.layout.saveNoteButton.setDisabled(false);
+          } else {
+            this.layout.saveNoteButton.setDisabled(true);
+          }
+          return this.Super('change', arguments);
+        },
         validators : [ {
           type : 'required'
         } ]
@@ -215,7 +232,15 @@
       layout : this,
       margin : 4, //hLayout layoutTopMargin is not affecting completly the button, so this magin tries to balance it
       title : OB.I18N.getLabel('OBUIAPP_SaveNoteButtonTitle'),
-      click : 'this.layout.saveNote()'
+      click : function() {
+        this.layout.saveNote();
+        return false;
+      },
+      canFocus : true,
+      draw: function() {
+        this.setDisabled(true);
+        return this.Super('draw', arguments);
+      }
     });
 
     hLayout.addMember(this.noteDynamicForm);
@@ -241,6 +266,8 @@
       headerHeight : 0,
       hoverStyle : 'OBNoteListGridCellOver',
       layout : this,
+      height: 1, //Due to issue 16695. Only with this, the visualization is strange when no records are shown. The noteListGrid visibility management is needed too.
+      visibility: 'hidden', //Due to issue 16695. The noteListGrid is automatically shown/hidden each time the note count (set using setNoteCount) is > 0
       selectionType : 'none',
       showEmptyMessage : false,
       styleName : 'OBNoteListGrid',
@@ -308,10 +335,10 @@
         // the current user
         if (record.createdBy === OB.User.id) {
           value = value +
-              ' <span class="OBNoteListGridDelete" ><a class="OBNoteListGridDelete" href="#" onclick="' +
+              ' <nobr><span class="OBNoteListGridDelete" ><a class="OBNoteListGridDelete" href="#" onclick="' +
               this.layout.ID + '.deleteNote(\'' +
               record.id +
-              '\')">[ ' + OB.I18N.getLabel('OBUIAPP_delete') + ' ]</a></span>';
+              '\')">[ ' + OB.I18N.getLabel('OBUIAPP_delete') + ' ]</a></span></nobr>';
         } 
         return value;
       },
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed Nov 23 18:54:57 2011 +0100
@@ -1657,26 +1657,11 @@
         }
       }    
     }
-
-    this.recomputeCanvasComponents(rowNum);
     
     ret = this.Super('startEditing', [rowNum, colNum, suppressFocus, eCe, suppressWarning]);
     
     return ret;
   },
-
-  // 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);
-      }
-    }
-  },
   
   startEditingNew: function(rowNum){
     // several cases:
@@ -1799,7 +1784,7 @@
     this.view.toolBar.updateButtonState(true);
     this.view.messageBar.hide();
     this.view.refreshParentRecord();
-    this.recomputeCanvasComponents(rowNum);
+    this.refreshRow(rowNum);
   },
 
   undoEditSelectedRows: function(){
@@ -1912,7 +1897,7 @@
       
       this.view.standardWindow.cleanUpAutoSaveProperties();
 
-      this.recomputeCanvasComponents(rowNum);
+      this.refreshRow(rowNum);
    
       // update after removing the error msg
       this.view.updateTabTitle();
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js	Wed Nov 23 18:54:57 2011 +0100
@@ -196,6 +196,9 @@
     // to be dropped on the statusbar
     if (folder.name === OB.Personalization.STATUSBAR_GROUPNAME) {
       for (i = 0; i < length; i++) {
+        if (nodes[i].preventInStatusBar) {
+          return;
+        }
         if (!nodes[i].wasOnStatusBarField && nodes[i].required && !nodes[i].hasDefaultValue) {
           return;
         }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js	Wed Nov 23 18:54:57 2011 +0100
@@ -108,6 +108,11 @@
     dataField = dataFields[i];
     fld = fields.find('name', dataField.name);
     if (fld) {
+      if (fld.clientClass) {
+        dataField.preventInStatusBar = true;
+      } else {
+        delete dataField.preventInStatusBar;
+      }
       dataField.required = fld.required;
       dataField.hasDisplayLogic = 
           fld.hasShowIf === true || (fld.showIf !== undef && !isc.isA.OBSectionItem(fld));
@@ -207,6 +212,7 @@
         colSpan : fld.colSpan,
         required: fld.required,
         hasDefaultValue: fld.hasDefaultValue,
+        preventInStatusBar: fld.clientClass,
         rowSpan : fld.rowSpan
       };
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Wed Nov 23 18:54:57 2011 +0100
@@ -90,6 +90,8 @@
     // required to show the funnel icon and to work
     this.filterClause = this.gridProperties.filterClause;
 
+    this.orderByClause = this.gridProperties.orderByClause;
+
     this.Super('initWidget', arguments);
   },
 
@@ -244,6 +246,9 @@
 
     params[OB.Constants.ORG_PARAMETER] = this.getOrgParameter();
 
+    if (this.orderByClause) {
+      params[OB.Constants.ORDERBY_PARAMETER] = this.orderByClause;
+    }
 
     if (this.filterClause) {
       if (props.whereClause) {
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/grid/gridHeaderMenuButton_Disabled.png has changed
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.14359]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.14359]]></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.14253]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.14359]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java	Wed Nov 23 18:54:57 2011 +0100
@@ -173,6 +173,14 @@
     return ActivationKey.getInstance().getLicenseClass().getCode();
   }
 
+  public String getTrialStringValue() {
+    return Boolean.toString(ActivationKey.getInstance().isTrial());
+  }
+
+  public String getGoldenStringValue() {
+    return Boolean.toString(ActivationKey.getInstance().isGolden());
+  }
+
   public String getVersionDescription() {
     ActivationKey ak = ActivationKey.getInstance();
     String strVersion = OBVersion.getInstance().getMajorVersion();
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl	Wed Nov 23 18:54:57 2011 +0100
@@ -29,6 +29,8 @@
         butlerUtilsUrl: '${data.butlerUtilsUrl?js_string}',
         purpose: '${data.instancePurpose?js_string}',
         licenseType: '${data.licenseType?js_string}',
+        isTrial: ${data.trialStringValue},
+        isGolden: ${data.goldenStringValue},
         versionDescription: '${data.versionDescription?js_string}'
     },
 
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.14359]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js	Wed Nov 23 18:54:57 2011 +0100
@@ -175,7 +175,7 @@
      return;
    }
 
-    if(OB.Application.licenseType === 'C') {
+    if(OB.Application.licenseType === 'C' || OB.Application.isTrial || OB.Application.isGolden) {
       isc.warn(OB.I18N.getLabel('OBUIAPP_ActivateMessage', [OB.I18N.getLabel('OBKMO_ActivateMessage')]), {
           isModal: true,
           showModalMask: true,
--- a/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.css	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.css	Wed Nov 23 18:54:57 2011 +0100
@@ -27,7 +27,7 @@
   font-family: 'lucida sans', sans-serif;
   font-weight: bold;
   padding-left: 5px;
-  padding-top: 2px;
+  padding-top: 4px;
   vertical-align: top;
 }
 
@@ -175,6 +175,7 @@
 .OBWidgetMenuButtonDisabled img,
 .OBWidgetMenuButtonFocused img,
 .OBWidgetMenuButtonFocusedOver img {
+  margin: 0px 2px 1px 0px;
   padding: 1px; 
   background: #91A777;
 }
--- a/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.js	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.js	Wed Nov 23 18:54:57 2011 +0100
@@ -36,7 +36,7 @@
   iconWidth: 18,
   iconHeight: 18,
   iconSpacing: 2,
-  width: 24,
+  width: 18,
   height: 18,
   menuButtonImage: OB.Styles.skinsPath + 'Default/org.openbravo.client.myob/images/widget/edit.png',
   baseStyle: 'OBWidgetMenuButton',
@@ -50,11 +50,12 @@
   edgeImage: OB.Styles.skinsPath + 'Default/org.openbravo.client.myob/images/widget/window.png',
   customEdges:null,
   edgeSize:2,
-  edgeTop:27,
+  edgeTop:29,
   edgeBottom:2,
   edgeOffsetTop:2,
   edgeOffsetRight:2,
   edgeOffsetBottom:2,
+  edgeOffsetLeft:2,
   showHeaderBackground:false, // part of edges
   showHeaderIcon:true,
 
@@ -76,7 +77,7 @@
 
 isc.OBWidget.changeDefaults('headerDefaults', {
   layoutMargin: 0,
-  height: 25
+  height: 27
 });
 
 isc.OBWidget.changeDefaults('headerLabelDefaults', {
@@ -163,5 +164,9 @@
   edgeImage: OB.Styles.skinsPath + 'Default/org.openbravo.client.myob/images/form/border.png',
   edgeSize : 1,
   edgeTop : 1,
-  edgeBottom : 1
+  edgeBottom : 1,
+  edgeOffsetTop:1,
+  edgeOffsetRight:1,
+  edgeOffsetBottom:1,
+  edgeOffsetLeft:1
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.14359]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.14359]]></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.14253]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.14359]]></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.14253]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.14359]]></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.14253]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.14359]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.14359]]></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.14253]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.14359]]></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.14253]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.14359]]></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.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.14359]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.14359]]></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.14253]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.14359]]></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.14253]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.14359]]></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.14253]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.14359]]></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.14253]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.14359]]></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.14253]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.14359]]></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/configScript.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.v3/src-db/database/configScript.xml	Wed Nov 23 18:54:57 2011 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <vector>
-    <versionInfo version="3.0.12729"/>
+    <versionInfo version="3.0.14253"/>
     <columnDataChange tablename="AD_PROCESS" columnname="ISACTIVE" pkRow="800026">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -493,10 +493,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="3216">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="3220">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.14359]]></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.14253]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.14359]]></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.14253]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.14359]]></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.14253]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.14359]]></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.14253]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.14359]]></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.14253]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.14359]]></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 Nov 23 16:42:43 2011 +0100
+++ b/referencedata/sampledata/F_B_International_Group.xml	Wed Nov 23 18:54:57 2011 +0100
@@ -8750,6 +8750,214 @@
     <widgetClass id="35002C82027448708D173B75FB27D037"/>
     <role id="43720ABF2A244050BB11E2C5AC652B5B"/>
   </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67E48A90016">
+    <id>FF80818133B61E980133B67E48A90016</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="CD1B06C4ED974B5F905A5A01B097DF4E"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67E6C330019">
+    <id>FF80818133B61E980133B67E6C330019</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="35002C82027448708D173B75FB27D037"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67E89E9001C">
+    <id>FF80818133B61E980133B67E89E9001C</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="8A6B99392E2B4192012E2B58F5790056"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67EAC3D001F">
+    <id>FF80818133B61E980133B67EAC3D001F</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="5EA740A9473048CFA6B6F1FB6F5576AC"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67EEBB30022">
+    <id>FF80818133B61E980133B67EEBB30022</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="34F279BBB85945519DC38F21573106C0"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67F15040025">
+    <id>FF80818133B61E980133B67F15040025</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="8A6B99392E2D9088012E2DC2C5520031"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67F3D360028">
+    <id>FF80818133B61E980133B67F3D360028</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="6E3AC867DCB34C068DEED85B40611FD8"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67F5E6D002B">
+    <id>FF80818133B61E980133B67F5E6D002B</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="E4C82D04605C4256A74258B770AA8867"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67F7F1A002F">
+    <id>FF80818133B61E980133B67F7F1A002F</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="CD1B06C4ED974B5F905A5A01B097DF4E"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67F98510032">
+    <id>FF80818133B61E980133B67F98510032</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="35002C82027448708D173B75FB27D037"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67FBD360035">
+    <id>FF80818133B61E980133B67FBD360035</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="8A6B99392E2B4192012E2B58F5790056"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B67FDB8D0038">
+    <id>FF80818133B61E980133B67FDB8D0038</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="5EA740A9473048CFA6B6F1FB6F5576AC"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B680101C003B">
+    <id>FF80818133B61E980133B680101C003B</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="34F279BBB85945519DC38F21573106C0"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B6803EBC003E">
+    <id>FF80818133B61E980133B6803EBC003E</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="8A6B99392E2D9088012E2DC2C5520031"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B6805C3F0041">
+    <id>FF80818133B61E980133B6805C3F0041</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="6E3AC867DCB34C068DEED85B40611FD8"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B6807CE20044">
+    <id>FF80818133B61E980133B6807CE20044</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="E4C82D04605C4256A74258B770AA8867"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B681EB790052">
+    <id>FF80818133B61E980133B681EB790052</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="5EA740A9473048CFA6B6F1FB6F5576AC"/>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B682339C0055">
+    <id>FF80818133B61E980133B682339C0055</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="8A6B99392E2D9088012E2DC2C5520031"/>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B68262650058">
+    <id>FF80818133B61E980133B68262650058</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="E4C82D04605C4256A74258B770AA8867"/>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B6827180005B">
+    <id>FF80818133B61E980133B6827180005B</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="6E3AC867DCB34C068DEED85B40611FD8"/>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B6844439006E">
+    <id>FF80818133B61E980133B6844439006E</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="5EA740A9473048CFA6B6F1FB6F5576AC"/>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B684A5DE0073">
+    <id>FF80818133B61E980133B684A5DE0073</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="8A6B99392E2D9088012E2DC2C5520031"/>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B684C0930076">
+    <id>FF80818133B61E980133B684C0930076</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="6E3AC867DCB34C068DEED85B40611FD8"/>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B684DE2C0079">
+    <id>FF80818133B61E980133B684DE2C0079</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="E4C82D04605C4256A74258B770AA8867"/>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B68BCE9C0084">
+    <id>FF80818133B61E980133B68BCE9C0084</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="8A6B99392E2B4192012E2B58F5790056"/>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+  </OBKMO_WidgetClassAccess>
+  <OBKMO_WidgetClassAccess id="FF80818133B61E980133B68C66FF0091">
+    <id>FF80818133B61E980133B68C66FF0091</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <widgetClass id="8A6B99392E2B4192012E2B58F5790056"/>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+  </OBKMO_WidgetClassAccess>
   <OBKMO_WidgetClassAccess id="FFF63E59E89B464984409EFDD8DB04F5">
     <id>FFF63E59E89B464984409EFDD8DB04F5</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -17767,7 +17975,7 @@
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <organization id="0"/>
     <active>true</active>
-    <name>Company Executive - US</name>
+    <name>F&amp;B US, Inc. - Company Executive</name>
     <description xsi:nil="true"/>
     <userLevel> CO</userLevel>
     <clientList>FF8080812AFBCB14012AFBD3E373001F</clientList>
@@ -17886,7 +18094,7 @@
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <organization id="0"/>
     <active>true</active>
-    <name>F&amp;B US, Inc. - Finance &amp; HR</name>
+    <name>F&amp;B US, Inc. - Finance</name>
     <description xsi:nil="true"/>
     <userLevel> CO</userLevel>
     <clientList>FF8080812AFBCB14012AFBD3E373001F</clientList>
@@ -17903,7 +18111,7 @@
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <organization id="0"/>
     <active>true</active>
-    <name>Company Admin - US</name>
+    <name>F&amp;B US, Inc. - Company Admin</name>
     <description xsi:nil="true"/>
     <userLevel> CO</userLevel>
     <clientList>FF8080812AFBCB14012AFBD3E373001F</clientList>
@@ -17954,11 +18162,11 @@
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <organization id="0"/>
     <active>false</active>
-    <name>Employee</name>
+    <name>F&amp;B España, S.A. - Employee</name>
     <description xsi:nil="true"/>
     <userLevel> CO</userLevel>
     <clientList>FF8080812AFBCB14012AFBD3E373001F</clientList>
-    <organizationList>0</organizationList>
+    <organizationList>0D8E225ADA6E425E98EAA0F34E5912D7,4F68EB1C1B734E79B27DE9D2DF56089F,7A8E888A4B4C4E638CD5EB3A41A3289A</organizationList>
     <currency xsi:nil="true"/>
     <approvalAmount>0.00</approvalAmount>
     <primaryTreeMenu xsi:nil="true"/>
@@ -18005,7 +18213,7 @@
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <organization id="0"/>
     <active>true</active>
-    <name>F&amp;B España, S.A. - Finance &amp; HR</name>
+    <name>F&amp;B España, S.A. - Finance</name>
     <description xsi:nil="true"/>
     <userLevel> CO</userLevel>
     <clientList>FF8080812AFBCB14012AFBD3E373001F</clientList>
@@ -18039,7 +18247,7 @@
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <organization id="0"/>
     <active>true</active>
-    <name>Company Admin - Spain</name>
+    <name>F&amp;B España, S.A. - Company Admin</name>
     <description>Set vital parameters of the company's Openbravo client.</description>
     <userLevel> CO</userLevel>
     <clientList>FF8080812AFBCB14012AFBD3E373001F</clientList>
@@ -18056,7 +18264,7 @@
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
     <organization id="0"/>
     <active>true</active>
-    <name>Company Executive - Spain</name>
+    <name>F&amp;B España, S.A. - Company Executive</name>
     <description>Overview key performance indicators and manage crucial data.</description>
     <userLevel> CO</userLevel>
     <clientList>FF8080812AFBCB14012AFBD3E373001F</clientList>
@@ -18085,6 +18293,57 @@
     <processNow>false</processNow>
     <clientAdmin>false</clientAdmin>
   </ADRole>
+  <ADRole id="FF80818133B1E8BD0133B2485958009E">
+    <id>FF80818133B1E8BD0133B2485958009E</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <name>F&amp;B US, Inc. - Employee</name>
+    <description xsi:nil="true"/>
+    <userLevel> CO</userLevel>
+    <clientList>FF8080812AFBCB14012AFBD3E373001F</clientList>
+    <organizationList>378AF0EAE1A2479EAAA33436645E9433,90A1F59849E84AFABD04814B3D15A691,B9C7088AB859483A9B1FB342AC2BE17A</organizationList>
+    <currency id="102"/>
+    <approvalAmount>0</approvalAmount>
+    <primaryTreeMenu xsi:nil="true"/>
+    <manual>true</manual>
+    <processNow>false</processNow>
+    <clientAdmin>false</clientAdmin>
+  </ADRole>
+  <ADRole id="FF80818133B1E8BD0133B264C0210186">
+    <id>FF80818133B1E8BD0133B264C0210186</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <name>F&amp;B España, S.A. - Purchase</name>
+    <description xsi:nil="true"/>
+    <userLevel> CO</userLevel>
+    <clientList>FF8080812AFBCB14012AFBD3E373001F</clientList>
+    <organizationList>0D8E225ADA6E425E98EAA0F34E5912D7,4F68EB1C1B734E79B27DE9D2DF56089F,7A8E888A4B4C4E638CD5EB3A41A3289A</organizationList>
+    <currency id="102"/>
+    <approvalAmount>0</approvalAmount>
+    <primaryTreeMenu xsi:nil="true"/>
+    <manual>true</manual>
+    <processNow>false</processNow>
+    <clientAdmin>false</clientAdmin>
+  </ADRole>
+  <ADRole id="FF80818133B1E8BD0133B265453E018B">
+    <id>FF80818133B1E8BD0133B265453E018B</id>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <name>F&amp;B US, Inc. - Purchase</name>
+    <description xsi:nil="true"/>
+    <userLevel> CO</userLevel>
+    <clientList>FF8080812AFBCB14012AFBD3E373001F</clientList>
+    <organizationList>378AF0EAE1A2479EAAA33436645E9433,90A1F59849E84AFABD04814B3D15A691,B9C7088AB859483A9B1FB342AC2BE17A</organizationList>
+    <currency id="102"/>
+    <approvalAmount>0</approvalAmount>
+    <primaryTreeMenu xsi:nil="true"/>
+    <manual>true</manual>
+    <processNow>false</processNow>
+    <clientAdmin>false</clientAdmin>
+  </ADRole>
   <ADUserRoles id="04C19A0907FF42239F64B172069CD535">
     <id>04C19A0907FF42239F64B172069CD535</id>
     <userContact id="CD4DC5DB71614651807E830045965649"/>
@@ -18607,6 +18866,78 @@
     <active>true</active>
     <roleAdmin>true</roleAdmin>
   </ADUserRoles>
+  <ADUserRoles id="FF80818133B1E8BD0133B240A4BF0074">
+    <id>FF80818133B1E8BD0133B240A4BF0074</id>
+    <userContact id="100"/>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <roleAdmin>false</roleAdmin>
+  </ADUserRoles>
+  <ADUserRoles id="FF80818133B1E8BD0133B2472BCC0097">
+    <id>FF80818133B1E8BD0133B2472BCC0097</id>
+    <userContact id="F37A0F5F36CB40E79123FE32F9C286D3"/>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <roleAdmin>false</roleAdmin>
+  </ADUserRoles>
+  <ADUserRoles id="FF80818133B1E8BD0133B249212F00AE">
+    <id>FF80818133B1E8BD0133B249212F00AE</id>
+    <userContact id="100"/>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <roleAdmin>false</roleAdmin>
+  </ADUserRoles>
+  <ADUserRoles id="FF80818133B1E8BD0133B24943A700B2">
+    <id>FF80818133B1E8BD0133B24943A700B2</id>
+    <userContact id="3DCE85BD0D764716A80BA4626497DDDA"/>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <roleAdmin>false</roleAdmin>
+  </ADUserRoles>
+  <ADUserRoles id="FF80818133B1E8BD0133B269BD8001A1">
+    <id>FF80818133B1E8BD0133B269BD8001A1</id>
+    <userContact id="100"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <roleAdmin>false</roleAdmin>
+  </ADUserRoles>
+  <ADUserRoles id="FF80818133B1E8BD0133B269E35501A4">
+    <id>FF80818133B1E8BD0133B269E35501A4</id>
+    <userContact id="F37A0F5F36CB40E79123FE32F9C286D3"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <roleAdmin>false</roleAdmin>
+  </ADUserRoles>
+  <ADUserRoles id="FF80818133B1E8BD0133B26A49B301A8">
+    <id>FF80818133B1E8BD0133B26A49B301A8</id>
+    <userContact id="100"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <roleAdmin>false</roleAdmin>
+  </ADUserRoles>
+  <ADUserRoles id="FF80818133B1E8BD0133B26A690C01AB">
+    <id>FF80818133B1E8BD0133B26A690C01AB</id>
+    <userContact id="3DCE85BD0D764716A80BA4626497DDDA"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <roleAdmin>false</roleAdmin>
+  </ADUserRoles>
   <Location id="064277EF6EA544518777EC5430B92592">
     <id>064277EF6EA544518777EC5430B92592</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -111864,6 +112195,276 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B25083FC00E9">
+    <id>FF80818133B1E8BD0133B25083FC00E9</id>
+    <process id="800135"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B250F4D300EC">
+    <id>FF80818133B1E8BD0133B250F4D300EC</id>
+    <process id="800137"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B251606D00EF">
+    <id>FF80818133B1E8BD0133B251606D00EF</id>
+    <process id="1002100000"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B251E36A00F2">
+    <id>FF80818133B1E8BD0133B251E36A00F2</id>
+    <process id="800138"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B252474000F5">
+    <id>FF80818133B1E8BD0133B252474000F5</id>
+    <process id="800023"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B252ADD900F8">
+    <id>FF80818133B1E8BD0133B252ADD900F8</id>
+    <process id="ACD33F81B247441B8659BECF10D7A808"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B25311FC00FB">
+    <id>FF80818133B1E8BD0133B25311FC00FB</id>
+    <process id="BBA11D1A061346459AF6148920FE6629"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B253834F00FE">
+    <id>FF80818133B1E8BD0133B253834F00FE</id>
+    <process id="1003900000"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B25670030117">
+    <id>FF80818133B1E8BD0133B25670030117</id>
+    <process id="800135"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B256F106011A">
+    <id>FF80818133B1E8BD0133B256F106011A</id>
+    <process id="800137"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B25758AC011D">
+    <id>FF80818133B1E8BD0133B25758AC011D</id>
+    <process id="1002100000"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B257B3E80120">
+    <id>FF80818133B1E8BD0133B257B3E80120</id>
+    <process id="800138"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B2581AA50123">
+    <id>FF80818133B1E8BD0133B2581AA50123</id>
+    <process id="800023"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B2586F260126">
+    <id>FF80818133B1E8BD0133B2586F260126</id>
+    <process id="ACD33F81B247441B8659BECF10D7A808"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B258BFB50129">
+    <id>FF80818133B1E8BD0133B258BFB50129</id>
+    <process id="BBA11D1A061346459AF6148920FE6629"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B2590AED012C">
+    <id>FF80818133B1E8BD0133B2590AED012C</id>
+    <process id="1003900000"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B26109DD015E">
+    <id>FF80818133B1E8BD0133B26109DD015E</id>
+    <process id="800079"/>
+    <role id="03552A00BDFD40839E68AB9EF76E0263"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B26215D4016E">
+    <id>FF80818133B1E8BD0133B26215D4016E</id>
+    <process id="800079"/>
+    <role id="FF808181259DADEB01259DDDA4C201E7"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B26D5CCD01D2">
+    <id>FF80818133B1E8BD0133B26D5CCD01D2</id>
+    <process id="800099"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>false</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B26E371D01D5">
+    <id>FF80818133B1E8BD0133B26E371D01D5</id>
+    <process id="1004400000"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B26E6E5D01D8">
+    <id>FF80818133B1E8BD0133B26E6E5D01D8</id>
+    <process id="800067"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B26EDF1601DB">
+    <id>FF80818133B1E8BD0133B26EDF1601DB</id>
+    <process id="800181"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B26F5A8601DE">
+    <id>FF80818133B1E8BD0133B26F5A8601DE</id>
+    <process id="800171"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B1E8BD0133B26F8BA801E1">
+    <id>FF80818133B1E8BD0133B26F8BA801E1</id>
+    <process id="800185"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B583F90133B592080A0024">
+    <id>FF80818133B583F90133B592080A0024</id>
+    <process id="800099"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>false</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B583F90133B59258240027">
+    <id>FF80818133B583F90133B59258240027</id>
+    <process id="800163"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B583F90133B593234E002A">
+    <id>FF80818133B583F90133B593234E002A</id>
+    <process id="800067"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B583F90133B5938793002D">
+    <id>FF80818133B583F90133B5938793002D</id>
+    <process id="800181"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B583F90133B593DEDA0030">
+    <id>FF80818133B583F90133B593DEDA0030</id>
+    <process id="800171"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
+  <ADProcessAccess id="FF80818133B583F90133B59434B30033">
+    <id>FF80818133B583F90133B59434B30033</id>
+    <process id="800185"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADProcessAccess>
   <ADProcessAccess id="FF85D831E20E435EBEC2625E700508A2">
     <id>FF85D831E20E435EBEC2625E700508A2</id>
     <process id="800188"/>
@@ -113592,15 +114193,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="1B7DE510520E42BEA50E7EAF1B9CC3C3">
-    <id>1B7DE510520E42BEA50E7EAF1B9CC3C3</id>
-    <window id="800084"/>
-    <role id="A9904A6C65FF43788A584E5A2268449D"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>true</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="1B9DB099FBA5463B8FF1E659BD522FB8">
     <id>1B9DB099FBA5463B8FF1E659BD522FB8</id>
     <window id="115"/>
@@ -115707,15 +116299,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="4028E6C731B3814F0131B39B1D64000E">
-    <id>4028E6C731B3814F0131B39B1D64000E</id>
-    <window id="800092"/>
-    <role id="FF8081812250326E012250353BDE0006"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="4028E6C731B3814F0131B39CC848001A">
     <id>4028E6C731B3814F0131B39CC848001A</id>
     <window id="800092"/>
@@ -115725,15 +116308,6 @@
     <active>true</active>
     <editableField>false</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="4028E6C731B3814F0131B39F21A50022">
-    <id>4028E6C731B3814F0131B39F21A50022</id>
-    <window id="800092"/>
-    <role id="0AD9EDA68B4E4542A5211CF5107514FE"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="4028E6C731B3814F0131B39F6D870026">
     <id>4028E6C731B3814F0131B39F6D870026</id>
     <window id="800092"/>
@@ -119037,15 +119611,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="7E282306895E4AB1A73129E5E38FE1F8">
-    <id>7E282306895E4AB1A73129E5E38FE1F8</id>
-    <window id="FEB8679CAA0D47E5978F10E22566FCEA"/>
-    <role id="0AD9EDA68B4E4542A5211CF5107514FE"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="7E4CE6D0D860407ABF9D2C8E5B22795D">
     <id>7E4CE6D0D860407ABF9D2C8E5B22795D</id>
     <window id="109"/>
@@ -119487,15 +120052,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="867A7C3B08AB410B80FFC97195609711">
-    <id>867A7C3B08AB410B80FFC97195609711</id>
-    <window id="140"/>
-    <role id="03552A00BDFD40839E68AB9EF76E0263"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="86B21E20E7214F0A8EE914167D370D54">
     <id>86B21E20E7214F0A8EE914167D370D54</id>
     <window id="110"/>
@@ -119613,15 +120169,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="88C85AF9201C43468647C3FF4FCB7E33">
-    <id>88C85AF9201C43468647C3FF4FCB7E33</id>
-    <window id="800084"/>
-    <role id="FF8081812250326E012250353BDE0005"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>true</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="88CB3DEDC11943F18119F10C8E9F7DDE">
     <id>88CB3DEDC11943F18119F10C8E9F7DDE</id>
     <window id="162"/>
@@ -120261,15 +120808,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="957360155E064C00A1E55FA03F6EC5E9">
-    <id>957360155E064C00A1E55FA03F6EC5E9</id>
-    <window id="140"/>
-    <role id="FF808181259DADEB01259DDDA4C201E7"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="95CD12BDAB074393A8D05083BF3B3C96">
     <id>95CD12BDAB074393A8D05083BF3B3C96</id>
     <window id="135"/>
@@ -121539,15 +122077,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="AC84236C5ACB48C9B23665D24EE23A43">
-    <id>AC84236C5ACB48C9B23665D24EE23A43</id>
-    <window id="FEB8679CAA0D47E5978F10E22566FCEA"/>
-    <role id="FF808181259DADEB01259DDDA4C201E7"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="AC88D44BA5E14CEC9723DD322B809E7D">
     <id>AC88D44BA5E14CEC9723DD322B809E7D</id>
     <window id="257"/>
@@ -121728,15 +122257,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="B075855236CE4C0E8DAFD0A3A007A449">
-    <id>B075855236CE4C0E8DAFD0A3A007A449</id>
-    <window id="143"/>
-    <role id="FF808181259DADEB01259DDDA4C201E7"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="B09AC0EC7066492D9E5FC1A08B18ADE5">
     <id>B09AC0EC7066492D9E5FC1A08B18ADE5</id>
     <window id="117"/>
@@ -122637,15 +123157,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="C38086383E544210823CE0E8D9A746C5">
-    <id>C38086383E544210823CE0E8D9A746C5</id>
-    <window id="FEB8679CAA0D47E5978F10E22566FCEA"/>
-    <role id="A9904A6C65FF43788A584E5A2268449D"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="C38D82EAE63A4CB6BD05F3BF068E6EB0">
     <id>C38D82EAE63A4CB6BD05F3BF068E6EB0</id>
     <window id="139"/>
@@ -124374,15 +124885,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="E67B95D22F5248618E58FE6450CEAE68">
-    <id>E67B95D22F5248618E58FE6450CEAE68</id>
-    <window id="143"/>
-    <role id="03552A00BDFD40839E68AB9EF76E0263"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="E6A45F5308FB45A5AFBA0A6F23F2F6A3">
     <id>E6A45F5308FB45A5AFBA0A6F23F2F6A3</id>
     <window id="276"/>
@@ -125130,15 +125632,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="F6950A520F344E5FB1CA1DD11F47CEDB">
-    <id>F6950A520F344E5FB1CA1DD11F47CEDB</id>
-    <window id="FEB8679CAA0D47E5978F10E22566FCEA"/>
-    <role id="FF8081812250326E012250353BDE0005"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="F697708B591E41539C84133B855D5111">
     <id>F697708B591E41539C84133B855D5111</id>
     <window id="800090"/>
@@ -125562,15 +126055,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
-  <ADWindowAccess id="FECA8D6684D241258D3BA1F73DFA94EC">
-    <id>FECA8D6684D241258D3BA1F73DFA94EC</id>
-    <window id="FEB8679CAA0D47E5978F10E22566FCEA"/>
-    <role id="03552A00BDFD40839E68AB9EF76E0263"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADWindowAccess>
   <ADWindowAccess id="FED9F5614F18410C8F853A609E7A72AC">
     <id>FED9F5614F18410C8F853A609E7A72AC</id>
     <window id="123"/>
@@ -126048,6 +126532,348 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B2304E8F001E">
+    <id>FF80818133B1E8BD0133B2304E8F001E</id>
+    <window id="D549B07D9D774AB2A60FF09E1562C93A"/>
+    <role id="BB1FB9F9C64B447185127050769771B6"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B2308E710021">
+    <id>FF80818133B1E8BD0133B2308E710021</id>
+    <window id="800092"/>
+    <role id="BB1FB9F9C64B447185127050769771B6"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B2310EE00025">
+    <id>FF80818133B1E8BD0133B2310EE00025</id>
+    <window id="D549B07D9D774AB2A60FF09E1562C93A"/>
+    <role id="FF808181259DADEB01259DDDA4BB01E5"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B2313BA90028">
+    <id>FF80818133B1E8BD0133B2313BA90028</id>
+    <window id="800092"/>
+    <role id="FF808181259DADEB01259DDDA4BB01E5"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B234DD250043">
+    <id>FF80818133B1E8BD0133B234DD250043</id>
+    <window id="800077"/>
+    <role id="1D09F82ECDAB4F37BCCCEC148124358D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B2352CCE0046">
+    <id>FF80818133B1E8BD0133B2352CCE0046</id>
+    <window id="800092"/>
+    <role id="1D09F82ECDAB4F37BCCCEC148124358D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B235845F0049">
+    <id>FF80818133B1E8BD0133B235845F0049</id>
+    <window id="137"/>
+    <role id="1D09F82ECDAB4F37BCCCEC148124358D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B238145E0055">
+    <id>FF80818133B1E8BD0133B238145E0055</id>
+    <window id="800077"/>
+    <role id="FF808181259DADEB01259DDDA4C201E6"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B23859A60058">
+    <id>FF80818133B1E8BD0133B23859A60058</id>
+    <window id="800092"/>
+    <role id="FF808181259DADEB01259DDDA4C201E6"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B23890DA005B">
+    <id>FF80818133B1E8BD0133B23890DA005B</id>
+    <window id="137"/>
+    <role id="FF808181259DADEB01259DDDA4C201E6"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B23F3A2F006D">
+    <id>FF80818133B1E8BD0133B23F3A2F006D</id>
+    <window id="800092"/>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B249B0D800B7">
+    <id>FF80818133B1E8BD0133B249B0D800B7</id>
+    <window id="800092"/>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B24D63A900D3">
+    <id>FF80818133B1E8BD0133B24D63A900D3</id>
+    <window id="800077"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B24E073700D6">
+    <id>FF80818133B1E8BD0133B24E073700D6</id>
+    <window id="D549B07D9D774AB2A60FF09E1562C93A"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B24E6D6100D9">
+    <id>FF80818133B1E8BD0133B24E6D6100D9</id>
+    <window id="800092"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B24EAE2300DC">
+    <id>FF80818133B1E8BD0133B24EAE2300DC</id>
+    <window id="1002100004"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B24EE55C00DF">
+    <id>FF80818133B1E8BD0133B24EE55C00DF</id>
+    <window id="137"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B24F21CF00E2">
+    <id>FF80818133B1E8BD0133B24F21CF00E2</id>
+    <window id="1002100003"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B259AA660139">
+    <id>FF80818133B1E8BD0133B259AA660139</id>
+    <window id="800077"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B25A0AEF013C">
+    <id>FF80818133B1E8BD0133B25A0AEF013C</id>
+    <window id="D549B07D9D774AB2A60FF09E1562C93A"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B25A4B5A013F">
+    <id>FF80818133B1E8BD0133B25A4B5A013F</id>
+    <window id="800092"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B25A93020142">
+    <id>FF80818133B1E8BD0133B25A93020142</id>
+    <window id="1002100004"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B25ACD630145">
+    <id>FF80818133B1E8BD0133B25ACD630145</id>
+    <window id="137"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B25B03120148">
+    <id>FF80818133B1E8BD0133B25B03120148</id>
+    <window id="1002100003"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B26BD94C01BF">
+    <id>FF80818133B1E8BD0133B26BD94C01BF</id>
+    <window id="123"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B26C3D3F01C2">
+    <id>FF80818133B1E8BD0133B26C3D3F01C2</id>
+    <window id="1004400000"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B26C614601C5">
+    <id>FF80818133B1E8BD0133B26C614601C5</id>
+    <window id="146"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B26C92AB01C8">
+    <id>FF80818133B1E8BD0133B26C92AB01C8</id>
+    <window id="140"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B26CBF5401CB">
+    <id>FF80818133B1E8BD0133B26CBF5401CB</id>
+    <window id="181"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B1E8BD0133B26CEBC601CE">
+    <id>FF80818133B1E8BD0133B26CEBC601CE</id>
+    <window id="800092"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B583F90133B58FDFC00011">
+    <id>FF80818133B583F90133B58FDFC00011</id>
+    <window id="123"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B583F90133B59009070014">
+    <id>FF80818133B583F90133B59009070014</id>
+    <window id="1004400000"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B583F90133B5904D900017">
+    <id>FF80818133B583F90133B5904D900017</id>
+    <window id="146"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B583F90133B590DE03001A">
+    <id>FF80818133B583F90133B590DE03001A</id>
+    <window id="140"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B583F90133B5914C57001D">
+    <id>FF80818133B583F90133B5914C57001D</id>
+    <window id="181"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B583F90133B59190EB0020">
+    <id>FF80818133B583F90133B59190EB0020</id>
+    <window id="800092"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B583F90133B5ABC9020066">
+    <id>FF80818133B583F90133B5ABC9020066</id>
+    <window id="115"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
+  <ADWindowAccess id="FF80818133B583F90133B5AC4AF4006A">
+    <id>FF80818133B583F90133B5AC4AF4006A</id>
+    <window id="115"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADWindowAccess>
   <ADWindowAccess id="FF8EF39B2DBD4376B612693FFC362A71">
     <id>FF8EF39B2DBD4376B612693FFC362A71</id>
     <window id="800085"/>
@@ -308050,15 +308876,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADFormAccess>
-  <ADFormAccess id="14DFB4156C0845BFACAC3ADDE13BC334">
-    <id>14DFB4156C0845BFACAC3ADDE13BC334</id>
-    <specialForm id="12D4CE60E8694097829C8FBBDBD503C4"/>
-    <role id="A9904A6C65FF43788A584E5A2268449D"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADFormAccess>
   <ADFormAccess id="15240EB0B8744C2EB3C4EAE2B82EF4E6">
     <id>15240EB0B8744C2EB3C4EAE2B82EF4E6</id>
     <specialForm id="800015"/>
@@ -308419,15 +309236,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADFormAccess>
-  <ADFormAccess id="3BF4F5DF16734391BF303C0D120539E7">
-    <id>3BF4F5DF16734391BF303C0D120539E7</id>
-    <specialForm id="12D4CE60E8694097829C8FBBDBD503C4"/>
-    <role id="03552A00BDFD40839E68AB9EF76E0263"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADFormAccess>
   <ADFormAccess id="3C1CACFE057A44DA864BD9FA943C8D8E">
     <id>3C1CACFE057A44DA864BD9FA943C8D8E</id>
     <specialForm id="800016"/>
@@ -308878,15 +309686,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADFormAccess>
-  <ADFormAccess id="786A1C377F5F4E1CAA26B70BC16DDBC3">
-    <id>786A1C377F5F4E1CAA26B70BC16DDBC3</id>
-    <specialForm id="12D4CE60E8694097829C8FBBDBD503C4"/>
-    <role id="FF8081812250326E012250353BDE0005"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADFormAccess>
   <ADFormAccess id="7A998A82DFA64A33B18423220860015E">
     <id>7A998A82DFA64A33B18423220860015E</id>
     <specialForm id="100"/>
@@ -309175,15 +309974,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADFormAccess>
-  <ADFormAccess id="A4C3129B4BC8489E84B2F90F5D6EB72C">
-    <id>A4C3129B4BC8489E84B2F90F5D6EB72C</id>
-    <specialForm id="12D4CE60E8694097829C8FBBDBD503C4"/>
-    <role id="FF808181259DADEB01259DDDA4C201E7"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADFormAccess>
   <ADFormAccess id="A771838A700444CF96F56D28CDF4F43E">
     <id>A771838A700444CF96F56D28CDF4F43E</id>
     <specialForm id="C09B000F160B47BE938A77FDE3207643"/>
@@ -309580,15 +310370,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADFormAccess>
-  <ADFormAccess id="E06F087640694198A0BE684F48FC1731">
-    <id>E06F087640694198A0BE684F48FC1731</id>
-    <specialForm id="12D4CE60E8694097829C8FBBDBD503C4"/>
-    <role id="FF8081812250326E012250353BDE0006"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADFormAccess>
   <ADFormAccess id="E0ACC53916AA41AFA4457BF2E072679C">
     <id>E0ACC53916AA41AFA4457BF2E072679C</id>
     <specialForm id="800007"/>
@@ -309706,15 +310487,6 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADFormAccess>
-  <ADFormAccess id="F7BDA04C45804258816FE4F980A827BA">
-    <id>F7BDA04C45804258816FE4F980A827BA</id>
-    <specialForm id="12D4CE60E8694097829C8FBBDBD503C4"/>
-    <role id="0AD9EDA68B4E4542A5211CF5107514FE"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <editableField>false</editableField>
-  </ADFormAccess>
   <ADFormAccess id="F8BEC8F67E6F4D3CB68B90BA7890A157">
     <id>F8BEC8F67E6F4D3CB68B90BA7890A157</id>
     <specialForm id="800016"/>
@@ -309850,6 +310622,141 @@
     <active>true</active>
     <editableField>true</editableField>
   </ADFormAccess>
+  <ADFormAccess id="FF80818133B1E8BD0133B2318ED2002D">
+    <id>FF80818133B1E8BD0133B2318ED2002D</id>
+    <specialForm id="800015"/>
+    <role id="BB1FB9F9C64B447185127050769771B6"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B1E8BD0133B236DC160051">
+    <id>FF80818133B1E8BD0133B236DC160051</id>
+    <specialForm id="800015"/>
+    <role id="1D09F82ECDAB4F37BCCCEC148124358D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B1E8BD0133B2399C650065">
+    <id>FF80818133B1E8BD0133B2399C650065</id>
+    <specialForm id="800015"/>
+    <role id="FF808181259DADEB01259DDDA4C201E6"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B1E8BD0133B23F73A70070">
+    <id>FF80818133B1E8BD0133B23F73A70070</id>
+    <specialForm id="800015"/>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B1E8BD0133B249E63200BC">
+    <id>FF80818133B1E8BD0133B249E63200BC</id>
+    <specialForm id="800015"/>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B1E8BD0133B253E90F0103">
+    <id>FF80818133B1E8BD0133B253E90F0103</id>
+    <specialForm id="800015"/>
+    <role id="A9904A6C65FF43788A584E5A2268449D"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B1E8BD0133B255DBA20110">
+    <id>FF80818133B1E8BD0133B255DBA20110</id>
+    <specialForm id="800015"/>
+    <role id="FF8081812250326E012250353BDE0005"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B1E8BD0133B26145730164">
+    <id>FF80818133B1E8BD0133B26145730164</id>
+    <specialForm id="800015"/>
+    <role id="03552A00BDFD40839E68AB9EF76E0263"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B1E8BD0133B261BEEF016A">
+    <id>FF80818133B1E8BD0133B261BEEF016A</id>
+    <specialForm id="800015"/>
+    <role id="FF808181259DADEB01259DDDA4C201E7"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B1E8BD0133B26FF14F01E5">
+    <id>FF80818133B1E8BD0133B26FF14F01E5</id>
+    <specialForm id="800015"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B1E8BD0133B270176001E8">
+    <id>FF80818133B1E8BD0133B270176001E8</id>
+    <specialForm id="1004400000"/>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B583F90133B59469C20036">
+    <id>FF80818133B583F90133B59469C20036</id>
+    <specialForm id="800015"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B583F90133B5949A030039">
+    <id>FF80818133B583F90133B5949A030039</id>
+    <specialForm id="1004400000"/>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B583F90133B59552BC0041">
+    <id>FF80818133B583F90133B59552BC0041</id>
+    <specialForm id="800015"/>
+    <role id="FF8081812250326E012250353BDE0006"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
+  <ADFormAccess id="FF80818133B583F90133B59698510054">
+    <id>FF80818133B583F90133B59698510054</id>
+    <specialForm id="800015"/>
+    <role id="0AD9EDA68B4E4542A5211CF5107514FE"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <organization id="0"/>
+    <active>true</active>
+    <editableField>true</editableField>
+  </ADFormAccess>
   <BusinessPartnerCategory id="8A64B71A2B0B2946012B0FE1E32E01AA">
     <id>8A64B71A2B0B2946012B0FE1E32E01AA</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -315888,14 +316795,6 @@
     <active>true</active>
     <orgAdmin>true</orgAdmin>
   </ADRoleOrganization>
-  <ADRoleOrganization id="BDC3BEFA5DA7432D9B5CC8500240373A">
-    <id>BDC3BEFA5DA7432D9B5CC8500240373A</id>
-    <role id="EEF20B58A840493CB89517EB5364978F"/>
-    <organization id="0"/>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <active>true</active>
-    <orgAdmin>false</orgAdmin>
-  </ADRoleOrganization>
   <ADRoleOrganization id="C2F66796DA9546DA8814C4C68E0B23C3">
     <id>C2F66796DA9546DA8814C4C68E0B23C3</id>
     <role id="FF8081812250326E012250353BDE0006"/>
@@ -316016,6 +316915,102 @@
     <active>true</active>
     <orgAdmin>false</orgAdmin>
   </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B2425F00007E">
+    <id>FF80818133B1E8BD0133B2425F00007E</id>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+    <organization id="4F68EB1C1B734E79B27DE9D2DF56089F"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B24278EF0081">
+    <id>FF80818133B1E8BD0133B24278EF0081</id>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B2428D290084">
+    <id>FF80818133B1E8BD0133B2428D290084</id>
+    <role id="EEF20B58A840493CB89517EB5364978F"/>
+    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B248D0BF00A1">
+    <id>FF80818133B1E8BD0133B248D0BF00A1</id>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+    <organization id="B9C7088AB859483A9B1FB342AC2BE17A"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B248E64700A5">
+    <id>FF80818133B1E8BD0133B248E64700A5</id>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B248FBAD00A9">
+    <id>FF80818133B1E8BD0133B248FBAD00A9</id>
+    <role id="FF80818133B1E8BD0133B2485958009E"/>
+    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B26969390198">
+    <id>FF80818133B1E8BD0133B26969390198</id>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <organization id="4F68EB1C1B734E79B27DE9D2DF56089F"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B2697847019B">
+    <id>FF80818133B1E8BD0133B2697847019B</id>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B269912E019E">
+    <id>FF80818133B1E8BD0133B269912E019E</id>
+    <role id="FF80818133B1E8BD0133B264C0210186"/>
+    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B26B006E01B4">
+    <id>FF80818133B1E8BD0133B26B006E01B4</id>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <organization id="B9C7088AB859483A9B1FB342AC2BE17A"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B26B10AC01B7">
+    <id>FF80818133B1E8BD0133B26B10AC01B7</id>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
+  <ADRoleOrganization id="FF80818133B1E8BD0133B26B20FD01BA">
+    <id>FF80818133B1E8BD0133B26B20FD01BA</id>
+    <role id="FF80818133B1E8BD0133B265453E018B"/>
+    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
+    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+    <active>true</active>
+    <orgAdmin>false</orgAdmin>
+  </ADRoleOrganization>
   <ADImage id="402880E92E2F838E012E307772B20108">
     <id>402880E92E2F838E012E307772B20108</id>
     <client id="FF8080812AFBCB14012AFBD3E373001F"/>
--- a/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Wed Nov 23 18:54:57 2011 +0100
@@ -191,7 +191,7 @@
         AND wp.GROUPUSE='Y';
       IF(v_count<>0) THEN
         v_ResultStr:='Distributing product of global use';
-        MA_GLOBALUSE_DISTRIBUTE(v_Client_ID, v_Org_ID, v_User_ID, v_Record_ID) ;
+        MA_GLOBALUSE_DISTRIBUTE(v_Client_ID, v_AD_Org_ID, v_User_ID, v_Record_ID) ;
       END IF;
     END IF; --FINISH_PROCESS
     IF(NOT FINISH_PROCESS) THEN
@@ -309,7 +309,7 @@
           )
           ;
         IF(CUR_PL_Post.IsStocked<>'N') THEN
-          M_Check_Stock(CUR_PL_Post.M_Product_ID, v_Client_ID, v_Org_ID, v_Result, v_Message) ;
+          M_Check_Stock(CUR_PL_Post.M_Product_ID, v_Client_ID, v_AD_Org_ID, v_Result, v_Message) ;
           IF (v_Result=0) THEN
             v_Message:=v_Message || ' @Inline@ ' || CUR_PL_Post.line;
             RAISE_APPLICATION_ERROR(-20000, v_Message);
--- a/src-db/database/model/tables/AD_ORG.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/src-db/database/model/tables/AD_ORG.xml	Wed Nov 23 18:54:57 2011 +0100
@@ -65,6 +65,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_ORG_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -74,6 +78,9 @@
       <foreign-key foreignTable="C_CALENDAR" name="AD_ORG_C_CALENDAR">
         <reference local="C_CALENDAR_ID" foreign="C_CALENDAR_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_CURRENCY" name="AD_ORG_C_CURRENCY">
+        <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
+      </foreign-key>
       <unique name="AD_ORG_VALUE">
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="VALUE"/>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Wed Nov 23 18:54:57 2011 +0100
@@ -253696,6 +253696,40 @@
 <!--8208AE0F929A4E3CA8FA6E09C2951D6C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--8208AE0F929A4E3CA8FA6E09C2951D6C--></AD_COLUMN>
 
+<!--821C2ABBBEF440CBB97CA03DB83D9883--><AD_COLUMN>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <AD_COLUMN_ID><![CDATA[821C2ABBBEF440CBB97CA03DB83D9883]]></AD_COLUMN_ID>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <NAME><![CDATA[Currency]]></NAME>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <DESCRIPTION><![CDATA[An accepted medium of monetary exchange that may vary across countries.]]></DESCRIPTION>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <HELP><![CDATA[Indicates the currency to be used when processing this document.]]></HELP>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <COLUMNNAME><![CDATA[C_Currency_ID]]></COLUMNNAME>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <SEQNO><![CDATA[61]]></SEQNO>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <AD_ELEMENT_ID><![CDATA[193]]></AD_ELEMENT_ID>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <POSITION><![CDATA[17]]></POSITION>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--821C2ABBBEF440CBB97CA03DB83D9883-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--821C2ABBBEF440CBB97CA03DB83D9883--></AD_COLUMN>
+
 <!--828EE0AE7FCD5FA1E040007F010067C7--><AD_COLUMN>
 <!--828EE0AE7FCD5FA1E040007F010067C7-->  <AD_COLUMN_ID><![CDATA[828EE0AE7FCD5FA1E040007F010067C7]]></AD_COLUMN_ID>
 <!--828EE0AE7FCD5FA1E040007F010067C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Nov 23 18:54:57 2011 +0100
@@ -13239,7 +13239,7 @@
 <!--800133-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800133-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800133-->  <COLUMNNAME><![CDATA[QtyOrderOnHand]]></COLUMNNAME>
-<!--800133-->  <NAME><![CDATA[On Hand Order Quanity]]></NAME>
+<!--800133-->  <NAME><![CDATA[On Hand Order Quantity]]></NAME>
 <!--800133-->  <PRINTNAME><![CDATA[On Hand Quantity order]]></PRINTNAME>
 <!--800133-->  <HELP><![CDATA[The On Hand Quantity indicates the quantity of a product that is on hand in a warehouse in the second uom]]></HELP>
 <!--800133-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Wed Nov 23 18:54:57 2011 +0100
@@ -10242,7 +10242,7 @@
 <!--882-->  <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID>
 <!--882-->  <AD_COLUMN_ID><![CDATA[1791]]></AD_COLUMN_ID>
 <!--882-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--882-->  <DISPLAYLOGIC><![CDATA[@$C_Currency_ID@!@C_Currency_ID@]]></DISPLAYLOGIC>
+<!--882-->  <DISPLAYLOGIC><![CDATA[@C_Currency_ID@!@$C_Currency_ID@]]></DISPLAYLOGIC>
 <!--882-->  <DISPLAYLENGTH><![CDATA[21]]></DISPLAYLENGTH>
 <!--882-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--882-->  <SEQNO><![CDATA[90]]></SEQNO>
@@ -10270,7 +10270,7 @@
 <!--883-->  <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID>
 <!--883-->  <AD_COLUMN_ID><![CDATA[1792]]></AD_COLUMN_ID>
 <!--883-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--883-->  <DISPLAYLOGIC><![CDATA[@$C_Currency_ID@!@C_Currency_ID@]]></DISPLAYLOGIC>
+<!--883-->  <DISPLAYLOGIC><![CDATA[@C_Currency_ID@!@$C_Currency_ID@]]></DISPLAYLOGIC>
 <!--883-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--883-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--883-->  <SEQNO><![CDATA[100]]></SEQNO>
@@ -105164,7 +105164,7 @@
 <!--800953-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800953-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800953-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800953-->  <NAME><![CDATA[On Hand Order Quanity]]></NAME>
+<!--800953-->  <NAME><![CDATA[On Hand Order Quantity]]></NAME>
 <!--800953-->  <HELP><![CDATA[The On Hand Quantity indicates the quantity of a product that is on hand in a warehouse in the second uom]]></HELP>
 <!--800953-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--800953-->  <AD_TAB_ID><![CDATA[179]]></AD_TAB_ID>
@@ -153344,13 +153344,15 @@
 <!--1002100007-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--1002100007-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--1002100007-->  <AD_COLUMN_ID><![CDATA[1002100009]]></AD_COLUMN_ID>
-<!--1002100007-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--1002100007-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1002100007-->  <DISPLAYLOGIC><![CDATA[@FinancialManagement@='']]></DISPLAYLOGIC>
 <!--1002100007-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--1002100007-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--1002100007-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100007-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100007-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--1002100007-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--1002100007-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1002100007-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100007-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--1002100007-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
@@ -156224,13 +156226,15 @@
 <!--1002100236-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--1002100236-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--1002100236-->  <AD_COLUMN_ID><![CDATA[1002100012]]></AD_COLUMN_ID>
-<!--1002100236-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--1002100236-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1002100236-->  <DISPLAYLOGIC><![CDATA[@FinancialManagement@='']]></DISPLAYLOGIC>
 <!--1002100236-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--1002100236-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--1002100236-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100236-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100236-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--1002100236-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--1002100236-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1002100236-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100236-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--1002100236-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
@@ -164118,6 +164122,32 @@
 <!--13D19F83EDA7483B9DF1A64423E5347B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--13D19F83EDA7483B9DF1A64423E5347B--></AD_FIELD>
 
+<!--1418FA20C83B4B6A99BB2729D52997E3--><AD_FIELD>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <AD_FIELD_ID><![CDATA[1418FA20C83B4B6A99BB2729D52997E3]]></AD_FIELD_ID>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <NAME><![CDATA[Currency]]></NAME>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <DESCRIPTION><![CDATA[An accepted medium of monetary exchange that may vary across countries.]]></DESCRIPTION>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <HELP><![CDATA[Organization currency will be loaded at login time and used to default its value in transactional windows. It will not be used for cost calculation.]]></HELP>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <AD_COLUMN_ID><![CDATA[821C2ABBBEF440CBB97CA03DB83D9883]]></AD_COLUMN_ID>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--1418FA20C83B4B6A99BB2729D52997E3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--1418FA20C83B4B6A99BB2729D52997E3--></AD_FIELD>
+
 <!--14404337B6D640B7BD4842BE1B202DDF--><AD_FIELD>
 <!--14404337B6D640B7BD4842BE1B202DDF-->  <AD_FIELD_ID><![CDATA[14404337B6D640B7BD4842BE1B202DDF]]></AD_FIELD_ID>
 <!--14404337B6D640B7BD4842BE1B202DDF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Nov 23 18:54:57 2011 +0100
@@ -14442,6 +14442,17 @@
 <!--0285053A21CD44D78A85AB89B3D7AE81-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0285053A21CD44D78A85AB89B3D7AE81--></AD_MESSAGE>
 
+<!--033824E108974C96A65EEBF5446A9B8A--><AD_MESSAGE>
+<!--033824E108974C96A65EEBF5446A9B8A-->  <AD_MESSAGE_ID><![CDATA[033824E108974C96A65EEBF5446A9B8A]]></AD_MESSAGE_ID>
+<!--033824E108974C96A65EEBF5446A9B8A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--033824E108974C96A65EEBF5446A9B8A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--033824E108974C96A65EEBF5446A9B8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--033824E108974C96A65EEBF5446A9B8A-->  <VALUE><![CDATA[InstanceRegisteredWithGoldenKey]]></VALUE>
+<!--033824E108974C96A65EEBF5446A9B8A-->  <MSGTEXT><![CDATA[This instance has already been activated with a Golden Key and cannot be activated with any other license.]]></MSGTEXT>
+<!--033824E108974C96A65EEBF5446A9B8A-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--033824E108974C96A65EEBF5446A9B8A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--033824E108974C96A65EEBF5446A9B8A--></AD_MESSAGE>
+
 <!--03C7B58E00F246E7BA06D153B3DB2D5B--><AD_MESSAGE>
 <!--03C7B58E00F246E7BA06D153B3DB2D5B-->  <AD_MESSAGE_ID><![CDATA[03C7B58E00F246E7BA06D153B3DB2D5B]]></AD_MESSAGE_ID>
 <!--03C7B58E00F246E7BA06D153B3DB2D5B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -14915,6 +14926,17 @@
 <!--177D043CB3EC463DB0781C41CC5706B0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--177D043CB3EC463DB0781C41CC5706B0--></AD_MESSAGE>
 
+<!--17D51C5DD28542978815562A9935F279--><AD_MESSAGE>
+<!--17D51C5DD28542978815562A9935F279-->  <AD_MESSAGE_ID><![CDATA[17D51C5DD28542978815562A9935F279]]></AD_MESSAGE_ID>
+<!--17D51C5DD28542978815562A9935F279-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--17D51C5DD28542978815562A9935F279-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--17D51C5DD28542978815562A9935F279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--17D51C5DD28542978815562A9935F279-->  <VALUE><![CDATA[OBPS_EXPIRED_PROF]]></VALUE>
+<!--17D51C5DD28542978815562A9935F279-->  <MSGTEXT><![CDATA[Your Openbravo Professional Subscription has expired. Now only System Administrators can log in the system to renew the subscription via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
+<!--17D51C5DD28542978815562A9935F279-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--17D51C5DD28542978815562A9935F279-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--17D51C5DD28542978815562A9935F279--></AD_MESSAGE>
+
 <!--17EB942A41BC417FA70FDFCA35027276--><AD_MESSAGE>
 <!--17EB942A41BC417FA70FDFCA35027276-->  <AD_MESSAGE_ID><![CDATA[17EB942A41BC417FA70FDFCA35027276]]></AD_MESSAGE_ID>
 <!--17EB942A41BC417FA70FDFCA35027276-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -15297,6 +15319,17 @@
 <!--27D70A51233E44C9B1319F3BE1453507-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--27D70A51233E44C9B1319F3BE1453507--></AD_MESSAGE>
 
+<!--2930CEDCD82F4EDFB16BE5E3CE2B5AA1--><AD_MESSAGE>
+<!--2930CEDCD82F4EDFB16BE5E3CE2B5AA1-->  <AD_MESSAGE_ID><![CDATA[2930CEDCD82F4EDFB16BE5E3CE2B5AA1]]></AD_MESSAGE_ID>
+<!--2930CEDCD82F4EDFB16BE5E3CE2B5AA1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2930CEDCD82F4EDFB16BE5E3CE2B5AA1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2930CEDCD82F4EDFB16BE5E3CE2B5AA1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2930CEDCD82F4EDFB16BE5E3CE2B5AA1-->  <VALUE><![CDATA[OBPS_TO_EXPIRE_GOLDEN]]></VALUE>
+<!--2930CEDCD82F4EDFB16BE5E3CE2B5AA1-->  <MSGTEXT><![CDATA[This instance is registered with a Golden Key license only for Evaluation.  In @days@ days this license will expire and the instance will not be longer usable. <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
+<!--2930CEDCD82F4EDFB16BE5E3CE2B5AA1-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--2930CEDCD82F4EDFB16BE5E3CE2B5AA1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2930CEDCD82F4EDFB16BE5E3CE2B5AA1--></AD_MESSAGE>
+
 <!--29C3C655E5394359B44C086A5D8B5C15--><AD_MESSAGE>
 <!--29C3C655E5394359B44C086A5D8B5C15-->  <AD_MESSAGE_ID><![CDATA[29C3C655E5394359B44C086A5D8B5C15]]></AD_MESSAGE_ID>
 <!--29C3C655E5394359B44C086A5D8B5C15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -15627,6 +15660,17 @@
 <!--364AD59665444A4AAF450F5FB59287FA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--364AD59665444A4AAF450F5FB59287FA--></AD_MESSAGE>
 
+<!--368B60C0A224458D8A388F911BD26785--><AD_MESSAGE>
+<!--368B60C0A224458D8A388F911BD26785-->  <AD_MESSAGE_ID><![CDATA[368B60C0A224458D8A388F911BD26785]]></AD_MESSAGE_ID>
+<!--368B60C0A224458D8A388F911BD26785-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--368B60C0A224458D8A388F911BD26785-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--368B60C0A224458D8A388F911BD26785-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--368B60C0A224458D8A388F911BD26785-->  <VALUE><![CDATA[OBPS_EXPIRED_TRIAL]]></VALUE>
+<!--368B60C0A224458D8A388F911BD26785-->  <MSGTEXT><![CDATA[This instance is registered with a Trial license for Evaluation. This license has expired.  Now only System Administrators can login the system to switch to a Basic or Professional subscription or to deactivate the subscription, via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
+<!--368B60C0A224458D8A388F911BD26785-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--368B60C0A224458D8A388F911BD26785-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--368B60C0A224458D8A388F911BD26785--></AD_MESSAGE>
+
 <!--37B25D3CE4344D7CA0E2452CEE985BAF--><AD_MESSAGE>
 <!--37B25D3CE4344D7CA0E2452CEE985BAF-->  <AD_MESSAGE_ID><![CDATA[37B25D3CE4344D7CA0E2452CEE985BAF]]></AD_MESSAGE_ID>
 <!--37B25D3CE4344D7CA0E2452CEE985BAF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16537,6 +16581,17 @@
 <!--67178C115E364ED2B68EC84473CD7404-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--67178C115E364ED2B68EC84473CD7404--></AD_MESSAGE>
 
+<!--672907E8CED54518ACFA037420623845--><AD_MESSAGE>
+<!--672907E8CED54518ACFA037420623845-->  <AD_MESSAGE_ID><![CDATA[672907E8CED54518ACFA037420623845]]></AD_MESSAGE_ID>
+<!--672907E8CED54518ACFA037420623845-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--672907E8CED54518ACFA037420623845-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--672907E8CED54518ACFA037420623845-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--672907E8CED54518ACFA037420623845-->  <VALUE><![CDATA[OBPSGoldenKeyRestricted]]></VALUE>
+<!--672907E8CED54518ACFA037420623845-->  <MSGTEXT><![CDATA[This feature is restricted to Golden Key instances]]></MSGTEXT>
+<!--672907E8CED54518ACFA037420623845-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--672907E8CED54518ACFA037420623845-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--672907E8CED54518ACFA037420623845--></AD_MESSAGE>
+
 <!--6775556A78264AB192CAD83F25E37E7B--><AD_MESSAGE>
 <!--6775556A78264AB192CAD83F25E37E7B-->  <AD_MESSAGE_ID><![CDATA[6775556A78264AB192CAD83F25E37E7B]]></AD_MESSAGE_ID>
 <!--6775556A78264AB192CAD83F25E37E7B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16804,6 +16859,17 @@
 <!--7272CB32B045428CA06727419E1E7561-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7272CB32B045428CA06727419E1E7561--></AD_MESSAGE>
 
+<!--7274F488C47D4E9EB793C4A506F2825C--><AD_MESSAGE>
+<!--7274F488C47D4E9EB793C4A506F2825C-->  <AD_MESSAGE_ID><![CDATA[7274F488C47D4E9EB793C4A506F2825C]]></AD_MESSAGE_ID>
+<!--7274F488C47D4E9EB793C4A506F2825C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7274F488C47D4E9EB793C4A506F2825C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7274F488C47D4E9EB793C4A506F2825C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7274F488C47D4E9EB793C4A506F2825C-->  <VALUE><![CDATA[OBPS_EXPIRED_BASIC]]></VALUE>
+<!--7274F488C47D4E9EB793C4A506F2825C-->  <MSGTEXT><![CDATA[Your Openbravo Basic Subscription has expired. Now only System Administrators can login the system to renew the subscription via the Instance Activation window (administrators only).  <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
+<!--7274F488C47D4E9EB793C4A506F2825C-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--7274F488C47D4E9EB793C4A506F2825C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7274F488C47D4E9EB793C4A506F2825C--></AD_MESSAGE>
+
 <!--72F16255E38E43B2BBAFEA26E502C9C8--><AD_MESSAGE>
 <!--72F16255E38E43B2BBAFEA26E502C9C8-->  <AD_MESSAGE_ID><![CDATA[72F16255E38E43B2BBAFEA26E502C9C8]]></AD_MESSAGE_ID>
 <!--72F16255E38E43B2BBAFEA26E502C9C8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17046,6 +17112,17 @@
 <!--7FD28F8FE35B492FA9200FF14D0A7749-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7FD28F8FE35B492FA9200FF14D0A7749--></AD_MESSAGE>
 
+<!--804D6F47FC0041C09F86F21DDE1FFF4C--><AD_MESSAGE>
+<!--804D6F47FC0041C09F86F21DDE1FFF4C-->  <AD_MESSAGE_ID><![CDATA[804D6F47FC0041C09F86F21DDE1FFF4C]]></AD_MESSAGE_ID>
+<!--804D6F47FC0041C09F86F21DDE1FFF4C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--804D6F47FC0041C09F86F21DDE1FFF4C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--804D6F47FC0041C09F86F21DDE1FFF4C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--804D6F47FC0041C09F86F21DDE1FFF4C-->  <VALUE><![CDATA[OPS_EXPIRED_GOLDEN_TITLE]]></VALUE>
+<!--804D6F47FC0041C09F86F21DDE1FFF4C-->  <MSGTEXT><![CDATA[Evaluation period has expired]]></MSGTEXT>
+<!--804D6F47FC0041C09F86F21DDE1FFF4C-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--804D6F47FC0041C09F86F21DDE1FFF4C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--804D6F47FC0041C09F86F21DDE1FFF4C--></AD_MESSAGE>
+
 <!--80F0ED31B28B4523A83293151EF87EA5--><AD_MESSAGE>
 <!--80F0ED31B28B4523A83293151EF87EA5-->  <AD_MESSAGE_ID><![CDATA[80F0ED31B28B4523A83293151EF87EA5]]></AD_MESSAGE_ID>
 <!--80F0ED31B28B4523A83293151EF87EA5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17068,6 +17145,17 @@
 <!--81088F7236714F8A9D6FE754B10D31E8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--81088F7236714F8A9D6FE754B10D31E8--></AD_MESSAGE>
 
+<!--815107A9103240C7BA1D901BAC3A035F--><AD_MESSAGE>
+<!--815107A9103240C7BA1D901BAC3A035F-->  <AD_MESSAGE_ID><![CDATA[815107A9103240C7BA1D901BAC3A035F]]></AD_MESSAGE_ID>
+<!--815107A9103240C7BA1D901BAC3A035F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--815107A9103240C7BA1D901BAC3A035F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--815107A9103240C7BA1D901BAC3A035F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--815107A9103240C7BA1D901BAC3A035F-->  <VALUE><![CDATA[OBPS_EXPIRED_GOLDEN]]></VALUE>
+<!--815107A9103240C7BA1D901BAC3A035F-->  <MSGTEXT><![CDATA[This instance is registered with a Golden Key license only for Evaluation. This license has expired and this system is no longer usable. <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
+<!--815107A9103240C7BA1D901BAC3A035F-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--815107A9103240C7BA1D901BAC3A035F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--815107A9103240C7BA1D901BAC3A035F--></AD_MESSAGE>
+
 <!--816164DB434A427E923D1C043556515A--><AD_MESSAGE>
 <!--816164DB434A427E923D1C043556515A-->  <AD_MESSAGE_ID><![CDATA[816164DB434A427E923D1C043556515A]]></AD_MESSAGE_ID>
 <!--816164DB434A427E923D1C043556515A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17446,6 +17534,17 @@
 <!--90EF39C94AD842C891FF9C1CEC7713DD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--90EF39C94AD842C891FF9C1CEC7713DD--></AD_MESSAGE>
 
+<!--9124D4EE7DE048D2A19201A1E779B9A7--><AD_MESSAGE>
+<!--9124D4EE7DE048D2A19201A1E779B9A7-->  <AD_MESSAGE_ID><![CDATA[9124D4EE7DE048D2A19201A1E779B9A7]]></AD_MESSAGE_ID>
+<!--9124D4EE7DE048D2A19201A1E779B9A7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9124D4EE7DE048D2A19201A1E779B9A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9124D4EE7DE048D2A19201A1E779B9A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9124D4EE7DE048D2A19201A1E779B9A7-->  <VALUE><![CDATA[OBPS_TO_EXPIRE_TRIAL]]></VALUE>
+<!--9124D4EE7DE048D2A19201A1E779B9A7-->  <MSGTEXT><![CDATA[This instance is registered with a Trial License for Evaluation. This Trial License will expire in @days@ days, before it expires you should buy a a Basic or Professional Subcription and activate it via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
+<!--9124D4EE7DE048D2A19201A1E779B9A7-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--9124D4EE7DE048D2A19201A1E779B9A7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9124D4EE7DE048D2A19201A1E779B9A7--></AD_MESSAGE>
+
 <!--912C10610C3A45C9B329BD418EAEB0E5--><AD_MESSAGE>
 <!--912C10610C3A45C9B329BD418EAEB0E5-->  <AD_MESSAGE_ID><![CDATA[912C10610C3A45C9B329BD418EAEB0E5]]></AD_MESSAGE_ID>
 <!--912C10610C3A45C9B329BD418EAEB0E5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17568,6 +17667,28 @@
 <!--971C582342544D60974307973BA00A06-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--971C582342544D60974307973BA00A06--></AD_MESSAGE>
 
+<!--972F58FA17C049DB9DA6F3ACDE62000C--><AD_MESSAGE>
+<!--972F58FA17C049DB9DA6F3ACDE62000C-->  <AD_MESSAGE_ID><![CDATA[972F58FA17C049DB9DA6F3ACDE62000C]]></AD_MESSAGE_ID>
+<!--972F58FA17C049DB9DA6F3ACDE62000C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--972F58FA17C049DB9DA6F3ACDE62000C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--972F58FA17C049DB9DA6F3ACDE62000C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--972F58FA17C049DB9DA6F3ACDE62000C-->  <VALUE><![CDATA[OBPS_TO_EXPIRE_PROF]]></VALUE>
+<!--972F58FA17C049DB9DA6F3ACDE62000C-->  <MSGTEXT><![CDATA[Your Openbravo Professional Subscription will expire in @days@ days. You should renew your subscription before it expires and refresh your license via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
+<!--972F58FA17C049DB9DA6F3ACDE62000C-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--972F58FA17C049DB9DA6F3ACDE62000C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--972F58FA17C049DB9DA6F3ACDE62000C--></AD_MESSAGE>
+
+<!--97481F69F2B84927918A073C6466BAE2--><AD_MESSAGE>
+<!--97481F69F2B84927918A073C6466BAE2-->  <AD_MESSAGE_ID><![CDATA[97481F69F2B84927918A073C6466BAE2]]></AD_MESSAGE_ID>
+<!--97481F69F2B84927918A073C6466BAE2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--97481F69F2B84927918A073C6466BAE2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--97481F69F2B84927918A073C6466BAE2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--97481F69F2B84927918A073C6466BAE2-->  <VALUE><![CDATA[OPS_EXPIRED_GOLDEN]]></VALUE>
+<!--97481F69F2B84927918A073C6466BAE2-->  <MSGTEXT><![CDATA[This instance was activated with a Golden Key for evaluation purposes. This license has expired and therefore, the instance cannot be used anymore.]]></MSGTEXT>
+<!--97481F69F2B84927918A073C6466BAE2-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--97481F69F2B84927918A073C6466BAE2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--97481F69F2B84927918A073C6466BAE2--></AD_MESSAGE>
+
 <!--9825FDAA19EC44B5AE5A32EAE999FDE5--><AD_MESSAGE>
 <!--9825FDAA19EC44B5AE5A32EAE999FDE5-->  <AD_MESSAGE_ID><![CDATA[9825FDAA19EC44B5AE5A32EAE999FDE5]]></AD_MESSAGE_ID>
 <!--9825FDAA19EC44B5AE5A32EAE999FDE5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19564,6 +19685,17 @@
 <!--FD5CDA03260B436D832C49C33AD3BB66-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--FD5CDA03260B436D832C49C33AD3BB66--></AD_MESSAGE>
 
+<!--FD616F085F164B17B921183A056358E7--><AD_MESSAGE>
+<!--FD616F085F164B17B921183A056358E7-->  <AD_MESSAGE_ID><![CDATA[FD616F085F164B17B921183A056358E7]]></AD_MESSAGE_ID>
+<!--FD616F085F164B17B921183A056358E7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FD616F085F164B17B921183A056358E7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FD616F085F164B17B921183A056358E7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FD616F085F164B17B921183A056358E7-->  <VALUE><![CDATA[OBPS_TO_EXPIRE_BASIC]]></VALUE>
+<!--FD616F085F164B17B921183A056358E7-->  <MSGTEXT><![CDATA[Your Openbravo Basic Subscription will expire in @days@ days. You should renew your subscription before it expires and refresh your license via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
+<!--FD616F085F164B17B921183A056358E7-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FD616F085F164B17B921183A056358E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FD616F085F164B17B921183A056358E7--></AD_MESSAGE>
+
 <!--FDAF6CE6D01549CF84BEAA538A442695--><AD_MESSAGE>
 <!--FDAF6CE6D01549CF84BEAA538A442695-->  <AD_MESSAGE_ID><![CDATA[FDAF6CE6D01549CF84BEAA538A442695]]></AD_MESSAGE_ID>
 <!--FDAF6CE6D01549CF84BEAA538A442695-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Wed Nov 23 18:54:57 2011 +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.14253]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.14359]]></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_TABLE.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/src-db/database/sourcedata/AD_TABLE.xml	Wed Nov 23 18:54:57 2011 +0100
@@ -7697,7 +7697,7 @@
 <!--1000500000-->  <TABLENAME><![CDATA[C_POC_CONFIGURATION]]></TABLENAME>
 <!--1000500000-->  <CLASSNAME><![CDATA[EmailServerConfiguration]]></CLASSNAME>
 <!--1000500000-->  <ISVIEW><![CDATA[N]]></ISVIEW>
-<!--1000500000-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--1000500000-->  <ACCESSLEVEL><![CDATA[6]]></ACCESSLEVEL>
 <!--1000500000-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
 <!--1000500000-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
 <!--1000500000-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
--- a/src/org/openbravo/base/secureApp/Attribute_data.xsql	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/base/secureApp/Attribute_data.xsql	Wed Nov 23 18:54:57 2011 +0100
@@ -19,7 +19,7 @@
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
         SELECT distinct a.C_ACCTSCHEMA_ID as VALUE, a.C_CURRENCY_ID as Attribute, a.HASALIAS, 
-        ae.ELEMENTTYPE, '' as AD_Window_ID
+        ae.ELEMENTTYPE, '' as AD_Window_ID, '' as C_CURRENCY_ID
         FROM C_AcctSchema a, C_AcctSchema_Element ae 
         WHERE a.C_AcctSchema_ID=ae.C_ACCTSCHEMA_ID 
         AND ae.ISACTIVE = 'Y'
@@ -52,4 +52,19 @@
       <Parameter name="clientlist" optional="true" type="replace" after="AND AD_CLIENT_ID IN (" text="'1'"/>
       <Parameter name="orglist" optional="true" type="replace" after="AND AD_ORG_ID IN (" text="'1'"/>
    </SqlMethod>
+   <SqlMethod name="selectOrgCurrency" type="preparedStatement" return="multiple">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql>
+        <![CDATA[
+          SELECT C_CURRENCY_ID 
+          FROM AD_ORG 
+          WHERE AD_ISORGINCLUDED(?,AD_ORG_ID,?) <> -1 AND C_CURRENCY_ID IS NOT NULL
+          ORDER BY AD_ISORGINCLUDED(?,AD_ORG_ID,?)
+        ]]>
+      </Sql>
+      <Parameter name="organization"/>
+      <Parameter name="client"/>
+      <Parameter name="organization"/>
+      <Parameter name="client"/>
+   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java	Wed Nov 23 18:54:57 2011 +0100
@@ -849,6 +849,7 @@
     String editionType = null;
     String completeWindowMsg = "";
     String discard[] = { "" };
+    String msg;
 
     switch (featureRestriction) {
     case TIER1_RESTRICTION:
@@ -866,9 +867,15 @@
       completeWindowMsg = infoText + "\n"
           + Utility.messageBD(this, "LearnHowToActivate", vars.getLanguage());
       break;
+    case GOLDEN_RESTRICTION:
+      discard[0] = "links";
+      msg = Utility.messageBD(this, "OBPSGoldenKeyRestricted", vars.getLanguage());
+      infoText = msg;
+      completeWindowMsg = msg;
+      break;
     case DISABLED_MODULE_RESTRICTION:
       discard[0] = "links";
-      String msg = Utility.messageBD(this, "FeatureInDisabledModule", vars.getLanguage());
+      msg = Utility.messageBD(this, "FeatureInDisabledModule", vars.getLanguage());
       infoText = msg;
       completeWindowMsg = msg;
       break;
--- a/src/org/openbravo/base/secureApp/LoginHandler.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/base/secureApp/LoginHandler.java	Wed Nov 23 18:54:57 2011 +0100
@@ -216,6 +216,11 @@
         updateDBSession(sessionId, msgType.equals("Warning"), "IOBPS");
         goToRetry(res, vars, msg, title, msgType, action, doRedirect);
         return;
+      case EXPIRED_GOLDEN:
+        msg = Utility.messageBD(myPool, "OPS_EXPIRED_GOLDEN", vars.getLanguage());
+        title = Utility.messageBD(myPool, "OPS_EXPIRED_GOLDEN_TITLE", vars.getLanguage());
+        updateDBSession(sessionId, false, "IOBPS");
+        goToRetry(res, vars, msg, title, "Error", "../security/Login_FS.html", doRedirect);
       case NO_RESTRICTION:
         break;
       }
--- a/src/org/openbravo/base/secureApp/LoginUtils.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/base/secureApp/LoginUtils.java	Wed Nov 23 18:54:57 2011 +0100
@@ -173,6 +173,9 @@
       String strUserAuth, String strLanguage, String strIsRTL, String strRol, String strCliente,
       String strOrg, String strAlmacen) throws ServletException {
 
+    // variable to save organization currency
+    AttributeData[] orgCurrency;
+
     // Check session options
     if (!validUserRole(conn, strUserAuth, strRol) || !validRoleClient(conn, strRol, strCliente)
         || !validRoleOrg(conn, strRol, strOrg)) {
@@ -217,6 +220,9 @@
     }
 
     try {
+      // set organization currency
+      orgCurrency = AttributeData.selectOrgCurrency(conn, strOrg, strCliente);
+
       SeguridadData[] data = SeguridadData.select(conn, strRol, strUserAuth);
       if (data == null || data.length == 0) {
         OBContext.setOBContext(currentContext);
@@ -239,7 +245,10 @@
           Utility.getContext(conn, vars, "#User_Org", "LoginHandler"));
       if (attr != null && attr.length > 0) {
         vars.setSessionValue("$C_AcctSchema_ID", attr[0].value);
-        vars.setSessionValue("$C_Currency_ID", attr[0].attribute);
+        if (orgCurrency.length > 0) {
+          vars.setSessionValue("$C_Currency_ID", orgCurrency[0].cCurrencyId);
+        } else
+          vars.setSessionValue("$C_Currency_ID", attr[0].attribute);
         vars.setSessionValue(
             "#StdPrecision",
             AttributeData.selectStdPrecision(conn, attr[0].attribute,
--- a/src/org/openbravo/erpCommon/ad_forms/DocLine_Cash.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocLine_Cash.java	Wed Nov 23 18:54:57 2011 +0100
@@ -50,15 +50,11 @@
   // public String m_C_BPartner_ID = "";
   public String m_C_Order_Id = "";
   public String m_C_Debt_Payment_Id = "";
-  //
-  public String m_C_Currency_ID = "";
-  public String m_AD_Org_ID = "";
 
   // Amounts
   public String m_Amount = ZERO.toString();
   public String m_DiscountAmt = ZERO.toString();
   public String m_WriteOffAmt = ZERO.toString();
-  public String m_C_Glitem_ID = "";
 
   public String Line_ID = "";
 
--- a/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java	Wed Nov 23 18:54:57 2011 +0100
@@ -103,7 +103,7 @@
     xmlDocument.setParameter("moduleTree", tree.toHtml());
     xmlDocument.setParameter("moduleTreeDescription", tree.descriptionToHtml());
 
-    xmlDocument.setData("reportCurrency", "liststructure", MonedaComboData.select(this));
+    xmlDocument.setData("reportCurrency", "liststructure", MonedaComboData.selectISO(this));
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
     out.println(xmlDocument.print());
--- a/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.java	Wed Nov 23 18:54:57 2011 +0100
@@ -134,7 +134,7 @@
 
       xmlDocument.setParameter("paramLocationId", "");
       xmlDocument.setParameter("paramLocationDescription", "");
-      xmlDocument.setData("reportCurrency", "liststructure", MonedaComboData.select(this));
+      xmlDocument.setData("reportCurrency", "liststructure", MonedaComboData.selectISO(this));
       xmlDocument.setData("reportOrgType", "liststructure",
           InitialOrgSetupData.selectOrgType(this, vars.getLanguage(), vars.getClient()));
       xmlDocument.setData("reportParentOrg", "liststructure",
--- a/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html	Wed Nov 23 18:54:57 2011 +0100
@@ -308,7 +308,7 @@
                     
                     </div>
                   </td>
-                 <tr>
+                 <tr id="discardGolden">
                   <td colspan="6">
                     <table class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
                     <tbody>
@@ -323,10 +323,9 @@
                     </tbody>
                     </table>
                   </td>
-                </tr>    
-                
-                <tr>
-                <td/>
+                 </tr>    
+                <tr id="discardGolden">
+                 <td/>
                   <td colspan="5" class="TitleCell" style="text-align:left;">
                     <span id="CEInstance" class="Label_ReadOnly_Text">
                         <p class="Label_ReadOnly_Text">A System Key is required to activate an Openbravo Professional or Basic Edition.</p>
@@ -351,10 +350,10 @@
                      </span>
                   </td>
                 </tr>
-                <tr>
+                <tr id="discardGolden">
                   <td>&nbsp;</td>
                 </tr>   
-                <tr> 
+                <tr id="discardGolden">
                 <td/>
                   <td class="Button_LeftAlign_ContentCell" colspan="2">
                     <div>
@@ -417,6 +416,7 @@
                 <tr>
                   <td>&nbsp;</td>
                 </tr> 
+                <div id="discardGolden">
                 <div id="OPSInstance">
                 <tr>
                   <td/>
@@ -449,7 +449,7 @@
                       <button type="button" 
                         id="buttonDeactivate" 
                         class="ButtonLink" 
-                        onclick="openServletNewWindow('SHOW_DEACTIVATE', false, 'InstanceManagement.html', 'BUTTON', null, true, 600, 900);return false;" 
+                        onclick="openServletNewWindow('SHOW_DEACTIVATE', false, 'InstanceManagement.html', 'BUTTON', null, true, 600, 900, null, null, null, null, true);return false;" 
                         onfocus="buttonEvent('onfocus', this); window.status='Deactivate'; return true;" 
                         onblur="buttonEvent('onblur', this);" 
                         onkeyup="buttonEvent('onkeyup', this);" 
@@ -497,6 +497,7 @@
                   
                   <td colspan="2"/>
                 </tr>
+       </div><!-- golden -->
               </div>
               </table>
                       <!-- USER CONTROLS -->
--- a/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java	Wed Nov 23 18:54:57 2011 +0100
@@ -63,6 +63,8 @@
 
     if (vars.commandIn("DEFAULT")) {
       printPageActive(response, vars, ActivationKey.getInstance());
+    } else if (ActivationKey.getInstance().isGolden()) {
+      pageError(response);
     } else if (vars.commandIn("SHOW_ACTIVATE")) {
       printPageNotActive(response, vars);
     } else if (vars.commandIn("ACTIVATE")) {
@@ -236,7 +238,7 @@
   private void printPageActive(HttpServletResponse response, VariablesSecureApp vars,
       ActivationKey activationKey) throws IOException, ServletException {
     response.setContentType("text/html; charset=UTF-8");
-    String discard[] = { "", "", "", "", "", "", "" };
+    String discard[] = { "", "", "", "", "", "", "", "" };
 
     switch (activationKey.getSubscriptionStatus()) {
     case COMMUNITY:
@@ -285,6 +287,10 @@
       break;
     }
 
+    if (activationKey.isGolden()) {
+      discard[6] = "discardGolden";
+    }
+
     XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
         "org/openbravo/erpCommon/ad_forms/InstanceManagement", discard).createXmlDocument();
 
--- a/src/org/openbravo/erpCommon/ad_forms/MonedaCombo_data.xsql	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/MonedaCombo_data.xsql	Wed Nov 23 18:54:57 2011 +0100
@@ -31,4 +31,11 @@
       FROM C_Currency ORDER BY 2
       </Sql>
    </SqlMethod>
+   <SqlMethod name="selectISO" type="preparedStatement" return="multiple">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql>
+      SELECT C_Currency_ID as id, iso_code as name
+      FROM C_Currency ORDER BY 2
+      </Sql>
+   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql	Wed Nov 23 18:54:57 2011 +0100
@@ -49,11 +49,13 @@
       SELECT pt.C_PaymentTerm_ID
       FROM C_PaymentTerm pt
       WHERE AD_ISORGINCLUDED(?, pt.ad_org_id, ?) <> -1
+      AND ad_client_id = ?
       AND isdefault = 'Y'
       ]]>
     </Sql>
     <Parameter name="adOrgId"/>
     <Parameter name="adClientId"/>
+    <Parameter name="adClientId"/>
   </SqlMethod>
 
 </SqlClass>
--- a/src/org/openbravo/erpCommon/obps/ActivationKey.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/obps/ActivationKey.java	Wed Nov 23 18:54:57 2011 +0100
@@ -30,7 +30,6 @@
 import java.security.PublicKey;
 import java.security.Signature;
 import java.security.spec.X509EncodedKeySpec;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -48,6 +47,8 @@
 import org.apache.log4j.Appender;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.exception.OBException;
@@ -90,8 +91,12 @@
   private LicenseClass licenseClass;
   private List<String> tier1Artifacts;
   private List<String> tier2Artifacts;
+  private List<String> goldenExcludedArtifacts;
   private Date lastRefreshTime;
   private boolean trial = false;
+  private boolean golden = false;
+  private Date startDate;
+  private Date endDate;
 
   private boolean notActiveYet = false;
   private boolean inconsistentInstance = false;
@@ -100,6 +105,7 @@
 
   private static final String TIER_1_PREMIUM_FEATURE = "T1P";
   private static final String TIER_2_PREMIUM_FEATURE = "T2P";
+  private static final String GOLDEN_EXCLUDED = "GOLDENEXCLUDED";
 
   /**
    * Number of minutes since last license refresh to wait before doing it again
@@ -107,7 +113,7 @@
   private static final int REFRESH_MIN_TIME = 60;
 
   public enum LicenseRestriction {
-    NO_RESTRICTION, OPS_INSTANCE_NOT_ACTIVE, NUMBER_OF_SOFT_USERS_REACHED, NUMBER_OF_CONCURRENT_USERS_REACHED, MODULE_EXPIRED, NOT_MATCHED_INSTANCE, HB_NOT_ACTIVE
+    NO_RESTRICTION, OPS_INSTANCE_NOT_ACTIVE, NUMBER_OF_SOFT_USERS_REACHED, NUMBER_OF_CONCURRENT_USERS_REACHED, MODULE_EXPIRED, NOT_MATCHED_INSTANCE, HB_NOT_ACTIVE, EXPIRED_GOLDEN
   }
 
   public enum CommercialModuleStatus {
@@ -116,7 +122,8 @@
 
   public enum FeatureRestriction {
     NO_RESTRICTION(""), DISABLED_MODULE_RESTRICTION("FeatureInDisabledModule"), TIER1_RESTRICTION(
-        "FEATURE_OBPS_ONLY"), TIER2_RESTRICTION("FEATURE_OBPS_ONLY"), UNKNOWN_RESTRICTION("");
+        "FEATURE_OBPS_ONLY"), TIER2_RESTRICTION("FEATURE_OBPS_ONLY"), UNKNOWN_RESTRICTION(""), GOLDEN_RESTRICTION(
+        "RESTRICTED_TO_GOLDEN");
 
     private String msg;
 
@@ -162,6 +169,8 @@
 
   private static final int MILLSECS_PER_DAY = 24 * 60 * 60 * 1000;
   private static final int PING_TIMEOUT_SECS = 120;
+  private static final Long EXPIRATION_BASIC_DAYS = 30L;
+  private static final Long EXPIRATION_PROF_DAYS = 30L;
 
   private static ActivationKey instance = new ActivationKey();
 
@@ -171,6 +180,10 @@
    * 
    */
   public static synchronized ActivationKey getInstance() {
+    if (instance.startDate != null) {
+      // check dates in case there is a license with dates
+      instance.checkDates();
+    }
     return instance;
   }
 
@@ -231,8 +244,13 @@
     subscriptionActuallyConverted = false;
     tier1Artifacts = null;
     tier2Artifacts = null;
+    goldenExcludedArtifacts = null;
     trial = false;
+    golden = false;
     licenseClass = LicenseClass.COMMUNITY;
+    startDate = null;
+    endDate = null;
+    pendingTime = null;
 
     if (strPublicKey == null || activationKey == null || strPublicKey.equals("")
         || activationKey.equals("")) {
@@ -311,19 +329,17 @@
 
     // Check for dates to know if the instance is active
     SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
-    Date startDate = null;
-    Date endDate = null;
-
     subscriptionConvertedProperty = "true".equals(getProperty("subscriptionConverted"));
 
     trial = "true".equals(getProperty("trial"));
+    golden = "true".equals(getProperty("golden"));
 
     try {
       startDate = sd.parse(getProperty("startdate"));
 
-      if (getProperty("enddate") != null)
+      if (getProperty("enddate") != null) {
         endDate = sd.parse(getProperty("enddate"));
-
+      }
     } catch (Exception e) {
       errorMessage = "@ErrorReadingDates@";
       isActive = false;
@@ -331,13 +347,19 @@
       setLogger();
       return;
     }
-    String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties()
-        .getProperty("dateFormat.java");
-    SimpleDateFormat outputFormat = new SimpleDateFormat(dateFormat);
+
+    checkDates();
+  }
+
+  private void checkDates() {
+    // Check for dates to know if the instance is active
     Date now = new Date();
     if (startDate == null || now.before(startDate)) {
       isActive = false;
       notActiveYet = true;
+      String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties()
+          .getProperty("dateFormat.java");
+      SimpleDateFormat outputFormat = new SimpleDateFormat(dateFormat);
       errorMessage = "@OPSNotActiveTill@ " + outputFormat.format(startDate);
       messageType = "Warning";
       setLogger();
@@ -345,16 +367,17 @@
     }
     if (endDate != null) {
       pendingTime = ((endDate.getTime() - now.getTime()) / MILLSECS_PER_DAY) + 1;
-      if (now.after(endDate)) {
+      if (pendingTime <= 0) {
         if (subscriptionConvertedProperty) {
           // A bought out instance is actually converted when the license has expired.
           subscriptionActuallyConverted = true;
         } else {
           isActive = false;
           hasExpired = true;
-
+          String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties()
+              .getProperty("dateFormat.java");
+          SimpleDateFormat outputFormat = new SimpleDateFormat(dateFormat);
           errorMessage = "@OPSActivationExpired@ " + outputFormat.format(endDate);
-
           setLogger();
           return;
         }
@@ -414,7 +437,8 @@
     DisabledModules.reload();
     tier1Artifacts = new ArrayList<String>();
     tier2Artifacts = new ArrayList<String>();
-    if (isActive() && licenseClass == LicenseClass.STD) {
+    goldenExcludedArtifacts = new ArrayList<String>();
+    if (isActive() && licenseClass == LicenseClass.STD && !golden) {
       // Don't read restrictions for Standard instances
       return;
     }
@@ -443,10 +467,15 @@
         // basic, restrict tier 2
         tier2Artifacts.addAll(m1.get(TIER_2_PREMIUM_FEATURE));
       }
+
+      if (isGolden()) {
+        goldenExcludedArtifacts.addAll(m1.get(GOLDEN_EXCLUDED));
+      }
     } catch (Exception e) {
       log4j.error("Error reading license restriction file", e);
       tier1Artifacts = null;
       tier2Artifacts = null;
+      goldenExcludedArtifacts = null;
     }
   }
 
@@ -589,6 +618,10 @@
       return LicenseRestriction.HB_NOT_ACTIVE;
     }
 
+    if (!isActive && golden) {
+      return LicenseRestriction.EXPIRED_GOLDEN;
+    }
+
     if (!isActive) {
       return LicenseRestriction.OPS_INSTANCE_NOT_ACTIVE;
     }
@@ -718,16 +751,6 @@
         .getProperty("dateFormat.java");
     SimpleDateFormat outputFormat = new SimpleDateFormat(dateFormat);
 
-    SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
-    Date startDate = null;
-    Date endDate = null;
-    try {
-      startDate = sd.parse(getProperty("startdate"));
-      if (getProperty("enddate") != null)
-        endDate = sd.parse(getProperty("enddate"));
-    } catch (ParseException e) {
-      log.error("Error parsing date", e);
-    }
     StringBuilder sb = new StringBuilder();
     if (instanceProperties != null) {
       sb.append("<tr><td>").append(Utility.messageBD(conn, "OPSCustomer", lang))
@@ -744,8 +767,10 @@
         sb.append(" (" + Utility.messageBD(conn, "OPSTrialLicense", lang) + ")");
       }
       sb.append("</td></tr>");
-      sb.append("<tr><td>").append(Utility.messageBD(conn, "OPSStartDate", lang))
-          .append("</td><td>").append(outputFormat.format(startDate)).append("</td></tr>");
+      if (startDate != null) {
+        sb.append("<tr><td>").append(Utility.messageBD(conn, "OPSStartDate", lang))
+            .append("</td><td>").append(outputFormat.format(startDate)).append("</td></tr>");
+      }
 
       sb.append("<tr><td>")
           .append(Utility.messageBD(conn, "OPSEndDate", lang))
@@ -1018,7 +1043,7 @@
       return FeatureRestriction.NO_RESTRICTION;
     }
     log4j.debug("Type:" + actualType + " id:" + id);
-    if (tier1Artifacts == null || tier2Artifacts == null) {
+    if (tier1Artifacts == null || tier2Artifacts == null || goldenExcludedArtifacts == null) {
       log4j.error("No restrictions set, do not allow access");
 
       throw new OBException(Utility.messageBD(new DalConnectionProvider(false),
@@ -1069,7 +1094,7 @@
     }
 
     // Check core premium features restrictions
-    if (licenseClass == LicenseClass.STD) {
+    if (licenseClass == LicenseClass.STD && !golden) {
       return FeatureRestriction.NO_RESTRICTION;
     }
 
@@ -1079,6 +1104,9 @@
     if (tier2Artifacts.contains(actualType + artifactId)) {
       return FeatureRestriction.TIER2_RESTRICTION;
     }
+    if (goldenExcludedArtifacts.contains(actualType + artifactId)) {
+      return FeatureRestriction.GOLDEN_RESTRICTION;
+    }
 
     if ("W".equals(actualType)) {
       // For windows, check also tab restrictions
@@ -1133,7 +1161,7 @@
    * Returns current subscription status
    */
   public SubscriptionStatus getSubscriptionStatus() {
-    if (!isOPSInstance()) {
+    if (!isOPSInstance() || inconsistentInstance) {
       return SubscriptionStatus.COMMUNITY;
     } else if (isSubscriptionConverted()) {
       return SubscriptionStatus.CANCEL;
@@ -1149,4 +1177,73 @@
   public boolean isTrial() {
     return trial;
   }
+
+  public boolean isGolden() {
+    return golden;
+  }
+
+  /**
+   * Returns a JSONObject with a message warning about near expiration or already expired instance.
+   * 
+   */
+  public JSONObject getExpirationMessage(String lang) {
+    JSONObject result = new JSONObject();
+    try {
+      // Community or professional without expiration
+      if (pendingTime == null || subscriptionActuallyConverted) {
+        return result;
+      }
+
+      if (!hasExpired) {
+        String msg;
+        Long daysToExpireMsg = getProperty("daysWarn") == null ? null : Long
+            .parseLong(getProperty("daysWarn"));
+        if (golden) {
+          msg = "OBPS_TO_EXPIRE_GOLDEN";
+          if (daysToExpireMsg == null) {
+            daysToExpireMsg = 999L; // show always
+          }
+        } else if (trial) {
+          msg = "OBPS_TO_EXPIRE_TRIAL";
+          if (daysToExpireMsg == null) {
+            daysToExpireMsg = 999L; // show always
+          }
+        } else if (licenseClass == LicenseClass.BASIC) {
+          msg = "OBPS_TO_EXPIRE_BASIC";
+          if (daysToExpireMsg == null) {
+            daysToExpireMsg = EXPIRATION_BASIC_DAYS;
+          }
+        } else {
+          msg = "OBPS_TO_EXPIRE_PROF";
+          if (daysToExpireMsg == null) {
+            daysToExpireMsg = EXPIRATION_PROF_DAYS;
+          }
+        }
+
+        if (pendingTime <= daysToExpireMsg) {
+          result.put("type", "Error");
+          result.put("text", Utility.messageBD(new DalConnectionProvider(false), msg, lang, false)
+              .replace("@days@", pendingTime.toString()));
+        }
+      } else {
+        String msg;
+        if (golden) {
+          msg = "OBPS_EXPIRED_GOLDEN";
+          result.put("disableLogin", true);
+        } else if (trial) {
+          msg = "OBPS_EXPIRED_TRIAL";
+        } else if (licenseClass == LicenseClass.BASIC) {
+          msg = "OBPS_EXPIRED_BASIC";
+        } else {
+          msg = "OBPS_EXPIRED_PROF";
+        }
+
+        result.put("type", "Error");
+        result.put("text", Utility.messageBD(new DalConnectionProvider(false), msg, lang, false));
+      }
+    } catch (JSONException e) {
+      log4j.error("Error calculating expiration message", e);
+    }
+    return result;
+  }
 }
--- a/src/org/openbravo/erpCommon/obps/licenseRestrictions	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/obps/licenseRestrictions	Wed Nov 23 18:54:57 2011 +0100
@@ -1,1 +1,1 @@
-IA/DfcMR2NjlaNbJ7IbnZh51dT6iwgG55vCK9ayiHCsk68kHw3FNucE1cQIo0olWElfCIkU8eam3loUcbYOAe8UaomAFotB9pD4ydXeDCVu9g1Z24woKbIgaQyC4OO2LT6q8N/j5t7PAhkgwYF/HjoKiEmAybWTLicvic3ArdK+PMPEYYQRikHlz1CDJPiqEeQIhMejebxNmHa/VTLN5Hmhc+lyBfRVseGdJeJaf2Nh1YMwunKFAGMNKwPFFhqLyAXoGsNFs2BK5yPTgOEWaFRS+5Dei4fewUm7GI5k+a4xZ1qDrjYl+C/p6vod1oYf+KFsfH1P07v2k7J4VQ71XBHfxbW8hNElv4fA0zDOZ/W93uyVHKyV/jWI/fgl5PzPfEpGWOetWHEVLPjsNLOyITc+tVI+niQnOaBaAviUofTFMUn8plSO7wGmNMhUGw77gAex6QXvWbOkpXWQmaR/5KSJmJy6GfRCyns117p1ZEKTXQl9SFQKWFdC6y3dMnhFIili71aruHuHC4xNmZ82NNzNif5Zyl7rwyNme/ibgpGweWfj5tWtjxRqjaPlj6UGrp9Q1YTg2VvcOUxm65sqR1lFHko17k01Xb+gQ6jJUCJprhYooChwZQQAgInKQYS3jeP40ydB+8JFwzasAFQrOwze6E+iOPyfiIKSUpAs5DOEcmUmTCRmIYLgcHAscKAl8lnO5jaUmx6dOQrQSLCvQ6mJQrBWnsLUvcidHEZmGUOvxfqq+N4E6PIUDL8zfRjt+b2ag+PfD+9uGfagFfK5/ZBqpdSwKH56TSVoLF66f3HuUETcGmFnBQ8mhV1QShLbevPIcL/BJs0hIfMyWIFQ8DoXIyS17n9IuJthKycdRHytVcAz4nCo2vch3YLIIkb1eG3xSQYFS8I/xBL9yLDNcw+3wLX0fcFW04ks55N363WcRvAQHEMg3pzyJGAd+QXsQjwFtOZhf5/FjASaVsucMaKqQCTNxHZPgef190TaLEQZWfHsa/mfjCju+BLjB3gtiZU9fvzkUsmw4pD3wXIScJRUitwj99vKBsIuO3O+2R7X/VAvB5NEE4LLxwS33OfzgDz2DPnNg9BYPJzhbEQiUrR79FDRcteLwfFnFfsvTHfhak/sSEECX2pJ9rfZ7+sIb9LQjoVsYcKinTRFPaUTa48DXqKCIq7PsWax8GxAIaB9zhSeyMNW+LHyQa+2E7XMLpO/MEwD8uBZU4iF2VnijRKQUVRnnlIr3EmB27xvdxj6xzqsAq2TwL/0RTcjdb0SKIb2N/ocz1n+hPpquyGIv5TBsm7KIZT4WUjp9Sd7kvBFTc5MG/49YU/00M3/BYbxBjFUd4oEY28rHaPhWwbm0tG0ioWLzMuqRd64uiXuBfmrBPe9B+c8F93OSdv99NMLFNFtQFtBGP1A+flvn9VHnNVkWjEkN5S8RYgAVydvU3/ge+PCENwBQMCzCJ5QBHYna4Q5YhujLf70rV+cNIQn07Gpm2nLT3uVdtYODjJ+K/u6Z8GGtQ/EVphBb+upJbYaiCAVekSOYYoMXnFwC2pLPKusUuDhAwzxsaeKGrl9kraEXuwGG+/2n4sMPT3VVL/qG2T7u2TB9iNVrtcHcTx6mdYsElV1rK0FOCfnBF+IPRikxSRLxJ9GnLzQkdpAegt91chQFgLgyD+Kwc02lULDdWFQy/P26WsDAXwgf+z9Wx9tFi0ZjvF4FLMhTJ4h9Q7UhDVTMSvDfpA2UHT5AxpgXphZyHb5erlj0Dtd1bTw5OGkjqd8NPxqTqOGqQoKhdD022QFw6fJKCxQvZ7oh4T1agu05B4oeT2Yt9nzdB2tuwttemU10rHAgCCLOPMpb3Hai6ZpWBSe39v8HT41rjlDnnw==
\ No newline at end of file
+PM1bqi9ULAVtjtGozHsAJMAK1UKiedd6TEXMGPySRQxCmACRfTRJaZTlLfHYvn/+L37Nqupd5R9UnsPY68bxe4ikGmnP5WNCcLRxmLPW1kZPv1IuprUY75qOkVT3ixMWKLBHtAvBlXYcwd2nVGRseWOP84TS66p2PplvIzObetmNpH4DeIciUoXrrKu8Yi67TMZhpdUn1/hbW7maSeTCNdNKFdEchpJP8tCF65Vs94CPAEQbaibEre5wbaB33EQFZ/bDRbfCxe1xuAxpJTq12BmkndYTU0/jtUhAKrtFH/AjpcyFG4HgnL5I8Z4XlWLaQgKU26PgiZzGD7lGxUDTjw31wgpl7fYYF6XInkDMJ4cv64oJFVWyLN3ADz48BcEwC+l9EwRo82eucjBe/7s7Q5nhPaE+nq7/F33jqOjEbQWLKExwHoR/JQJShDzbUy92wJenoOOkHAAA3ZRWhFOCgCll0GEGa8mvxVmHVv+sYI1dQAY5qVkQtAh92KY+6dVMKQBEt1wz3DAlmFR42408WIPWpZcp0LUo4ZNGR/ggywF16j6J6TfkE1ZS1vNDw6FKLKft3jfTSN8Sv8gYaZmPOq9gSWudM07d1CsJF5u41/Ve5JrWcBrE4G9+SkXHSeZ1eola0aiuGThIrWCEoLf3LsO/y1ovpiWmbFqT/mfPiXyBmx9MzRP7rBp+RXgJRK5gbf3FIXknMDlu5Jk1LsvqNr9D46C6LEEensSZEn09knRTJqV9sm7MBHk3kVwgv/mHVoECt2REQj7wWi5esD4BJ4jGRtR/SUdWkv35qAkDGTZjTmgWry/dtZM+H4l7O9fppw3jrEeIPJLqm7wttRk5dnLdb9jIKdDOl5VFu9cewl+clbZDbzHZMrQPzBMX5wAFwonw0nqqqMA5ut/DT1d3X44i7F/yBs8Z2vaCywXl3K5IcERGkAeg6IeA8pizm+1xWg3ltKBoVWW3SGCgKXK4edIFVEYjp6WOxuAQ5ShgYWjEHrCWmB1M107nOrVOTBIhJBF5hK6gHWcyBRopZUA+cEKkC/2mQHJR4VAYNgYSs1twMZBiojVla7+VdZ5cEdhW4eVZrqfPP3O25YVX6Xx2t63EfI5VtPyY5SyEEeHyTZC6kLZZtqHIqtElkTKWPm/3zZV7AQ4mn3letqbYMNvaw+2UrsGWOLeCaL7h7DSGHhgPCgmcdQ0JLMTUD7r7opg9n2om7Z5QOUzJarnq0b1KVMO8k68TB3d0NvBeTtiyYfS4pUHO3XiE8nFGLpmZXF1UGMpdwa+wltEeZpLZR/tf15e0Fi29lt2EX88hTO0f3Ms6w+m6cJFgqAZ+I0NyYXRhynNHSFjxAQVuyyDGC0n3m4iEA9ZBg5y/4w66tNtEBdouLPBGnLc4KfWtqk7Yt24CUdEXDWi08Jyxya2oiei669BNHcsd23xwtoggb7Y4TfgxayMNRa9UvnYVN+7yhglLyx9gqUTVttK/M+9NArk1hK+cQj3FfbhUGXqKixBW5e7gIQlbk1/fzbfGIv3NVsCvAo4cY4Ts3XbCYbhZw0wKH0ODW+W/N+riPbLyA5cCTU61bzs9rSVcDWh+kO1z7/oRYLFe9Oop7QJw7xrUebq+nKerYCDc0Dhlfyz0KEkjrLT6Ro1C7KaNWNXrHR4ij4iELEvHb+Qiz/SRDwds6JUARUcjnxrL/etWyOvtOG3MlMJC9cek7Su5FSeFKgFh+OpxbuAT4EeoJ6c+g2z532kdpU0pQQrR+0ZoOwHLimXUeNkur5aIAab5HVUiT1KGeJ8mtWCtR60R1xSR+vAdduTMbckLDz7Ky0rZjDqCG9jW3XhjVX7fxKymKaGmNDcpVGoJj3DTjOSQUUDwJqSK4fDdr3oUwxx2i/x6ec6J3LMMFn6htNdWkftrYdkat0SUSnZvoCHmzzOMXz6odtYbkov2kAlT9eGyhlBYTK1J6R2GBC18P+Y9RoJ8V7kas4dNlrTsPHmM6lnlZfVyPUd4cvTquLb9qg1Ke6+Bvpnm2AO9xQRajzV727JkNc7wozEmdJEP
\ No newline at end of file
--- a/src/org/openbravo/erpCommon/security/Login.html	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/security/Login.html	Wed Nov 23 18:54:57 2011 +0100
@@ -32,6 +32,7 @@
 <script language="JavaScript" src="../utility/CheckCleanCache.js?cache=false" type="text/javascript"></script>
 <script language="JavaScript" type="text/javascript" id="visualPrefs">var showCompanyLogo = true, showSupportLogo = true, showForgeLogo = true, urlCompany = 'http://www.openbravo.com/', urlSupport = 'http://support.openbravo.com/';/* Parameters retreived from Login.java */</script>
 <script language="JavaScript" type="text/javascript">var urlForge = 'http://forge.openbravo.com/';</script>
+<script language="JavaScript" type="text/javascript" id="expirationMessage"></script>
 <script language="JavaScript" type="text/javascript" id="cacheMsg">var cacheMsg = 'xx';</script>
 <script language="JavaScript" type="text/javascript" id="validBrowserMsg">var validBrowserMsg = 'xx';</script>
 <script language="JavaScript" type="text/javascript" id="validBrowserMsgOrHigher">var validBrowserMsgOrHigher = 'xx';</script>
@@ -403,6 +404,15 @@
       var displayRecBrowserMsgText = buildRecBrowserMsgText();
       setRecommendedBrowserMessage(recBrowserMsgTitle, displayRecBrowserMsgText);
     }
+    
+    if (expirationMessage){
+      setLoginMessage(expirationMessage.type, expirationMessage.title, expirationMessage.text);
+      if (expirationMessage.disableLogin) {
+          disableButton('buttonOK');
+          document.frmIdentificacion.user.disabled = true;
+          document.frmIdentificacion.password.disabled = true;
+      }
+    }
   }
 </script>
 <script type="text/javascript">
--- a/src/org/openbravo/erpCommon/security/Login.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/security/Login.java	Wed Nov 23 18:54:57 2011 +0100
@@ -252,7 +252,8 @@
     SystemInformation sysInfo = OBDal.getInstance().get(SystemInformation.class, "0");
     Module module = OBDal.getInstance().get(Module.class, GOOGLE_INTEGRATION_MODULE_ID);
 
-    if (ActivationKey.getInstance().isActive()) {
+    ActivationKey ak = ActivationKey.getInstance();
+    if (ak.isActive()) {
       String hql = "from ADPreference pref where searchKey like :value and property = :prop and (visibleAtClient is null or visibleAtClient.id = '0')";
       Query q = OBDal.getInstance().getSession().createQuery(hql);
       q.setParameter("value", "N");
@@ -285,6 +286,10 @@
         + showITLogo + ", showForgeLogo = " + showForgeLogo + ", urlCompany = '" + companyLink
         + "', urlSupport = '" + itLink + "', urlOBForge = 'http://forge.openbravo.com/';";
     xmlDocument.setParameter("visualPrefs", visualPrefs);
+
+    String expirationMessage = "var expirationMessage="
+        + ak.getExpirationMessage(vars.getLanguage()).toString() + ";";
+    xmlDocument.setParameter("expirationMessage", expirationMessage);
     xmlDocument.setParameter("itServiceUrl",
         "var itServiceUrl = '" + SessionLoginData.selectSupportContact(this) + "'");
 
--- a/src/org/openbravo/erpCommon/security/Login.xml	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/security/Login.xml	Wed Nov 23 18:54:57 2011 +0100
@@ -22,6 +22,7 @@
   <PARAMETER id="paramDirectory" name="directory" default=""/>
   <PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
   <PARAMETER id="visualPrefs" name="visualPrefs" default=""/>
+  <PARAMETER id="expirationMessage" name="expirationMessage" default=""/>
   <PARAMETER id="itServiceUrl" name="itServiceUrl" default=""/>
   <PARAMETER id="cacheMsg" name="cacheMsg" default=""/>
   <PARAMETER id="validBrowserMsg" name="validBrowserMsg" default=""/>
--- a/src/org/openbravo/erpCommon/utility/Utility.java	Wed Nov 23 16:42:43 2011 +0100
+++ b/src/org/openbravo/erpCommon/utility/Utility.java	Wed Nov 23 18:54:57 2011 +0100
@@ -294,6 +294,13 @@
   }
 
   /**
+   * @see Utility#messageBD(ConnectionProvider, String, String, boolean)
+   */
+  public static String messageBD(ConnectionProvider conn, String strCode, String strLanguage) {
+    return messageBD(conn, strCode, strLanguage, true);
+  }
+
+  /**
    * Translate the given code into some message from the application dictionary.
    * 
    * @param conn
@@ -302,9 +309,12 @@
    *          String with the code to search.
    * @param strLanguage
    *          String with the translation language.
+   * @param escape
+   *          Escape \n and " characters
    * @return String with the translated message.
    */
-  public static String messageBD(ConnectionProvider conn, String strCode, String strLanguage) {
+  public static String messageBD(ConnectionProvider conn, String strCode, String strLanguage,
+      boolean escape) {
     String strMessage = "";
     if (strLanguage == null || strLanguage.equals(""))
       strLanguage = "en_US";
@@ -327,7 +337,10 @@
     if (strMessage == null || strMessage.equals("")) {
       strMessage = strCode;
     }
-    return Replace.replace(Replace.replace(strMessage, "\n", "\\n"), "\"", "&quot;");
+    if (escape) {
+      strMessage = Replace.replace(Replace.replace(strMessage, "\n", "\\n"), "\"", "&quot;");
+    }
+    return strMessage;
   }
 
   /**