Merged from PI
authorMartin Taal <martin.taal@openbravo.com>
Tue, 02 Jun 2015 12:57:37 +0200
changeset 26854 29517c0c206d
parent 26807 b49c05f23079 (current diff)
parent 26853 0e4febf32416 (diff)
child 26898 f8ac0641f008
Merged from PI
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
src-core/src/org/openbravo/base/VariablesBase.java
src-db/database/model/tables/C_IMPORT_ENTRY.xml
src-db/database/model/tables/C_IMPORT_ENTRY_ARCHIVE.xml
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_REFERENCE.xml
src-db/database/sourcedata/AD_TAB.xml
src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java
src/org/openbravo/service/importprocess/ImportEntryManager.java
src/org/openbravo/service/importprocess/ImportEntryProcessor.java
src/org/openbravo/service/importprocess/ImportProcessUtils.java
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.26767]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.26767]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.26817]]></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-db/database/sourcedata/AD_TAB.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -655,7 +655,7 @@
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--C095D2CC39704DBE8B906B7CD7710968-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
+<!--C095D2CC39704DBE8B906B7CD7710968-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <HQLORDERBYCLAUSE><![CDATA[-transactionDate]]></HQLORDERBYCLAUSE>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
@@ -1059,7 +1059,7 @@
 <!--FF8080812F213146012F2135BC25000E-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
 <!--FF8080812F213146012F2135BC25000E-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--FF8080812F213146012F2135BC25000E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--FF8080812F213146012F2135BC25000E-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
+<!--FF8080812F213146012F2135BC25000E-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--FF8080812F213146012F2135BC25000E-->  <HQLFILTERCLAUSE><![CDATA[e.reconciled = false]]></HQLFILTERCLAUSE>
 <!--FF8080812F213146012F2135BC25000E-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
 <!--FF8080812F213146012F2135BC25000E-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementOnLoadPreferenceActionHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementOnLoadPreferenceActionHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -27,12 +27,8 @@
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.model.ad.domain.Preference;
 import org.openbravo.model.common.enterprise.Organization;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class MatchStatementOnLoadPreferenceActionHandler extends BaseActionHandler {
-  private static final Logger log = LoggerFactory
-      .getLogger(MatchStatementOnLoadPreferenceActionHandler.class);
 
   @Override
   protected JSONObject execute(Map<String, Object> parameters, String content) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java	Tue Jun 02 12:57:37 2015 +0200
@@ -30,9 +30,7 @@
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.provider.OBProvider;
-import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.client.application.process.BaseProcessActionHandler;
-import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBDao;
@@ -49,7 +47,6 @@
   protected JSONObject doExecute(Map<String, Object> parameters, String content) {
     JSONObject jsonRequest = null;
     OBContext.setAdminMode();
-    VariablesSecureApp vars = RequestContext.get().getVariablesSecureApp();
     try {
       jsonRequest = new JSONObject(content);
       log.debug(jsonRequest);
@@ -121,7 +118,7 @@
     int cont = 0;
     String differentPaymentMethod = "false";
     for (int i = 0; i < selectedLines.length(); i++) {
-      JSONObject selectedLine = selectedLines.getJSONObject((int) i);
+      JSONObject selectedLine = selectedLines.getJSONObject(i);
       log.debug(selectedLine);
       BigDecimal paidAmount = new BigDecimal(selectedLine.getString("payment"));
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Tue Jun 02 12:57:37 2015 +0200
@@ -833,8 +833,8 @@
    * 
    * @param vars
    *          VariablseSecureApp with the session data.
-   * @param selectedPaymentScheduleDetails
-   *          List of FIN_PaymentScheduleDetails that need to be included in the HashMap.
+   * @param _strSelectedScheduledPaymentDetailIds
+   *          List of id's of FIN_PaymentScheduleDetails that need to be included in the HashMap.
    * @return A HashMap mapping the FIN_PaymentScheduleDetail's Id with the corresponding amount.
    */
   private HashMap<String, BigDecimal> getSelectedPaymentDetailsAndAmount(VariablesSecureApp vars,
@@ -876,7 +876,6 @@
    *          : amount to split among the set
    * @param psdSet
    *          : set of payment schedule details where to allocate the amount
-   * @return
    */
   private HashMap<String, BigDecimal> calculateAmounts(BigDecimal recordAmount, Set<String> psdSet) {
     BigDecimal remainingAmount = recordAmount;
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java	Tue Jun 02 12:57:37 2015 +0200
@@ -33,12 +33,8 @@
 import org.openbravo.model.financialmgmt.gl.GLItem;
 import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class FIN_FinaccTransactionEventListener extends EntityPersistenceEventObserver {
-  private static final Logger logger = LoggerFactory
-      .getLogger(FIN_FinaccTransactionEventListener.class);
 
   private static Entity[] entities = { ModelProvider.getInstance().getEntity(
       FIN_FinaccTransaction.ENTITY_NAME) };
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpressionHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpressionHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -83,7 +83,7 @@
     AddPaymentDefaultValuesHandler handler = getDefaultsHandler(strWindowId);
     String paymentMethodId = handler.getDefaultPaymentMethod(requestMap);
     if (context.has("inpfinPaymentId") && context.get("inpfinPaymentId") != JSONObject.NULL
-        && StringUtils.isNotBlank((String) context.getString("inpfinPaymentId"))) {
+        && StringUtils.isNotBlank(context.getString("inpfinPaymentId"))) {
       if (hasDetailsWithDifferentPaymentMethods((String) context.get("inpfinPaymentId"))) {
         return "";
       } else {
@@ -111,7 +111,7 @@
     query.setParameter("paymentId", paymentId);
     FIN_Payment payment = OBDal.getInstance().get(FIN_Payment.class, paymentId);
     for (Object pmId : query.list()) {
-      if (!payment.getPaymentMethod().getId().equals((String) pmId)) {
+      if (!payment.getPaymentMethod().getId().equals(pmId)) {
         return true;
       }
     }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentSelectorFilterExpression.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentSelectorFilterExpression.java	Tue Jun 02 12:57:37 2015 +0200
@@ -21,26 +21,16 @@
 
 import java.util.Map;
 
-import javax.servlet.http.HttpSession;
-
-import org.apache.log4j.Logger;
 import org.openbravo.client.application.FilterExpression;
-import org.openbravo.client.application.OBBindingsConstants;
-import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
 
 public class PaymentSelectorFilterExpression implements FilterExpression {
-  private Logger log = Logger.getLogger(PaymentSelectorFilterExpression.class);
   private Map<String, String> requestMap;
-  private HttpSession httpSession;
-  private String windowId;
 
   @Override
   public String getExpression(Map<String, String> _requestMap) {
     requestMap = _requestMap;
-    httpSession = RequestContext.get().getSession();
-    windowId = requestMap.get(OBBindingsConstants.WINDOW_ID_PARAM);
 
     if (requestMap.containsKey("inpfinFinancialAccountId")) {
       FIN_FinancialAccount financialaccount = OBDal.getInstance().get(FIN_FinancialAccount.class,
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java	Tue Jun 02 12:57:37 2015 +0200
@@ -329,10 +329,6 @@
 
   /**
    * Order by selectedPSDs, scheduled date and document number
-   * 
-   * @param selectedPSDs
-   * @param transactionType
-   * @return
    */
   protected StringBuffer getOrderByClause(String transactionType, List<String> selectedPSDs,
       Map<String, String> requestParameters) {
@@ -391,13 +387,6 @@
     return hqlQuery;
   }
 
-  /**
-   * @param _hqlQuery
-   * @param transactionType
-   * @param criteria
-   * @param queryNamedParameters
-   * @return
-   */
   protected String calculateHavingClause(String _hqlQuery, String transactionType,
       JSONObject criteria, Map<String, Object> queryNamedParameters) {
     String hqlQuery = _hqlQuery;
@@ -527,13 +516,6 @@
     return hqlQuery;
   }
 
-  /**
-   * @param _hqlQuery
-   * @param transactionType
-   * @param selectedPSDs
-   * @param orderByClause
-   * @return
-   */
   protected String appendOrderByClause(String _hqlQuery, StringBuffer orderByClause,
       boolean justCount) {
     String hqlQuery = _hqlQuery;
@@ -570,10 +552,6 @@
     buildCriteria.put("criteria", newCriteriaArray);
   }
 
-  /**
-   * @param expression
-   * @return
-   */
   protected String getAggregatorFunction(String expression) {
     return " hqlagg(" + expression + ")";
   }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Tue Jun 02 12:57:37 2015 +0200
@@ -1276,9 +1276,6 @@
 
   /**
    * Returns the date in which last payment for this invoice took place
-   * 
-   * @param invoice
-   * @return
    */
   private static Date getFinalSettlementDate(Invoice invoice) {
     final OBCriteria<FIN_PaymentSchedInvV> obc = OBDal.getInstance().createCriteria(
@@ -1526,7 +1523,7 @@
    *          Payment Schedule Detail amount.
    * @param paymentAmount
    *          Amount selected to be collected. Always less or equal than scheduleDetailAmount.
-   * @param doubtfulDebtAmount
+   * @param doubtfulDebtTotalAmount
    *          Payment Schedule Detail doubtFulDebt amount.
    * @return resultant doubtful debt amount. Zero if no doubtful debt amount was present.
    */
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java	Tue Jun 02 12:57:37 2015 +0200
@@ -42,7 +42,7 @@
       final VariablesSecureApp vars = bundle.getContext().toVars();
       final ConnectionProvider conProvider = bundle.getConnection();
       final String language = bundle.getContext().getLanguage();
-      final boolean isForceProcess = (Boolean) "2DDE7D3618034C38A4462B7F3456C28D".equals(bundle
+      final boolean isForceProcess = "2DDE7D3618034C38A4462B7F3456C28D".equals(bundle
           .getProcessId());
 
       bankStatement.setProcessNow(true);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Tue Jun 02 12:57:37 2015 +0200
@@ -191,9 +191,6 @@
 
   /**
    * Returns the date in which last payment for this invoice took place
-   * 
-   * @param invoice
-   * @return
    */
   private static Date getFinalSettlementDate(Invoice invoice) {
     final OBCriteria<FIN_PaymentSchedInvV> obc = OBDal.getInstance().createCriteria(
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Tue Jun 02 12:57:37 2015 +0200
@@ -392,7 +392,8 @@
                     .invoicePaymentStatus(payment)));
                 paymentScheduleDetail.setInvoicePaid(false);
                 // Payment = 0 when the payment is generated by a invoice that consume credit
-                if (invoicePaidAmounts
+                if ((invoicePaidAmounts && paymentScheduleDetail.getInvoicePaymentSchedule() != null)
+                    || (paymentScheduleDetail.getOrderPaymentSchedule() != null)
                     || (payment.getAmount().compareTo(new BigDecimal("0.00")) == 0)) {
                   if (paymentScheduleDetail.getInvoicePaymentSchedule() != null) {
                     // BP SO_CreditUsed
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java	Tue Jun 02 12:57:37 2015 +0200
@@ -111,7 +111,7 @@
           bundle.setResult(msg);
           return;
         }
-        final boolean isForceProcess = (Boolean) "6BF16EFC772843AC9A17552AE0B26AB7".equals(bundle
+        final boolean isForceProcess = "6BF16EFC772843AC9A17552AE0B26AB7".equals(bundle
             .getProcessId());
         // Transaction exists
         if (!isForceProcess && !MatchTransactionDao.islastreconciliation(reconciliation)) {
@@ -158,7 +158,6 @@
         reconciliation.setAPRMProcessReconciliationForce("P");
         OBDal.getInstance().save(reconciliation);
         OBDal.getInstance().flush();
-        Boolean invoicePaidold = false;
       }
       reconciliation.setProcessNow(false);
       OBDal.getInstance().save(reconciliation);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java	Tue Jun 02 12:57:37 2015 +0200
@@ -137,7 +137,8 @@
             for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
               invoicePaidold = psd.isInvoicePaid();
               if (!invoicePaidold) {
-                if ((FIN_Utility.invoicePaymentStatus(payment).equals(payment.getStatus()))) {
+                if (FIN_Utility.invoicePaymentStatus(payment).equals(payment.getStatus())
+                    && psd.getInvoicePaymentSchedule() != null) {
                   psd.setInvoicePaid(true);
                 }
                 if (psd.isInvoicePaid()) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Tue Jun 02 12:57:37 2015 +0200
@@ -425,7 +425,7 @@
         if (!businessPartnersScroll.next()) {
           String strParnterId = "";
           if (resultObject.getClass().isArray()) {
-            final Object[] values = (Object[]) resultObject;
+            final Object[] values = resultObject;
             strParnterId = (String) values[0];
           }
           BusinessPartner bp = OBDal.getInstance().get(BusinessPartner.class, strParnterId);
@@ -454,7 +454,7 @@
 
       String targetBusinessPartnerName = "";
       if (resultObject.getClass().isArray()) {
-        final Object[] values = (Object[]) resultObject;
+        final Object[] values = resultObject;
         targetBusinessPartnerId = (String) values[0];
         targetBusinessPartnerName = (String) values[1];
       }
@@ -481,7 +481,7 @@
         String bpName = "";
         resultObject = (Object[]) businessPartners.get(0);
         if (resultObject.getClass().isArray()) {
-          final Object[] values = (Object[]) resultObject;
+          final Object[] values = resultObject;
           bpId = (String) values[0];
           bpName = (String) values[1];
         }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Tue Jun 02 12:57:37 2015 +0200
@@ -1059,7 +1059,7 @@
       invoiceDocNo = invoice.getDocumentNo();
 
       final String paymentDescription = OBDal.getInstance()
-          .get(OrganizationInformation.class, ((String) DalUtil.getId(organization)))
+          .get(OrganizationInformation.class, (DalUtil.getId(organization)))
           .getAPRMPaymentDescription();
       // In case of a purchase invoice and the Supplier Reference is selected use Reference
       if (paymentDescription.equals("Supplier Reference") && !invoice.isSalesTransaction()) {
@@ -1245,7 +1245,6 @@
 
   public static boolean periodControlOpened(String tableName, String recordId, String idColumnName,
       String orgType) {
-    final Session session = OBDal.getInstance().getSession();
 
     List<Object> parameters = new ArrayList<Object>();
     parameters.add(tableName);
@@ -1255,7 +1254,7 @@
     Object result = CallStoredProcedure.getInstance().call("ad_get_doc_le_bu", parameters, null,
         false, true);
 
-    Organization org = OBDal.getInstance().get(Organization.class, (String) result);
+    Organization org = OBDal.getInstance().get(Organization.class, result);
 
     return org.getOrganizationType().isLegalEntityWithAccounting();
   }
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.26767]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.26767]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.26817]]></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_MESSAGE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -1605,6 +1605,18 @@
 <!--CE3E9A8711D54E719F02630BE8D5E2FB-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--CE3E9A8711D54E719F02630BE8D5E2FB--></AD_MESSAGE>
 
+<!--CEA329C437C54C7AB101D4A3EC0A89EC--><AD_MESSAGE>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <AD_MESSAGE_ID><![CDATA[CEA329C437C54C7AB101D4A3EC0A89EC]]></AD_MESSAGE_ID>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <VALUE><![CDATA[OBUIAPP_NumOfSeledtedItemsChange]]></VALUE>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <MSGTEXT><![CDATA[There were %0 records selected prior to refreshing. Due to limitations regarding the page size, only the  first %1 record(s) selection has been kept.]]></MSGTEXT>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <MSGTYPE><![CDATA[W]]></MSGTYPE>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC--></AD_MESSAGE>
+
 <!--CF668C49E43D4FA799A43191EA10C17A--><AD_MESSAGE>
 <!--CF668C49E43D4FA799A43191EA10C17A-->  <AD_MESSAGE_ID><![CDATA[CF668C49E43D4FA799A43191EA10C17A]]></AD_MESSAGE_ID>
 <!--CF668C49E43D4FA799A43191EA10C17A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.26767]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.26767]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.26817]]></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.26767]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.26817]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Tue Jun 02 12:57:37 2015 +0200
@@ -479,6 +479,7 @@
     testResources.add("web/org.openbravo.client.application/js/test/ob-property-store-test.js");
     testResources.add("web/org.openbravo.client.application/js/test/ob-utilities-date-test.js");
     testResources.add("web/org.openbravo.client.application/js/test/ob-navbar-test.js");
+    testResources.add("web/org.openbravo.client.application/js/test/ob-utilities-number-test.js");
     return testResources;
   }
 }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Tue Jun 02 12:57:37 2015 +0200
@@ -262,7 +262,7 @@
    * 
    * If the value is enclosed between brackets, it is extracted, translated and enclosed again
    * 
-   * @see DynamicExpressionParserTest
+   * There is a junit test in the class: DynamicExpressionParserTest
    * 
    * @param value
    *          A string expression like <b>'Y'</b>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/GlobalMenu.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/GlobalMenu.java	Tue Jun 02 12:57:37 2015 +0200
@@ -120,7 +120,7 @@
     final String menuHql = "select m from ADMenu m left join fetch m.aDMenuTrlList where m.module.enabled=true";
     final Query menuQry = OBDal.getInstance().getSession().createQuery(menuHql);
     @SuppressWarnings("unchecked")
-    List<Menu> menus = (List<Menu>) menuQry.list();
+    List<Menu> menus = menuQry.list();
 
     List<TreeNode> nodes = treeNodes.list();
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MultipleDeleteActionHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MultipleDeleteActionHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -66,7 +66,7 @@
       DataSourceService dataSourceService = getCustomDataSourceService(entityName);
       for (int i = 0; i < ids.length(); i++) {
         if (dataSourceService == null) {
-          final BaseOBObject object = OBDal.getInstance().get(entityName, (String) ids.get(i));
+          final BaseOBObject object = OBDal.getInstance().get(entityName, ids.get(i));
           if (object != null) {
             OBDal.getInstance().remove(object);
             // https://issues.openbravo.com/view.php?id=21229#c51631
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java	Tue Jun 02 12:57:37 2015 +0200
@@ -138,21 +138,21 @@
     if (!checkRequestMap()) {
       return null;
     }
-    return (String) requestMap.get(OBBindingsConstants.WINDOW_ID_PARAM);
+    return requestMap.get(OBBindingsConstants.WINDOW_ID_PARAM);
   }
 
   public String getTabId() {
     if (!checkRequestMap()) {
       return null;
     }
-    return (String) requestMap.get(OBBindingsConstants.TAB_ID_PARAM);
+    return requestMap.get(OBBindingsConstants.TAB_ID_PARAM);
   }
 
   public String getCommandType() {
     if (!checkRequestMap()) {
       return null;
     }
-    return (String) requestMap.get(OBBindingsConstants.COMMAND_TYPE_PARAM);
+    return requestMap.get(OBBindingsConstants.COMMAND_TYPE_PARAM);
   }
 
   public Boolean isPosted() {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -79,10 +79,18 @@
       final String roleId = OBContext.getOBContext().getRole().getId();
       final DalConnectionProvider dalConnectionProvider = new DalConnectionProvider();
       final JSONObject jsonUIPattern = new JSONObject();
+      final String windowType = window.getWindowType();
       for (Tab tab : window.getADTabList()) {
         final boolean readOnlyAccess = org.openbravo.erpCommon.utility.WindowAccessData
             .hasReadOnlyAccess(dalConnectionProvider, roleId, tab.getId());
         String uiPattern = readOnlyAccess ? "RO" : tab.getUIPattern();
+        // window should be read only when is assigned with a table defined as a view
+        if (!"RO".equals(uiPattern) && ("T".equals(windowType) || "M".equals(windowType))
+            && tab.getTable().isView()) {
+          log4j.warn("Tab \"" + tab.getName()
+              + "\" is set to read only because is assigned with a table defined as a view.");
+          uiPattern = "RO";
+        }
         jsonUIPattern.put(tab.getId(), uiPattern);
       }
       final JSONObject json = new JSONObject();
@@ -220,13 +228,13 @@
             if (settingValue instanceof List) {
               for (Object callbackExtra : (List<?>) settingValue) {
                 if (callbackExtra instanceof String) {
-                  extraCallbacks.put((String) callbackExtra);
+                  extraCallbacks.put(callbackExtra);
                 } else {
                   log4j.warn("You are trying to set a wrong instance of extraCallbacks");
                 }
               }
             } else if (settingValue instanceof String) {
-              extraCallbacks.put((String) settingValue);
+              extraCallbacks.put(settingValue);
             } else {
               log4j.warn("You are trying to set a wrong instance of extraCallbacks");
             }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -112,7 +112,7 @@
     for (Entity entity : ModelProvider.getInstance().getEntityWithImage().keySet()) {
       entityArray.add(entity);
     }
-    return (Entity[]) entityArray.toArray(new Entity[entityArray.size()]);
+    return entityArray.toArray(new Entity[entityArray.size()]);
   }
 
   // Check if this image is used by another product
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -45,7 +45,8 @@
  * following deletion fails as the record is not longer present. This class works around that by
  * explicitely deleting c_ordertax entries on delete of c_order. (Same for c_invoicetax)
  * 
- * @link https://issues.openbravo.com/view.php?id=17199
+ * {@link "https://issues.openbravo.com/view.php?id=17199"}
+ * 
  * @author shuehner
  */
 public class ReorderCascadingChildDeletionsHandler extends EntityPersistenceEventObserver {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TableTreeEventHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TableTreeEventHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -37,8 +37,6 @@
 import org.openbravo.model.ad.datamodel.Table;
 import org.openbravo.model.ad.utility.TableTree;
 import org.openbravo.service.db.DalConnectionProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This event handler listen to events that are fired in the TableTree table. This table is used to
@@ -50,7 +48,6 @@
 public class TableTreeEventHandler extends EntityPersistenceEventObserver {
 
   private static Entity[] entities = { ModelProvider.getInstance().getEntity(TableTree.ENTITY_NAME) };
-  private static Logger logger = LoggerFactory.getLogger(TableTreeEventHandler.class);
   private static final String ADTREE_STRUCTURE = "ADTree";
 
   @Override
@@ -82,10 +79,15 @@
   }
 
   /**
-   * Checks that no other ADTree structured tree exists for this table, throws an exception if this occurs
-   * @param table table being checked
-   * @param treeStructure treestructure of the added/updated tree
-   * @param recordId null if a new record is being created or id of the record being modified
+   * Checks that no other ADTree structured tree exists for this table, throws an exception if this
+   * occurs
+   * 
+   * @param table
+   *          table being checked
+   * @param treeStructure
+   *          treestructure of the added/updated tree
+   * @param recordId
+   *          null if a new record is being created or id of the record being modified
    */
   private void checkTreeStructure(Table table, String treeStructure, String recordId) {
     if (ADTREE_STRUCTURE.equals(treeStructure)) {
@@ -94,7 +96,7 @@
       obq.add(Restrictions.eq(TableTree.PROPERTY_TABLE, table));
       obq.add(Restrictions.eq(TableTree.PROPERTY_TREESTRUCTURE, treeStructure));
       if (recordId != null) {
-          obq.add(Restrictions.ne(TableTree.PROPERTY_ID, recordId));
+        obq.add(Restrictions.ne(TableTree.PROPERTY_ID, recordId));
       }
       if (obq.count() > 0) {
         String language = OBContext.getOBContext().getLanguage().getLanguage();
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -167,6 +167,6 @@
     for (Table treeTable : treeTableList) {
       entityArray.add(ModelProvider.getInstance().getEntityByTableId(treeTable.getId()));
     }
-    return (Entity[]) entityArray.toArray(new Entity[entityArray.size()]);
+    return entityArray.toArray(new Entity[entityArray.size()]);
   }
 }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -69,7 +69,7 @@
       final String action = request.getString("action");
 
       if ("INITIALIZE".equals(action)) {
-        String productId = (String) request.getString("productId");
+        String productId = request.getString("productId");
         Product product = OBDal.getInstance().get(Product.class, productId);
 
         // Retrieves all the product invariant characteristics
@@ -120,7 +120,7 @@
         response.put("productId", productId);
         return response;
       } else {
-        String productId = (String) request.getString("productId");
+        String productId = request.getString("productId");
         Product product = OBDal.getInstance().get(Product.class, productId);
         final JSONObject updatedValues = request.getJSONObject("updatedValues");
         final JSONObject existingProdChValues = request.getJSONObject("existingProdChValues");
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -269,8 +269,8 @@
     final JSONArray jsonArray = new JSONArray();
     for (BaseOBObject bob : objects) {
       final JSONObject jsonArrayItem = new JSONObject();
-      jsonArrayItem.put(JsonConstants.ID, (String) bob.getId());
-      jsonArrayItem.put(JsonConstants.IDENTIFIER, (String) bob.getIdentifier());
+      jsonArrayItem.put(JsonConstants.ID, bob.getId());
+      jsonArrayItem.put(JsonConstants.IDENTIFIER, bob.getIdentifier());
       jsonArray.put(jsonArrayItem);
     }
     return jsonArray;
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -470,7 +470,7 @@
       } else {
         jsonObject = new JSONObject();
       }
-      jsonObject.put(target, (Object) jsonValue);
+      jsonObject.put(target, jsonValue);
       uiPersonalization.setValue(jsonObject.toString());
       OBDal.getInstance().save(uiPersonalization);
       return uiPersonalization;
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Tue Jun 02 12:57:37 2015 +0200
@@ -366,7 +366,7 @@
     OBQuery<Note> obq = OBDal.getInstance().createQuery(Note.class,
         " table.id=:tableId and record=:recordId");
     obq.setFilterOnReadableOrganization(false);
-    obq.setNamedParameter("tableId", (String) DalUtil.getId(tab.getTable()));
+    obq.setNamedParameter("tableId", DalUtil.getId(tab.getTable()));
     obq.setNamedParameter("recordId", rowId);
     return obq.count();
   }
@@ -403,11 +403,11 @@
       Object[] array = (Object[]) qobj;
       JSONObject obj = new JSONObject();
       try {
-        obj.put("name", (String) array[0]);
-        obj.put("id", (String) array[1]);
+        obj.put("name", array[0]);
+        obj.put("id", array[1]);
         obj.put("age", (new Date().getTime() - ((Date) array[2]).getTime()));
-        obj.put("updatedby", (String) array[3]);
-        obj.put("description", (String) array[4]);
+        obj.put("updatedby", array[3]);
+        obj.put("description", array[4]);
       } catch (JSONException e) {
         log.error("Error while reading attachments", e);
       }
@@ -1070,8 +1070,6 @@
     }
 
     Entity parentEntity = parentRecord.getEntity();
-    Entity entity = ModelProvider.getInstance().getEntityByTableId(
-        field.getTab().getTable().getId());
     Property property = KernelUtils.getProperty(field);
     Entity referencedEntity = property.getReferencedProperty().getEntity();
     return referencedEntity.equals(parentEntity);
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java	Tue Jun 02 12:57:37 2015 +0200
@@ -20,7 +20,6 @@
 
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.client.kernel.BaseActionHandler;
@@ -30,8 +29,6 @@
 
 public class GetNameGeneralLedger extends BaseActionHandler {
 
-  private static final Logger log = Logger.getLogger(GetNameGeneralLedger.class);
-
   @Override
   protected JSONObject execute(Map<String, Object> parameters, String content) {
     OBContext.setAdminMode();
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -71,8 +71,7 @@
       String parentObjectId = (String) parameters.get("parentObjectId");
       Entity entity = ModelProvider.getInstance().getEntityByTableName(table.getDBTableName());
       String propertyName = entity.getPropertyByColumnName(columnName).getName();
-      BaseOBObject parentObject = (BaseOBObject) OBDal.getInstance().get(entity.getName(),
-          parentObjectId);
+      BaseOBObject parentObject = OBDal.getInstance().get(entity.getName(), parentObjectId);
       parentObject.set(propertyName, null);
       return new JSONObject();
     } else if (parameters.get("command").equals("GETSIZE")) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -895,7 +895,6 @@
     private String displaylogicgrid = "";
 
     private int gridSort = 0;
-    private String id;
 
     public String getOnChangeFunction() {
       return field.getOnChangeFunction();
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js	Tue Jun 02 12:57:37 2015 +0200
@@ -330,7 +330,7 @@
         this.emptyMessage = this.emptyDataMessage;
       },
       dataArrived: function (startRow, endRow) {
-        if (startRow === 0 && endRow === -1) {
+        if (this.data && this.data.getLength && this.data.getLength() === 0) {
           this.showNoRowsMessage();
         }
         return this.Super('dataArrived', arguments);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Tue Jun 02 12:57:37 2015 +0200
@@ -1785,6 +1785,12 @@
         this.selectedRecordEndInterval = this.selectedRecordInitInterval + this.data.resultSize;
       }
       this.notRemoveFilter = true;
+      if (this.getSelectedRecords().length > 1) {
+        this.selectedRecordsBeforeRefresh = [];
+        for (i = 0; i < this.getSelectedRecords().length; i++) {
+          this.selectedRecordsBeforeRefresh.push(this.getSelectedRecords()[i][OB.Constants.ID]);
+        }
+      }
     } else {
       visibleRows = this.getVisibleRows();
       if (visibleRows && visibleRows[0] > 0) {
@@ -1833,6 +1839,7 @@
       criteria = originalCriteria;
     }
     filterDataCallback = function () {
+      var i, gridRecord, recordIndexes = [];
       if (me.refreshingWithScrolledGrid) {
         // move the scroll to part of the grid that contains the data that was just received to
         // prevent unneded requests (see https://issues.openbravo.com/view.php?id=25811)
@@ -1846,6 +1853,25 @@
       delete me.selectedRecordInitInterval;
       delete me.selectedRecordEndInterval;
       delete me.selectedRecordId;
+
+      if (me.selectedRecordsBeforeRefresh) {
+        for (i = 0; i < me.selectedRecordsBeforeRefresh.length; i++) {
+          gridRecord = me.data.find(OB.Constants.ID, me.selectedRecordsBeforeRefresh[i]);
+          if (gridRecord !== null) {
+            recordIndexes.push(me.getRecordIndex(gridRecord));
+          }
+        }
+        me.singleRecordSelection = false;
+        me.selectRecords(recordIndexes);
+        if (me.selectedRecordsBeforeRefresh.length !== recordIndexes.length) {
+          if (me.view.messageBar.isVisible()) {
+            isc.warn(OB.I18N.getLabel('OBUIAPP_NumOfSeledtedItemsChange', [me.selectedRecordsBeforeRefresh.length, recordIndexes.length]));
+          } else {
+            me.view.messageBar.setMessage(isc.OBMessageBar.TYPE_WARNING, null, OB.I18N.getLabel('OBUIAPP_NumOfSeledtedItemsChange', [me.selectedRecordsBeforeRefresh.length, recordIndexes.length]));
+          }
+        }
+        delete me.selectedRecordsBeforeRefresh;
+      }
     };
     this.filterData(criteria, filterDataCallback, context);
     // Set the refreshingWithRecordSelected and refreshingWithScrolledGrid flags to true when needed after
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-number-test.js	Tue Jun 02 12:57:37 2015 +0200
@@ -0,0 +1,218 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+/*global QUnit */
+
+QUnit.module('org.openbravo.client.application1');
+
+QUnit.test('OB.Utilities.Number. ScientificToDecimal, OBMaskedToOBPlain and roundJSNumber functions', function () {
+  QUnit.expect(6);
+
+  var outputText = '';
+  var decSeparator = '.';
+  var groupSeparator = ',';
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.ScientificToDecimal works properly';
+    var failureText = 'OB.Utilities.Number.ScientificToDecimal failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list = [
+      ['-5E-4', '-0.0005'],
+      ['-5E4', '-50000'],
+      ['5E7', '50000000'],
+      ['-1.056E-5', '-0.00001056'],
+      ['-1.056E5', '-105600'],
+      ['1.056E-5', '0.00001056'],
+      ['1.056E5', '105600'],
+      ['-1.2E-5', '-0.000012'],
+      ['-1.2E5', '-120000'],
+      ['1.2E-5', '0.000012'],
+      ['1.2E5', '120000'],
+      ['-3.566E-4', '-0.0003566']
+    ];
+    for (i = 0; i < list.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.ScientificToDecimal(list[i][0], decSeparator);
+      if (normalizedDisplayFormat !== list[i][1]) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + list[i][0] + '\') === \'' + list[i][1] + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.OBMaskedToOBPlain works properly when the exponent of the scientific number ends with 0';
+    var failureText = 'OB.Utilities.Number.OBMaskedToOBPlain failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list = [
+      ['1.12E10', '11200000000'],
+      ['1.12E-10', '0.000000000112'],
+      ['-1.0564E10', '-10564000000'],
+      ['1.056E-5', '0.00001056']
+    ];
+    for (i = 0; i < list.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.OBMaskedToOBPlain(list[i][0], decSeparator, groupSeparator);
+      if (normalizedDisplayFormat !== list[i][1]) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + list[i][0] + '\') === \'' + list[i][1] + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.ScientificToDecimal works properly for the conversion of the numbers from scientific notation to decimal notation in the case of the upper case E, lower case e and if a sign is added to the exponent';
+    var failureText = 'OB.Utilities.Number.ScientificToDecimal failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list = [
+      ['1.12E10', '11200000000'],
+      ['-5E20', '-500000000000000000000'],
+      ['-1.056E10', '-10560000000'],
+      ['1.12E+10', '11200000000'],
+      ['-5E+20', '-500000000000000000000'],
+      ['-1.056E+10', '-10560000000'],
+      ['1.12e10', '11200000000'],
+      ['-5e20', '-500000000000000000000'],
+      ['-1.056e10', '-10560000000'],
+      ['1.12e+10', '11200000000'],
+      ['-5e+20', '-500000000000000000000'],
+      ['-1.056e+10', '-10560000000']
+    ];
+    for (i = 0; i < list.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.ScientificToDecimal(list[i][0], decSeparator);
+      if (normalizedDisplayFormat !== list[i][1]) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + list[i][0] + '\') === \'' + list[i][1] + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.ScientificToDecimal works properly';
+    var failureText = 'OB.Utilities.Number.ScientificToDecimal failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list = [
+      ['1.020050045E7', '10200500.45'],
+      ['-1.020050045E7', '-10200500.45'],
+      ['1.020050000E7', '10200500.00'],
+      ['-1.020050000E7', '-10200500.00']
+    ];
+    for (i = 0; i < list.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.ScientificToDecimal(list[i][0], decSeparator);
+      if (normalizedDisplayFormat !== list[i][1]) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + list[i][0] + '\') === \'' + list[i][1] + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.roundJSNumber works properly';
+    var failureText = 'OB.Utilities.Number.roundJSNumber failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list1 = [
+      [0.145, 2],
+      [1.145, 2],
+      [10.145, 2],
+      [14.499999999999998, 2]
+    ];
+    var list2 = [
+      [0.15],
+      [1.15],
+      [10.15],
+      [14.5]
+    ];
+    for (i = 0; i < list1.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.roundJSNumber(list1[i][0], list1[i][1]);
+      if (normalizedDisplayFormat !== list2[i][0]) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + 'number ' + list1[i][0] + ' with ' + list1[i][1] + 'decimals' + '\') === \'' + list2[i][0] + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.roundJSNumber works properly when the parameter is NaN';
+    var failureText = 'OB.Utilities.Number.roundJSNumber failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list = [
+      ['a', 2],
+      ['12a', 2]
+    ];
+    for (i = 0; i < list.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.roundJSNumber(list[i][0], list[i][1]);
+      if (!isNaN(normalizedDisplayFormat)) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + list[i][0] + '\') === \'' + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+});
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js	Tue Jun 02 12:57:37 2015 +0200
@@ -73,10 +73,10 @@
   var numberSign = '';
   if (plainNumber.substring(0, 1) === '+') {
     numberSign = '';
-    plainNumber = plainNumber.substring(1, number.length);
+    plainNumber = plainNumber.substring(1, plainNumber.length);
   } else if (plainNumber.substring(0, 1) === '-') {
     numberSign = '-';
-    plainNumber = plainNumber.substring(1, number.length);
+    plainNumber = plainNumber.substring(1, plainNumber.length);
   }
 
   // Remove ending decimal '0'
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.26767]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.26767]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.26767]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.26767]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.26817]]></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.26767]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.26817]]></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.26767]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.26817]]></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/BaseComponent.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java	Tue Jun 02 12:57:37 2015 +0200
@@ -173,7 +173,7 @@
    * @return an instance of clz
    */
   public <U extends Component> U createComponent(Class<U> clz) {
-    return (U) components.select(clz).get();
+    return components.select(clz).get();
   }
 
   /*
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java	Tue Jun 02 12:57:37 2015 +0200
@@ -48,7 +48,7 @@
    * @return an instance of clz
    */
   protected <U extends Component> U getComponent(Class<U> clz) {
-    return (U) WeldUtils.getInstanceFromStaticBeanManager(clz);
+    return WeldUtils.getInstanceFromStaticBeanManager(clz);
   }
 
   public Module getModule() {
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/GetLabelActionHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/GetLabelActionHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -22,7 +22,6 @@
 
 import javax.enterprise.context.ApplicationScoped;
 
-import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.dal.core.OBContext;
@@ -34,7 +33,6 @@
  */
 @ApplicationScoped
 public class GetLabelActionHandler extends BaseActionHandler {
-  private static final Logger log = Logger.getLogger(GetLabelActionHandler.class);
 
   private static final String KEY_PARAMETER = "key";
   private static final String LABEL_PROPERTY = "label";
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java	Tue Jun 02 12:57:37 2015 +0200
@@ -435,7 +435,7 @@
     }
     List<Tab> subTabList = new ArrayList<Tab>();
     for (int i = 0; i < tabIds.length; i++) {
-      String tabId = ((KernelUtilsData) tabIds[i]).adTabId;
+      String tabId = tabIds[i].adTabId;
       Tab subTab = OBDal.getInstance().get(Tab.class, tabId);
       subTabList.add(subTab);
     }
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/SetContextInfoActionHandler.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/SetContextInfoActionHandler.java	Tue Jun 02 12:57:37 2015 +0200
@@ -4,7 +4,6 @@
 
 import javax.enterprise.context.ApplicationScoped;
 
-import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
@@ -18,8 +17,6 @@
 @ApplicationScoped
 public class SetContextInfoActionHandler extends BaseActionHandler {
 
-  private static final Logger log = Logger.getLogger(SetContextInfoActionHandler.class);
-
   @Override
   protected JSONObject execute(Map<String, Object> parameters, String content) {
 
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Tue Jun 02 12:57:37 2015 +0200
@@ -532,8 +532,8 @@
       if (!isListReference && "AD_ORG_ID".equals(field.getColumn().getDBColumnName().toUpperCase())
           && "".equals(columnValue) && vars.getStringParameter("CHANGED_COLUMN").equals(columnName)) {
         JSONObject entry = new JSONObject();
-        entry.put(JsonConstants.ID, (String) columnValue);
-        entry.put(JsonConstants.IDENTIFIER, (String) columnValue);
+        entry.put(JsonConstants.ID, columnValue);
+        entry.put(JsonConstants.IDENTIFIER, columnValue);
         return entry.toString();
       }
       boolean comboreload = rq.getRequestParameter("donotaddcurrentelement") != null
--- a/modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/ui-test-suite/index.html	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/ui-test-suite/index.html	Tue Jun 02 12:57:37 2015 +0200
@@ -27,6 +27,7 @@
 
 <script type="text/javascript" src="../js/LAB.min.js"></script>
 <script type="text/javascript"  src="./qunit/qunit.js"></script>
+<script src="../js/BigDecimal-all-1.0.1.min.js"></script>
 
 <title>Openbravo - Test Suite</title>
 </head>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.26767]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.26767]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.26817]]></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/src/org/openbravo/client/myob/CalendarWidgetProvider.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/CalendarWidgetProvider.java	Tue Jun 02 12:57:37 2015 +0200
@@ -18,7 +18,6 @@
  */
 package org.openbravo.client.myob;
 
-import org.apache.log4j.Logger;
 import org.openbravo.client.kernel.KernelConstants;
 
 /**
@@ -30,8 +29,6 @@
 
   public static final String WIDGETCLASS_PARAMETER = "WIDGET_CLASS";
 
-  private static final Logger log = Logger.getLogger(CalendarWidgetProvider.class);
-
   @Override
   public String generate() {
     final String result = "isc.defineClass('" + KernelConstants.ID_PREFIX
--- a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java	Tue Jun 02 12:57:37 2015 +0200
@@ -68,12 +68,12 @@
    * Computes the widget title using the user's language, if no translation is available then the
    * {@link WidgetClass#getWidgetTitle()} is used.
    * 
-   * @param widgetInstance
+   * @param widgetClass
    *          the widget class of this instance is used to read the title
    * @return the title of the widget read from the widgetclass
-   * @see WidgetInstance#getOBKMOWidgetClass()
+   * @see WidgetInstance#getWidgetClass()
    * @see WidgetClassTrl
-   * @see WidgetClass#getTitle()
+   * @see WidgetClass#getWidgetTitle()
    */
   static String getWidgetTitle(WidgetClass widgetClass) {
     final String userLanguageId = OBContext.getOBContext().getLanguage().getId();
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.26767]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.26767]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.26817]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java	Tue Jun 02 12:57:37 2015 +0200
@@ -318,9 +318,9 @@
    * fields. If the HQL query already contains order by fields, the new fields are appended for the
    * existing fields.
    * 
-   * @param hQL
+   * @param hql
    *          original HQL query
-   * @param sortByParametersString
+   * @param sortBy
    *          parameter that contains sortBy field values
    * @return an updated HQL query that will set the order by fields
    */
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.26767]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.26767]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.26767]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.26767]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.26817]]></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.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Tue Jun 02 12:57:37 2015 +0200
@@ -1192,16 +1192,13 @@
       }
       OBContext.restorePreviousMode();
     }
-    return (FieldProvider[]) totalData.toArray(new FieldProvider[totalData.size()]);
+    return totalData.toArray(new FieldProvider[totalData.size()]);
   }
 
   /**
    * This method combines the information from the transactions list and the last element inserted
    * into grouped data into total data.
    * 
-   * @param fieldProvider
-   * @param transactionsList
-   * @param totalData
    * @throws OBException
    */
   private boolean insertIntoTotal(FieldProvider data,
@@ -1223,8 +1220,6 @@
   /**
    * This method creates a field provider with the information of the transaction
    * 
-   * @param fin_FinaccTransaction
-   * @return
    * @throws OBException
    */
   private FieldProvider createFieldProviderForTransaction(FIN_FinaccTransaction transaction,
@@ -1471,11 +1466,6 @@
 
   /**
    * This method compares the status and the order criteria of the transactions and data
-   * 
-   * @param transaction
-   * @param data
-   * @param strOrdCrit
-   * @return
    */
   private boolean isBeforeStatusAndOrder(FIN_FinaccTransaction transaction, FieldProvider data,
       String strOrdCrit, String BPName, String BPCategory, String strProject) {
@@ -1495,11 +1485,6 @@
 
   /**
    * This method compares recursively the order criteria of the transactions and data
-   * 
-   * @param transaction
-   * @param data
-   * @param strOrdCrit
-   * @return
    */
   private boolean isBeforeOrder(FIN_FinaccTransaction transaction, FieldProvider data,
       String[] strOrdCritList, int i, String BPName, String BPCategory, String strProject) {
@@ -1646,10 +1631,6 @@
   /**
    * Compares two DIFFERENT payment status. If the first one goes before the second it returns true,
    * elsewise it returns false
-   * 
-   * @param firstValue
-   * @param secondValue
-   * @return
    */
   private boolean isBeforeStatus(String firstValue, String secondValue) {
     String[] strStatus = { firstValue, secondValue };
@@ -2121,7 +2102,7 @@
       final Session session = OBDal.getInstance().getSession();
       final Query query = session.createQuery(sql.toString());
       for (final Object o : query.list()) {
-        result.add(OBDal.getInstance().get(Invoice.class, (String) o));
+        result.add(OBDal.getInstance().get(Invoice.class, o));
       }
 
       return result;
@@ -2209,9 +2190,6 @@
 
   /**
    * Given a String of organizations this method returns an array of organizations
-   * 
-   * @param strOrgFamily
-   * @return
    */
   private Organization[] getOrganizations(Set<String> strOrgFamily) {
     Iterator<String> orgChildTreeIter = strOrgFamily.iterator();
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.26767]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.26767]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.26767]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.26767]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.26817]]></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.26767]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.26817]]></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.26767]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.26817]]></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.26767]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.26817]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java	Tue Jun 02 12:57:37 2015 +0200
@@ -289,11 +289,11 @@
     int cont = 0;
     ScrollableResults scrollNodes = obq.createQuery().scroll(ScrollMode.FORWARD_ONLY);
     while (scrollNodes.next()) {
-      Object[] node = (Object[]) scrollNodes.get();
+      Object[] node = scrollNodes.get();
       JSONObject value = null;
       BaseOBObject bob = (BaseOBObject) node[ENTITY];
       try {
-        value = toJsonConverter.toJsonObject((BaseOBObject) bob, DataResolvingMode.FULL);
+        value = toJsonConverter.toJsonObject(bob, DataResolvingMode.FULL);
         value.put("nodeId", bob.getId().toString());
         if (fetchRoot) {
           value.put("parentId", ROOT_NODE_CLIENT);
@@ -485,9 +485,6 @@
 
   /**
    * Checks if a tree is ordered
-   * 
-   * @param tree
-   * @return
    */
   private boolean isOrdered(Tree tree) {
     Table table = tree.getTable();
@@ -502,10 +499,6 @@
 
   /**
    * Returns a Tree given the referencedTableId and the parentRecordId
-   * 
-   * @param referencedTableId
-   * @param parentRecordId
-   * @return
    */
   private Tree getTree(String referencedTableId) {
     Table referencedTable = OBDal.getInstance().get(Table.class, referencedTableId);
@@ -522,10 +515,6 @@
    * Returns a Tree given the referencedTableId and a jsonobject that contains the node properties
    * This is called from the EventHandler, because the parentRecordId is not avaiable in the
    * parameters
-   * 
-   * @param referencedTableId
-   * @param parentRecordId
-   * @return
    */
   private Tree getTree(Table table, JSONObject bobProperties) {
     Tree tree = null;
@@ -660,7 +649,7 @@
       treeNodeCriteria.add(Restrictions.eq(TreeNode.PROPERTY_NODE, bobId));
       TreeNode treeNode = (TreeNode) treeNodeCriteria.uniqueResult();
       BaseOBObject bob = OBDal.getInstance().get(entity.getName(), treeNode.getNode());
-      json = toJsonConverter.toJsonObject((BaseOBObject) bob, DataResolvingMode.FULL);
+      json = toJsonConverter.toJsonObject(bob, DataResolvingMode.FULL);
       json.put("nodeId", bobId);
       if (treeNode.getReportSet() == null) {
         json.put("parentId", ROOT_NODE_CLIENT);
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java	Tue Jun 02 12:57:37 2015 +0200
@@ -37,8 +37,6 @@
 public abstract class BaseDataSourceService implements DataSourceService {
   private static final Logger log = Logger.getLogger(BaseDataSourceService.class);
 
-  private static final long serialVersionUID = 1L;
-
   private String name;
   private Template template;
 
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java	Tue Jun 02 12:57:37 2015 +0200
@@ -44,8 +44,6 @@
 @ApplicationScoped
 public class DataSourceServiceProvider {
 
-  private static final long serialVersionUID = 1L;
-
   private Map<String, DataSourceService> dataSources = new ConcurrentHashMap<String, DataSourceService>();
 
   @Inject
@@ -122,7 +120,7 @@
     final OBCriteria<Table> qTable = OBDal.getInstance().createCriteria(Table.class);
     qTable.add(Restrictions.eq(Table.PROPERTY_NAME, tableName));
     if (!qTable.list().isEmpty()) {
-      Table table = (Table) qTable.list().get(0);
+      Table table = qTable.list().get(0);
       if (ApplicationConstants.DATASOURCEBASEDTABLE.equals(table.getDataOriginType())) {
         // If the table is based on a manual datasource, return that particular datasource
         dataSource = table.getObserdsDatasource();
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java	Tue Jun 02 12:57:37 2015 +0200
@@ -27,7 +27,6 @@
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.model.Entity;
-import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
 import org.openbravo.base.model.domaintype.DateDomainType;
 import org.openbravo.base.model.domaintype.DatetimeDomainType;
@@ -57,7 +56,6 @@
  * @author mtaal
  */
 public class DefaultDataSourceService extends BaseDataSourceService {
-  private static final long serialVersionUID = 1L;
   private static final Logger log4j = Logger.getLogger(DefaultDataSourceService.class);
 
   /*
@@ -112,7 +110,7 @@
         && parameters.containsKey(JsonConstants.TARGETRECORDID_PARAMETER)) {
       final String parentProperty = parameters.get(JsonConstants.FILTERBYPARENTPROPERTY_PARAMETER);
       final BaseOBObject bob = OBDal.getInstance().get(getEntity().getName(),
-          (String) parameters.get(JsonConstants.TARGETRECORDID_PARAMETER));
+          parameters.get(JsonConstants.TARGETRECORDID_PARAMETER));
 
       // a special case, a child tab actually displays the parent record
       // but a different set of information of that record
@@ -120,7 +118,7 @@
       if (bob.getId().equals(bob.get(parentProperty))) {
         parentId = (String) bob.getId();
       } else {
-        parentId = (String) DalUtil.getId((BaseOBObject) bob.get(parentProperty));
+        parentId = (String) DalUtil.getId(bob.get(parentProperty));
       }
 
       final String whereClause;
@@ -253,7 +251,6 @@
                   + "          and exists (from ADWindowAccess wa where f.tab.window = wa.window and wa.role.id = :roleId and wa.editableField = false and wa.active = true)))");
       fieldQuery.setNamedParameter("tabId", tab.getId());
       fieldQuery.setNamedParameter("roleId", roleId);
-      final Entity entity = ModelProvider.getInstance().getEntity(entityName);
       for (Field f : fieldQuery.list()) {
         String key = KernelUtils.getProperty(f).getName();
         if (data.has(key)) {
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java	Tue Jun 02 12:57:37 2015 +0200
@@ -231,11 +231,6 @@
    * Returns a hibernate query object based on the hql query, if the justCount parameter is true,
    * the query will just return the number of records that fulfill the criteria. If justCount is
    * false, the query will return all the actual records that fulfill the criteria
-   * 
-   * @param table
-   * @param parameters
-   * @param justCount
-   * @return
    */
   private Query getQuery(Table table, Map<String, String> parameters, boolean justCount) {
     OBContext.setAdminMode(true);
@@ -561,7 +556,6 @@
    *          filter created from the grid criteria
    * @param parameters
    *          parameters used for this request
-   * @return
    */
   private String addAdditionalFilters(Table table, String hqlQuery, String filterWhereClause,
       Map<String, String> parameters) {
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java	Tue Jun 02 12:57:37 2015 +0200
@@ -187,7 +187,6 @@
    *          hql where clase of the tab/selector
    * @param hqlWhereClauseRootNodes
    *          hql where clause that define what nodes are roots
-   * @return
    * @throws JSONException
    * @throws TooManyTreeNodesException
    *           if the number of returned nodes were to be too high
@@ -287,8 +286,7 @@
     final ScrollableResults scrollableResults = query.scroll(ScrollMode.FORWARD_ONLY);
     while (scrollableResults.next()) {
       BaseOBObject bob = (BaseOBObject) scrollableResults.get()[0];
-      final JSONObject json = toJsonConverter.toJsonObject((BaseOBObject) bob,
-          DataResolvingMode.FULL);
+      final JSONObject json = toJsonConverter.toJsonObject(bob, DataResolvingMode.FULL);
       if (fetchRoot) {
         json.put("parentId", ROOT_NODE_CLIENT);
       } else {
@@ -404,7 +402,6 @@
    *          bob with the node properties
    * @param hqlWhereClause
    *          where clause to be applied to the children
-   * @return
    */
   private boolean nodeHasChildren(Entity entity, Property linkToParentProperty,
       Property nodeIdProperty, BaseOBObject node, String hqlWhereClause) {
@@ -467,8 +464,7 @@
     OBDal.getInstance().flush();
     final DataToJsonConverter toJsonConverter = OBProvider.getInstance().get(
         DataToJsonConverter.class);
-    JSONObject updatedData = toJsonConverter.toJsonObject((BaseOBObject) bob,
-        DataResolvingMode.FULL);
+    JSONObject updatedData = toJsonConverter.toJsonObject(bob, DataResolvingMode.FULL);
     addNodeCommonAttributes(entity, bob, updatedData);
     updatedData.put("parentId", newParentId);
     updatedData.put("_hasChildren", (this.nodeHasChildren(entity, linkToParentProperty,
@@ -537,7 +533,6 @@
    *          id of the node to be checked
    * @param hqlWhereClause
    *          hql where clause to be applied
-   * @return
    */
   @Override
   protected boolean nodeConformsToWhereClause(TableTree tableTree, String nodeId,
@@ -604,7 +599,7 @@
 
     try {
       BaseOBObject bob = OBDal.getInstance().get(entity.getName(), bobId);
-      json = toJsonConverter.toJsonObject((BaseOBObject) bob, DataResolvingMode.FULL);
+      json = toJsonConverter.toJsonObject(bob, DataResolvingMode.FULL);
       if (fillNodeIdAndParentId) {
         String parentId = null;
         if (linkToParentProperty.isPrimitive()) {
@@ -618,7 +613,7 @@
         if (parentId != null) {
           json.put("parentId", parentId);
         } else {
-          json.put("parentId", (String) ROOT_NODE_CLIENT);
+          json.put("parentId", ROOT_NODE_CLIENT);
         }
         Object nodeId = bob.get(nodeIdProperty.getName());
         String nodeIdStr = null;
@@ -639,8 +634,6 @@
   }
 
   /**
-   * @param parameters
-   * @param nodeId
    * @return returns a json object with the definition of a node give its record id
    */
   @Override
@@ -849,8 +842,7 @@
     final ScrollableResults scrollableResults = query.scroll(ScrollMode.FORWARD_ONLY);
     while (scrollableResults.next()) {
       BaseOBObject bob = (BaseOBObject) scrollableResults.get()[0];
-      final JSONObject json = toJsonConverter.toJsonObject((BaseOBObject) bob,
-          DataResolvingMode.FULL);
+      final JSONObject json = toJsonConverter.toJsonObject(bob, DataResolvingMode.FULL);
 
       Object nodeId = bob.get(nodeIdProperty.getName());
       String nodeIdStr = null;
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java	Tue Jun 02 12:57:37 2015 +0200
@@ -47,7 +47,6 @@
   private static final String DATASOURCE_FIELD = "property";
   private static final String FORM_FIELD = "inpadTableId";
 
-  private static final long serialVersionUID = 1L;
   private static final Logger log = Logger.getLogger(ModelDataSourceService.class);
   private static final Property identifier = new Property();
 
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/NoteDataSource.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/NoteDataSource.java	Tue Jun 02 12:57:37 2015 +0200
@@ -94,7 +94,7 @@
     OBContext.setAdminMode(false);
     try {
       String noteId = parameters.get("id");
-      Note note = (Note) OBDal.getInstance().get(Note.class, noteId);
+      Note note = OBDal.getInstance().get(Note.class, noteId);
       Table table = note.getTable();
       String tableId = table.getId();
       String recordId = note.getRecord();
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java	Tue Jun 02 12:57:37 2015 +0200
@@ -45,8 +45,6 @@
 public abstract class ReadOnlyDataSourceService extends DefaultDataSourceService {
   private static final Logger log = Logger.getLogger(ReadOnlyDataSourceService.class);
 
-  private static final long serialVersionUID = 1L;
-
   /*
    * (non-Javadoc)
    * 
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java	Tue Jun 02 12:57:37 2015 +0200
@@ -685,7 +685,6 @@
    *          hqlWhereClause that defines the root nodes
    * @param tableTree
    *          tableTree that defines the tree category that defines the tree
-   * @return
    */
   private boolean isRoot(JSONObject node, String hqlTreeWhereClauseRootNodes, TableTree tableTree) {
     try {
@@ -715,7 +714,6 @@
    *          id of the node to be checked
    * @param hqlWhereClause
    *          hql where clause to be applied
-   * @return
    */
   protected abstract boolean nodeConformsToWhereClause(TableTree tableTree, String nodeId,
       String hqlWhereClause);
@@ -785,7 +783,6 @@
    *          hql where clase of the tab/selector
    * @param hqlWhereClauseRootNodes
    *          hql where clause that define what nodes are roots
-   * @return
    * @throws JSONException
    * @throws TooManyTreeNodesException
    *           if the number of returned nodes were to be too high
@@ -848,8 +845,7 @@
    *          previous values of the node, including its previous parent
    * @param prevNodeId
    * @param nextNodeId
-   *          new position of the node amont its peers
-   * @return
+   *          new position of the node amount its peers
    * @throws Exception
    */
   private String processNodeMovement(Map<String, String> parameters, JSONObject data,
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.26767]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.26767]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.26817]]></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.26767]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.26767]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.26767]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.26767]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.26767]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.26817]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Tue Jun 02 12:57:37 2015 +0200
@@ -141,7 +141,7 @@
   public List<JSONObject> toJsonObjects(List<BaseOBObject> bobs) {
     final List<JSONObject> jsonObjects = new ArrayList<JSONObject>();
     for (BaseOBObject bob : bobs) {
-      jsonObjects.add(toJsonObject((BaseOBObject) bob, DataResolvingMode.FULL));
+      jsonObjects.add(toJsonObject(bob, DataResolvingMode.FULL));
     }
     return jsonObjects;
   }
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Tue Jun 02 12:57:37 2015 +0200
@@ -554,9 +554,9 @@
       if (value == null) {
         value = (BaseOBObject) OBProvider.getInstance().get(entity.getName());
         // put it here, it must be imported later as a real object
-        newObjects.put(key, (BaseOBObject) value);
+        newObjects.put(key, value);
       }
-      keyToObject.put(key, (BaseOBObject) value);
+      keyToObject.put(key, value);
     } else {
       value = (BaseOBObject) OBProvider.getInstance().get(entity.getName());
     }
@@ -615,9 +615,9 @@
       if (value == null) {
         value = (BaseOBObject) OBProvider.getInstance().get(entity.getName());
         // put it here, it must be imported later as a real object
-        newObjects.put(key, (BaseOBObject) value);
+        newObjects.put(key, value);
       }
-      keyToObject.put(key, (BaseOBObject) value);
+      keyToObject.put(key, value);
     } else {
       value = (BaseOBObject) OBProvider.getInstance().get(entity.getName());
     }
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/QueryBuilder.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/QueryBuilder.java	Tue Jun 02 12:57:37 2015 +0200
@@ -58,8 +58,6 @@
 
   private static final Logger log = Logger.getLogger(QueryBuilder.class);
 
-  private static final long serialVersionUID = 1L;
-
   private Map<String, String> filterParameters = new HashMap<String, String>();
   private List<Object> typedParameters = new ArrayList<Object>();
   private Entity entity;
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.26767]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.26767]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.26817]]></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.26767]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.26817]]></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.26767]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.26817]]></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.26767]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.26817]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java	Tue Jun 02 12:57:37 2015 +0200
@@ -163,7 +163,8 @@
    * These include a filter clause:
    * <ul>
    * <li>for the main entity's client by the context's client.</li>
-   * <li>for the main entity's organization by an organization list see {@link #getOrgs(String)}</li>
+   * <li>for the main entity's organization by an organization list see
+   * {@link DataSourceUtils#getOrgs(String)}</li>
    * <li>with Selector's default filter expression.</li>
    * <li>for each default expression defined on the selector fields.</li>
    * <li>for each selector field in case exists a value for it on the parameters param.</li>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.26767]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.26767]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.26767]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.26767]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.26817]]></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.26767]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.26817]]></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.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <NAME><![CDATA[Log Clean Up Utility]]></NAME>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.26767]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.26817]]></VERSION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <DESCRIPTION><![CDATA[Log Clean Up Utility]]></DESCRIPTION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HELP><![CDATA[Utility to periodically cleanup log tables]]></HELP>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <URL><![CDATA[http://centralrepository.openbravo.com/heartbeat-server/org.openbravo.forge.ui/ForgeProjectDetail?projectId=7DC25E3B7ADE426CAD71E7804B95C1BF]]></URL>
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_MODULE_ID>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.26767]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.26817]]></STARTVERSION>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.26767]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.26767]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.26817]]></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.26767]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.26817]]></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.26767]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.26767]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.26767]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.26817]]></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.26767]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.26817]]></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.26767]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.26817]]></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.26767]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.26817]]></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.26767]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.26817]]></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.26767]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.26817]]></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.26767]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.26817]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.26767]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.26817]]></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 May 27 23:11:01 2015 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7,7 +7,7 @@
 <!--4D11E3A70650475381139522373CD191-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D11E3A70650475381139522373CD191-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--4D11E3A70650475381139522373CD191-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.26767]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.26817]]></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.26767]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.26817]]></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.26767]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.26817]]></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.26767]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.26817]]></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.26767]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.26817]]></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.26767]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.26817]]></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 @@
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_DEPENDENT_MODULE_ID>
-<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.26767]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.26817]]></STARTVERSION>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDANT_MODULE_NAME><![CDATA[Log Clean Up Utility]]></DEPENDANT_MODULE_NAME>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,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.26767]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.26817]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,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.26767]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.26817]]></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>
@@ -133,7 +133,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.26767]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.26817]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/src-core/src/org/openbravo/base/VariablesBase.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-core/src/org/openbravo/base/VariablesBase.java	Tue Jun 02 12:57:37 2015 +0200
@@ -1408,9 +1408,9 @@
     Object auxStr = null;
     try {
       if (session != null) {
-        auxStr = (Object) session.getAttribute(sessionAttribute.toUpperCase());
+        auxStr = session.getAttribute(sessionAttribute.toUpperCase());
       } else {
-        auxStr = (Object) sessionAttributes.get(sessionAttribute.toUpperCase());
+        auxStr = sessionAttributes.get(sessionAttribute.toUpperCase());
       }
     } catch (Exception e) {
       auxStr = null;
--- a/src-core/src/org/openbravo/xmlEngine/XmlVectorValue.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-core/src/org/openbravo/xmlEngine/XmlVectorValue.java	Tue Jun 02 12:57:37 2015 +0200
@@ -52,7 +52,6 @@
         if (xmlComponentValue.print() != null && !xmlComponentValue.print().startsWith("<")
             && !xmlComponentValue.print().equals("")) {
 
-          boolean isTranslated = false;
           result = xmlComponentValue.print().replace(String.valueOf((char) 160), " ").trim();
           log4jXmlVectorValue.debug("printStringBuffer(HashMap<String, String> textMap) - result: "
               + result);
Binary file src-db/database/lib/dbsourcemanager.jar has changed
--- a/src-db/database/model/tables/C_IMPORT_ENTRY.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/model/tables/C_IMPORT_ENTRY.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -33,10 +33,6 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="STORED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
-        <default><![CDATA[SYSDATE]]></default>
-        <onCreateDefault/>
-      </column>
       <column name="IMPORTED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false">
         <default><![CDATA[SYSDATE]]></default>
         <onCreateDefault/>
@@ -57,6 +53,13 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_ROLE" name="C_IMPORT_ENTRY_AD_ROLE">
+        <reference local="AD_ROLE_ID" foreign="AD_ROLE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_CLIENT" name="C_IMPORT_ENTRY_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -65,9 +68,7 @@
       </foreign-key>
       <index name="C_IMPORT_ENTRY_IDX" unique="false">
         <index-column name="IMPORTSTATUS"/>
-        <index-column name="STORED"/>
-        <index-column name="TYPEOFDATA"/>
-        <index-column name="AD_ORG_ID"/>
+        <index-column name="CREATED"/>
       </index>
     </table>
   </database>
--- a/src-db/database/model/tables/C_IMPORT_ENTRY_ARCHIVE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/model/tables/C_IMPORT_ENTRY_ARCHIVE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -33,10 +33,6 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="STORED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
-        <default><![CDATA[SYSDATE]]></default>
-        <onCreateDefault/>
-      </column>
       <column name="IMPORTED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false">
         <default><![CDATA[SYSDATE]]></default>
         <onCreateDefault/>
@@ -57,6 +53,13 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_ROLE" name="C_IMPORT_EA_AD_ROLE">
+        <reference local="AD_ROLE_ID" foreign="AD_ROLE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_CLIENT" name="C_IMPORT_EA_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/src-db/database/model/triggers/M_WAREHOUSE_TRG.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/model/triggers/M_WAREHOUSE_TRG.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -17,7 +17,7 @@
     * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
     * All Rights Reserved.
     * Contributor(s): Openbravo SLU
-    * Contributions are Copyright (C) 2001-2008 Openbravo, S.L.U.
+    * Contributions are Copyright (C) 2001-2015 Openbravo, S.L.U.
     *
     * Specifically, this derivative work is based upon the following Compiere
     * file and version.
@@ -72,11 +72,13 @@
         ;
     END LOOP;
   ELSIF (UPDATING) THEN
-    UPDATE M_WAREHOUSE_ACCT SET AD_ORG_ID = :new.AD_ORG_ID
-    WHERE M_WAREHOUSE_ID = :new.M_WAREHOUSE_ID;
+    IF (:new.AD_ORG_ID <> :old.AD_ORG_ID) THEN
+      UPDATE M_WAREHOUSE_ACCT SET AD_ORG_ID = :new.AD_ORG_ID
+      WHERE M_WAREHOUSE_ID = :new.M_WAREHOUSE_ID;
     
-    UPDATE M_LOCATOR SET AD_ORG_ID = :new.AD_ORG_ID
-    WHERE M_WAREHOUSE_ID = :new.M_WAREHOUSE_ID;
+      UPDATE M_LOCATOR SET AD_ORG_ID = :new.AD_ORG_ID
+      WHERE M_WAREHOUSE_ID = :new.M_WAREHOUSE_ID;
+    END IF;
   END IF;
 END M_WAREHOUSE_TRG
 ]]></body>
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -2068,6 +2068,17 @@
 <!--571778C5E2AD4A13BDD7DD15A4DA470E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--571778C5E2AD4A13BDD7DD15A4DA470E--></AD_AUXILIARINPUT>
 
+<!--57C6F047656D4BB2B7D987BFA8C028B8--><AD_AUXILIARINPUT>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <AD_AUXILIARINPUT_ID><![CDATA[57C6F047656D4BB2B7D987BFA8C028B8]]></AD_AUXILIARINPUT_ID>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <CODE><![CDATA[APP]]></CODE>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--57C6F047656D4BB2B7D987BFA8C028B8--></AD_AUXILIARINPUT>
+
 <!--580450E783674E3B8C03B76B49613CF2--><AD_AUXILIARINPUT>
 <!--580450E783674E3B8C03B76B49613CF2-->  <AD_AUXILIARINPUT_ID><![CDATA[580450E783674E3B8C03B76B49613CF2]]></AD_AUXILIARINPUT_ID>
 <!--580450E783674E3B8C03B76B49613CF2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2935,6 +2946,17 @@
 <!--991A2EBD0227461DA2792317D75F576F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--991A2EBD0227461DA2792317D75F576F--></AD_AUXILIARINPUT>
 
+<!--9B3FBCD97DCE4611A67532F8611161F0--><AD_AUXILIARINPUT>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <AD_AUXILIARINPUT_ID><![CDATA[9B3FBCD97DCE4611A67532F8611161F0]]></AD_AUXILIARINPUT_ID>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <CODE><![CDATA[ARR]]></CODE>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9B3FBCD97DCE4611A67532F8611161F0--></AD_AUXILIARINPUT>
+
 <!--9B8DEEF369014E938A73D766890AE941--><AD_AUXILIARINPUT>
 <!--9B8DEEF369014E938A73D766890AE941-->  <AD_AUXILIARINPUT_ID><![CDATA[9B8DEEF369014E938A73D766890AE941]]></AD_AUXILIARINPUT_ID>
 <!--9B8DEEF369014E938A73D766890AE941-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -222222,7 +222222,7 @@
 <!--00568254CB928733E050007F01000513-->  <COLUMNNAME><![CDATA[M_Inoutline_ID]]></COLUMNNAME>
 <!--00568254CB928733E050007F01000513-->  <AD_TABLE_ID><![CDATA[FC90AED3E5ED45CAB28A1FF2D571FB99]]></AD_TABLE_ID>
 <!--00568254CB928733E050007F01000513-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
-<!--00568254CB928733E050007F01000513-->  <AD_REFERENCE_VALUE_ID><![CDATA[224C53E343404771A44494C2AD51DAF3]]></AD_REFERENCE_VALUE_ID>
+<!--00568254CB928733E050007F01000513-->  <AD_REFERENCE_VALUE_ID><![CDATA[1A431A28EC2E48BF990DFA1C12C962B3]]></AD_REFERENCE_VALUE_ID>
 <!--00568254CB928733E050007F01000513-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--00568254CB928733E050007F01000513-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--00568254CB928733E050007F01000513-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -224267,6 +224267,41 @@
 <!--02EB43A0A82D41B88ECE38232D0E9636-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--02EB43A0A82D41B88ECE38232D0E9636--></AD_COLUMN>
 
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3--><AD_COLUMN>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <AD_COLUMN_ID><![CDATA[02EDB5224DE54FBBA4DD9AA1C02CC5D3]]></AD_COLUMN_ID>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <NAME><![CDATA[Role]]></NAME>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <DESCRIPTION><![CDATA[The profile of security for the user defining what windows and tabs they can see.]]></DESCRIPTION>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <HELP><![CDATA[The Role determines security and access a user who has this Role will have in the System.]]></HELP>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <COLUMNNAME><![CDATA[AD_Role_ID]]></COLUMNNAME>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <AD_TABLE_ID><![CDATA[C2968EF014C146B99A0C136BA9D6331F]]></AD_TABLE_ID>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <AD_ELEMENT_ID><![CDATA[123]]></AD_ELEMENT_ID>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <POSITION><![CDATA[16]]></POSITION>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--02EDB5224DE54FBBA4DD9AA1C02CC5D3--></AD_COLUMN>
+
 <!--02F5245E7C6B4829AD55F3760808027F--><AD_COLUMN>
 <!--02F5245E7C6B4829AD55F3760808027F-->  <AD_COLUMN_ID><![CDATA[02F5245E7C6B4829AD55F3760808027F]]></AD_COLUMN_ID>
 <!--02F5245E7C6B4829AD55F3760808027F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -225383,6 +225418,41 @@
 <!--06146353992C48FE945CB1C60A28E7FC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--06146353992C48FE945CB1C60A28E7FC--></AD_COLUMN>
 
+<!--062D7EC34B074DC4BF2BB6A1E973D171--><AD_COLUMN>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <AD_COLUMN_ID><![CDATA[062D7EC34B074DC4BF2BB6A1E973D171]]></AD_COLUMN_ID>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <NAME><![CDATA[DueDate]]></NAME>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <COLUMNNAME><![CDATA[DueDate]]></COLUMNNAME>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <SEQNO><![CDATA[250]]></SEQNO>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <AD_ELEMENT_ID><![CDATA[2000]]></AD_ELEMENT_ID>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--062D7EC34B074DC4BF2BB6A1E973D171-->  <SQLLOGIC><![CDATA[(select ps.duedate from FIN_Payment_ScheduleDetail psd, FIN_Payment_Schedule ps where ps.FIN_Payment_Schedule_ID = coalesce(psd.fin_payment_schedule_invoice, psd.fin_payment_schedule_order) and psd.FIN_Payment_ScheduleDetail_ID = fin_payment_scheduledetail_id)]]></SQLLOGIC>
+<!--062D7EC34B074DC4BF2BB6A1E973D171--></AD_COLUMN>
+
 <!--0665AD61112844B18C999D519EDB12A0--><AD_COLUMN>
 <!--0665AD61112844B18C999D519EDB12A0-->  <AD_COLUMN_ID><![CDATA[0665AD61112844B18C999D519EDB12A0]]></AD_COLUMN_ID>
 <!--0665AD61112844B18C999D519EDB12A0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -236836,7 +236906,7 @@
 <!--393102FB4B954F58A9D8223E19453EC6-->  <COLUMNNAME><![CDATA[Jsoninfo]]></COLUMNNAME>
 <!--393102FB4B954F58A9D8223E19453EC6-->  <AD_TABLE_ID><![CDATA[1B19E761F8E24E00B5FBF2C22082A006]]></AD_TABLE_ID>
 <!--393102FB4B954F58A9D8223E19453EC6-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
-<!--393102FB4B954F58A9D8223E19453EC6-->  <FIELDLENGTH><![CDATA[1000000]]></FIELDLENGTH>
+<!--393102FB4B954F58A9D8223E19453EC6-->  <FIELDLENGTH><![CDATA[10000000]]></FIELDLENGTH>
 <!--393102FB4B954F58A9D8223E19453EC6-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--393102FB4B954F58A9D8223E19453EC6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--393102FB4B954F58A9D8223E19453EC6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -257080,7 +257150,6 @@
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--5BC978BD972A4CB9936D7B5794153BE1-->  <READONLYLOGIC><![CDATA['Y' = 'Y']]></READONLYLOGIC>
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <SEQNO><![CDATA[140]]></SEQNO>
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -287155,6 +287224,39 @@
 <!--831B272EE4364C208EFA70098EDF29B4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--831B272EE4364C208EFA70098EDF29B4--></AD_COLUMN>
 
+<!--831F84E0E0904C22B9E00AD729DDECAE--><AD_COLUMN>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <AD_COLUMN_ID><![CDATA[831F84E0E0904C22B9E00AD729DDECAE]]></AD_COLUMN_ID>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <NAME><![CDATA[Invoice Amount]]></NAME>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <COLUMNNAME><![CDATA[InvoiceAmount]]></COLUMNNAME>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <SEQNO><![CDATA[270]]></SEQNO>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <AD_ELEMENT_ID><![CDATA[D81D859886DB4CA4910DBC340EAF3D5F]]></AD_ELEMENT_ID>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--831F84E0E0904C22B9E00AD729DDECAE-->  <SQLLOGIC><![CDATA[(select coalesce(c_invoice.grandtotal, c_order.grandtotal) from FIN_Payment_ScheduleDetail psd, FIN_Payment_Schedule ps left join c_invoice on c_invoice.c_invoice_id = ps.c_invoice_id left join c_order on c_order.c_order_id = ps.c_order_id where ps.FIN_Payment_Schedule_ID = coalesce(psd.fin_payment_schedule_invoice, psd.fin_payment_schedule_order) and psd.FIN_Payment_ScheduleDetail_ID = fin_payment_scheduledetail_id)]]></SQLLOGIC>
+<!--831F84E0E0904C22B9E00AD729DDECAE--></AD_COLUMN>
+
 <!--8340585805C35071E040007F01001EE8--><AD_COLUMN>
 <!--8340585805C35071E040007F01001EE8-->  <AD_COLUMN_ID><![CDATA[8340585805C35071E040007F01001EE8]]></AD_COLUMN_ID>
 <!--8340585805C35071E040007F01001EE8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -288125,6 +288227,39 @@
 <!--860C49EAB8D44C8693ADEA903154030F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--860C49EAB8D44C8693ADEA903154030F--></AD_COLUMN>
 
+<!--8638D66DE4474084BC8F44BEEF3C9F22--><AD_COLUMN>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <AD_COLUMN_ID><![CDATA[8638D66DE4474084BC8F44BEEF3C9F22]]></AD_COLUMN_ID>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <NAME><![CDATA[Expected]]></NAME>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <COLUMNNAME><![CDATA[ExpectedAmount]]></COLUMNNAME>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <SEQNO><![CDATA[260]]></SEQNO>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <AD_ELEMENT_ID><![CDATA[F0D23ADDB5B6410F8DE5CE121EEE2121]]></AD_ELEMENT_ID>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8638D66DE4474084BC8F44BEEF3C9F22-->  <SQLLOGIC><![CDATA[(select ps.amount from FIN_Payment_ScheduleDetail psd, FIN_Payment_Schedule ps where ps.FIN_Payment_Schedule_ID = coalesce(psd.fin_payment_schedule_invoice, psd.fin_payment_schedule_order) and psd.FIN_Payment_ScheduleDetail_ID = fin_payment_scheduledetail_id)]]></SQLLOGIC>
+<!--8638D66DE4474084BC8F44BEEF3C9F22--></AD_COLUMN>
+
 <!--86486D2A475A452DB3A739D1FA2F5F4E--><AD_COLUMN>
 <!--86486D2A475A452DB3A739D1FA2F5F4E-->  <AD_COLUMN_ID><![CDATA[86486D2A475A452DB3A739D1FA2F5F4E]]></AD_COLUMN_ID>
 <!--86486D2A475A452DB3A739D1FA2F5F4E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -302250,7 +302385,7 @@
 <!--9FD5B3AAA35C42B39EC38CA5BDE5BF1F-->  <COLUMNNAME><![CDATA[Jsoninfo]]></COLUMNNAME>
 <!--9FD5B3AAA35C42B39EC38CA5BDE5BF1F-->  <AD_TABLE_ID><![CDATA[C2968EF014C146B99A0C136BA9D6331F]]></AD_TABLE_ID>
 <!--9FD5B3AAA35C42B39EC38CA5BDE5BF1F-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
-<!--9FD5B3AAA35C42B39EC38CA5BDE5BF1F-->  <FIELDLENGTH><![CDATA[1000000]]></FIELDLENGTH>
+<!--9FD5B3AAA35C42B39EC38CA5BDE5BF1F-->  <FIELDLENGTH><![CDATA[10000000]]></FIELDLENGTH>
 <!--9FD5B3AAA35C42B39EC38CA5BDE5BF1F-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--9FD5B3AAA35C42B39EC38CA5BDE5BF1F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--9FD5B3AAA35C42B39EC38CA5BDE5BF1F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -303791,40 +303926,6 @@
 <!--A437240FB0894CFFAA0C96A925D69141-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A437240FB0894CFFAA0C96A925D69141--></AD_COLUMN>
 
-<!--A442A53BD7A54C618FB7FCA289FA114D--><AD_COLUMN>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <AD_COLUMN_ID><![CDATA[A442A53BD7A54C618FB7FCA289FA114D]]></AD_COLUMN_ID>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <NAME><![CDATA[Stored]]></NAME>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <COLUMNNAME><![CDATA[Stored]]></COLUMNNAME>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <AD_TABLE_ID><![CDATA[1B19E761F8E24E00B5FBF2C22082A006]]></AD_TABLE_ID>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <SEQNO><![CDATA[90]]></SEQNO>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <AD_ELEMENT_ID><![CDATA[0F7DEEB13D924F28BFBA3AD34079C231]]></AD_ELEMENT_ID>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <POSITION><![CDATA[9]]></POSITION>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--A442A53BD7A54C618FB7FCA289FA114D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--A442A53BD7A54C618FB7FCA289FA114D--></AD_COLUMN>
-
 <!--A474A30DFC524BDFA5D17CE7F4D317A1--><AD_COLUMN>
 <!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <AD_COLUMN_ID><![CDATA[A474A30DFC524BDFA5D17CE7F4D317A1]]></AD_COLUMN_ID>
 <!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -304364,40 +304465,6 @@
 <!--A61D7183726147BA82B75A3339BC6D21-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A61D7183726147BA82B75A3339BC6D21--></AD_COLUMN>
 
-<!--A655AE8B366D4FE1A52BA9F10510457F--><AD_COLUMN>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <AD_COLUMN_ID><![CDATA[A655AE8B366D4FE1A52BA9F10510457F]]></AD_COLUMN_ID>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <NAME><![CDATA[Stored]]></NAME>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <COLUMNNAME><![CDATA[Stored]]></COLUMNNAME>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <AD_TABLE_ID><![CDATA[C2968EF014C146B99A0C136BA9D6331F]]></AD_TABLE_ID>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <SEQNO><![CDATA[90]]></SEQNO>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <AD_ELEMENT_ID><![CDATA[0F7DEEB13D924F28BFBA3AD34079C231]]></AD_ELEMENT_ID>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <POSITION><![CDATA[9]]></POSITION>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--A655AE8B366D4FE1A52BA9F10510457F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--A655AE8B366D4FE1A52BA9F10510457F--></AD_COLUMN>
-
 <!--A6730B8F9A5F4EADA0976C1FF09CF66F--><AD_COLUMN>
 <!--A6730B8F9A5F4EADA0976C1FF09CF66F-->  <AD_COLUMN_ID><![CDATA[A6730B8F9A5F4EADA0976C1FF09CF66F]]></AD_COLUMN_ID>
 <!--A6730B8F9A5F4EADA0976C1FF09CF66F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -325787,6 +325854,41 @@
 <!--D4F7FC47E23A499CA0445FFD58BC5A81-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D4F7FC47E23A499CA0445FFD58BC5A81--></AD_COLUMN>
 
+<!--D51CD55DE2D441ED99283A396909336F--><AD_COLUMN>
+<!--D51CD55DE2D441ED99283A396909336F-->  <AD_COLUMN_ID><![CDATA[D51CD55DE2D441ED99283A396909336F]]></AD_COLUMN_ID>
+<!--D51CD55DE2D441ED99283A396909336F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D51CD55DE2D441ED99283A396909336F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D51CD55DE2D441ED99283A396909336F-->  <NAME><![CDATA[Role]]></NAME>
+<!--D51CD55DE2D441ED99283A396909336F-->  <DESCRIPTION><![CDATA[The profile of security for the user defining what windows and tabs they can see.]]></DESCRIPTION>
+<!--D51CD55DE2D441ED99283A396909336F-->  <HELP><![CDATA[The Role determines security and access a user who has this Role will have in the System.]]></HELP>
+<!--D51CD55DE2D441ED99283A396909336F-->  <COLUMNNAME><![CDATA[AD_Role_ID]]></COLUMNNAME>
+<!--D51CD55DE2D441ED99283A396909336F-->  <AD_TABLE_ID><![CDATA[1B19E761F8E24E00B5FBF2C22082A006]]></AD_TABLE_ID>
+<!--D51CD55DE2D441ED99283A396909336F-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--D51CD55DE2D441ED99283A396909336F-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D51CD55DE2D441ED99283A396909336F-->  <SEQNO><![CDATA[170]]></SEQNO>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D51CD55DE2D441ED99283A396909336F-->  <AD_ELEMENT_ID><![CDATA[123]]></AD_ELEMENT_ID>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D51CD55DE2D441ED99283A396909336F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D51CD55DE2D441ED99283A396909336F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D51CD55DE2D441ED99283A396909336F-->  <POSITION><![CDATA[16]]></POSITION>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D51CD55DE2D441ED99283A396909336F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D51CD55DE2D441ED99283A396909336F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D51CD55DE2D441ED99283A396909336F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D51CD55DE2D441ED99283A396909336F--></AD_COLUMN>
+
 <!--D5B00732731F427381C26651F24F2B66--><AD_COLUMN>
 <!--D5B00732731F427381C26651F24F2B66-->  <AD_COLUMN_ID><![CDATA[D5B00732731F427381C26651F24F2B66]]></AD_COLUMN_ID>
 <!--D5B00732731F427381C26651F24F2B66-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -329419,7 +329521,7 @@
 <!--D9A9BEACE89C41AE8035A4F7D892E5CC-->  <COLUMNNAME><![CDATA[Errorinfo]]></COLUMNNAME>
 <!--D9A9BEACE89C41AE8035A4F7D892E5CC-->  <AD_TABLE_ID><![CDATA[C2968EF014C146B99A0C136BA9D6331F]]></AD_TABLE_ID>
 <!--D9A9BEACE89C41AE8035A4F7D892E5CC-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
-<!--D9A9BEACE89C41AE8035A4F7D892E5CC-->  <FIELDLENGTH><![CDATA[1000000]]></FIELDLENGTH>
+<!--D9A9BEACE89C41AE8035A4F7D892E5CC-->  <FIELDLENGTH><![CDATA[10000000]]></FIELDLENGTH>
 <!--D9A9BEACE89C41AE8035A4F7D892E5CC-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--D9A9BEACE89C41AE8035A4F7D892E5CC-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--D9A9BEACE89C41AE8035A4F7D892E5CC-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -330968,7 +331070,7 @@
 <!--DD072B18A9034797933D9A21E46A2D62-->  <COLUMNNAME><![CDATA[Errorinfo]]></COLUMNNAME>
 <!--DD072B18A9034797933D9A21E46A2D62-->  <AD_TABLE_ID><![CDATA[1B19E761F8E24E00B5FBF2C22082A006]]></AD_TABLE_ID>
 <!--DD072B18A9034797933D9A21E46A2D62-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
-<!--DD072B18A9034797933D9A21E46A2D62-->  <FIELDLENGTH><![CDATA[1000000]]></FIELDLENGTH>
+<!--DD072B18A9034797933D9A21E46A2D62-->  <FIELDLENGTH><![CDATA[10000000]]></FIELDLENGTH>
 <!--DD072B18A9034797933D9A21E46A2D62-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--DD072B18A9034797933D9A21E46A2D62-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--DD072B18A9034797933D9A21E46A2D62-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
--- a/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -52,6 +52,19 @@
 <!--00421E0B29274BB29CB3AED8DBEBFDDE-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--00421E0B29274BB29CB3AED8DBEBFDDE--></AD_DIMENSION_MAPPING>
 
+<!--00A7D847D921409F9FFE0F33DCFC2671--><AD_DIMENSION_MAPPING>
+<!--00A7D847D921409F9FFE0F33DCFC2671-->  <AD_DIMENSION_MAPPING_ID><![CDATA[00A7D847D921409F9FFE0F33DCFC2671]]></AD_DIMENSION_MAPPING_ID>
+<!--00A7D847D921409F9FFE0F33DCFC2671-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--00A7D847D921409F9FFE0F33DCFC2671-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--00A7D847D921409F9FFE0F33DCFC2671-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--00A7D847D921409F9FFE0F33DCFC2671-->  <DIMENSION><![CDATA[BP]]></DIMENSION>
+<!--00A7D847D921409F9FFE0F33DCFC2671-->  <DOCBASETYPE><![CDATA[APP]]></DOCBASETYPE>
+<!--00A7D847D921409F9FFE0F33DCFC2671-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--00A7D847D921409F9FFE0F33DCFC2671-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--00A7D847D921409F9FFE0F33DCFC2671-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--00A7D847D921409F9FFE0F33DCFC2671-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--00A7D847D921409F9FFE0F33DCFC2671--></AD_DIMENSION_MAPPING>
+
 <!--00EDB5E1044E441E9F03350F62046570--><AD_DIMENSION_MAPPING>
 <!--00EDB5E1044E441E9F03350F62046570-->  <AD_DIMENSION_MAPPING_ID><![CDATA[00EDB5E1044E441E9F03350F62046570]]></AD_DIMENSION_MAPPING_ID>
 <!--00EDB5E1044E441E9F03350F62046570-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -299,6 +312,19 @@
 <!--095908A0A6544532B7413ACEA01E54A4-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
 <!--095908A0A6544532B7413ACEA01E54A4--></AD_DIMENSION_MAPPING>
 
+<!--09D6DC2780E44CA08C4605AE346755F6--><AD_DIMENSION_MAPPING>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <AD_DIMENSION_MAPPING_ID><![CDATA[09D6DC2780E44CA08C4605AE346755F6]]></AD_DIMENSION_MAPPING_ID>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <DIMENSION><![CDATA[U1]]></DIMENSION>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <DOCBASETYPE><![CDATA[APP]]></DOCBASETYPE>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--09D6DC2780E44CA08C4605AE346755F6--></AD_DIMENSION_MAPPING>
+
 <!--0A122FCE059342EBAE5A41CAB5AA0C1F--><AD_DIMENSION_MAPPING>
 <!--0A122FCE059342EBAE5A41CAB5AA0C1F-->  <AD_DIMENSION_MAPPING_ID><![CDATA[0A122FCE059342EBAE5A41CAB5AA0C1F]]></AD_DIMENSION_MAPPING_ID>
 <!--0A122FCE059342EBAE5A41CAB5AA0C1F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -845,6 +871,19 @@
 <!--3123CF4C6AF74F6196DB3A095E08E987-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--3123CF4C6AF74F6196DB3A095E08E987--></AD_DIMENSION_MAPPING>
 
+<!--31D018BB1C8641E4B20C0480E32FB67C--><AD_DIMENSION_MAPPING>
+<!--31D018BB1C8641E4B20C0480E32FB67C-->  <AD_DIMENSION_MAPPING_ID><![CDATA[31D018BB1C8641E4B20C0480E32FB67C]]></AD_DIMENSION_MAPPING_ID>
+<!--31D018BB1C8641E4B20C0480E32FB67C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--31D018BB1C8641E4B20C0480E32FB67C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--31D018BB1C8641E4B20C0480E32FB67C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--31D018BB1C8641E4B20C0480E32FB67C-->  <DIMENSION><![CDATA[PJ]]></DIMENSION>
+<!--31D018BB1C8641E4B20C0480E32FB67C-->  <DOCBASETYPE><![CDATA[APP]]></DOCBASETYPE>
+<!--31D018BB1C8641E4B20C0480E32FB67C-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--31D018BB1C8641E4B20C0480E32FB67C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--31D018BB1C8641E4B20C0480E32FB67C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--31D018BB1C8641E4B20C0480E32FB67C-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--31D018BB1C8641E4B20C0480E32FB67C--></AD_DIMENSION_MAPPING>
+
 <!--331591AA3524415ABC74EB1F74408A2B--><AD_DIMENSION_MAPPING>
 <!--331591AA3524415ABC74EB1F74408A2B-->  <AD_DIMENSION_MAPPING_ID><![CDATA[331591AA3524415ABC74EB1F74408A2B]]></AD_DIMENSION_MAPPING_ID>
 <!--331591AA3524415ABC74EB1F74408A2B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1313,6 +1352,19 @@
 <!--4A802D177AF54248B69D73492B74EEFF-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--4A802D177AF54248B69D73492B74EEFF--></AD_DIMENSION_MAPPING>
 
+<!--4BD403FD08674545A2FDDEEC89C927D6--><AD_DIMENSION_MAPPING>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <AD_DIMENSION_MAPPING_ID><![CDATA[4BD403FD08674545A2FDDEEC89C927D6]]></AD_DIMENSION_MAPPING_ID>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <DIMENSION><![CDATA[CC]]></DIMENSION>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <DOCBASETYPE><![CDATA[ARR]]></DOCBASETYPE>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--4BD403FD08674545A2FDDEEC89C927D6--></AD_DIMENSION_MAPPING>
+
 <!--4E3EED08E1F44D099C7E7D7551452AAC--><AD_DIMENSION_MAPPING>
 <!--4E3EED08E1F44D099C7E7D7551452AAC-->  <AD_DIMENSION_MAPPING_ID><![CDATA[4E3EED08E1F44D099C7E7D7551452AAC]]></AD_DIMENSION_MAPPING_ID>
 <!--4E3EED08E1F44D099C7E7D7551452AAC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1586,6 +1638,19 @@
 <!--58628F7C27B64407A6AEF11462F2CB13-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--58628F7C27B64407A6AEF11462F2CB13--></AD_DIMENSION_MAPPING>
 
+<!--58B170496DCF4E979C85F35E60CB65E0--><AD_DIMENSION_MAPPING>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <AD_DIMENSION_MAPPING_ID><![CDATA[58B170496DCF4E979C85F35E60CB65E0]]></AD_DIMENSION_MAPPING_ID>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <DIMENSION><![CDATA[U2]]></DIMENSION>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <DOCBASETYPE><![CDATA[ARR]]></DOCBASETYPE>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--58B170496DCF4E979C85F35E60CB65E0--></AD_DIMENSION_MAPPING>
+
 <!--58C8138C329A4C6C97FB3118CFDA9C75--><AD_DIMENSION_MAPPING>
 <!--58C8138C329A4C6C97FB3118CFDA9C75-->  <AD_DIMENSION_MAPPING_ID><![CDATA[58C8138C329A4C6C97FB3118CFDA9C75]]></AD_DIMENSION_MAPPING_ID>
 <!--58C8138C329A4C6C97FB3118CFDA9C75-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1716,6 +1781,19 @@
 <!--5DC26CC3C7B34D9A97A6EEA3EEB18EA3-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
 <!--5DC26CC3C7B34D9A97A6EEA3EEB18EA3--></AD_DIMENSION_MAPPING>
 
+<!--5E737C153A6E4CFF8182518F6922CC51--><AD_DIMENSION_MAPPING>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <AD_DIMENSION_MAPPING_ID><![CDATA[5E737C153A6E4CFF8182518F6922CC51]]></AD_DIMENSION_MAPPING_ID>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <DIMENSION><![CDATA[U2]]></DIMENSION>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <DOCBASETYPE><![CDATA[APP]]></DOCBASETYPE>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--5E737C153A6E4CFF8182518F6922CC51--></AD_DIMENSION_MAPPING>
+
 <!--5F06327AFA8442E481CEF2853440DBB2--><AD_DIMENSION_MAPPING>
 <!--5F06327AFA8442E481CEF2853440DBB2-->  <AD_DIMENSION_MAPPING_ID><![CDATA[5F06327AFA8442E481CEF2853440DBB2]]></AD_DIMENSION_MAPPING_ID>
 <!--5F06327AFA8442E481CEF2853440DBB2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2548,6 +2626,19 @@
 <!--861BE97C472041B0BE72863348F79C13-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
 <!--861BE97C472041B0BE72863348F79C13--></AD_DIMENSION_MAPPING>
 
+<!--862D99D1B343407DA00824A10E98B46C--><AD_DIMENSION_MAPPING>
+<!--862D99D1B343407DA00824A10E98B46C-->  <AD_DIMENSION_MAPPING_ID><![CDATA[862D99D1B343407DA00824A10E98B46C]]></AD_DIMENSION_MAPPING_ID>
+<!--862D99D1B343407DA00824A10E98B46C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--862D99D1B343407DA00824A10E98B46C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--862D99D1B343407DA00824A10E98B46C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--862D99D1B343407DA00824A10E98B46C-->  <DIMENSION><![CDATA[U1]]></DIMENSION>
+<!--862D99D1B343407DA00824A10E98B46C-->  <DOCBASETYPE><![CDATA[ARR]]></DOCBASETYPE>
+<!--862D99D1B343407DA00824A10E98B46C-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--862D99D1B343407DA00824A10E98B46C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--862D99D1B343407DA00824A10E98B46C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--862D99D1B343407DA00824A10E98B46C-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--862D99D1B343407DA00824A10E98B46C--></AD_DIMENSION_MAPPING>
+
 <!--865501E11C9A4684B82183F07808C04A--><AD_DIMENSION_MAPPING>
 <!--865501E11C9A4684B82183F07808C04A-->  <AD_DIMENSION_MAPPING_ID><![CDATA[865501E11C9A4684B82183F07808C04A]]></AD_DIMENSION_MAPPING_ID>
 <!--865501E11C9A4684B82183F07808C04A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3354,6 +3445,19 @@
 <!--ABDF79D2B4734040B5B3B2779DCAC2AA-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--ABDF79D2B4734040B5B3B2779DCAC2AA--></AD_DIMENSION_MAPPING>
 
+<!--AC5B5070283949308A42918B2C21A198--><AD_DIMENSION_MAPPING>
+<!--AC5B5070283949308A42918B2C21A198-->  <AD_DIMENSION_MAPPING_ID><![CDATA[AC5B5070283949308A42918B2C21A198]]></AD_DIMENSION_MAPPING_ID>
+<!--AC5B5070283949308A42918B2C21A198-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AC5B5070283949308A42918B2C21A198-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AC5B5070283949308A42918B2C21A198-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AC5B5070283949308A42918B2C21A198-->  <DIMENSION><![CDATA[PR]]></DIMENSION>
+<!--AC5B5070283949308A42918B2C21A198-->  <DOCBASETYPE><![CDATA[ARR]]></DOCBASETYPE>
+<!--AC5B5070283949308A42918B2C21A198-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--AC5B5070283949308A42918B2C21A198-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AC5B5070283949308A42918B2C21A198-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--AC5B5070283949308A42918B2C21A198-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--AC5B5070283949308A42918B2C21A198--></AD_DIMENSION_MAPPING>
+
 <!--AC5E12A8EFB240FEA21FBF8ECA8A5508--><AD_DIMENSION_MAPPING>
 <!--AC5E12A8EFB240FEA21FBF8ECA8A5508-->  <AD_DIMENSION_MAPPING_ID><![CDATA[AC5E12A8EFB240FEA21FBF8ECA8A5508]]></AD_DIMENSION_MAPPING_ID>
 <!--AC5E12A8EFB240FEA21FBF8ECA8A5508-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3809,6 +3913,19 @@
 <!--C41B18CCEE734FF1B29D27DA98EB30C8-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
 <!--C41B18CCEE734FF1B29D27DA98EB30C8--></AD_DIMENSION_MAPPING>
 
+<!--C6F3C76862864DACACFD8369DD9C4C5F--><AD_DIMENSION_MAPPING>
+<!--C6F3C76862864DACACFD8369DD9C4C5F-->  <AD_DIMENSION_MAPPING_ID><![CDATA[C6F3C76862864DACACFD8369DD9C4C5F]]></AD_DIMENSION_MAPPING_ID>
+<!--C6F3C76862864DACACFD8369DD9C4C5F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C6F3C76862864DACACFD8369DD9C4C5F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C6F3C76862864DACACFD8369DD9C4C5F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C6F3C76862864DACACFD8369DD9C4C5F-->  <DIMENSION><![CDATA[PJ]]></DIMENSION>
+<!--C6F3C76862864DACACFD8369DD9C4C5F-->  <DOCBASETYPE><![CDATA[ARR]]></DOCBASETYPE>
+<!--C6F3C76862864DACACFD8369DD9C4C5F-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--C6F3C76862864DACACFD8369DD9C4C5F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C6F3C76862864DACACFD8369DD9C4C5F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C6F3C76862864DACACFD8369DD9C4C5F-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--C6F3C76862864DACACFD8369DD9C4C5F--></AD_DIMENSION_MAPPING>
+
 <!--C78416FDDFA249988D6AEA6E30893D76--><AD_DIMENSION_MAPPING>
 <!--C78416FDDFA249988D6AEA6E30893D76-->  <AD_DIMENSION_MAPPING_ID><![CDATA[C78416FDDFA249988D6AEA6E30893D76]]></AD_DIMENSION_MAPPING_ID>
 <!--C78416FDDFA249988D6AEA6E30893D76-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3848,6 +3965,19 @@
 <!--C8A257C01F764EAFBDDE8E9BD0EFE9E7-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--C8A257C01F764EAFBDDE8E9BD0EFE9E7--></AD_DIMENSION_MAPPING>
 
+<!--C8BF3702DFFF40B99F32A3747758F58C--><AD_DIMENSION_MAPPING>
+<!--C8BF3702DFFF40B99F32A3747758F58C-->  <AD_DIMENSION_MAPPING_ID><![CDATA[C8BF3702DFFF40B99F32A3747758F58C]]></AD_DIMENSION_MAPPING_ID>
+<!--C8BF3702DFFF40B99F32A3747758F58C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C8BF3702DFFF40B99F32A3747758F58C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C8BF3702DFFF40B99F32A3747758F58C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C8BF3702DFFF40B99F32A3747758F58C-->  <DIMENSION><![CDATA[BP]]></DIMENSION>
+<!--C8BF3702DFFF40B99F32A3747758F58C-->  <DOCBASETYPE><![CDATA[ARR]]></DOCBASETYPE>
+<!--C8BF3702DFFF40B99F32A3747758F58C-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--C8BF3702DFFF40B99F32A3747758F58C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C8BF3702DFFF40B99F32A3747758F58C-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--C8BF3702DFFF40B99F32A3747758F58C-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--C8BF3702DFFF40B99F32A3747758F58C--></AD_DIMENSION_MAPPING>
+
 <!--C921C6C2B7574863B76C4AC68DE48ED1--><AD_DIMENSION_MAPPING>
 <!--C921C6C2B7574863B76C4AC68DE48ED1-->  <AD_DIMENSION_MAPPING_ID><![CDATA[C921C6C2B7574863B76C4AC68DE48ED1]]></AD_DIMENSION_MAPPING_ID>
 <!--C921C6C2B7574863B76C4AC68DE48ED1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4043,6 +4173,32 @@
 <!--D77D072E7CAF48319043169F65E4F5E1-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--D77D072E7CAF48319043169F65E4F5E1--></AD_DIMENSION_MAPPING>
 
+<!--D86080B5CCC44AF4B3462C1B3AED23B1--><AD_DIMENSION_MAPPING>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <AD_DIMENSION_MAPPING_ID><![CDATA[D86080B5CCC44AF4B3462C1B3AED23B1]]></AD_DIMENSION_MAPPING_ID>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <DIMENSION><![CDATA[CC]]></DIMENSION>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <DOCBASETYPE><![CDATA[APP]]></DOCBASETYPE>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1--></AD_DIMENSION_MAPPING>
+
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA--><AD_DIMENSION_MAPPING>
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <AD_DIMENSION_MAPPING_ID><![CDATA[D86A82D5233F4ABFBB41CD4BF052B6DA]]></AD_DIMENSION_MAPPING_ID>
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <DIMENSION><![CDATA[PR]]></DIMENSION>
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <DOCBASETYPE><![CDATA[APP]]></DOCBASETYPE>
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--D86A82D5233F4ABFBB41CD4BF052B6DA--></AD_DIMENSION_MAPPING>
+
 <!--D92C60957DBF4398A7628A92861BEEF8--><AD_DIMENSION_MAPPING>
 <!--D92C60957DBF4398A7628A92861BEEF8-->  <AD_DIMENSION_MAPPING_ID><![CDATA[D92C60957DBF4398A7628A92861BEEF8]]></AD_DIMENSION_MAPPING_ID>
 <!--D92C60957DBF4398A7628A92861BEEF8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -21334,18 +21334,6 @@
 <!--0F34BE626A044A1BA104160398FBF53A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--0F34BE626A044A1BA104160398FBF53A--></AD_ELEMENT>
 
-<!--0F7DEEB13D924F28BFBA3AD34079C231--><AD_ELEMENT>
-<!--0F7DEEB13D924F28BFBA3AD34079C231-->  <AD_ELEMENT_ID><![CDATA[0F7DEEB13D924F28BFBA3AD34079C231]]></AD_ELEMENT_ID>
-<!--0F7DEEB13D924F28BFBA3AD34079C231-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--0F7DEEB13D924F28BFBA3AD34079C231-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--0F7DEEB13D924F28BFBA3AD34079C231-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0F7DEEB13D924F28BFBA3AD34079C231-->  <COLUMNNAME><![CDATA[Stored]]></COLUMNNAME>
-<!--0F7DEEB13D924F28BFBA3AD34079C231-->  <NAME><![CDATA[Stored]]></NAME>
-<!--0F7DEEB13D924F28BFBA3AD34079C231-->  <PRINTNAME><![CDATA[Stored]]></PRINTNAME>
-<!--0F7DEEB13D924F28BFBA3AD34079C231-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--0F7DEEB13D924F28BFBA3AD34079C231-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--0F7DEEB13D924F28BFBA3AD34079C231--></AD_ELEMENT>
-
 <!--0FF8F04EC4204CA3AC8F003F38C0502A--><AD_ELEMENT>
 <!--0FF8F04EC4204CA3AC8F003F38C0502A-->  <AD_ELEMENT_ID><![CDATA[0FF8F04EC4204CA3AC8F003F38C0502A]]></AD_ELEMENT_ID>
 <!--0FF8F04EC4204CA3AC8F003F38C0502A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -32578,6 +32566,18 @@
 <!--D8028ED62BC34DAFBD15048D0AB458BB-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D8028ED62BC34DAFBD15048D0AB458BB--></AD_ELEMENT>
 
+<!--D81D859886DB4CA4910DBC340EAF3D5F--><AD_ELEMENT>
+<!--D81D859886DB4CA4910DBC340EAF3D5F-->  <AD_ELEMENT_ID><![CDATA[D81D859886DB4CA4910DBC340EAF3D5F]]></AD_ELEMENT_ID>
+<!--D81D859886DB4CA4910DBC340EAF3D5F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D81D859886DB4CA4910DBC340EAF3D5F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D81D859886DB4CA4910DBC340EAF3D5F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D81D859886DB4CA4910DBC340EAF3D5F-->  <COLUMNNAME><![CDATA[InvoiceAmount]]></COLUMNNAME>
+<!--D81D859886DB4CA4910DBC340EAF3D5F-->  <NAME><![CDATA[Invoice Amount]]></NAME>
+<!--D81D859886DB4CA4910DBC340EAF3D5F-->  <PRINTNAME><![CDATA[Invoice Amount]]></PRINTNAME>
+<!--D81D859886DB4CA4910DBC340EAF3D5F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D81D859886DB4CA4910DBC340EAF3D5F-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D81D859886DB4CA4910DBC340EAF3D5F--></AD_ELEMENT>
+
 <!--D83B9497015D4097989560C2348969BE--><AD_ELEMENT>
 <!--D83B9497015D4097989560C2348969BE-->  <AD_ELEMENT_ID><![CDATA[D83B9497015D4097989560C2348969BE]]></AD_ELEMENT_ID>
 <!--D83B9497015D4097989560C2348969BE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -33393,6 +33393,18 @@
 <!--F01EC4089294476F984FFD0D825ED13F-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--F01EC4089294476F984FFD0D825ED13F--></AD_ELEMENT>
 
+<!--F0D23ADDB5B6410F8DE5CE121EEE2121--><AD_ELEMENT>
+<!--F0D23ADDB5B6410F8DE5CE121EEE2121-->  <AD_ELEMENT_ID><![CDATA[F0D23ADDB5B6410F8DE5CE121EEE2121]]></AD_ELEMENT_ID>
+<!--F0D23ADDB5B6410F8DE5CE121EEE2121-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F0D23ADDB5B6410F8DE5CE121EEE2121-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F0D23ADDB5B6410F8DE5CE121EEE2121-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F0D23ADDB5B6410F8DE5CE121EEE2121-->  <COLUMNNAME><![CDATA[ExpectedAmount]]></COLUMNNAME>
+<!--F0D23ADDB5B6410F8DE5CE121EEE2121-->  <NAME><![CDATA[Expected Amount]]></NAME>
+<!--F0D23ADDB5B6410F8DE5CE121EEE2121-->  <PRINTNAME><![CDATA[Expected Amount]]></PRINTNAME>
+<!--F0D23ADDB5B6410F8DE5CE121EEE2121-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F0D23ADDB5B6410F8DE5CE121EEE2121-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--F0D23ADDB5B6410F8DE5CE121EEE2121--></AD_ELEMENT>
+
 <!--F1852A15D8FD45F9B9A54962B40E1E43--><AD_ELEMENT>
 <!--F1852A15D8FD45F9B9A54962B40E1E43-->  <AD_ELEMENT_ID><![CDATA[F1852A15D8FD45F9B9A54962B40E1E43]]></AD_ELEMENT_ID>
 <!--F1852A15D8FD45F9B9A54962B40E1E43-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -180117,6 +180117,37 @@
 <!--0639C6CA78F44969A3379F68A8074740-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--0639C6CA78F44969A3379F68A8074740--></AD_FIELD>
 
+<!--0654DFBA5DAB463499127DB1AA43C856--><AD_FIELD>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <AD_FIELD_ID><![CDATA[0654DFBA5DAB463499127DB1AA43C856]]></AD_FIELD_ID>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <NAME><![CDATA[Sales Campaign]]></NAME>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <DESCRIPTION><![CDATA[An advertising effort aimed at increasing sales.]]></DESCRIPTION>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <HELP><![CDATA[The Campaign defines a unique marketing program.  Projects can be associated with a pre defined Marketing Campaign.  You can then report based on a specific Campaign.]]></HELP>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <AD_COLUMN_ID><![CDATA[2C18C72E50CB499BB466F65C2E06F66D]]></AD_COLUMN_ID>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <DISPLAYLOGIC><![CDATA[@$Element_MC@='Y']]></DISPLAYLOGIC>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0654DFBA5DAB463499127DB1AA43C856--></AD_FIELD>
+
 <!--068662C2B1F241A2A123556D4E584FD8--><AD_FIELD>
 <!--068662C2B1F241A2A123556D4E584FD8-->  <AD_FIELD_ID><![CDATA[068662C2B1F241A2A123556D4E584FD8]]></AD_FIELD_ID>
 <!--068662C2B1F241A2A123556D4E584FD8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -180564,6 +180595,36 @@
 <!--07C14F7112E34EA8B4EB6C2B720A7CB6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--07C14F7112E34EA8B4EB6C2B720A7CB6--></AD_FIELD>
 
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E--><AD_FIELD>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <AD_FIELD_ID><![CDATA[07D37B50650B44A2A7A7D5B1BAF07E4E]]></AD_FIELD_ID>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <NAME><![CDATA[2nd Dimension]]></NAME>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <AD_COLUMN_ID><![CDATA[594197039CB647DF9FBEC3386D5761BD]]></AD_COLUMN_ID>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <SEQNO><![CDATA[170]]></SEQNO>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E--></AD_FIELD>
+
 <!--07EE15CE493B4D1B99AD94D5711CE301--><AD_FIELD>
 <!--07EE15CE493B4D1B99AD94D5711CE301-->  <AD_FIELD_ID><![CDATA[07EE15CE493B4D1B99AD94D5711CE301]]></AD_FIELD_ID>
 <!--07EE15CE493B4D1B99AD94D5711CE301-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -181008,6 +181069,32 @@
 <!--090122697F994BE696E9F947FFF34E3C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--090122697F994BE696E9F947FFF34E3C--></AD_FIELD>
 
+<!--0909F7FBCE5D49BA9C50BC07E77175C7--><AD_FIELD>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <AD_FIELD_ID><![CDATA[0909F7FBCE5D49BA9C50BC07E77175C7]]></AD_FIELD_ID>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <NAME><![CDATA[Payment Details]]></NAME>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560141FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0909F7FBCE5D49BA9C50BC07E77175C7--></AD_FIELD>
+
 <!--0916FE8D15FB480FA097670967A881B9--><AD_FIELD>
 <!--0916FE8D15FB480FA097670967A881B9-->  <AD_FIELD_ID><![CDATA[0916FE8D15FB480FA097670967A881B9]]></AD_FIELD_ID>
 <!--0916FE8D15FB480FA097670967A881B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -181371,6 +181458,34 @@
 <!--09EBD591E2334479AB46E0822F34A930-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--09EBD591E2334479AB46E0822F34A930--></AD_FIELD>
 
+<!--0AA97BC575E040EF8314AFE584112FD0--><AD_FIELD>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <AD_FIELD_ID><![CDATA[0AA97BC575E040EF8314AFE584112FD0]]></AD_FIELD_ID>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <NAME><![CDATA[Order Payment Schedule]]></NAME>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560241FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <PROPERTY><![CDATA[orderPaymentSchedule]]></PROPERTY>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <GRID_SEQNO><![CDATA[270]]></GRID_SEQNO>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0AA97BC575E040EF8314AFE584112FD0--></AD_FIELD>
+
 <!--0AF3D682A04A4974A0645192BC014F37--><AD_FIELD>
 <!--0AF3D682A04A4974A0645192BC014F37-->  <AD_FIELD_ID><![CDATA[0AF3D682A04A4974A0645192BC014F37]]></AD_FIELD_ID>
 <!--0AF3D682A04A4974A0645192BC014F37-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -182562,6 +182677,37 @@
 <!--0E429C0CD8FE48D59ABDB15BBF153DFA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--0E429C0CD8FE48D59ABDB15BBF153DFA--></AD_FIELD>
 
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA--><AD_FIELD>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <AD_FIELD_ID><![CDATA[0E49E537EBCF4953ABF8DCBF0C2885AA]]></AD_FIELD_ID>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <NAME><![CDATA[Sales Region]]></NAME>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <DESCRIPTION><![CDATA[A defined section of the world where sales efforts will be focused.]]></DESCRIPTION>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <HELP><![CDATA[The Sales Region indicates a specific area of sales coverage.]]></HELP>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <AD_COLUMN_ID><![CDATA[A581C9F44F0B4A51963ACFEC7EECA642]]></AD_COLUMN_ID>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <DISPLAYLOGIC><![CDATA[@$Element_SR@='Y']]></DISPLAYLOGIC>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA--></AD_FIELD>
+
 <!--0E4F4F34EC73471D9C2899FC285D9BDA--><AD_FIELD>
 <!--0E4F4F34EC73471D9C2899FC285D9BDA-->  <AD_FIELD_ID><![CDATA[0E4F4F34EC73471D9C2899FC285D9BDA]]></AD_FIELD_ID>
 <!--0E4F4F34EC73471D9C2899FC285D9BDA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -185463,6 +185609,33 @@
 <!--154ED7B694C24AC0BD7AE5288247B411-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--154ED7B694C24AC0BD7AE5288247B411--></AD_FIELD>
 
+<!--155C0203D6974D59B54E8D1F081B47C0--><AD_FIELD>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <AD_FIELD_ID><![CDATA[155C0203D6974D59B54E8D1F081B47C0]]></AD_FIELD_ID>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <NAME><![CDATA[Expected Amount]]></NAME>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <AD_COLUMN_ID><![CDATA[8638D66DE4474084BC8F44BEEF3C9F22]]></AD_COLUMN_ID>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--155C0203D6974D59B54E8D1F081B47C0--></AD_FIELD>
+
 <!--156E0BBADC784D429200047DBC2DBE78--><AD_FIELD>
 <!--156E0BBADC784D429200047DBC2DBE78-->  <AD_FIELD_ID><![CDATA[156E0BBADC784D429200047DBC2DBE78]]></AD_FIELD_ID>
 <!--156E0BBADC784D429200047DBC2DBE78-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -187451,6 +187624,33 @@
 <!--1A1FB833ADF84AF380832122F9CA5608-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--1A1FB833ADF84AF380832122F9CA5608--></AD_FIELD>
 
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054--><AD_FIELD>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <AD_FIELD_ID><![CDATA[1A2DC0E48A5548F6AB2E1694D7FC5054]]></AD_FIELD_ID>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <NAME><![CDATA[Client]]></NAME>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C55FB41FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--1A2DC0E48A5548F6AB2E1694D7FC5054--></AD_FIELD>
+
 <!--1A3A49BF0852448BB6C9B1ADFE62BB76--><AD_FIELD>
 <!--1A3A49BF0852448BB6C9B1ADFE62BB76-->  <AD_FIELD_ID><![CDATA[1A3A49BF0852448BB6C9B1ADFE62BB76]]></AD_FIELD_ID>
 <!--1A3A49BF0852448BB6C9B1ADFE62BB76-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -187532,6 +187732,37 @@
 <!--1A45C55BE23F4E109A78EB25A22EC2F3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--1A45C55BE23F4E109A78EB25A22EC2F3--></AD_FIELD>
 
+<!--1A4B8B9E94B348BD9D45B50916B136D1--><AD_FIELD>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <AD_FIELD_ID><![CDATA[1A4B8B9E94B348BD9D45B50916B136D1]]></AD_FIELD_ID>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <NAME><![CDATA[Activity]]></NAME>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <DESCRIPTION><![CDATA[A distinct activity defined and used in activity based management.]]></DESCRIPTION>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <HELP><![CDATA[Activities indicate tasks that are performed and used to utilize Activity based Costing]]></HELP>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <AD_COLUMN_ID><![CDATA[AE3FB28F95334421BB3DFAAA5B85307A]]></AD_COLUMN_ID>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <DISPLAYLOGIC><![CDATA[@$Element_AY@='Y']]></DISPLAYLOGIC>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--1A4B8B9E94B348BD9D45B50916B136D1--></AD_FIELD>
+
 <!--1AA16E38ACE744F092BD4F11DB9FB234--><AD_FIELD>
 <!--1AA16E38ACE744F092BD4F11DB9FB234-->  <AD_FIELD_ID><![CDATA[1AA16E38ACE744F092BD4F11DB9FB234]]></AD_FIELD_ID>
 <!--1AA16E38ACE744F092BD4F11DB9FB234-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -188289,6 +188520,33 @@
 <!--1C1FBE81744B4AB4974716E8E420F27B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--1C1FBE81744B4AB4974716E8E420F27B--></AD_FIELD>
 
+<!--1C2F424FD31742C48557D2DAB13C62F8--><AD_FIELD>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <AD_FIELD_ID><![CDATA[1C2F424FD31742C48557D2DAB13C62F8]]></AD_FIELD_ID>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <NAME><![CDATA[Canceled]]></NAME>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <AD_COLUMN_ID><![CDATA[5BC978BD972A4CB9936D7B5794153BE1]]></AD_COLUMN_ID>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--1C2F424FD31742C48557D2DAB13C62F8--></AD_FIELD>
+
 <!--1C57893D7EE14B43BA50FA6C1CC652CD--><AD_FIELD>
 <!--1C57893D7EE14B43BA50FA6C1CC652CD-->  <AD_FIELD_ID><![CDATA[1C57893D7EE14B43BA50FA6C1CC652CD]]></AD_FIELD_ID>
 <!--1C57893D7EE14B43BA50FA6C1CC652CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -189819,7 +190077,7 @@
 <!--20EF8A3435D240F4A347BDF73FE24F53-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--20EF8A3435D240F4A347BDF73FE24F53-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--20EF8A3435D240F4A347BDF73FE24F53-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--20EF8A3435D240F4A347BDF73FE24F53-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--20EF8A3435D240F4A347BDF73FE24F53-->  <SEQNO><![CDATA[60]]></SEQNO>
 <!--20EF8A3435D240F4A347BDF73FE24F53-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--20EF8A3435D240F4A347BDF73FE24F53-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--20EF8A3435D240F4A347BDF73FE24F53-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -191459,6 +191717,32 @@
 <!--25CB64C7ED234878A8D9FDBC54951256-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--25CB64C7ED234878A8D9FDBC54951256--></AD_FIELD>
 
+<!--25D13EE69A8847B08B30F2FB50E522A4--><AD_FIELD>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <AD_FIELD_ID><![CDATA[25D13EE69A8847B08B30F2FB50E522A4]]></AD_FIELD_ID>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <NAME><![CDATA[Invoice Payment Schedule]]></NAME>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560341FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--25D13EE69A8847B08B30F2FB50E522A4-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--25D13EE69A8847B08B30F2FB50E522A4--></AD_FIELD>
+
 <!--25E891FC62E74EA58E85D35FF9814107--><AD_FIELD>
 <!--25E891FC62E74EA58E85D35FF9814107-->  <AD_FIELD_ID><![CDATA[25E891FC62E74EA58E85D35FF9814107]]></AD_FIELD_ID>
 <!--25E891FC62E74EA58E85D35FF9814107-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -197643,6 +197927,36 @@
 <!--34C720C8661E475198A8E5DE8516B069-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--34C720C8661E475198A8E5DE8516B069--></AD_FIELD>
 
+<!--34E0280E1EA348DE8BC1CEEFD0508424--><AD_FIELD>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <AD_FIELD_ID><![CDATA[34E0280E1EA348DE8BC1CEEFD0508424]]></AD_FIELD_ID>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <NAME><![CDATA[Document No.]]></NAME>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <DESCRIPTION><![CDATA[An often automatically generated identifier for all documents.]]></DESCRIPTION>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <HELP><![CDATA[The document number is usually automatically generated by the system and determined by the document type of the document. If the document is not saved, the preliminary number is displayed in "<>". If the document type of your document has no automatic document sequence defined, the field will be empty when creating a new document. This is for documents which usually have an external number (like vendor invoice).  If you leave the field empty, the system will generate a document number for you. The document sequence used for this fallback number is defined in the "Document Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table inside the database (e.g. C_Order).]]></HELP>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <AD_COLUMN_ID><![CDATA[2169]]></AD_COLUMN_ID>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <PROPERTY><![CDATA[orderPaymentSchedule.order.documentNo]]></PROPERTY>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--34E0280E1EA348DE8BC1CEEFD0508424--></AD_FIELD>
+
 <!--34E9944E57FC410EA5F9495BCFFFA0F4--><AD_FIELD>
 <!--34E9944E57FC410EA5F9495BCFFFA0F4-->  <AD_FIELD_ID><![CDATA[34E9944E57FC410EA5F9495BCFFFA0F4]]></AD_FIELD_ID>
 <!--34E9944E57FC410EA5F9495BCFFFA0F4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -202676,6 +202990,37 @@
 <!--42A998181EC411DE8B4ED7036F75A048-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--42A998181EC411DE8B4ED7036F75A048--></AD_FIELD>
 
+<!--42A9B6EF19F84243B9D4C025EF25CA19--><AD_FIELD>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <AD_FIELD_ID><![CDATA[42A9B6EF19F84243B9D4C025EF25CA19]]></AD_FIELD_ID>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <NAME><![CDATA[Sales Campaign]]></NAME>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <DESCRIPTION><![CDATA[An advertising effort aimed at increasing sales.]]></DESCRIPTION>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <HELP><![CDATA[The Campaign defines a unique marketing program.  Projects can be associated with a pre defined Marketing Campaign.  You can then report based on a specific Campaign.]]></HELP>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <AD_COLUMN_ID><![CDATA[2C18C72E50CB499BB466F65C2E06F66D]]></AD_COLUMN_ID>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <DISPLAYLOGIC><![CDATA[@$Element_MC@='Y']]></DISPLAYLOGIC>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--42A9B6EF19F84243B9D4C025EF25CA19--></AD_FIELD>
+
 <!--42AA0D021EC411DE9F90339CA6E9F175--><AD_FIELD>
 <!--42AA0D021EC411DE9F90339CA6E9F175-->  <AD_FIELD_ID><![CDATA[42AA0D021EC411DE9F90339CA6E9F175]]></AD_FIELD_ID>
 <!--42AA0D021EC411DE9F90339CA6E9F175-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -205979,6 +206324,33 @@
 <!--4C762EF911CE4DD7A8C1CC9A2EB3DE54-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4C762EF911CE4DD7A8C1CC9A2EB3DE54--></AD_FIELD>
 
+<!--4C88FF39C98C4704B2A57A8D01C55DF8--><AD_FIELD>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <AD_FIELD_ID><![CDATA[4C88FF39C98C4704B2A57A8D01C55DF8]]></AD_FIELD_ID>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <NAME><![CDATA[Invoice Amount]]></NAME>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <AD_COLUMN_ID><![CDATA[831F84E0E0904C22B9E00AD729DDECAE]]></AD_COLUMN_ID>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8--></AD_FIELD>
+
 <!--4CB2A8900B854127B12FF6C4C32E29D1--><AD_FIELD>
 <!--4CB2A8900B854127B12FF6C4C32E29D1-->  <AD_FIELD_ID><![CDATA[4CB2A8900B854127B12FF6C4C32E29D1]]></AD_FIELD_ID>
 <!--4CB2A8900B854127B12FF6C4C32E29D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -206202,6 +206574,62 @@
 <!--4D5E3039BF884EF4BB3DE4951AF9C602-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4D5E3039BF884EF4BB3DE4951AF9C602--></AD_FIELD>
 
+<!--4D7210CF7CDC46278CCD3E6C34590D52--><AD_FIELD>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <AD_FIELD_ID><![CDATA[4D7210CF7CDC46278CCD3E6C34590D52]]></AD_FIELD_ID>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <NAME><![CDATA[Invoice Payment Schedule]]></NAME>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560341FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <PROPERTY><![CDATA[invoicePaymentSchedule]]></PROPERTY>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <GRID_SEQNO><![CDATA[370]]></GRID_SEQNO>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4D7210CF7CDC46278CCD3E6C34590D52--></AD_FIELD>
+
+<!--4D99FA18C5684C45A3CDAB5381AB721B--><AD_FIELD>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <AD_FIELD_ID><![CDATA[4D99FA18C5684C45A3CDAB5381AB721B]]></AD_FIELD_ID>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <NAME><![CDATA[Write-off Amount]]></NAME>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <DESCRIPTION><![CDATA[A monetary sum that can be deducted from tax obligations.]]></DESCRIPTION>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <HELP><![CDATA[The Write Off Amount indicates the amount to be written off as uncollectible.]]></HELP>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560641FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4D99FA18C5684C45A3CDAB5381AB721B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4D99FA18C5684C45A3CDAB5381AB721B--></AD_FIELD>
+
 <!--4DC348B91DF64C2B919ECC00A2DDF82D--><AD_FIELD>
 <!--4DC348B91DF64C2B919ECC00A2DDF82D-->  <AD_FIELD_ID><![CDATA[4DC348B91DF64C2B919ECC00A2DDF82D]]></AD_FIELD_ID>
 <!--4DC348B91DF64C2B919ECC00A2DDF82D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -206288,6 +206716,36 @@
 <!--4DC9F4739D3F4B289D87FBDC06D4FAA5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4DC9F4739D3F4B289D87FBDC06D4FAA5--></AD_FIELD>
 
+<!--4DD2289423954DDE95FF74BF3EAB2E46--><AD_FIELD>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <AD_FIELD_ID><![CDATA[4DD2289423954DDE95FF74BF3EAB2E46]]></AD_FIELD_ID>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <NAME><![CDATA[1st Dimension]]></NAME>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <AD_COLUMN_ID><![CDATA[5837FEED4CE74D7F859166E5EC158BED]]></AD_COLUMN_ID>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4DD2289423954DDE95FF74BF3EAB2E46--></AD_FIELD>
+
 <!--4DE61628B58743B6A09ADF24D989D9B1--><AD_FIELD>
 <!--4DE61628B58743B6A09ADF24D989D9B1-->  <AD_FIELD_ID><![CDATA[4DE61628B58743B6A09ADF24D989D9B1]]></AD_FIELD_ID>
 <!--4DE61628B58743B6A09ADF24D989D9B1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -206459,6 +206917,34 @@
 <!--4E277C7DCF1A4440B81AB9D7D12FCE53-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4E277C7DCF1A4440B81AB9D7D12FCE53--></AD_FIELD>
 
+<!--4E5C4EF2F9484386A404C59C355CAA6D--><AD_FIELD>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <AD_FIELD_ID><![CDATA[4E5C4EF2F9484386A404C59C355CAA6D]]></AD_FIELD_ID>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <NAME><![CDATA[Doubtful Debt Amount]]></NAME>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <DESCRIPTION><![CDATA[Doubtful Debt Amount]]></DESCRIPTION>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <HELP><![CDATA[Doubtful Debt Amount]]></HELP>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <AD_COLUMN_ID><![CDATA[A5CF4D3408B744808F87A1E1A8F4C2E0]]></AD_COLUMN_ID>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4E5C4EF2F9484386A404C59C355CAA6D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4E5C4EF2F9484386A404C59C355CAA6D--></AD_FIELD>
+
 <!--4E7181E5E2EC4BD89FB05FDA27FF9B60--><AD_FIELD>
 <!--4E7181E5E2EC4BD89FB05FDA27FF9B60-->  <AD_FIELD_ID><![CDATA[4E7181E5E2EC4BD89FB05FDA27FF9B60]]></AD_FIELD_ID>
 <!--4E7181E5E2EC4BD89FB05FDA27FF9B60-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -207548,6 +208034,32 @@
 <!--51D48D6F8FA54AE19BC54060BA2B7E98-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--51D48D6F8FA54AE19BC54060BA2B7E98--></AD_FIELD>
 
+<!--520042E69DD34530A5A02148D2F14D05--><AD_FIELD>
+<!--520042E69DD34530A5A02148D2F14D05-->  <AD_FIELD_ID><![CDATA[520042E69DD34530A5A02148D2F14D05]]></AD_FIELD_ID>
+<!--520042E69DD34530A5A02148D2F14D05-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--520042E69DD34530A5A02148D2F14D05-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--520042E69DD34530A5A02148D2F14D05-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--520042E69DD34530A5A02148D2F14D05-->  <NAME><![CDATA[Order Payment Schedule]]></NAME>
+<!--520042E69DD34530A5A02148D2F14D05-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--520042E69DD34530A5A02148D2F14D05-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--520042E69DD34530A5A02148D2F14D05-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560241FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--520042E69DD34530A5A02148D2F14D05-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--520042E69DD34530A5A02148D2F14D05-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--520042E69DD34530A5A02148D2F14D05-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--520042E69DD34530A5A02148D2F14D05-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--520042E69DD34530A5A02148D2F14D05-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--520042E69DD34530A5A02148D2F14D05-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--520042E69DD34530A5A02148D2F14D05-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--520042E69DD34530A5A02148D2F14D05-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--520042E69DD34530A5A02148D2F14D05-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--520042E69DD34530A5A02148D2F14D05-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--520042E69DD34530A5A02148D2F14D05-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--520042E69DD34530A5A02148D2F14D05-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--520042E69DD34530A5A02148D2F14D05-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--520042E69DD34530A5A02148D2F14D05-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--520042E69DD34530A5A02148D2F14D05-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--520042E69DD34530A5A02148D2F14D05--></AD_FIELD>
+
 <!--52169D91906B42928957936A5DD28BAB--><AD_FIELD>
 <!--52169D91906B42928957936A5DD28BAB-->  <AD_FIELD_ID><![CDATA[52169D91906B42928957936A5DD28BAB]]></AD_FIELD_ID>
 <!--52169D91906B42928957936A5DD28BAB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -209542,6 +210054,37 @@
 <!--531BD5A3B0CF4D8C80AE539CFD7E8760-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--531BD5A3B0CF4D8C80AE539CFD7E8760--></AD_FIELD>
 
+<!--531E438D61704C03AE3E5AC156E46287--><AD_FIELD>
+<!--531E438D61704C03AE3E5AC156E46287-->  <AD_FIELD_ID><![CDATA[531E438D61704C03AE3E5AC156E46287]]></AD_FIELD_ID>
+<!--531E438D61704C03AE3E5AC156E46287-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--531E438D61704C03AE3E5AC156E46287-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--531E438D61704C03AE3E5AC156E46287-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--531E438D61704C03AE3E5AC156E46287-->  <NAME><![CDATA[Project]]></NAME>
+<!--531E438D61704C03AE3E5AC156E46287-->  <DESCRIPTION><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></DESCRIPTION>
+<!--531E438D61704C03AE3E5AC156E46287-->  <HELP><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></HELP>
+<!--531E438D61704C03AE3E5AC156E46287-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--531E438D61704C03AE3E5AC156E46287-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--531E438D61704C03AE3E5AC156E46287-->  <AD_COLUMN_ID><![CDATA[7C8B0463053745C6B5408D804C1646C9]]></AD_COLUMN_ID>
+<!--531E438D61704C03AE3E5AC156E46287-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--531E438D61704C03AE3E5AC156E46287-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--531E438D61704C03AE3E5AC156E46287-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--531E438D61704C03AE3E5AC156E46287-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--531E438D61704C03AE3E5AC156E46287-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--531E438D61704C03AE3E5AC156E46287-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--531E438D61704C03AE3E5AC156E46287-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--531E438D61704C03AE3E5AC156E46287-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--531E438D61704C03AE3E5AC156E46287-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--531E438D61704C03AE3E5AC156E46287-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--531E438D61704C03AE3E5AC156E46287-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--531E438D61704C03AE3E5AC156E46287-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--531E438D61704C03AE3E5AC156E46287-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--531E438D61704C03AE3E5AC156E46287-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
+<!--531E438D61704C03AE3E5AC156E46287-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--531E438D61704C03AE3E5AC156E46287-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--531E438D61704C03AE3E5AC156E46287-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--531E438D61704C03AE3E5AC156E46287-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--531E438D61704C03AE3E5AC156E46287--></AD_FIELD>
+
 <!--5321F9BE1D0B41638BAA9FCB4876A4A2--><AD_FIELD>
 <!--5321F9BE1D0B41638BAA9FCB4876A4A2-->  <AD_FIELD_ID><![CDATA[5321F9BE1D0B41638BAA9FCB4876A4A2]]></AD_FIELD_ID>
 <!--5321F9BE1D0B41638BAA9FCB4876A4A2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -211622,6 +212165,34 @@
 <!--5661EC317B693D0FE040007F01004528-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5661EC317B693D0FE040007F01004528--></AD_FIELD>
 
+<!--566308B3F02448D4B9CE6BDCE6AE6E21--><AD_FIELD>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <AD_FIELD_ID><![CDATA[566308B3F02448D4B9CE6BDCE6AE6E21]]></AD_FIELD_ID>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <NAME><![CDATA[Organization]]></NAME>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C55FC41FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--566308B3F02448D4B9CE6BDCE6AE6E21--></AD_FIELD>
+
 <!--5663A9C58E5D9AF1E040007F01007B6F--><AD_FIELD>
 <!--5663A9C58E5D9AF1E040007F01007B6F-->  <AD_FIELD_ID><![CDATA[5663A9C58E5D9AF1E040007F01007B6F]]></AD_FIELD_ID>
 <!--5663A9C58E5D9AF1E040007F01007B6F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -211920,7 +212491,7 @@
 <!--56D76EBD13CB41BEBC870277FE864DC8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--56D76EBD13CB41BEBC870277FE864DC8-->  <DISPLAYLENGTH><![CDATA[1000000]]></DISPLAYLENGTH>
 <!--56D76EBD13CB41BEBC870277FE864DC8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--56D76EBD13CB41BEBC870277FE864DC8-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--56D76EBD13CB41BEBC870277FE864DC8-->  <SEQNO><![CDATA[70]]></SEQNO>
 <!--56D76EBD13CB41BEBC870277FE864DC8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--56D76EBD13CB41BEBC870277FE864DC8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--56D76EBD13CB41BEBC870277FE864DC8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -211932,7 +212503,7 @@
 <!--56D76EBD13CB41BEBC870277FE864DC8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--56D76EBD13CB41BEBC870277FE864DC8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--56D76EBD13CB41BEBC870277FE864DC8-->  <EM_OBUIAPP_COLSPAN><![CDATA[2]]></EM_OBUIAPP_COLSPAN>
-<!--56D76EBD13CB41BEBC870277FE864DC8-->  <EM_OBUIAPP_ROWSPAN><![CDATA[2]]></EM_OBUIAPP_ROWSPAN>
+<!--56D76EBD13CB41BEBC870277FE864DC8-->  <EM_OBUIAPP_ROWSPAN><![CDATA[4]]></EM_OBUIAPP_ROWSPAN>
 <!--56D76EBD13CB41BEBC870277FE864DC8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--56D76EBD13CB41BEBC870277FE864DC8--></AD_FIELD>
 
@@ -217234,6 +217805,36 @@
 <!--59887AF4886AC5B0E040007F01015E76-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--59887AF4886AC5B0E040007F01015E76--></AD_FIELD>
 
+<!--598F8411C8174E1DAA072C3194A2350E--><AD_FIELD>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <AD_FIELD_ID><![CDATA[598F8411C8174E1DAA072C3194A2350E]]></AD_FIELD_ID>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <NAME><![CDATA[Cost Center]]></NAME>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <DESCRIPTION><![CDATA[Division that adds to the cost of an organization]]></DESCRIPTION>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <HELP><![CDATA[Division that adds to the cost of an organization. Internal structure for cost allocation.]]></HELP>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <AD_COLUMN_ID><![CDATA[BB466480BFAC492AA36E5495EC72BD44]]></AD_COLUMN_ID>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--598F8411C8174E1DAA072C3194A2350E--></AD_FIELD>
+
 <!--59B9E27E38EF4CDB86C9548E0DFFE8E6--><AD_FIELD>
 <!--59B9E27E38EF4CDB86C9548E0DFFE8E6-->  <AD_FIELD_ID><![CDATA[59B9E27E38EF4CDB86C9548E0DFFE8E6]]></AD_FIELD_ID>
 <!--59B9E27E38EF4CDB86C9548E0DFFE8E6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -218530,7 +219131,7 @@
 <!--5A1DA518A757487F9DE177777CDD937B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--5A1DA518A757487F9DE177777CDD937B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--5A1DA518A757487F9DE177777CDD937B-->  <EM_OBUIAPP_COLSPAN><![CDATA[2]]></EM_OBUIAPP_COLSPAN>
-<!--5A1DA518A757487F9DE177777CDD937B-->  <EM_OBUIAPP_ROWSPAN><![CDATA[2]]></EM_OBUIAPP_ROWSPAN>
+<!--5A1DA518A757487F9DE177777CDD937B-->  <EM_OBUIAPP_ROWSPAN><![CDATA[4]]></EM_OBUIAPP_ROWSPAN>
 <!--5A1DA518A757487F9DE177777CDD937B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5A1DA518A757487F9DE177777CDD937B--></AD_FIELD>
 
@@ -221002,6 +221603,33 @@
 <!--5DCD4166FA444943B7C94A3141782B73-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5DCD4166FA444943B7C94A3141782B73--></AD_FIELD>
 
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2--><AD_FIELD>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <AD_FIELD_ID><![CDATA[5DD7287D8AFF4B7AABD6963C91FBF0C2]]></AD_FIELD_ID>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <NAME><![CDATA[Invoice Amount]]></NAME>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <AD_COLUMN_ID><![CDATA[831F84E0E0904C22B9E00AD729DDECAE]]></AD_COLUMN_ID>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2--></AD_FIELD>
+
 <!--5DE3421949F440D798503A1D4D8D9137--><AD_FIELD>
 <!--5DE3421949F440D798503A1D4D8D9137-->  <AD_FIELD_ID><![CDATA[5DE3421949F440D798503A1D4D8D9137]]></AD_FIELD_ID>
 <!--5DE3421949F440D798503A1D4D8D9137-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -221341,6 +221969,34 @@
 <!--5E8F602946CE4797AF57EBF0D9C22A67-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5E8F602946CE4797AF57EBF0D9C22A67--></AD_FIELD>
 
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF--><AD_FIELD>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <AD_FIELD_ID><![CDATA[5E905E42DD2B4D3FBD8490C5DC48F3BF]]></AD_FIELD_ID>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <NAME><![CDATA[Write-off Amount]]></NAME>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <DESCRIPTION><![CDATA[A monetary sum that can be deducted from tax obligations.]]></DESCRIPTION>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <HELP><![CDATA[The Write Off Amount indicates the amount to be written off as uncollectible.]]></HELP>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560641FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--5E905E42DD2B4D3FBD8490C5DC48F3BF--></AD_FIELD>
+
 <!--5E95A11823874003AECE279AA1AA92EB--><AD_FIELD>
 <!--5E95A11823874003AECE279AA1AA92EB-->  <AD_FIELD_ID><![CDATA[5E95A11823874003AECE279AA1AA92EB]]></AD_FIELD_ID>
 <!--5E95A11823874003AECE279AA1AA92EB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -222183,6 +222839,31 @@
 <!--60DF138727B64DD687494FE0DBEDF5D9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--60DF138727B64DD687494FE0DBEDF5D9--></AD_FIELD>
 
+<!--60F6765783634D6EBB20999159E679E8--><AD_FIELD>
+<!--60F6765783634D6EBB20999159E679E8-->  <AD_FIELD_ID><![CDATA[60F6765783634D6EBB20999159E679E8]]></AD_FIELD_ID>
+<!--60F6765783634D6EBB20999159E679E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--60F6765783634D6EBB20999159E679E8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--60F6765783634D6EBB20999159E679E8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--60F6765783634D6EBB20999159E679E8-->  <NAME><![CDATA[Payment Schedule Detail]]></NAME>
+<!--60F6765783634D6EBB20999159E679E8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--60F6765783634D6EBB20999159E679E8-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--60F6765783634D6EBB20999159E679E8-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C55FA41FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--60F6765783634D6EBB20999159E679E8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--60F6765783634D6EBB20999159E679E8-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--60F6765783634D6EBB20999159E679E8-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--60F6765783634D6EBB20999159E679E8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--60F6765783634D6EBB20999159E679E8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--60F6765783634D6EBB20999159E679E8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--60F6765783634D6EBB20999159E679E8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--60F6765783634D6EBB20999159E679E8-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--60F6765783634D6EBB20999159E679E8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--60F6765783634D6EBB20999159E679E8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--60F6765783634D6EBB20999159E679E8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--60F6765783634D6EBB20999159E679E8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--60F6765783634D6EBB20999159E679E8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--60F6765783634D6EBB20999159E679E8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--60F6765783634D6EBB20999159E679E8--></AD_FIELD>
+
 <!--60FCCD631EBAEDF8E040007F01013AD4--><AD_FIELD>
 <!--60FCCD631EBAEDF8E040007F01013AD4-->  <AD_FIELD_ID><![CDATA[60FCCD631EBAEDF8E040007F01013AD4]]></AD_FIELD_ID>
 <!--60FCCD631EBAEDF8E040007F01013AD4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -222721,6 +223402,37 @@
 <!--616CFC5A610449CF90CADDC3E7D4590E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--616CFC5A610449CF90CADDC3E7D4590E--></AD_FIELD>
 
+<!--6175F26324464D34B930A648822F83E7--><AD_FIELD>
+<!--6175F26324464D34B930A648822F83E7-->  <AD_FIELD_ID><![CDATA[6175F26324464D34B930A648822F83E7]]></AD_FIELD_ID>
+<!--6175F26324464D34B930A648822F83E7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6175F26324464D34B930A648822F83E7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6175F26324464D34B930A648822F83E7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6175F26324464D34B930A648822F83E7-->  <NAME><![CDATA[1st Dimension]]></NAME>
+<!--6175F26324464D34B930A648822F83E7-->  <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--6175F26324464D34B930A648822F83E7-->  <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--6175F26324464D34B930A648822F83E7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6175F26324464D34B930A648822F83E7-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--6175F26324464D34B930A648822F83E7-->  <AD_COLUMN_ID><![CDATA[5837FEED4CE74D7F859166E5EC158BED]]></AD_COLUMN_ID>
+<!--6175F26324464D34B930A648822F83E7-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6175F26324464D34B930A648822F83E7-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--6175F26324464D34B930A648822F83E7-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6175F26324464D34B930A648822F83E7-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--6175F26324464D34B930A648822F83E7-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--6175F26324464D34B930A648822F83E7-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6175F26324464D34B930A648822F83E7-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--6175F26324464D34B930A648822F83E7-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6175F26324464D34B930A648822F83E7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6175F26324464D34B930A648822F83E7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6175F26324464D34B930A648822F83E7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6175F26324464D34B930A648822F83E7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6175F26324464D34B930A648822F83E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6175F26324464D34B930A648822F83E7-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
+<!--6175F26324464D34B930A648822F83E7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6175F26324464D34B930A648822F83E7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6175F26324464D34B930A648822F83E7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6175F26324464D34B930A648822F83E7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6175F26324464D34B930A648822F83E7--></AD_FIELD>
+
 <!--617A25F4EF00D703E040007F0101562B--><AD_FIELD>
 <!--617A25F4EF00D703E040007F0101562B-->  <AD_FIELD_ID><![CDATA[617A25F4EF00D703E040007F0101562B]]></AD_FIELD_ID>
 <!--617A25F4EF00D703E040007F0101562B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -222838,6 +223550,36 @@
 <!--61B7F6EF400547B493183DA74CC09EDE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--61B7F6EF400547B493183DA74CC09EDE--></AD_FIELD>
 
+<!--61B8E78777794FD68AD577BCDBAC34A8--><AD_FIELD>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <AD_FIELD_ID><![CDATA[61B8E78777794FD68AD577BCDBAC34A8]]></AD_FIELD_ID>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <NAME><![CDATA[Active]]></NAME>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560541FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--61B8E78777794FD68AD577BCDBAC34A8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--61B8E78777794FD68AD577BCDBAC34A8--></AD_FIELD>
+
 <!--61C0FD1BA783485DA292057D3A152353--><AD_FIELD>
 <!--61C0FD1BA783485DA292057D3A152353-->  <AD_FIELD_ID><![CDATA[61C0FD1BA783485DA292057D3A152353]]></AD_FIELD_ID>
 <!--61C0FD1BA783485DA292057D3A152353-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -224655,7 +225397,7 @@
 <!--64C5ADAB2D624FC8B57285D62C8B2722-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--64C5ADAB2D624FC8B57285D62C8B2722-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--64C5ADAB2D624FC8B57285D62C8B2722-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--64C5ADAB2D624FC8B57285D62C8B2722-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--64C5ADAB2D624FC8B57285D62C8B2722-->  <GRID_SEQNO><![CDATA[75]]></GRID_SEQNO>
 <!--64C5ADAB2D624FC8B57285D62C8B2722-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--64C5ADAB2D624FC8B57285D62C8B2722-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--64C5ADAB2D624FC8B57285D62C8B2722-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -225042,6 +225784,37 @@
 <!--662F362ECFB14D4A9676D4A728890AB3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--662F362ECFB14D4A9676D4A728890AB3--></AD_FIELD>
 
+<!--6641967A77BC4962BF0433EC8B5E13A6--><AD_FIELD>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <AD_FIELD_ID><![CDATA[6641967A77BC4962BF0433EC8B5E13A6]]></AD_FIELD_ID>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <NAME><![CDATA[Activity]]></NAME>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <DESCRIPTION><![CDATA[A distinct activity defined and used in activity based management.]]></DESCRIPTION>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <HELP><![CDATA[Activities indicate tasks that are performed and used to utilize Activity based Costing]]></HELP>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <AD_COLUMN_ID><![CDATA[AE3FB28F95334421BB3DFAAA5B85307A]]></AD_COLUMN_ID>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <DISPLAYLOGIC><![CDATA[@$Element_AY@='Y']]></DISPLAYLOGIC>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6641967A77BC4962BF0433EC8B5E13A6--></AD_FIELD>
+
 <!--66500498F44D4067965EF43D01378FA0--><AD_FIELD>
 <!--66500498F44D4067965EF43D01378FA0-->  <AD_FIELD_ID><![CDATA[66500498F44D4067965EF43D01378FA0]]></AD_FIELD_ID>
 <!--66500498F44D4067965EF43D01378FA0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -226317,6 +227090,36 @@
 <!--6A71ADF25375450DB1E5B99BF2CB7CC3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6A71ADF25375450DB1E5B99BF2CB7CC3--></AD_FIELD>
 
+<!--6A80E7A6014749B4926F6822651F1A2B--><AD_FIELD>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <AD_FIELD_ID><![CDATA[6A80E7A6014749B4926F6822651F1A2B]]></AD_FIELD_ID>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <NAME><![CDATA[Document No.]]></NAME>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <DESCRIPTION><![CDATA[An often automatically generated identifier for all documents.]]></DESCRIPTION>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <HELP><![CDATA[The document number is usually automatically generated by the system and determined by the document type of the document. If the document is not saved, the preliminary number is displayed in "<>". If the document type of your document has no automatic document sequence defined, the field will be empty when creating a new document. This is for documents which usually have an external number (like vendor invoice).  If you leave the field empty, the system will generate a document number for you. The document sequence used for this fallback number is defined in the "Document Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table inside the database (e.g. C_Order).]]></HELP>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <AD_COLUMN_ID><![CDATA[3492]]></AD_COLUMN_ID>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <PROPERTY><![CDATA[invoicePaymentSchedule.invoice.documentNo]]></PROPERTY>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6A80E7A6014749B4926F6822651F1A2B--></AD_FIELD>
+
 <!--6A910B42BC6D49B5B097EDB3FC4CD0B2--><AD_FIELD>
 <!--6A910B42BC6D49B5B097EDB3FC4CD0B2-->  <AD_FIELD_ID><![CDATA[6A910B42BC6D49B5B097EDB3FC4CD0B2]]></AD_FIELD_ID>
 <!--6A910B42BC6D49B5B097EDB3FC4CD0B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -227724,6 +228527,37 @@
 <!--6E88FB15DBC84249831ABAC6561578D7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6E88FB15DBC84249831ABAC6561578D7--></AD_FIELD>
 
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9--><AD_FIELD>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <AD_FIELD_ID><![CDATA[6E8B6D13DA0D4A38B8713062B8E0DDA9]]></AD_FIELD_ID>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <NAME><![CDATA[Product]]></NAME>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <AD_COLUMN_ID><![CDATA[7B1F0700FBEC4FCCB3050AD1E750A3F6]]></AD_COLUMN_ID>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9--></AD_FIELD>
+
 <!--6E9E962C2F0A43429FC35238845C3F70--><AD_FIELD>
 <!--6E9E962C2F0A43429FC35238845C3F70-->  <AD_FIELD_ID><![CDATA[6E9E962C2F0A43429FC35238845C3F70]]></AD_FIELD_ID>
 <!--6E9E962C2F0A43429FC35238845C3F70-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -237663,6 +238497,35 @@
 <!--7EDE8C56308A4941873AA44A0CC87317-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--7EDE8C56308A4941873AA44A0CC87317--></AD_FIELD>
 
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1--><AD_FIELD>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <AD_FIELD_ID><![CDATA[7EF5F3926EF245EC8B9A70FCDD100BC1]]></AD_FIELD_ID>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <AD_TAB_ID><![CDATA[A55C6E2F874F4CD0B7AEDE4362701EA2]]></AD_TAB_ID>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <AD_COLUMN_ID><![CDATA[E2C69E0F8EC34C6788EC0ED377C8C2CC]]></AD_COLUMN_ID>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--7EF5F3926EF245EC8B9A70FCDD100BC1--></AD_FIELD>
+
 <!--7F1FA06CE26E4FE4A376744C330A98FC--><AD_FIELD>
 <!--7F1FA06CE26E4FE4A376744C330A98FC-->  <AD_FIELD_ID><![CDATA[7F1FA06CE26E4FE4A376744C330A98FC]]></AD_FIELD_ID>
 <!--7F1FA06CE26E4FE4A376744C330A98FC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -244176,6 +245039,36 @@
 <!--86CA5FC377F44E19B90D4BB7B0024040-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--86CA5FC377F44E19B90D4BB7B0024040--></AD_FIELD>
 
+<!--86CCCAEE17A2407F85E9885BB571424F--><AD_FIELD>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <AD_FIELD_ID><![CDATA[86CCCAEE17A2407F85E9885BB571424F]]></AD_FIELD_ID>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <NAME><![CDATA[G/L Item]]></NAME>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <DESCRIPTION><![CDATA[An alias for the Account Combination which can be commonly used in daily operations.]]></DESCRIPTION>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <HELP><![CDATA[General ledger item.]]></HELP>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <AD_COLUMN_ID><![CDATA[7DC34559B3F6B45BE040007F0100784A]]></AD_COLUMN_ID>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <PROPERTY><![CDATA[paymentDetails.gLItem]]></PROPERTY>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--86CCCAEE17A2407F85E9885BB571424F--></AD_FIELD>
+
 <!--86DF1B3B331D03FEE040007F0101757D--><AD_FIELD>
 <!--86DF1B3B331D03FEE040007F0101757D-->  <AD_FIELD_ID><![CDATA[86DF1B3B331D03FEE040007F0101757D]]></AD_FIELD_ID>
 <!--86DF1B3B331D03FEE040007F0101757D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -245518,6 +246411,34 @@
 <!--8805B43A11F842698C397F4BFFF6D104-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--8805B43A11F842698C397F4BFFF6D104--></AD_FIELD>
 
+<!--881F7C50A4E2484E93960CB7E15F117A--><AD_FIELD>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <AD_FIELD_ID><![CDATA[881F7C50A4E2484E93960CB7E15F117A]]></AD_FIELD_ID>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <NAME><![CDATA[Organization]]></NAME>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C55FC41FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--881F7C50A4E2484E93960CB7E15F117A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--881F7C50A4E2484E93960CB7E15F117A--></AD_FIELD>
+
 <!--8823FD2EC4044635AE910E9BB6B27E04--><AD_FIELD>
 <!--8823FD2EC4044635AE910E9BB6B27E04-->  <AD_FIELD_ID><![CDATA[8823FD2EC4044635AE910E9BB6B27E04]]></AD_FIELD_ID>
 <!--8823FD2EC4044635AE910E9BB6B27E04-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -245632,6 +246553,33 @@
 <!--885E9621B9424DFAB2312D6B70FCAED7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--885E9621B9424DFAB2312D6B70FCAED7--></AD_FIELD>
 
+<!--888E6479171749F791296171121F974E--><AD_FIELD>
+<!--888E6479171749F791296171121F974E-->  <AD_FIELD_ID><![CDATA[888E6479171749F791296171121F974E]]></AD_FIELD_ID>
+<!--888E6479171749F791296171121F974E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--888E6479171749F791296171121F974E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--888E6479171749F791296171121F974E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--888E6479171749F791296171121F974E-->  <NAME><![CDATA[Canceled]]></NAME>
+<!--888E6479171749F791296171121F974E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--888E6479171749F791296171121F974E-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--888E6479171749F791296171121F974E-->  <AD_COLUMN_ID><![CDATA[5BC978BD972A4CB9936D7B5794153BE1]]></AD_COLUMN_ID>
+<!--888E6479171749F791296171121F974E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--888E6479171749F791296171121F974E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--888E6479171749F791296171121F974E-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--888E6479171749F791296171121F974E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--888E6479171749F791296171121F974E-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--888E6479171749F791296171121F974E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--888E6479171749F791296171121F974E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--888E6479171749F791296171121F974E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--888E6479171749F791296171121F974E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--888E6479171749F791296171121F974E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--888E6479171749F791296171121F974E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--888E6479171749F791296171121F974E-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
+<!--888E6479171749F791296171121F974E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--888E6479171749F791296171121F974E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--888E6479171749F791296171121F974E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--888E6479171749F791296171121F974E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--888E6479171749F791296171121F974E--></AD_FIELD>
+
 <!--88A41F6DC5DE48169114FB7758B4874D--><AD_FIELD>
 <!--88A41F6DC5DE48169114FB7758B4874D-->  <AD_FIELD_ID><![CDATA[88A41F6DC5DE48169114FB7758B4874D]]></AD_FIELD_ID>
 <!--88A41F6DC5DE48169114FB7758B4874D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -246246,33 +247194,6 @@
 <!--8A15A9AFEE7E4E0199B0E91292049B44-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--8A15A9AFEE7E4E0199B0E91292049B44--></AD_FIELD>
 
-<!--8A2832092DBF47BAACB2D24CD2CC2F38--><AD_FIELD>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <AD_FIELD_ID><![CDATA[8A2832092DBF47BAACB2D24CD2CC2F38]]></AD_FIELD_ID>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <NAME><![CDATA[Stored]]></NAME>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <AD_TAB_ID><![CDATA[DA845735FBB34548B04F1908E2089CEC]]></AD_TAB_ID>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <AD_COLUMN_ID><![CDATA[A655AE8B366D4FE1A52BA9F10510457F]]></AD_COLUMN_ID>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--8A2832092DBF47BAACB2D24CD2CC2F38--></AD_FIELD>
-
 <!--8A2DEDD6E4A94D0090C6238BE68E38FD--><AD_FIELD>
 <!--8A2DEDD6E4A94D0090C6238BE68E38FD-->  <AD_FIELD_ID><![CDATA[8A2DEDD6E4A94D0090C6238BE68E38FD]]></AD_FIELD_ID>
 <!--8A2DEDD6E4A94D0090C6238BE68E38FD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -252233,6 +253154,34 @@
 <!--9670FA4B7131465FA2A6FA6E93D77BDF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--9670FA4B7131465FA2A6FA6E93D77BDF--></AD_FIELD>
 
+<!--967489DF64CB47BF96F571C3EA28A236--><AD_FIELD>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <AD_FIELD_ID><![CDATA[967489DF64CB47BF96F571C3EA28A236]]></AD_FIELD_ID>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <NAME><![CDATA[Order Payment Schedule]]></NAME>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560241FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <PROPERTY><![CDATA[orderPaymentSchedule]]></PROPERTY>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <GRID_SEQNO><![CDATA[270]]></GRID_SEQNO>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--967489DF64CB47BF96F571C3EA28A236--></AD_FIELD>
+
 <!--96765FC7606648C6841BA794FC08F690--><AD_FIELD>
 <!--96765FC7606648C6841BA794FC08F690-->  <AD_FIELD_ID><![CDATA[96765FC7606648C6841BA794FC08F690]]></AD_FIELD_ID>
 <!--96765FC7606648C6841BA794FC08F690-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -252423,6 +253372,35 @@
 <!--96C44F2E2B7A41B092E09E5F4F243B74-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--96C44F2E2B7A41B092E09E5F4F243B74--></AD_FIELD>
 
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8--><AD_FIELD>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <AD_FIELD_ID><![CDATA[96E39E8A5CA244B8A1D8BBE8A74AAEB8]]></AD_FIELD_ID>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <NAME><![CDATA[Role]]></NAME>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <DESCRIPTION><![CDATA[The profile of security for the user defining what windows and tabs they can see.]]></DESCRIPTION>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <HELP><![CDATA[The Role determines security and access a user who has this Role will have in the System.]]></HELP>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <AD_TAB_ID><![CDATA[DA845735FBB34548B04F1908E2089CEC]]></AD_TAB_ID>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <AD_COLUMN_ID><![CDATA[02EDB5224DE54FBBA4DD9AA1C02CC5D3]]></AD_COLUMN_ID>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <SEQNO><![CDATA[15]]></SEQNO>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <GRID_SEQNO><![CDATA[15]]></GRID_SEQNO>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--96E39E8A5CA244B8A1D8BBE8A74AAEB8--></AD_FIELD>
+
 <!--97045257D2E8419786C52DD8702193DA--><AD_FIELD>
 <!--97045257D2E8419786C52DD8702193DA-->  <AD_FIELD_ID><![CDATA[97045257D2E8419786C52DD8702193DA]]></AD_FIELD_ID>
 <!--97045257D2E8419786C52DD8702193DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -252481,6 +253459,33 @@
 <!--970E9E7536BE40998D16E6534F01F028-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--970E9E7536BE40998D16E6534F01F028--></AD_FIELD>
 
+<!--97121CB0AC4740328AAB8B6CE2BC6794--><AD_FIELD>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <AD_FIELD_ID><![CDATA[97121CB0AC4740328AAB8B6CE2BC6794]]></AD_FIELD_ID>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <NAME><![CDATA[Received Amount]]></NAME>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560441FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--97121CB0AC4740328AAB8B6CE2BC6794--></AD_FIELD>
+
 <!--9715E1FF17DF4C90B66A842299C91B92--><AD_FIELD>
 <!--9715E1FF17DF4C90B66A842299C91B92-->  <AD_FIELD_ID><![CDATA[9715E1FF17DF4C90B66A842299C91B92]]></AD_FIELD_ID>
 <!--9715E1FF17DF4C90B66A842299C91B92-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -252535,6 +253540,36 @@
 <!--971618B418C74BEC9D902DFDD1A474C3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--971618B418C74BEC9D902DFDD1A474C3--></AD_FIELD>
 
+<!--9722B8A10DCA4CF5AED5779B782113FC--><AD_FIELD>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <AD_FIELD_ID><![CDATA[9722B8A10DCA4CF5AED5779B782113FC]]></AD_FIELD_ID>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <NAME><![CDATA[Document No.]]></NAME>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <DESCRIPTION><![CDATA[An often automatically generated identifier for all documents.]]></DESCRIPTION>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <HELP><![CDATA[The document number is usually automatically generated by the system and determined by the document type of the document. If the document is not saved, the preliminary number is displayed in "<>". If the document type of your document has no automatic document sequence defined, the field will be empty when creating a new document. This is for documents which usually have an external number (like vendor invoice).  If you leave the field empty, the system will generate a document number for you. The document sequence used for this fallback number is defined in the "Document Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table inside the database (e.g. C_Order).]]></HELP>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <AD_COLUMN_ID><![CDATA[3492]]></AD_COLUMN_ID>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <PROPERTY><![CDATA[invoicePaymentSchedule.invoice.documentNo]]></PROPERTY>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9722B8A10DCA4CF5AED5779B782113FC--></AD_FIELD>
+
 <!--9731D50121074D9C8AC9F274934DAFE6--><AD_FIELD>
 <!--9731D50121074D9C8AC9F274934DAFE6-->  <AD_FIELD_ID><![CDATA[9731D50121074D9C8AC9F274934DAFE6]]></AD_FIELD_ID>
 <!--9731D50121074D9C8AC9F274934DAFE6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -252877,6 +253912,37 @@
 <!--98A587CFD53E4BA7A5C5F1D8546817D9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--98A587CFD53E4BA7A5C5F1D8546817D9--></AD_FIELD>
 
+<!--98A79DD714E94F1692C54DD0D6423107--><AD_FIELD>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <AD_FIELD_ID><![CDATA[98A79DD714E94F1692C54DD0D6423107]]></AD_FIELD_ID>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <NAME><![CDATA[Business Partner]]></NAME>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <AD_COLUMN_ID><![CDATA[5502AEFEFC29441197D3C4473C1C6C68]]></AD_COLUMN_ID>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--98A79DD714E94F1692C54DD0D6423107--></AD_FIELD>
+
 <!--98B9A86EA9AF411DBD29D820FF30AAC5--><AD_FIELD>
 <!--98B9A86EA9AF411DBD29D820FF30AAC5-->  <AD_FIELD_ID><![CDATA[98B9A86EA9AF411DBD29D820FF30AAC5]]></AD_FIELD_ID>
 <!--98B9A86EA9AF411DBD29D820FF30AAC5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -253581,6 +254647,32 @@
 <!--9A2CFA94905D4641B8E6591BF0E32182-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--9A2CFA94905D4641B8E6591BF0E32182--></AD_FIELD>
 
+<!--9A305A8596DE4B158CCD7586E995BFFB--><AD_FIELD>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <AD_FIELD_ID><![CDATA[9A305A8596DE4B158CCD7586E995BFFB]]></AD_FIELD_ID>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <NAME><![CDATA[Payment Details]]></NAME>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560141FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9A305A8596DE4B158CCD7586E995BFFB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9A305A8596DE4B158CCD7586E995BFFB--></AD_FIELD>
+
 <!--9A36DC6C4F174E8484FE3625FED7F064--><AD_FIELD>
 <!--9A36DC6C4F174E8484FE3625FED7F064-->  <AD_FIELD_ID><![CDATA[9A36DC6C4F174E8484FE3625FED7F064]]></AD_FIELD_ID>
 <!--9A36DC6C4F174E8484FE3625FED7F064-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -255135,6 +256227,36 @@
 <!--9E28B878268D4A3D924FADA959E0F50C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--9E28B878268D4A3D924FADA959E0F50C--></AD_FIELD>
 
+<!--9E5508C17547495AA904EE61BEF0F2CF--><AD_FIELD>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <AD_FIELD_ID><![CDATA[9E5508C17547495AA904EE61BEF0F2CF]]></AD_FIELD_ID>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <NAME><![CDATA[Document No.]]></NAME>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <DESCRIPTION><![CDATA[An often automatically generated identifier for all documents.]]></DESCRIPTION>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <HELP><![CDATA[The document number is usually automatically generated by the system and determined by the document type of the document. If the document is not saved, the preliminary number is displayed in "<>". If the document type of your document has no automatic document sequence defined, the field will be empty when creating a new document. This is for documents which usually have an external number (like vendor invoice).  If you leave the field empty, the system will generate a document number for you. The document sequence used for this fallback number is defined in the "Document Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table inside the database (e.g. C_Order).]]></HELP>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <AD_COLUMN_ID><![CDATA[2169]]></AD_COLUMN_ID>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <PROPERTY><![CDATA[orderPaymentSchedule.order.documentNo]]></PROPERTY>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9E5508C17547495AA904EE61BEF0F2CF--></AD_FIELD>
+
 <!--9E798A9578E1490490DDFE35EFEDBAFE--><AD_FIELD>
 <!--9E798A9578E1490490DDFE35EFEDBAFE-->  <AD_FIELD_ID><![CDATA[9E798A9578E1490490DDFE35EFEDBAFE]]></AD_FIELD_ID>
 <!--9E798A9578E1490490DDFE35EFEDBAFE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -256042,6 +257164,34 @@
 <!--A04EE1CF307F414F8488024092454B37-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A04EE1CF307F414F8488024092454B37--></AD_FIELD>
 
+<!--A054D296F4A643988278714E70EB097F--><AD_FIELD>
+<!--A054D296F4A643988278714E70EB097F-->  <AD_FIELD_ID><![CDATA[A054D296F4A643988278714E70EB097F]]></AD_FIELD_ID>
+<!--A054D296F4A643988278714E70EB097F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A054D296F4A643988278714E70EB097F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A054D296F4A643988278714E70EB097F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A054D296F4A643988278714E70EB097F-->  <NAME><![CDATA[Invoice Paid]]></NAME>
+<!--A054D296F4A643988278714E70EB097F-->  <DESCRIPTION><![CDATA[A flag indicating whether this document type is consider paid or not.]]></DESCRIPTION>
+<!--A054D296F4A643988278714E70EB097F-->  <HELP><![CDATA[A flag indicating whether this document type is consider paid or not.]]></HELP>
+<!--A054D296F4A643988278714E70EB097F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A054D296F4A643988278714E70EB097F-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--A054D296F4A643988278714E70EB097F-->  <AD_COLUMN_ID><![CDATA[C5CABD48EA774B8289401E670504371C]]></AD_COLUMN_ID>
+<!--A054D296F4A643988278714E70EB097F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--A054D296F4A643988278714E70EB097F-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--A054D296F4A643988278714E70EB097F-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--A054D296F4A643988278714E70EB097F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A054D296F4A643988278714E70EB097F-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--A054D296F4A643988278714E70EB097F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A054D296F4A643988278714E70EB097F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A054D296F4A643988278714E70EB097F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A054D296F4A643988278714E70EB097F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--A054D296F4A643988278714E70EB097F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A054D296F4A643988278714E70EB097F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A054D296F4A643988278714E70EB097F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A054D296F4A643988278714E70EB097F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A054D296F4A643988278714E70EB097F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A054D296F4A643988278714E70EB097F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A054D296F4A643988278714E70EB097F--></AD_FIELD>
+
 <!--A0807BE504154C049FE277B1615BD71B--><AD_FIELD>
 <!--A0807BE504154C049FE277B1615BD71B-->  <AD_FIELD_ID><![CDATA[A0807BE504154C049FE277B1615BD71B]]></AD_FIELD_ID>
 <!--A0807BE504154C049FE277B1615BD71B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -256330,6 +257480,31 @@
 <!--A10432A9F3DE482C9EFC1B20D96EEF1D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A10432A9F3DE482C9EFC1B20D96EEF1D--></AD_FIELD>
 
+<!--A107002B874644459B8844644E7990B3--><AD_FIELD>
+<!--A107002B874644459B8844644E7990B3-->  <AD_FIELD_ID><![CDATA[A107002B874644459B8844644E7990B3]]></AD_FIELD_ID>
+<!--A107002B874644459B8844644E7990B3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A107002B874644459B8844644E7990B3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A107002B874644459B8844644E7990B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A107002B874644459B8844644E7990B3-->  <NAME><![CDATA[Payment Schedule Detail]]></NAME>
+<!--A107002B874644459B8844644E7990B3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A107002B874644459B8844644E7990B3-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--A107002B874644459B8844644E7990B3-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C55FA41FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--A107002B874644459B8844644E7990B3-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--A107002B874644459B8844644E7990B3-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--A107002B874644459B8844644E7990B3-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--A107002B874644459B8844644E7990B3-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A107002B874644459B8844644E7990B3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A107002B874644459B8844644E7990B3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A107002B874644459B8844644E7990B3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A107002B874644459B8844644E7990B3-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--A107002B874644459B8844644E7990B3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A107002B874644459B8844644E7990B3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A107002B874644459B8844644E7990B3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A107002B874644459B8844644E7990B3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A107002B874644459B8844644E7990B3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A107002B874644459B8844644E7990B3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A107002B874644459B8844644E7990B3--></AD_FIELD>
+
 <!--A14584EE8EB74A0F945DEEDF34991B73--><AD_FIELD>
 <!--A14584EE8EB74A0F945DEEDF34991B73-->  <AD_FIELD_ID><![CDATA[A14584EE8EB74A0F945DEEDF34991B73]]></AD_FIELD_ID>
 <!--A14584EE8EB74A0F945DEEDF34991B73-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -256698,6 +257873,33 @@
 <!--A253CB2BC7BE4E81B411FE5A6AE6152A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A253CB2BC7BE4E81B411FE5A6AE6152A--></AD_FIELD>
 
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741--><AD_FIELD>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <AD_FIELD_ID><![CDATA[A25B94CDDAE74D1BB18F29B4BAFB4741]]></AD_FIELD_ID>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <NAME><![CDATA[Paid Amount]]></NAME>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560441FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741--></AD_FIELD>
+
 <!--A273EC1E181247E9AF6876F5B12F0E00--><AD_FIELD>
 <!--A273EC1E181247E9AF6876F5B12F0E00-->  <AD_FIELD_ID><![CDATA[A273EC1E181247E9AF6876F5B12F0E00]]></AD_FIELD_ID>
 <!--A273EC1E181247E9AF6876F5B12F0E00-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -259106,6 +260308,37 @@
 <!--A9686A8ABB9B41E1942E9AD90D3397E9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A9686A8ABB9B41E1942E9AD90D3397E9--></AD_FIELD>
 
+<!--A9AA1AAD978D44A1B10C2117E1232609--><AD_FIELD>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_FIELD_ID><![CDATA[A9AA1AAD978D44A1B10C2117E1232609]]></AD_FIELD_ID>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <NAME><![CDATA[2nd Dimension]]></NAME>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_COLUMN_ID><![CDATA[594197039CB647DF9FBEC3386D5761BD]]></AD_COLUMN_ID>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <SEQNO><![CDATA[170]]></SEQNO>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A9AA1AAD978D44A1B10C2117E1232609--></AD_FIELD>
+
 <!--A9AF19FD62884F2F8E183B5C83B00B68--><AD_FIELD>
 <!--A9AF19FD62884F2F8E183B5C83B00B68-->  <AD_FIELD_ID><![CDATA[A9AF19FD62884F2F8E183B5C83B00B68]]></AD_FIELD_ID>
 <!--A9AF19FD62884F2F8E183B5C83B00B68-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -259785,6 +261018,32 @@
 <!--ABE2BD6B9F2B42E5AA58CCD5616230F3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--ABE2BD6B9F2B42E5AA58CCD5616230F3--></AD_FIELD>
 
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4--><AD_FIELD>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <AD_FIELD_ID><![CDATA[ABED0A65D75A499C9D21BB8E9FE7AEF4]]></AD_FIELD_ID>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <NAME><![CDATA[Order Payment Schedule]]></NAME>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560241FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--ABED0A65D75A499C9D21BB8E9FE7AEF4--></AD_FIELD>
+
 <!--AC0ADD00A6C64658BBA92FD549089EC6--><AD_FIELD>
 <!--AC0ADD00A6C64658BBA92FD549089EC6-->  <AD_FIELD_ID><![CDATA[AC0ADD00A6C64658BBA92FD549089EC6]]></AD_FIELD_ID>
 <!--AC0ADD00A6C64658BBA92FD549089EC6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -268850,6 +270109,33 @@
 <!--B16F216A03A849C1939A93B5E4704566-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B16F216A03A849C1939A93B5E4704566--></AD_FIELD>
 
+<!--B1A17CCE711646109CD6FA65D3F5E3F1--><AD_FIELD>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <AD_FIELD_ID><![CDATA[B1A17CCE711646109CD6FA65D3F5E3F1]]></AD_FIELD_ID>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <NAME><![CDATA[Client]]></NAME>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C55FB41FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B1A17CCE711646109CD6FA65D3F5E3F1--></AD_FIELD>
+
 <!--B1A526684CFF4EB7B089539A98DABF9C--><AD_FIELD>
 <!--B1A526684CFF4EB7B089539A98DABF9C-->  <AD_FIELD_ID><![CDATA[B1A526684CFF4EB7B089539A98DABF9C]]></AD_FIELD_ID>
 <!--B1A526684CFF4EB7B089539A98DABF9C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -269439,6 +270725,35 @@
 <!--B2A0F24559EE449CBB44C0EB1DAAC75F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B2A0F24559EE449CBB44C0EB1DAAC75F--></AD_FIELD>
 
+<!--B2BE151C512F4057B5711E12963A0256--><AD_FIELD>
+<!--B2BE151C512F4057B5711E12963A0256-->  <AD_FIELD_ID><![CDATA[B2BE151C512F4057B5711E12963A0256]]></AD_FIELD_ID>
+<!--B2BE151C512F4057B5711E12963A0256-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B2BE151C512F4057B5711E12963A0256-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B2BE151C512F4057B5711E12963A0256-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B2BE151C512F4057B5711E12963A0256-->  <NAME><![CDATA[Role]]></NAME>
+<!--B2BE151C512F4057B5711E12963A0256-->  <DESCRIPTION><![CDATA[The profile of security for the user defining what windows and tabs they can see.]]></DESCRIPTION>
+<!--B2BE151C512F4057B5711E12963A0256-->  <HELP><![CDATA[The Role determines security and access a user who has this Role will have in the System.]]></HELP>
+<!--B2BE151C512F4057B5711E12963A0256-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B2BE151C512F4057B5711E12963A0256-->  <AD_TAB_ID><![CDATA[A55C6E2F874F4CD0B7AEDE4362701EA2]]></AD_TAB_ID>
+<!--B2BE151C512F4057B5711E12963A0256-->  <AD_COLUMN_ID><![CDATA[D51CD55DE2D441ED99283A396909336F]]></AD_COLUMN_ID>
+<!--B2BE151C512F4057B5711E12963A0256-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B2BE151C512F4057B5711E12963A0256-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B2BE151C512F4057B5711E12963A0256-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--B2BE151C512F4057B5711E12963A0256-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--B2BE151C512F4057B5711E12963A0256-->  <SEQNO><![CDATA[15]]></SEQNO>
+<!--B2BE151C512F4057B5711E12963A0256-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B2BE151C512F4057B5711E12963A0256-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B2BE151C512F4057B5711E12963A0256-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B2BE151C512F4057B5711E12963A0256-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B2BE151C512F4057B5711E12963A0256-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B2BE151C512F4057B5711E12963A0256-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B2BE151C512F4057B5711E12963A0256-->  <GRID_SEQNO><![CDATA[15]]></GRID_SEQNO>
+<!--B2BE151C512F4057B5711E12963A0256-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B2BE151C512F4057B5711E12963A0256-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B2BE151C512F4057B5711E12963A0256-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B2BE151C512F4057B5711E12963A0256-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B2BE151C512F4057B5711E12963A0256--></AD_FIELD>
+
 <!--B2CAF17F8D704FBEBE68F769C14F1055--><AD_FIELD>
 <!--B2CAF17F8D704FBEBE68F769C14F1055-->  <AD_FIELD_ID><![CDATA[B2CAF17F8D704FBEBE68F769C14F1055]]></AD_FIELD_ID>
 <!--B2CAF17F8D704FBEBE68F769C14F1055-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -271729,6 +273044,37 @@
 <!--B727DFE94FFB44DBA7E83A5CC110FE56-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B727DFE94FFB44DBA7E83A5CC110FE56--></AD_FIELD>
 
+<!--B7462CA219BE4EFA9352029710EE9FDD--><AD_FIELD>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <AD_FIELD_ID><![CDATA[B7462CA219BE4EFA9352029710EE9FDD]]></AD_FIELD_ID>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <NAME><![CDATA[Product]]></NAME>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <AD_COLUMN_ID><![CDATA[7B1F0700FBEC4FCCB3050AD1E750A3F6]]></AD_COLUMN_ID>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B7462CA219BE4EFA9352029710EE9FDD--></AD_FIELD>
+
 <!--B74729322D0B4B56A356E0196DB589C9--><AD_FIELD>
 <!--B74729322D0B4B56A356E0196DB589C9-->  <AD_FIELD_ID><![CDATA[B74729322D0B4B56A356E0196DB589C9]]></AD_FIELD_ID>
 <!--B74729322D0B4B56A356E0196DB589C9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -274834,6 +276180,37 @@
 <!--BC4C7B4C15B2EC44E040007F01007DA7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--BC4C7B4C15B2EC44E040007F01007DA7--></AD_FIELD>
 
+<!--BC5959F0B1CF447E829C54E3516DFA8C--><AD_FIELD>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <AD_FIELD_ID><![CDATA[BC5959F0B1CF447E829C54E3516DFA8C]]></AD_FIELD_ID>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <NAME><![CDATA[Project]]></NAME>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <DESCRIPTION><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></DESCRIPTION>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <HELP><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></HELP>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <AD_COLUMN_ID><![CDATA[7C8B0463053745C6B5408D804C1646C9]]></AD_COLUMN_ID>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--BC5959F0B1CF447E829C54E3516DFA8C--></AD_FIELD>
+
 <!--BC62A32A3F014F7AB645399D8EE77DA5--><AD_FIELD>
 <!--BC62A32A3F014F7AB645399D8EE77DA5-->  <AD_FIELD_ID><![CDATA[BC62A32A3F014F7AB645399D8EE77DA5]]></AD_FIELD_ID>
 <!--BC62A32A3F014F7AB645399D8EE77DA5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -275530,6 +276907,35 @@
 <!--BE72ECFB2E8C4C568C9AD6D93AFF146E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--BE72ECFB2E8C4C568C9AD6D93AFF146E--></AD_FIELD>
 
+<!--BE7BCC6594514A3A9343B453BB62945F--><AD_FIELD>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <AD_FIELD_ID><![CDATA[BE7BCC6594514A3A9343B453BB62945F]]></AD_FIELD_ID>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <AD_TAB_ID><![CDATA[DA845735FBB34548B04F1908E2089CEC]]></AD_TAB_ID>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <AD_COLUMN_ID><![CDATA[BD8F659DEF86433D93BD93858D223732]]></AD_COLUMN_ID>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--BE7BCC6594514A3A9343B453BB62945F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--BE7BCC6594514A3A9343B453BB62945F--></AD_FIELD>
+
 <!--BE7E52451C394C038D875B914A12C150--><AD_FIELD>
 <!--BE7E52451C394C038D875B914A12C150-->  <AD_FIELD_ID><![CDATA[BE7E52451C394C038D875B914A12C150]]></AD_FIELD_ID>
 <!--BE7E52451C394C038D875B914A12C150-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -275600,7 +277006,7 @@
 <!--BEB0D785211B4CF8BE7C249EA81C13F7-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--BEB0D785211B4CF8BE7C249EA81C13F7-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--BEB0D785211B4CF8BE7C249EA81C13F7-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--BEB0D785211B4CF8BE7C249EA81C13F7-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--BEB0D785211B4CF8BE7C249EA81C13F7-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--BEB0D785211B4CF8BE7C249EA81C13F7-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--BEB0D785211B4CF8BE7C249EA81C13F7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--BEB0D785211B4CF8BE7C249EA81C13F7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -282954,6 +284360,35 @@
 <!--CD8DD55B53FD4AC399F82B68A81A14D0-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--CD8DD55B53FD4AC399F82B68A81A14D0--></AD_FIELD>
 
+<!--CD95FF6ECD014CCC88CC73EB828D7336--><AD_FIELD>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <AD_FIELD_ID><![CDATA[CD95FF6ECD014CCC88CC73EB828D7336]]></AD_FIELD_ID>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <NAME><![CDATA[Due Date]]></NAME>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <AD_COLUMN_ID><![CDATA[062D7EC34B074DC4BF2BB6A1E973D171]]></AD_COLUMN_ID>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--CD95FF6ECD014CCC88CC73EB828D7336--></AD_FIELD>
+
 <!--CDB44BC768524004A512F12675BF9399--><AD_FIELD>
 <!--CDB44BC768524004A512F12675BF9399-->  <AD_FIELD_ID><![CDATA[CDB44BC768524004A512F12675BF9399]]></AD_FIELD_ID>
 <!--CDB44BC768524004A512F12675BF9399-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -284695,6 +286130,32 @@
 <!--CF01982B728B44A5A76DA2F94ECEF4B6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--CF01982B728B44A5A76DA2F94ECEF4B6--></AD_FIELD>
 
+<!--CF026FDA7C614852B4A3A74A1B3EFA48--><AD_FIELD>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <AD_FIELD_ID><![CDATA[CF026FDA7C614852B4A3A74A1B3EFA48]]></AD_FIELD_ID>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <NAME><![CDATA[Invoice Payment Schedule]]></NAME>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560341FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--CF026FDA7C614852B4A3A74A1B3EFA48--></AD_FIELD>
+
 <!--CF10AC8300C84CEEA08D47D2105B3500--><AD_FIELD>
 <!--CF10AC8300C84CEEA08D47D2105B3500-->  <AD_FIELD_ID><![CDATA[CF10AC8300C84CEEA08D47D2105B3500]]></AD_FIELD_ID>
 <!--CF10AC8300C84CEEA08D47D2105B3500-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -287140,6 +288601,37 @@
 <!--D5C2F8F063FDD47CE040007F01004029-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--D5C2F8F063FDD47CE040007F01004029--></AD_FIELD>
 
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8--><AD_FIELD>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <AD_FIELD_ID><![CDATA[D5C575CCCAFC4C62B5FA64938B0FB5C8]]></AD_FIELD_ID>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <NAME><![CDATA[Business Partner]]></NAME>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <AD_COLUMN_ID><![CDATA[5502AEFEFC29441197D3C4473C1C6C68]]></AD_COLUMN_ID>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8--></AD_FIELD>
+
 <!--D5CAB62F6D99404EADBC2A5917BE10B6--><AD_FIELD>
 <!--D5CAB62F6D99404EADBC2A5917BE10B6-->  <AD_FIELD_ID><![CDATA[D5CAB62F6D99404EADBC2A5917BE10B6]]></AD_FIELD_ID>
 <!--D5CAB62F6D99404EADBC2A5917BE10B6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -291969,6 +293461,34 @@
 <!--DD1EBE37AD75403BAFEA77EC0734D41E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--DD1EBE37AD75403BAFEA77EC0734D41E--></AD_FIELD>
 
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3--><AD_FIELD>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <AD_FIELD_ID><![CDATA[DD2937FF9C7345BD83C07C9F7B1D0AD3]]></AD_FIELD_ID>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <NAME><![CDATA[Doubtful Debt Amount]]></NAME>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <DESCRIPTION><![CDATA[Doubtful Debt Amount]]></DESCRIPTION>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <HELP><![CDATA[Doubtful Debt Amount]]></HELP>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <AD_COLUMN_ID><![CDATA[A5CF4D3408B744808F87A1E1A8F4C2E0]]></AD_COLUMN_ID>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--DD2937FF9C7345BD83C07C9F7B1D0AD3--></AD_FIELD>
+
 <!--DD2A5839D78146559012A9D2AC8FA1F7--><AD_FIELD>
 <!--DD2A5839D78146559012A9D2AC8FA1F7-->  <AD_FIELD_ID><![CDATA[DD2A5839D78146559012A9D2AC8FA1F7]]></AD_FIELD_ID>
 <!--DD2A5839D78146559012A9D2AC8FA1F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -292798,7 +294318,7 @@
 <!--DFAD5A49692B4291BCCDB5E47E6791F9-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--DFAD5A49692B4291BCCDB5E47E6791F9-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--DFAD5A49692B4291BCCDB5E47E6791F9-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--DFAD5A49692B4291BCCDB5E47E6791F9-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--DFAD5A49692B4291BCCDB5E47E6791F9-->  <SEQNO><![CDATA[90]]></SEQNO>
 <!--DFAD5A49692B4291BCCDB5E47E6791F9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--DFAD5A49692B4291BCCDB5E47E6791F9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--DFAD5A49692B4291BCCDB5E47E6791F9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -293789,33 +295309,6 @@
 <!--E08B7961A1894624A25918204633568E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E08B7961A1894624A25918204633568E--></AD_FIELD>
 
-<!--E08C0628B19E4EE8BC34448F4946930E--><AD_FIELD>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <AD_FIELD_ID><![CDATA[E08C0628B19E4EE8BC34448F4946930E]]></AD_FIELD_ID>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <NAME><![CDATA[Stored]]></NAME>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <AD_TAB_ID><![CDATA[A55C6E2F874F4CD0B7AEDE4362701EA2]]></AD_TAB_ID>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <AD_COLUMN_ID><![CDATA[A442A53BD7A54C618FB7FCA289FA114D]]></AD_COLUMN_ID>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <SEQNO><![CDATA[40]]></SEQNO>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--E08C0628B19E4EE8BC34448F4946930E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--E08C0628B19E4EE8BC34448F4946930E--></AD_FIELD>
-
 <!--E0B9705EA3F64E78ACBFB1E7284A4BB3--><AD_FIELD>
 <!--E0B9705EA3F64E78ACBFB1E7284A4BB3-->  <AD_FIELD_ID><![CDATA[E0B9705EA3F64E78ACBFB1E7284A4BB3]]></AD_FIELD_ID>
 <!--E0B9705EA3F64E78ACBFB1E7284A4BB3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -295091,6 +296584,37 @@
 <!--E54428A47B1F4BA699E7ACEE4EDFCAAF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E54428A47B1F4BA699E7ACEE4EDFCAAF--></AD_FIELD>
 
+<!--E54C6EB9DE884D5A9779012F3CBBE674--><AD_FIELD>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <AD_FIELD_ID><![CDATA[E54C6EB9DE884D5A9779012F3CBBE674]]></AD_FIELD_ID>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <NAME><![CDATA[Sales Region]]></NAME>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <DESCRIPTION><![CDATA[A defined section of the world where sales efforts will be focused.]]></DESCRIPTION>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <HELP><![CDATA[The Sales Region indicates a specific area of sales coverage.]]></HELP>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <AD_COLUMN_ID><![CDATA[A581C9F44F0B4A51963ACFEC7EECA642]]></AD_COLUMN_ID>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <DISPLAYLOGIC><![CDATA[@$Element_SR@='Y']]></DISPLAYLOGIC>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E54C6EB9DE884D5A9779012F3CBBE674--></AD_FIELD>
+
 <!--E570F4CC2C6D42218AA9BCF40C146AEE--><AD_FIELD>
 <!--E570F4CC2C6D42218AA9BCF40C146AEE-->  <AD_FIELD_ID><![CDATA[E570F4CC2C6D42218AA9BCF40C146AEE]]></AD_FIELD_ID>
 <!--E570F4CC2C6D42218AA9BCF40C146AEE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -296188,6 +297712,37 @@
 <!--E8525D42578B48B2ADB33D8AC083CDBC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E8525D42578B48B2ADB33D8AC083CDBC--></AD_FIELD>
 
+<!--E857B25D48604CC39BCF9530ED2A8E00--><AD_FIELD>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <AD_FIELD_ID><![CDATA[E857B25D48604CC39BCF9530ED2A8E00]]></AD_FIELD_ID>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <NAME><![CDATA[Cost Center]]></NAME>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <DESCRIPTION><![CDATA[Division that adds to the cost of an organization]]></DESCRIPTION>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <HELP><![CDATA[Division that adds to the cost of an organization. Internal structure for cost allocation.]]></HELP>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <AD_COLUMN_ID><![CDATA[BB466480BFAC492AA36E5495EC72BD44]]></AD_COLUMN_ID>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E857B25D48604CC39BCF9530ED2A8E00--></AD_FIELD>
+
 <!--E85AED65DA944BA1AE844BC7E2C19394--><AD_FIELD>
 <!--E85AED65DA944BA1AE844BC7E2C19394-->  <AD_FIELD_ID><![CDATA[E85AED65DA944BA1AE844BC7E2C19394]]></AD_FIELD_ID>
 <!--E85AED65DA944BA1AE844BC7E2C19394-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -297054,6 +298609,35 @@
 <!--EADA3D76E27B4598B65D605D2441F113-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--EADA3D76E27B4598B65D605D2441F113--></AD_FIELD>
 
+<!--EB1ABC95FEFA4F499384EA5421CF8844--><AD_FIELD>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <AD_FIELD_ID><![CDATA[EB1ABC95FEFA4F499384EA5421CF8844]]></AD_FIELD_ID>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <NAME><![CDATA[Due Date]]></NAME>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <AD_COLUMN_ID><![CDATA[062D7EC34B074DC4BF2BB6A1E973D171]]></AD_COLUMN_ID>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--EB1ABC95FEFA4F499384EA5421CF8844--></AD_FIELD>
+
 <!--EB25427A31A448B7896CE84C3276DB18--><AD_FIELD>
 <!--EB25427A31A448B7896CE84C3276DB18-->  <AD_FIELD_ID><![CDATA[EB25427A31A448B7896CE84C3276DB18]]></AD_FIELD_ID>
 <!--EB25427A31A448B7896CE84C3276DB18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -297282,6 +298866,34 @@
 <!--EB8FF491CE734785982BAD81F9523B93-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--EB8FF491CE734785982BAD81F9523B93--></AD_FIELD>
 
+<!--EBE2AF15821C404E875192E43994CE00--><AD_FIELD>
+<!--EBE2AF15821C404E875192E43994CE00-->  <AD_FIELD_ID><![CDATA[EBE2AF15821C404E875192E43994CE00]]></AD_FIELD_ID>
+<!--EBE2AF15821C404E875192E43994CE00-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EBE2AF15821C404E875192E43994CE00-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EBE2AF15821C404E875192E43994CE00-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EBE2AF15821C404E875192E43994CE00-->  <NAME><![CDATA[Invoice Paid]]></NAME>
+<!--EBE2AF15821C404E875192E43994CE00-->  <DESCRIPTION><![CDATA[A flag indicating whether this document type is consider paid or not.]]></DESCRIPTION>
+<!--EBE2AF15821C404E875192E43994CE00-->  <HELP><![CDATA[A flag indicating whether this document type is consider paid or not.]]></HELP>
+<!--EBE2AF15821C404E875192E43994CE00-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--EBE2AF15821C404E875192E43994CE00-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--EBE2AF15821C404E875192E43994CE00-->  <AD_COLUMN_ID><![CDATA[C5CABD48EA774B8289401E670504371C]]></AD_COLUMN_ID>
+<!--EBE2AF15821C404E875192E43994CE00-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--EBE2AF15821C404E875192E43994CE00-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--EBE2AF15821C404E875192E43994CE00-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--EBE2AF15821C404E875192E43994CE00-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--EBE2AF15821C404E875192E43994CE00-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--EBE2AF15821C404E875192E43994CE00-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--EBE2AF15821C404E875192E43994CE00-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--EBE2AF15821C404E875192E43994CE00-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EBE2AF15821C404E875192E43994CE00-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--EBE2AF15821C404E875192E43994CE00-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--EBE2AF15821C404E875192E43994CE00-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EBE2AF15821C404E875192E43994CE00-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--EBE2AF15821C404E875192E43994CE00-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--EBE2AF15821C404E875192E43994CE00-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--EBE2AF15821C404E875192E43994CE00-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--EBE2AF15821C404E875192E43994CE00--></AD_FIELD>
+
 <!--EC3124AE4095410DA49E7AC5FEF2AC48--><AD_FIELD>
 <!--EC3124AE4095410DA49E7AC5FEF2AC48-->  <AD_FIELD_ID><![CDATA[EC3124AE4095410DA49E7AC5FEF2AC48]]></AD_FIELD_ID>
 <!--EC3124AE4095410DA49E7AC5FEF2AC48-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -297783,6 +299395,36 @@
 <!--EDF36638F68D42C38EAF83DFDCFF4800-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--EDF36638F68D42C38EAF83DFDCFF4800--></AD_FIELD>
 
+<!--EE00A2938E8241649BC64CBD34DAC138--><AD_FIELD>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <AD_FIELD_ID><![CDATA[EE00A2938E8241649BC64CBD34DAC138]]></AD_FIELD_ID>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <NAME><![CDATA[Active]]></NAME>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560541FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--EE00A2938E8241649BC64CBD34DAC138-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--EE00A2938E8241649BC64CBD34DAC138--></AD_FIELD>
+
 <!--EE42FF358039451A8E1DBB610AE46537--><AD_FIELD>
 <!--EE42FF358039451A8E1DBB610AE46537-->  <AD_FIELD_ID><![CDATA[EE42FF358039451A8E1DBB610AE46537]]></AD_FIELD_ID>
 <!--EE42FF358039451A8E1DBB610AE46537-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -300245,6 +301887,34 @@
 <!--F489C0DA5BFE40D28C0C888FBC1EF4A5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F489C0DA5BFE40D28C0C888FBC1EF4A5--></AD_FIELD>
 
+<!--F492C58D6C10449E8A98A09B21F6046A--><AD_FIELD>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <AD_FIELD_ID><![CDATA[F492C58D6C10449E8A98A09B21F6046A]]></AD_FIELD_ID>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <NAME><![CDATA[Invoice Payment Schedule]]></NAME>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560341FDE040007F010060C1]]></AD_COLUMN_ID>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <PROPERTY><![CDATA[invoicePaymentSchedule]]></PROPERTY>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <GRID_SEQNO><![CDATA[370]]></GRID_SEQNO>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F492C58D6C10449E8A98A09B21F6046A--></AD_FIELD>
+
 <!--F4A7AD7B84CB49E08F3B5FF360389061--><AD_FIELD>
 <!--F4A7AD7B84CB49E08F3B5FF360389061-->  <AD_FIELD_ID><![CDATA[F4A7AD7B84CB49E08F3B5FF360389061]]></AD_FIELD_ID>
 <!--F4A7AD7B84CB49E08F3B5FF360389061-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -301978,6 +303648,36 @@
 <!--F99DC37FCDD1412A88AFE50D25A029FA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F99DC37FCDD1412A88AFE50D25A029FA--></AD_FIELD>
 
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D--><AD_FIELD>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <AD_FIELD_ID><![CDATA[F9AF6EB2AEBA4B588C39A8CB68E2795D]]></AD_FIELD_ID>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <NAME><![CDATA[G/L Item]]></NAME>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <DESCRIPTION><![CDATA[An alias for the Account Combination which can be commonly used in daily operations.]]></DESCRIPTION>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <HELP><![CDATA[General ledger item.]]></HELP>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <AD_COLUMN_ID><![CDATA[7DC34559B3F6B45BE040007F0100784A]]></AD_COLUMN_ID>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <PROPERTY><![CDATA[paymentDetails.gLItem]]></PROPERTY>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D--></AD_FIELD>
+
 <!--F9BCBD7808EE44C3AC9E1BD7B601E39E--><AD_FIELD>
 <!--F9BCBD7808EE44C3AC9E1BD7B601E39E-->  <AD_FIELD_ID><![CDATA[F9BCBD7808EE44C3AC9E1BD7B601E39E]]></AD_FIELD_ID>
 <!--F9BCBD7808EE44C3AC9E1BD7B601E39E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -304518,6 +306218,33 @@
 <!--FF179F806FBC41ACBE61668897E8BC28-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--FF179F806FBC41ACBE61668897E8BC28--></AD_FIELD>
 
+<!--FF24A0DF410D42DBA62154C68AC78CF3--><AD_FIELD>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <AD_FIELD_ID><![CDATA[FF24A0DF410D42DBA62154C68AC78CF3]]></AD_FIELD_ID>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <NAME><![CDATA[Expected Amount]]></NAME>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <AD_COLUMN_ID><![CDATA[8638D66DE4474084BC8F44BEEF3C9F22]]></AD_COLUMN_ID>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--FF24A0DF410D42DBA62154C68AC78CF3--></AD_FIELD>
+
 <!--FF2F0DA561794D44B179CB2237C70935--><AD_FIELD>
 <!--FF2F0DA561794D44B179CB2237C70935-->  <AD_FIELD_ID><![CDATA[FF2F0DA561794D44B179CB2237C70935]]></AD_FIELD_ID>
 <!--FF2F0DA561794D44B179CB2237C70935-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[Core]]></NAME>
-<!--0-->  <VERSION><![CDATA[3.0.26767]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.26817]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/src-db/database/sourcedata/AD_PROCESS.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/sourcedata/AD_PROCESS.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -6988,6 +6988,30 @@
 <!--BDB3B6FCA0AB453DB4E83503BAB82470-->  <ISKILLABLE><![CDATA[N]]></ISKILLABLE>
 <!--BDB3B6FCA0AB453DB4E83503BAB82470--></AD_PROCESS>
 
+<!--CD10460DF4C14232801DD5C6A14575DD--><AD_PROCESS>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <AD_PROCESS_ID><![CDATA[CD10460DF4C14232801DD5C6A14575DD]]></AD_PROCESS_ID>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <VALUE><![CDATA[ReprocessErrorImportEntries]]></VALUE>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <NAME><![CDATA[Reprocess Error Import Entries]]></NAME>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <DESCRIPTION><![CDATA[Reset all Error Import Entries back to Initial to be reprocessed]]></DESCRIPTION>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <ISREPORT><![CDATA[N]]></ISREPORT>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <CLASSNAME><![CDATA[org.openbravo.service.importprocess.ImportReprocessErrorEntries]]></CLASSNAME>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <ISBACKGROUND><![CDATA[Y]]></ISBACKGROUND>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
+<!--CD10460DF4C14232801DD5C6A14575DD-->  <ISKILLABLE><![CDATA[N]]></ISKILLABLE>
+<!--CD10460DF4C14232801DD5C6A14575DD--></AD_PROCESS>
+
 <!--CD7283DF804B449C97DA09446669EEEF--><AD_PROCESS>
 <!--CD7283DF804B449C97DA09446669EEEF-->  <AD_PROCESS_ID><![CDATA[CD7283DF804B449C97DA09446669EEEF]]></AD_PROCESS_ID>
 <!--CD7283DF804B449C97DA09446669EEEF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -4423,6 +4423,18 @@
 <!--1852D69AB3FD453F8F031813501B26F0-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--1852D69AB3FD453F8F031813501B26F0--></AD_REFERENCE>
 
+<!--1A431A28EC2E48BF990DFA1C12C962B3--><AD_REFERENCE>
+<!--1A431A28EC2E48BF990DFA1C12C962B3-->  <AD_REFERENCE_ID><![CDATA[1A431A28EC2E48BF990DFA1C12C962B3]]></AD_REFERENCE_ID>
+<!--1A431A28EC2E48BF990DFA1C12C962B3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1A431A28EC2E48BF990DFA1C12C962B3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1A431A28EC2E48BF990DFA1C12C962B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1A431A28EC2E48BF990DFA1C12C962B3-->  <NAME><![CDATA[M_InOutLine Receipts]]></NAME>
+<!--1A431A28EC2E48BF990DFA1C12C962B3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1A431A28EC2E48BF990DFA1C12C962B3-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--1A431A28EC2E48BF990DFA1C12C962B3-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--1A431A28EC2E48BF990DFA1C12C962B3-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--1A431A28EC2E48BF990DFA1C12C962B3--></AD_REFERENCE>
+
 <!--1CC9902786384893A551465428468C2A--><AD_REFERENCE>
 <!--1CC9902786384893A551465428468C2A-->  <AD_REFERENCE_ID><![CDATA[1CC9902786384893A551465428468C2A]]></AD_REFERENCE_ID>
 <!--1CC9902786384893A551465428468C2A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6670,7 +6682,8 @@
 <!--F784938E74564BCABF9517EB80DB15F5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F784938E74564BCABF9517EB80DB15F5-->  <NAME><![CDATA[Product Complete (Stocked only)]]></NAME>
 <!--F784938E74564BCABF9517EB80DB15F5-->  <DESCRIPTION><![CDATA[Based on Product Complete selector, but only for Stocked products]]></DESCRIPTION>
-<!--F784938E74564BCABF9517EB80DB15F5-->  <HELP><![CDATA[Based on Product Complete selector, but only for Stocked products]]></HELP>
+<!--F784938E74564BCABF9517EB80DB15F5-->  <HELP><![CDATA[Based on Product Complete selector, but only for Stocked products.
+It only shows products set as stocked = Y with or without stock.]]></HELP>
 <!--F784938E74564BCABF9517EB80DB15F5-->  <VALIDATIONTYPE><![CDATA[S]]></VALIDATIONTYPE>
 <!--F784938E74564BCABF9517EB80DB15F5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F784938E74564BCABF9517EB80DB15F5-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
--- a/src-db/database/sourcedata/AD_TAB.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -7496,7 +7496,7 @@
 <!--800027-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
 <!--800027-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--800027-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--800027-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--800027-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--800027-->  <HQLWHERECLAUSE><![CDATA[e.manual='N']]></HQLWHERECLAUSE>
 <!--800027-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
 <!--800027-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
@@ -7592,7 +7592,7 @@
 <!--800031-->  <PROCESSING><![CDATA[N]]></PROCESSING>
 <!--800031-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--800031-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--800031-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--800031-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--800031-->  <HQLWHERECLAUSE><![CDATA[e.manual='Y']]></HQLWHERECLAUSE>
 <!--800031-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
 <!--800031-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
@@ -13287,8 +13287,8 @@
 <!--07F009753DA647C2AF38697BA9F1B1A0-->  <AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
 <!--07F009753DA647C2AF38697BA9F1B1A0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--07F009753DA647C2AF38697BA9F1B1A0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--07F009753DA647C2AF38697BA9F1B1A0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--07F009753DA647C2AF38697BA9F1B1A0-->  <NAME><![CDATA[Lines]]></NAME>
+<!--07F009753DA647C2AF38697BA9F1B1A0-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
+<!--07F009753DA647C2AF38697BA9F1B1A0-->  <NAME><![CDATA[Lines (Old)]]></NAME>
 <!--07F009753DA647C2AF38697BA9F1B1A0-->  <HELP><![CDATA[Lines tab contains a list of the documents to be paid or already paid by the payment.]]></HELP>
 <!--07F009753DA647C2AF38697BA9F1B1A0-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--07F009753DA647C2AF38697BA9F1B1A0-->  <AD_WINDOW_ID><![CDATA[6F8F913FA60F4CBD93DC1D3AA696E76E]]></AD_WINDOW_ID>
@@ -13503,8 +13503,8 @@
 <!--173B46EC4F91406E9B68DCF6464BB308-->  <AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
 <!--173B46EC4F91406E9B68DCF6464BB308-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--173B46EC4F91406E9B68DCF6464BB308-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--173B46EC4F91406E9B68DCF6464BB308-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--173B46EC4F91406E9B68DCF6464BB308-->  <NAME><![CDATA[Lines]]></NAME>
+<!--173B46EC4F91406E9B68DCF6464BB308-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
+<!--173B46EC4F91406E9B68DCF6464BB308-->  <NAME><![CDATA[Lines (Old)]]></NAME>
 <!--173B46EC4F91406E9B68DCF6464BB308-->  <DESCRIPTION><![CDATA[Add new customer payment into the system. ]]></DESCRIPTION>
 <!--173B46EC4F91406E9B68DCF6464BB308-->  <HELP><![CDATA[The lines tab contains a list of the documents paid by the payment.]]></HELP>
 <!--173B46EC4F91406E9B68DCF6464BB308-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
@@ -14328,6 +14328,38 @@
 <!--33C66CD397294F6382B9AE616C92C716-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--33C66CD397294F6382B9AE616C92C716--></AD_TAB>
 
+<!--34DA12C2E9E3424E9A853563BEFDE81F--><AD_TAB>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <NAME><![CDATA[Lines]]></NAME>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <DESCRIPTION><![CDATA[Add new customer payment into the system. ]]></DESCRIPTION>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <HELP><![CDATA[The lines tab contains a list of the documents paid by the payment.]]></HELP>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <AD_WINDOW_ID><![CDATA[E547CE89D4C04429B6340FFA44E70716]]></AD_WINDOW_ID>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <SEQNO><![CDATA[25]]></SEQNO>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <TABLEVEL><![CDATA[1]]></TABLEVEL>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <HQLWHERECLAUSE><![CDATA[exists (select 1 from FIN_Payment_Detail pd where pd = e.paymentDetails and pd.finPayment.id = @FIN_Payment_ID@)]]></HQLWHERECLAUSE>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[Y]]></DISABLE_PARENT_KEY_PROPERTY>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
+<!--34DA12C2E9E3424E9A853563BEFDE81F-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--34DA12C2E9E3424E9A853563BEFDE81F--></AD_TAB>
+
 <!--367D9DF685DA42A38CAE641D30A0BEBF--><AD_TAB>
 <!--367D9DF685DA42A38CAE641D30A0BEBF-->  <AD_TAB_ID><![CDATA[367D9DF685DA42A38CAE641D30A0BEBF]]></AD_TAB_ID>
 <!--367D9DF685DA42A38CAE641D30A0BEBF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16497,6 +16529,37 @@
 <!--8086A0E5732A45C398A625D766C88FAD-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--8086A0E5732A45C398A625D766C88FAD--></AD_TAB>
 
+<!--809C66481863428C8D714F2018644CC6--><AD_TAB>
+<!--809C66481863428C8D714F2018644CC6-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--809C66481863428C8D714F2018644CC6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--809C66481863428C8D714F2018644CC6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--809C66481863428C8D714F2018644CC6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--809C66481863428C8D714F2018644CC6-->  <NAME><![CDATA[Lines]]></NAME>
+<!--809C66481863428C8D714F2018644CC6-->  <HELP><![CDATA[Lines tab contains a list of the documents to be paid or already paid by the payment.]]></HELP>
+<!--809C66481863428C8D714F2018644CC6-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--809C66481863428C8D714F2018644CC6-->  <AD_WINDOW_ID><![CDATA[6F8F913FA60F4CBD93DC1D3AA696E76E]]></AD_WINDOW_ID>
+<!--809C66481863428C8D714F2018644CC6-->  <SEQNO><![CDATA[25]]></SEQNO>
+<!--809C66481863428C8D714F2018644CC6-->  <TABLEVEL><![CDATA[1]]></TABLEVEL>
+<!--809C66481863428C8D714F2018644CC6-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
+<!--809C66481863428C8D714F2018644CC6-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
+<!--809C66481863428C8D714F2018644CC6-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
+<!--809C66481863428C8D714F2018644CC6-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--809C66481863428C8D714F2018644CC6-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--809C66481863428C8D714F2018644CC6-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--809C66481863428C8D714F2018644CC6-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
+<!--809C66481863428C8D714F2018644CC6-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--809C66481863428C8D714F2018644CC6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--809C66481863428C8D714F2018644CC6-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
+<!--809C66481863428C8D714F2018644CC6-->  <HQLWHERECLAUSE><![CDATA[exists (select 1 from FIN_Payment_Detail pd where pd = e.paymentDetails and pd.finPayment.id = @FIN_Payment_ID@)]]></HQLWHERECLAUSE>
+<!--809C66481863428C8D714F2018644CC6-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--809C66481863428C8D714F2018644CC6-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[Y]]></DISABLE_PARENT_KEY_PROPERTY>
+<!--809C66481863428C8D714F2018644CC6-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
+<!--809C66481863428C8D714F2018644CC6-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
+<!--809C66481863428C8D714F2018644CC6-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--809C66481863428C8D714F2018644CC6-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
+<!--809C66481863428C8D714F2018644CC6-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--809C66481863428C8D714F2018644CC6--></AD_TAB>
+
 <!--81F3CB82FABC4208BA76DEBB3728A14B--><AD_TAB>
 <!--81F3CB82FABC4208BA76DEBB3728A14B-->  <AD_TAB_ID><![CDATA[81F3CB82FABC4208BA76DEBB3728A14B]]></AD_TAB_ID>
 <!--81F3CB82FABC4208BA76DEBB3728A14B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17047,7 +17110,7 @@
 <!--97E1F35BE08840AFB1DA4FE66D329542-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
 <!--97E1F35BE08840AFB1DA4FE66D329542-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--97E1F35BE08840AFB1DA4FE66D329542-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--97E1F35BE08840AFB1DA4FE66D329542-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
+<!--97E1F35BE08840AFB1DA4FE66D329542-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--97E1F35BE08840AFB1DA4FE66D329542-->  <HQLORDERBYCLAUSE><![CDATA[year._identifier]]></HQLORDERBYCLAUSE>
 <!--97E1F35BE08840AFB1DA4FE66D329542-->  <HQLFILTERCLAUSE><![CDATA[e.organization.id = ad_org_getperiodcontrolallow(@#AD_Org_ID@) ]]></HQLFILTERCLAUSE>
 <!--97E1F35BE08840AFB1DA4FE66D329542-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
@@ -17386,7 +17449,7 @@
 <!--A55C6E2F874F4CD0B7AEDE4362701EA2-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--A55C6E2F874F4CD0B7AEDE4362701EA2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A55C6E2F874F4CD0B7AEDE4362701EA2-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
-<!--A55C6E2F874F4CD0B7AEDE4362701EA2-->  <HQLORDERBYCLAUSE><![CDATA[stored desc]]></HQLORDERBYCLAUSE>
+<!--A55C6E2F874F4CD0B7AEDE4362701EA2-->  <HQLORDERBYCLAUSE><![CDATA[creationDate desc]]></HQLORDERBYCLAUSE>
 <!--A55C6E2F874F4CD0B7AEDE4362701EA2-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
 <!--A55C6E2F874F4CD0B7AEDE4362701EA2-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--A55C6E2F874F4CD0B7AEDE4362701EA2-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
@@ -18836,7 +18899,7 @@
 <!--DA845735FBB34548B04F1908E2089CEC-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--DA845735FBB34548B04F1908E2089CEC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--DA845735FBB34548B04F1908E2089CEC-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
-<!--DA845735FBB34548B04F1908E2089CEC-->  <HQLORDERBYCLAUSE><![CDATA[stored desc]]></HQLORDERBYCLAUSE>
+<!--DA845735FBB34548B04F1908E2089CEC-->  <HQLORDERBYCLAUSE><![CDATA[creationDate desc]]></HQLORDERBYCLAUSE>
 <!--DA845735FBB34548B04F1908E2089CEC-->  <HQLFILTERCLAUSE><![CDATA[importStatus='Initial' or importStatus='Error' ]]></HQLFILTERCLAUSE>
 <!--DA845735FBB34548B04F1908E2089CEC-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
 <!--DA845735FBB34548B04F1908E2089CEC-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -320,7 +320,7 @@
 <!--4D3AD61E57AF460EAB4D36A4E1476667-->  <NAME><![CDATA[Product Complete]]></NAME>
 <!--4D3AD61E57AF460EAB4D36A4E1476667-->  <AD_REFERENCE_ID><![CDATA[F784938E74564BCABF9517EB80DB15F5]]></AD_REFERENCE_ID>
 <!--4D3AD61E57AF460EAB4D36A4E1476667-->  <AD_TABLE_ID><![CDATA[FF8080812E381D1E012E3898C5DD0010]]></AD_TABLE_ID>
-<!--4D3AD61E57AF460EAB4D36A4E1476667-->  <WHERECLAUSE><![CDATA[e.active='Y' and e.stocked='Y']]></WHERECLAUSE>
+<!--4D3AD61E57AF460EAB4D36A4E1476667-->  <WHERECLAUSE><![CDATA[e.active='Y' and e.product.stocked='Y']]></WHERECLAUSE>
 <!--4D3AD61E57AF460EAB4D36A4E1476667-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
 <!--4D3AD61E57AF460EAB4D36A4E1476667-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D3AD61E57AF460EAB4D36A4E1476667-->  <VALUEFIELD_ID><![CDATA[A29D60CD276243789FCACA4D044318FE]]></VALUEFIELD_ID>
@@ -450,6 +450,22 @@
 <!--814758DD755642E9BF38BD2E5AD713EC-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
 <!--814758DD755642E9BF38BD2E5AD713EC--></OBUISEL_SELECTOR>
 
+<!--8190C8CCE42C41B2AF573D075BF90F1B--><OBUISEL_SELECTOR>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <OBUISEL_SELECTOR_ID><![CDATA[8190C8CCE42C41B2AF573D075BF90F1B]]></OBUISEL_SELECTOR_ID>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <NAME><![CDATA[M_InOutLine Receipts]]></NAME>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <AD_REFERENCE_ID><![CDATA[1A431A28EC2E48BF990DFA1C12C962B3]]></AD_REFERENCE_ID>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <AD_TABLE_ID><![CDATA[320]]></AD_TABLE_ID>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <WHERECLAUSE><![CDATA[e.shipmentReceipt.id = @inpmInoutId@ AND e.movementQuantity >= 0]]></WHERECLAUSE>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <POPUPTEXTMATCHSTYLE><![CDATA[substring]]></POPUPTEXTMATCHSTYLE>
+<!--8190C8CCE42C41B2AF573D075BF90F1B-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--8190C8CCE42C41B2AF573D075BF90F1B--></OBUISEL_SELECTOR>
+
 <!--862F54CB1B074513BD791C6789F4AA42--><OBUISEL_SELECTOR>
 <!--862F54CB1B074513BD791C6789F4AA42-->  <OBUISEL_SELECTOR_ID><![CDATA[862F54CB1B074513BD791C6789F4AA42]]></OBUISEL_SELECTOR_ID>
 <!--862F54CB1B074513BD791C6789F4AA42-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -988,7 +1004,7 @@
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <NAME><![CDATA[Receipts]]></NAME>
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <AD_REFERENCE_ID><![CDATA[E68CCF4495A34ED7902293A930386B93]]></AD_REFERENCE_ID>
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <AD_TABLE_ID><![CDATA[319]]></AD_TABLE_ID>
-<!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <WHERECLAUSE><![CDATA[e.salesTransaction = false AND e.documentStatus = 'CO']]></WHERECLAUSE>
+<!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <WHERECLAUSE><![CDATA[e.salesTransaction = false AND e.documentStatus = 'CO' AND exists ( select 1 from MaterialMgmtShipmentInOutLine m where m.shipmentReceipt.id=e.id and m.movementQuantity >= 0 )]]></WHERECLAUSE>
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Wed May 27 23:11:01 2015 +0200
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Tue Jun 02 12:57:37 2015 +0200
@@ -1286,7 +1286,7 @@
 <!--4B5C3C443DE744349DD370B8C85A4C28-->  <PROPERTY><![CDATA[stocked]]></PROPERTY>
 <!--4B5C3C443DE744349DD370B8C85A4C28-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--4B5C3C443DE744349DD370B8C85A4C28-->  <SORT><![CDATA[N]]></SORT>
-<!--4B5C3C443DE744349DD370B8C85A4C28-->  <FILTER><![CDATA[N]]></FILTER>
+<!--4B5C3C443DE744349DD370B8C85A4C28-->  <FILTER><![CDATA[Y]]></FILTER>
 <!--4B5C3C443DE744349DD370B8C85A4C28-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
 <!--4B5C3C443DE744349DD370B8C85A4C28-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
 <!--4B5C3C443DE744349DD370B8C85A4C28-->  <SORTNO><![CDATA[110]]></SORTNO>
@@ -1342,6 +1342,28 @@
 <!--4C72931EA7A94CF7B4CF570A8C81DC6A-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--4C72931EA7A94CF7B4CF570A8C81DC6A--></OBUISEL_SELECTOR_FIELD>
 
+<!--4EF51CFED3194C2CAF394CB3E8C9989B--><OBUISEL_SELECTOR_FIELD>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[4EF51CFED3194C2CAF394CB3E8C9989B]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <OBUISEL_SELECTOR_ID><![CDATA[8190C8CCE42C41B2AF573D075BF90F1B]]></OBUISEL_SELECTOR_ID>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <AD_COLUMN_ID><![CDATA[3795]]></AD_COLUMN_ID>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <NAME><![CDATA[Business Partner]]></NAME>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <PROPERTY><![CDATA[shipmentReceipt.businessPartner]]></PROPERTY>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <SORT><![CDATA[Y]]></SORT>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <SORTNO><![CDATA[30]]></SORTNO>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--4EF51CFED3194C2CAF394CB3E8C9989B--></OBUISEL_SELECTOR_FIELD>
+
 <!--5044C81844C841AB9B123DE30591D671--><OBUISEL_SELECTOR_FIELD>
 <!--5044C81844C841AB9B123DE30591D671-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[5044C81844C841AB9B123DE30591D671]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--5044C81844C841AB9B123DE30591D671-->  <OBUISEL_SELECTOR_ID><![CDATA[D47A3616483E46C18A09794B9B276B37]]></OBUISEL_SELECTOR_ID>
@@ -1364,6 +1386,28 @@
 <!--5044C81844C841AB9B123DE30591D671-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--5044C81844C841AB9B123DE30591D671--></OBUISEL_SELECTOR_FIELD>
 
+<!--52D36264D17D4EE193C59B61478BC467--><OBUISEL_SELECTOR_FIELD>
+<!--52D36264D17D4EE193C59B61478BC467-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[52D36264D17D4EE193C59B61478BC467]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--52D36264D17D4EE193C59B61478BC467-->  <OBUISEL_SELECTOR_ID><![CDATA[8190C8CCE42C41B2AF573D075BF90F1B]]></OBUISEL_SELECTOR_ID>
+<!--52D36264D17D4EE193C59B61478BC467-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--52D36264D17D4EE193C59B61478BC467-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--52D36264D17D4EE193C59B61478BC467-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--52D36264D17D4EE193C59B61478BC467-->  <AD_COLUMN_ID><![CDATA[3539]]></AD_COLUMN_ID>
+<!--52D36264D17D4EE193C59B61478BC467-->  <NAME><![CDATA[Product]]></NAME>
+<!--52D36264D17D4EE193C59B61478BC467-->  <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION>
+<!--52D36264D17D4EE193C59B61478BC467-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
+<!--52D36264D17D4EE193C59B61478BC467-->  <PROPERTY><![CDATA[product]]></PROPERTY>
+<!--52D36264D17D4EE193C59B61478BC467-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--52D36264D17D4EE193C59B61478BC467-->  <SORT><![CDATA[Y]]></SORT>
+<!--52D36264D17D4EE193C59B61478BC467-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--52D36264D17D4EE193C59B61478BC467-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--52D36264D17D4EE193C59B61478BC467-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--52D36264D17D4EE193C59B61478BC467-->  <SORTNO><![CDATA[50]]></SORTNO>
+<!--52D36264D17D4EE193C59B61478BC467-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--52D36264D17D4EE193C59B61478BC467-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--52D36264D17D4EE193C59B61478BC467-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--52D36264D17D4EE193C59B61478BC467--></OBUISEL_SELECTOR_FIELD>
+
 <!--541F7FD2135848ED854ED1327A06A679--><OBUISEL_SELECTOR_FIELD>
 <!--541F7FD2135848ED854ED1327A06A679-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[541F7FD2135848ED854ED1327A06A679]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--541F7FD2135848ED854ED1327A06A679-->  <OBUISEL_SELECTOR_ID><![CDATA[32CFC9EB6DD04FACA7452C20C39116F0]]></OBUISEL_SELECTOR_ID>
@@ -3013,6 +3057,28 @@
 <!--B759B8BC264044D1A93CD79594A72F38-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--B759B8BC264044D1A93CD79594A72F38--></OBUISEL_SELECTOR_FIELD>
 
+<!--B7C53AA69D3248859079B3419EB733CC--><OBUISEL_SELECTOR_FIELD>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[B7C53AA69D3248859079B3419EB733CC]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <OBUISEL_SELECTOR_ID><![CDATA[8190C8CCE42C41B2AF573D075BF90F1B]]></OBUISEL_SELECTOR_ID>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <AD_COLUMN_ID><![CDATA[3798]]></AD_COLUMN_ID>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <NAME><![CDATA[Warehouse]]></NAME>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <DESCRIPTION><![CDATA[The location where products arrive to or are sent from.]]></DESCRIPTION>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <HELP><![CDATA[The Warehouse identifies a unique Warehouse where products are stored or Services are provided.]]></HELP>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <PROPERTY><![CDATA[shipmentReceipt.warehouse]]></PROPERTY>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <SORT><![CDATA[Y]]></SORT>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <SORTNO><![CDATA[10]]></SORTNO>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--B7C53AA69D3248859079B3419EB733CC-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--B7C53AA69D3248859079B3419EB733CC--></OBUISEL_SELECTOR_FIELD>
+
 <!--BB033289258248078B1F36B148D04387--><OBUISEL_SELECTOR_FIELD>
 <!--BB033289258248078B1F36B148D04387-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[BB033289258248078B1F36B148D04387]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--BB033289258248078B1F36B148D04387-->  <OBUISEL_SELECTOR_ID><![CDATA[4C8BC3E8E56441F4B8C98C684A0C9212]]></OBUISEL_SELECTOR_ID>
@@ -3188,6 +3254,28 @@
 <!--C3F5DD6F4E964FF090ACF187960C4CAD-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--C3F5DD6F4E964FF090ACF187960C4CAD--></OBUISEL_SELECTOR_FIELD>
 
+<!--C420F12B0A74419397162106AE797C80--><OBUISEL_SELECTOR_FIELD>
+<!--C420F12B0A74419397162106AE797C80-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[C420F12B0A74419397162106AE797C80]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--C420F12B0A74419397162106AE797C80-->  <OBUISEL_SELECTOR_ID><![CDATA[8190C8CCE42C41B2AF573D075BF90F1B]]></OBUISEL_SELECTOR_ID>
+<!--C420F12B0A74419397162106AE797C80-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C420F12B0A74419397162106AE797C80-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C420F12B0A74419397162106AE797C80-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C420F12B0A74419397162106AE797C80-->  <AD_COLUMN_ID><![CDATA[3517]]></AD_COLUMN_ID>
+<!--C420F12B0A74419397162106AE797C80-->  <NAME><![CDATA[Movement Date]]></NAME>
+<!--C420F12B0A74419397162106AE797C80-->  <DESCRIPTION><![CDATA[The date that a certain item is moved from one location to another.]]></DESCRIPTION>
+<!--C420F12B0A74419397162106AE797C80-->  <HELP><![CDATA[The Movement Date indicates the date that a product moved in or out of inventory.  This is the result of a shipment, receipt or inventory movement.]]></HELP>
+<!--C420F12B0A74419397162106AE797C80-->  <PROPERTY><![CDATA[shipmentReceipt.movementDate]]></PROPERTY>
+<!--C420F12B0A74419397162106AE797C80-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C420F12B0A74419397162106AE797C80-->  <SORT><![CDATA[Y]]></SORT>
+<!--C420F12B0A74419397162106AE797C80-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--C420F12B0A74419397162106AE797C80-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--C420F12B0A74419397162106AE797C80-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--C420F12B0A74419397162106AE797C80-->  <SORTNO><![CDATA[40]]></SORTNO>
+<!--C420F12B0A74419397162106AE797C80-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C420F12B0A74419397162106AE797C80-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--C420F12B0A74419397162106AE797C80-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--C420F12B0A74419397162106AE797C80--></OBUISEL_SELECTOR_FIELD>
+
 <!--C4D04905498A4966976DA9E33E57CAEB--><OBUISEL_SELECTOR_FIELD>
 <!--C4D04905498A4966976DA9E33E57CAEB-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[C4D04905498A4966976DA9E33E57CAEB]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--C4D04905498A4966976DA9E33E57CAEB-->  <OBUISEL_SELECTOR_ID><![CDATA[D60F1A02D8D54D55BE825659A2879262]]></OBUISEL_SELECTOR_ID>
@@ -3426,6 +3514,28 @@
 <!--D28E1E1D317844B896947BBD5DDD902A-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--D28E1E1D317844B896947BBD5DDD902A--></OBUISEL_SELECTOR_FIELD>
 
+<!--D2FC05CE951E496CA63117EDD3B92995--><OBUISEL_SELECTOR_FIELD>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[D2FC05CE951E496CA63117EDD3B92995]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <OBUISEL_SELECTOR_ID><![CDATA[8190C8CCE42C41B2AF573D075BF90F1B]]></OBUISEL_SELECTOR_ID>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <AD_COLUMN_ID><![CDATA[3540]]></AD_COLUMN_ID>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <NAME><![CDATA[Movement Quantity]]></NAME>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <DESCRIPTION><![CDATA[The number of items being moved from one location to another.]]></DESCRIPTION>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <HELP><![CDATA[The Movement Quantity indicates the quantity of a product that has been moved.]]></HELP>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <PROPERTY><![CDATA[movementQuantity]]></PROPERTY>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <SORT><![CDATA[Y]]></SORT>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <SORTNO><![CDATA[60]]></SORTNO>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--D2FC05CE951E496CA63117EDD3B92995-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--D2FC05CE951E496CA63117EDD3B92995--></OBUISEL_SELECTOR_FIELD>
+
 <!--D313500687424563ABC3782E70F2F73B--><OBUISEL_SELECTOR_FIELD>
 <!--D313500687424563ABC3782E70F2F73B-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[D313500687424563ABC3782E70F2F73B]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--D313500687424563ABC3782E70F2F73B-->  <OBUISEL_SELECTOR_ID><![CDATA[518C9A856274423AB19490CA145AE139]]></OBUISEL_SELECTOR_ID>
@@ -3830,6 +3940,28 @@
 <!--EC506629A62741D0B4BECED153FD8526-->  <SHOWINPICKLIST><![CDATA[Y]]></SHOWINPICKLIST>
 <!--EC506629A62741D0B4BECED153FD8526--></OBUISEL_SELECTOR_FIELD>
 
+<!--ECBD8D593A3D4035BEE67C327463BB92--><OBUISEL_SELECTOR_FIELD>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[ECBD8D593A3D4035BEE67C327463BB92]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <OBUISEL_SELECTOR_ID><![CDATA[8190C8CCE42C41B2AF573D075BF90F1B]]></OBUISEL_SELECTOR_ID>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <AD_COLUMN_ID><![CDATA[3791]]></AD_COLUMN_ID>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <NAME><![CDATA[Document No.]]></NAME>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <DESCRIPTION><![CDATA[An often automatically generated identifier for all documents.]]></DESCRIPTION>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <HELP><![CDATA[The document number is usually automatically generated by the system and determined by the document type of the document. If the document is not saved, the preliminary number is displayed in "<>". If the document type of your document has no automatic document sequence defined, the field will be empty when creating a new document. This is for documents which usually have an external number (like vendor invoice).  If you leave the field empty, the system will generate a document number for you. The document sequence used for this fallback number is defined in the "Document Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table inside the database (e.g. C_Order).]]></HELP>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <PROPERTY><![CDATA[shipmentReceipt.documentNo]]></PROPERTY>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <SORT><![CDATA[Y]]></SORT>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <SORTNO><![CDATA[20]]></SORTNO>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--ECBD8D593A3D4035BEE67C327463BB92-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--ECBD8D593A3D4035BEE67C327463BB92--></OBUISEL_SELECTOR_FIELD>
+
 <!--ED5469193BCF430995F32F9586C85DAF--><OBUISEL_SELECTOR_FIELD>
 <!--ED5469193BCF430995F32F9586C85DAF-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[ED5469193BCF430995F32F9586C85DAF]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--ED5469193BCF430995F32F9586C85DAF-->  <OBUISEL_SELECTOR_ID><![CDATA[DE0239D3891D434E889A48916A7CAF88]]></OBUISEL_SELECTOR_ID>
--- a/src-test/src/org/openbravo/test/AllAntTaskTests.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-test/src/org/openbravo/test/AllAntTaskTests.java	Tue Jun 02 12:57:37 2015 +0200
@@ -63,6 +63,7 @@
 import org.openbravo.test.security.EntityAccessTest;
 import org.openbravo.test.security.WritableReadableOrganizationClientTest;
 import org.openbravo.test.system.ErrorTextParserTest;
+import org.openbravo.test.system.ImportEntrySizeTest;
 import org.openbravo.test.system.Issue29934Test;
 import org.openbravo.test.system.SystemServiceTest;
 import org.openbravo.test.system.SystemValidatorTest;
@@ -139,6 +140,7 @@
     ErrorTextParserTest.class, //
     TestInfrastructure.class, //
     Issue29934Test.class, //
+    ImportEntrySizeTest.class, //
 
     // xml
     ClientExportImportTest.class, //
--- a/src-test/src/org/openbravo/test/AllQuickAntTaskTests.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-test/src/org/openbravo/test/AllQuickAntTaskTests.java	Tue Jun 02 12:57:37 2015 +0200
@@ -40,6 +40,7 @@
 import org.openbravo.test.security.EntityAccessTest;
 import org.openbravo.test.security.WritableReadableOrganizationClientTest;
 import org.openbravo.test.system.ErrorTextParserTest;
+import org.openbravo.test.system.ImportEntrySizeTest;
 import org.openbravo.test.system.Issue29934Test;
 import org.openbravo.test.system.SystemServiceTest;
 import org.openbravo.test.system.SystemValidatorTest;
@@ -93,6 +94,7 @@
     ErrorTextParserTest.class, //
     TestInfrastructure.class, //
     Issue29934Test.class, //
+    ImportEntrySizeTest.class, //
 
     // xml
     EntityXMLImportTestBusinessObject.class, //
--- a/src-test/src/org/openbravo/test/AllWebserviceTests.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-test/src/org/openbravo/test/AllWebserviceTests.java	Tue Jun 02 12:57:37 2015 +0200
@@ -35,6 +35,7 @@
 import org.openbravo.test.webservice.WSAddRecordWithComputedColumns;
 import org.openbravo.test.webservice.WSReadTest;
 import org.openbravo.test.webservice.WSUpdateTest;
+import org.openbravo.test.webservice.WebServicesWithNoActiveFilterTest;
 
 /**
  * This test suite should only contain test cases which are to run the webservices included in core.
@@ -58,6 +59,7 @@
     FICTest.class, //
     HQLDataSourceTest.class, //
     TestNoteDatasource.class,//
-    TestCosting.class })
+    TestCosting.class,//
+    WebServicesWithNoActiveFilterTest.class })
 public class AllWebserviceTests {
 }
--- a/src-test/src/org/openbravo/test/AntTaskTests.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-test/src/org/openbravo/test/AntTaskTests.java	Tue Jun 02 12:57:37 2015 +0200
@@ -54,6 +54,7 @@
 import org.openbravo.test.security.EntityAccessTest;
 import org.openbravo.test.security.WritableReadableOrganizationClientTest;
 import org.openbravo.test.system.ErrorTextParserTest;
+import org.openbravo.test.system.ImportEntrySizeTest;
 import org.openbravo.test.system.Issue29934Test;
 import org.openbravo.test.system.SystemServiceTest;
 import org.openbravo.test.system.SystemValidatorTest;
@@ -126,6 +127,7 @@
     ErrorTextParserTest.class, //
     TestInfrastructure.class, //
     Issue29934Test.class, //
+    ImportEntrySizeTest.class, //
 
     // xml
     EntityXMLImportTestBusinessObject.class, //
--- a/src-test/src/org/openbravo/test/dal/ADCachedMultiThreadTest.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-test/src/org/openbravo/test/dal/ADCachedMultiThreadTest.java	Tue Jun 02 12:57:37 2015 +0200
@@ -178,7 +178,7 @@
     ArrayList<Callable<Long>> threads = new ArrayList<Callable<Long>>();
 
     @SuppressWarnings("unchecked")
-    List<String> tabIds = (List<String>) qTabs.list();
+    List<String> tabIds = qTabs.list();
     for (String tabId : tabIds) {
       threads.add(new TabLoader(adcs, tabId, false));
     }
--- a/src-test/src/org/openbravo/test/dal/DalPerformanceExampleTest.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-test/src/org/openbravo/test/dal/DalPerformanceExampleTest.java	Tue Jun 02 12:57:37 2015 +0200
@@ -159,7 +159,6 @@
 
     // get the id and entityname in a way which does not load the object
     final Object id = DalUtil.getId(category);
-    final String entityName = DalUtil.getEntityName(category);
 
     // still unloaded
     Assert.assertTrue(((HibernateProxy) category).getHibernateLazyInitializer().isUninitialized());
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/src/org/openbravo/test/system/ImportEntrySizeTest.java	Tue Jun 02 12:57:37 2015 +0200
@@ -0,0 +1,114 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SLU 
+ * All portions are Copyright (C) 2015 Openbravo SLU 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.test.system;
+
+import java.util.Date;
+import java.util.UUID;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openbravo.base.provider.OBProvider;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.ad.utility.DataSet;
+import org.openbravo.service.dataset.DataSetService;
+import org.openbravo.service.importprocess.ImportEntry;
+import org.openbravo.service.importprocess.ImportEntryArchive;
+import org.openbravo.test.base.OBBaseTest;
+
+/**
+ * Test the {@link ImportEntry} and {@link ImportEntryArchive} tables to see that large text fit in
+ * there.
+ * 
+ * @author mtaal
+ */
+
+public class ImportEntrySizeTest extends OBBaseTest {
+  private static final long SIZE = 1000 * 1000 * 10;
+
+  /**
+   * Test the {@link DataSetService#hasChanged(DataSet, Date)} method.
+   */
+  @Test
+  public void testChangedDataSet() {
+    setTestAdminContext();
+
+    // create a random string
+    StringBuilder sb = new StringBuilder();
+    // do -100 as the new UUID will maybe get it over the max length which is 10 million
+    while (sb.length() <= (SIZE - 100)) {
+      sb.append(UUID.randomUUID().toString());
+    }
+    String json = sb.toString();
+
+    StringBuilder sb2 = new StringBuilder();
+    // do -100 as the new UUID will maybe get it over the max length which is 10 million
+    while (sb2.length() <= (SIZE - 100)) {
+      sb2.append(UUID.randomUUID().toString());
+    }
+    String error = sb2.toString();
+
+    String importEntryId = null;
+    {
+      final ImportEntry importEntry = OBProvider.getInstance().get(ImportEntry.class);
+      importEntry.setJsonInfo(json);
+      importEntry.setErrorinfo(error);
+      importEntry.setImported(new Date());
+      importEntry.setImportStatus("Initial");
+      importEntry.setTypeofdata("Order");
+      OBDal.getInstance().save(importEntry);
+      importEntryId = importEntry.getId();
+
+      final ImportEntryArchive importEntryArchive = OBProvider.getInstance().get(
+          ImportEntryArchive.class);
+      importEntryArchive.setId(importEntry.getId());
+      importEntryArchive.setNewOBObject(true);
+      importEntryArchive.setJsonInfo(json);
+      importEntryArchive.setErrorinfo(error);
+      importEntryArchive.setImported(new Date());
+      importEntryArchive.setImportStatus("Initial");
+      importEntryArchive.setTypeofdata("Order");
+      OBDal.getInstance().save(importEntryArchive);
+      OBDal.getInstance().commitAndClose();
+    }
+
+    // read and check
+    ImportEntry importEntry = OBDal.getInstance().get(ImportEntry.class, importEntryId);
+    ImportEntryArchive importEntryArchive = OBDal.getInstance().get(ImportEntryArchive.class,
+        importEntryId);
+
+    // remove to clean the db before checking
+    OBDal.getInstance().remove(importEntryArchive);
+    OBDal.getInstance().remove(importEntry);
+    OBDal.getInstance().commitAndClose();
+
+    // check the result
+    Assert.assertEquals(json, importEntry.getJsonInfo());
+    Assert.assertEquals(error, importEntry.getErrorinfo());
+
+    Assert.assertEquals(json, importEntryArchive.getJsonInfo());
+    Assert.assertEquals(error, importEntryArchive.getErrorinfo());
+
+    // and check that we actually checked big sizes
+    Assert.assertTrue(importEntry.getJsonInfo().length() > (SIZE - 100));
+    Assert.assertTrue(importEntry.getErrorinfo().length() > (SIZE - 100));
+    Assert.assertTrue(importEntryArchive.getJsonInfo().length() > (SIZE - 100));
+    Assert.assertTrue(importEntryArchive.getErrorinfo().length() > (SIZE - 100));
+  }
+}
\ No newline at end of file
--- a/src-test/src/org/openbravo/test/webservice/JSONWebServices.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-test/src/org/openbravo/test/webservice/JSONWebServices.java	Tue Jun 02 12:57:37 2015 +0200
@@ -126,7 +126,7 @@
     assertThat("Row's entity", aRecord.getString("_entityName"), is(equalTo("Organization")));
   }
 
-  private String request(String entityName, String id, String queryPart, String method) {
+  protected String request(String entityName, String id, String queryPart, String method) {
     String wsPart = entityName + (id == null ? "" : "/" + id)
         + (queryPart == null ? "" : "?" + queryPart);
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/src/org/openbravo/test/webservice/WebServicesWithNoActiveFilterTest.java	Tue Jun 02 12:57:37 2015 +0200
@@ -0,0 +1,152 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SLU 
+ * All portions are Copyright (C) 2015 Openbravo SLU 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.test.webservice;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.junit.Test;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.common.geography.Country;
+
+/**
+ * Test cases for JSON and dal Webservices, using noActiveFilter.
+ * 
+ * @author NaroaIriarte
+ *
+ */
+
+public class WebServicesWithNoActiveFilterTest extends BaseWSTest {
+  private static final String GERMANY_ID_DAL = "<id>101</id>";
+  private static final String GERMANY_ID_JSON = "Country\\/101";
+  private static final String GERMANY_ID = "101";
+
+  /**
+   * Test to ensure that the no_active_filter is working when it is set to true in the JSON
+   * WebServices. The expected behavior is getting the elements which are not active.
+   */
+  @Test
+  public void jsonWithNoActiveFilterTrue() throws JSONException {
+    OBContext.setAdminMode();
+    try {
+      String jsonResp = jsonRequest("_noActiveFilter=true");
+      assertTrue(jsonResp.contains(GERMANY_ID_JSON));
+      Country country = OBDal.getInstance().get(Country.class, GERMANY_ID);
+      country.setActive(true);
+    } finally {
+      OBDal.getInstance().commitAndClose();
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  /**
+   * Test to ensure that the no_active_filter is working when it is set to false in the JSON
+   * WebServices. The expected behavior is not getting the elements which are not active.
+   */
+  @Test
+  public void jsonWithNoActiveFilterFalse() throws JSONException {
+    OBContext.setAdminMode();
+    try {
+      String jsonResp = jsonRequest("_noActiveFilter=false");
+      assertFalse(jsonResp.contains(GERMANY_ID_JSON));
+      Country country = OBDal.getInstance().get(Country.class, GERMANY_ID);
+      country.setActive(true);
+    } finally {
+      OBDal.getInstance().commitAndClose();
+      OBContext.restorePreviousMode();
+    }
+
+  }
+
+  /**
+   * Test to ensure that the no_active_filter is working when it is set to true in the dal
+   * WebServices. The expected behavior is getting the elements which are not active.
+   */
+  @Test
+  public void dalWithNoActiveFilterTrue() {
+    OBContext.setAdminMode();
+    try {
+      String dalResp = dalRequest("/ws/dal/Country?_noActiveFilter=true");
+      assertTrue(dalResp.contains(GERMANY_ID_DAL));
+      Country country = OBDal.getInstance().get(Country.class, GERMANY_ID);
+      country.setActive(true);
+    } finally {
+      OBDal.getInstance().commitAndClose();
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  /**
+   * Test to ensure that the no_active_filter is working when it is set to false in the dal
+   * WebServices. The expected behavior is not getting the elements which are not active.
+   */
+  @Test
+  public void dalWithNoActiveFilterFalse() {
+    OBContext.setAdminMode();
+    try {
+      String dalResp = dalRequest("/ws/dal/Country?_noActiveFilter=false");
+      assertFalse(dalResp.contains(GERMANY_ID_DAL));
+      Country country = OBDal.getInstance().get(Country.class, GERMANY_ID);
+      country.setActive(true);
+    } finally {
+      OBDal.getInstance().commitAndClose();
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  private String jsonRequest(String noActiveFilter) throws JSONException {
+    String countryDataString;
+    OBContext.setAdminMode();
+    try {
+      Country country = OBDal.getInstance().get(Country.class, GERMANY_ID);
+      country.setActive(false);
+      OBDal.getInstance().commitAndClose();
+
+      JSONWebServices jws = new JSONWebServices();
+      JSONObject resp = new JSONObject(jws.request("Country", "", noActiveFilter, "GET"));
+      JSONArray countryData = resp.getJSONObject("response").getJSONArray("data");
+      // Now in this JSONArray, we are going to check if the country is shown.
+      countryDataString = countryData.toString();
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+    return countryDataString;
+  }
+
+  private String dalRequest(String noActiveFilter) {
+    String countryDataString;
+    OBContext.setAdminMode();
+    try {
+      Country country = OBDal.getInstance().get(Country.class, GERMANY_ID);
+      country.setActive(false);
+      OBDal.getInstance().commitAndClose();
+      countryDataString = doTestGetRequest(noActiveFilter, null, 200);
+
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+    return countryDataString;
+  }
+
+}
--- a/src-test/src/org/openbravo/test/xml/EntityXMLIssues.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-test/src/org/openbravo/test/xml/EntityXMLIssues.java	Tue Jun 02 12:57:37 2015 +0200
@@ -68,7 +68,7 @@
     addReadWriteAccess(Greeting.class);
 
     // only do one greeting
-    final Greeting greeting = (Greeting) OBProvider.getInstance().get(Greeting.class);
+    final Greeting greeting = OBProvider.getInstance().get(Greeting.class);
     final String id = "" + System.currentTimeMillis();
     greeting.setName("test" + id);
     greeting.setId(id);
--- a/src-trl/src/org/openbravo/translate/RTLSkin.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-trl/src/org/openbravo/translate/RTLSkin.java	Tue Jun 02 12:57:37 2015 +0200
@@ -38,7 +38,6 @@
   static int count = 0;
   private static String srcDirRTLSkin = "";
   private static String srcDirLTRSkin = "";
-  private static String srcDirOrig = "";
   private static Vector<String> vImagesToFlip;
 
   static Logger log4j = Logger.getLogger(Translate.class);
@@ -85,7 +84,6 @@
     File fileLTRSrcDeep, fileRTLSrcDeep;
 
     for (int i = 0; i < files.length; i++) {
-      String pathModule = "";
       log4j.info("Processing RTL skin " + files[i]);
       vImagesToFlip = new Vector<String>();
       fImagesToFlip = new File(srcDirRTLSkin + "/" + files[i] + "/RTLFlippedImages.txt");
@@ -96,7 +94,6 @@
         if (strDirModule.list().length == 1 && strDirModule.isDirectory()) {
           fImagesToFlip = new File(srcDirRTLSkin + "/" + files[i] + "/" + strDirModule.list()[0]
               + "/RTLFlippedImages.txt");
-          pathModule = srcDirRTLSkin + "/" + files[i] + "/" + strDirModule.list()[0];
         } else {
           log4j.error("Not Founded File with images to flip! " + srcDirRTLSkin + "/" + files[i]
               + "/RTLFlippedImages.txt");
@@ -143,14 +140,16 @@
    * @param strSkinFolderName
    *          Path to the folder that contains the original skin -where no change will be
    *          performed-.
-   * @param relativePath
+   * @param _relativePath
    *          Relative Path.
    * @param folderContentType
    *          whether skin or javascript folder is passed in srcDir
    */
-  public static void runFolders(File srcDir, String strSkinFolderName, String relativePath,
+  public static void runFolders(File srcDir, String strSkinFolderName, String _relativePath,
       String folderContentType) {
 
+    String relativePath = _relativePath;
+
     File[] list = srcDir.listFiles();
 
     for (int i = 0; i < list.length; i++) {
--- a/src-trl/src/org/openbravo/translate/Translate.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-trl/src/org/openbravo/translate/Translate.java	Tue Jun 02 12:57:37 2015 +0200
@@ -211,11 +211,12 @@
    *          If is filtered.
    * @param dirFilter
    *          Filter to apply.
-   * @param relativePath
+   * @param _relativePath
    *          The relative path.
    */
   private static void listDir(File file, boolean boolFilter, DirFilter dirFilter,
-      String relativePath, boolean parse, String parent, int level, String module) {
+      String _relativePath, boolean parse, String parent, int level, String module) {
+    String relativePath = _relativePath;
     File[] list;
     if (boolFilter)
       list = file.listFiles(dirFilter);
@@ -293,12 +294,13 @@
    * 
    * @param fileParsing
    *          File to parse.
-   * @param relativePath
+   * @param _relativePath
    *          The relative path.
    */
-  private static void parseFile(File fileParsing, String relativePath, String parent, String module) {
+  private static void parseFile(File fileParsing, String _relativePath, String parent, String module) {
     if (!translateModule)
       return;
+    String relativePath = _relativePath;
     final String strFileName = fileParsing.getName();
     if (log4j.isDebugEnabled())
       log4j.debug("Parsing of " + strFileName);
@@ -530,15 +532,16 @@
   /**
    * This method is the one in charge of the translation of the found text.
    * 
-   * @param ini
+   * @param input
    *          String with the text to translate.
    * @param isPartial
    *          Indicates if the text passed is partial text or the complete one found in the element
    *          content.
    */
-  private void translate(String ini, boolean isPartial) {
+  private void translate(String input, boolean isPartial) {
     if (!translateModule)
       return;
+    String ini = input;
     ini = replace(replace(ini.trim(), "\r", ""), "\n", " ");
     ini = ini.trim();
     ini = delSp(ini);
@@ -559,10 +562,9 @@
     final Vector<String> translated = new Vector<String>(0);
     boolean aux = true;
     translated.addElement("Y");
-    String resultado = ini;
     if (!ini.equals("") && !ini.toLowerCase().startsWith("xx") && !isNumeric(ini)) {
       log4j.debug("Translating " + ini + " for file" + actualFile + " moduleLang:" + moduleLang);
-      resultado = tokenize(ini, 0, translated);
+      tokenize(ini, 0, translated);
       try {
         aux = translated.elementAt(0).equals("Y");
         if (moduleLang == null || moduleLang.equals("")) {
Binary file src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentPlanData.class has changed
--- a/src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan_data.xsql	Wed May 27 23:11:01 2015 +0200
+++ b/src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan_data.xsql	Tue Jun 02 12:57:37 2015 +0200
@@ -54,7 +54,7 @@
         SELECT count(*) as exist
         FROM DUAL
         WHERE EXISTS (SELECT 1 FROM ad_preference
-                      WHERE attribute = 'PaymentPlanUpdatedV2')
+                      WHERE attribute = 'PaymentPlanUpdatedV3')
       ]]>
     </Sql>
   </SqlMethod>
@@ -66,7 +66,7 @@
            ad_preference_id, ad_client_id, ad_org_id, isactive,
            createdby, created, updatedby, updated,attribute
            ) VALUES (
-           get_uuid(), '0', '0', 'Y', '0', NOW(), '0', NOW(),'PaymentPlanUpdatedV2')
+           get_uuid(), '0', '0', 'Y', '0', NOW(), '0', NOW(),'PaymentPlanUpdatedV3')
          ]]>
         </Sql>
    </SqlMethod>
--- a/src-wad/src/org/openbravo/wad/Wad.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-wad/src/org/openbravo/wad/Wad.java	Tue Jun 02 12:57:37 2015 +0200
@@ -995,7 +995,6 @@
       }
 
       int parentTabIndex = -1;
-      boolean sinParent = false;
       String grandfatherField = "";
       if (allTabs != null && allTabs.length > 0)
         parentTabIndex = parentTabId(allTabs, tabsData.tabid);
@@ -1012,7 +1011,6 @@
       if (parentTabIndex != -1 && (parentsFieldsData == null || parentsFieldsData.length == 0)) {
         parentsFieldsData = FieldsData.parentsColumnReal(pool, allTabs[parentTabIndex].tabid,
             tabsData.tabid);
-        sinParent = true;
         if (parentsFieldsData == null || parentsFieldsData.length == 0) {
           log4j.info("No key found in parent tab: " + allTabs[parentTabIndex].tabname);
         }
@@ -1296,8 +1294,7 @@
       }
       for (int i = 0; i < vecAuxSelCol.size(); i++)
         vecSelCol.addElement(vecAuxSelCol.elementAt(i));
-      selCol = new EditionFieldsData[vecSelCol.size()];
-      vecSelCol.copyInto(selCol);
+      return vecSelCol.toArray(new EditionFieldsData[0]);
     }
     return selCol;
   }
@@ -2381,13 +2378,14 @@
    * Generates the where with the params as java vars, to put it in the java file to be used in all
    * the internal searchs, like gotoFirstRow...
    * 
-   * @param strWhere
+   * @param _strWhere
    *          The tab's where clause
    * @param vecParameters
    *          Vector with the parameters for the where clause.
    * @return String with the new static where clause.
    */
-  private String generateStaticWhere(String strWhere, Vector<Object> vecParameters) {
+  private String generateStaticWhere(String _strWhere, Vector<Object> vecParameters) {
+    String strWhere = _strWhere;
     final StringBuffer result = new StringBuffer();
     if (strWhere == null || strWhere.equals(""))
       return strWhere;
@@ -2436,16 +2434,17 @@
    * @param vecTableParametersTop
    *          Vector with the from clause parameters.
    * @param whereClause
-   * @param orderBy
+   * @param _orderBy
    * @throws ServletException
    * @throws IOException
    */
   private void processTabXSQLSortTab(FieldsData[] parentsFieldsData, File fileDir, String strTab,
       String tabName, String tableName, String windowName, String keyColumnName,
       String strColumnSortOrderId, String strColumnSortYNId, Vector<Object> vecParametersTop,
-      Vector<Object> vecTableParametersTop, String javaPackage, String whereClause, String orderBy)
+      Vector<Object> vecTableParametersTop, String javaPackage, String whereClause, String _orderBy)
       throws ServletException, IOException {
     log4j.debug("Processing Sort Tab xsql: " + strTab + ", " + tabName);
+    String orderBy = _orderBy;
     XmlDocument xmlDocumentXsql;
     final String[] discard = { "", "", "hasOrgKey" };
     if (parentsFieldsData == null || parentsFieldsData.length == 0)
@@ -2490,9 +2489,9 @@
       final Vector<Object> vecTable = new Vector<Object>();
       final Vector<Object> vecWhere = new Vector<Object>();
       final FieldsData[] data = FieldsData.identifierColumns(pool, tableName);
-      log4j.debug("Total Identifiers for " + tableName + ": " + data.length);
       if (data == null)
         strFields = "''";
+      log4j.debug("Total Identifiers for " + tableName + ": " + data.length);
       vecCounters.addElement("0");
       vecCounters.addElement("0");
       for (int i = 0; i < data.length; i++) {
@@ -3622,7 +3621,7 @@
    *          Id of the tab.
    * @param tabName
    *          Name of the tab.
-   * @param keyColumnName
+   * @param _keyColumnName
    *          Name of the tab's key column.
    * @param isreadonly
    *          Boolean that means if is a read only tab or not.
@@ -3640,11 +3639,12 @@
    * @throws IOException
    */
   private void processTabHtmlRelation(FieldsData[] parentsFieldsData, File fileDir, String strTab,
-      String tabName, String keyColumnName, boolean isreadonly, WADControl control,
+      String tabName, String _keyColumnName, boolean isreadonly, WADControl control,
       boolean isTranslated, String adLanguage, String tabNamePresentation, String strTable,
       String accessLevel) throws ServletException, IOException {
     log4j.debug("Procesig relation html" + (isTranslated ? " translated" : "") + ": " + strTab
         + ", " + tabName);
+    String keyColumnName = _keyColumnName;
     final String[] discard = new String[1];
     if (parentsFieldsData.length == 0)
       discard[0] = new String("parent");
@@ -3667,12 +3667,10 @@
           "inp" + Sqlc.TransformaNombreColumna(parentsFieldsData[0].name));
       xmlDocument.setParameter("parentKeyName", parentsFieldsData[0].name);
     }
-    xmlDocument.setParameter("importCSS",
-        getVectorElementsNotRepeated(control.getCSSImport(), new Vector<String>(), 1));
-    xmlDocument.setParameter("importJS",
-        getVectorElementsNotRepeated(control.getImport(), new Vector<String>(), 2));
+    xmlDocument.setParameter("importCSS", getVectorElementsNotRepeated(control.getCSSImport(), 1));
+    xmlDocument.setParameter("importJS", getVectorElementsNotRepeated(control.getImport(), 2));
     final StringBuffer script = new StringBuffer();
-    script.append(getVectorElementsNotRepeated(control.getJSCode(), new Vector<String>(), 0));
+    script.append(getVectorElementsNotRepeated(control.getJSCode(), 0));
     script.append("function validateClient(action, form, value) {\n");
     script.append("  var frm=document.frmMain;\n");
     script.append(control.getValidation()).append("\n");
@@ -3689,16 +3687,12 @@
    * 
    * @param data
    *          The main Vector.
-   * @param addedElements
-   *          Vector with the new values to add.
    * @param type
    *          Indicates the type of import (1=CSS, 2=JS).
    * @return String with the list of imports in html format.
    */
-  private String getVectorElementsNotRepeated(Vector<String[]> data, Vector<String> addedElements,
-      int type) {
-    if (addedElements == null)
-      addedElements = new Vector<String>();
+  private String getVectorElementsNotRepeated(Vector<String[]> data, int type) {
+    Vector<String> addedElements = new Vector<String>();
     if (data == null)
       return "";
     final StringBuffer text = new StringBuffer();
@@ -3868,7 +3862,7 @@
    *          Array of parent fields.
    * @param vecFields
    *          Vector with the select clause.
-   * @param isreadonly
+   * @param _isreadonly
    *          Boolean that indicates if the tab is read only or not.
    * @param isSOTrx
    *          Indicates if the tab is a sales tab or not (Y | N).
@@ -3884,13 +3878,14 @@
   private void processTabHtmlEdition(FieldProvider[] efd, FieldProvider[] efdauxiliar,
       File fileDir, String strTab, String tabName, String keyColumnName,
       String tabNamePresentation, String windowId, FieldsData[] parentsFieldsData,
-      Vector<Object> vecFields, boolean isreadonly, String isSOTrx, String strTable,
+      Vector<Object> vecFields, boolean _isreadonly, String isSOTrx, String strTable,
       double pixelSize, String strLanguage, boolean editable, boolean isSecondaryKey)
       throws ServletException, IOException {
     if (log4j.isDebugEnabled())
       log4j.debug("Procesig edition html" + (strLanguage.equals("") ? "" : " translated") + ": "
           + strTab + ", " + tabName);
 
+    boolean isreadonly = _isreadonly;
     final boolean isReadOnlyDefinedTab = (isreadonly && editable); // isReadOnlyDefinedTab:
     // the
     // tab is
@@ -4535,9 +4530,9 @@
    * @return The copy array of FieldsData objects.
    */
   private FieldsData[] copyarray(FieldsData[] from) {
-    log4j.debug("Starting copyarray: " + from.length);
     if (from == null)
       return null;
+    log4j.debug("Starting copyarray: " + from.length);
     final FieldsData[] to = new FieldsData[from.length];
     for (int i = 0; i < from.length; i++) {
       log4j.debug("For copyarray");
--- a/src-wad/src/org/openbravo/wad/WadUtility.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-wad/src/org/openbravo/wad/WadUtility.java	Tue Jun 02 12:57:37 2015 +0200
@@ -62,8 +62,7 @@
     else if (reference.equals("16"))
       return "TO_CHAR(" + text + ", '" + sqlDateFormat + " HH24:MM:SS')";
     else
-      text = "TO_CHAR(COALESCE(TO_CHAR(" + text + "), ''))";
-    return text;
+      return "TO_CHAR(COALESCE(TO_CHAR(" + text + "), ''))";
   }
 
   public static String columnIdentifier(ConnectionProvider conn, String tableName,
@@ -575,9 +574,10 @@
     return getComboReloadText(token, vecFields, parentsFieldsData, vecComboReload, prefix, "");
   }
 
-  public static String getComboReloadText(String token, Vector<Object> vecFields,
+  public static String getComboReloadText(String _token, Vector<Object> vecFields,
       FieldsData[] parentsFieldsData, Vector<Object> vecComboReload, String prefix,
       String columnname) {
+    String token = _token;
     StringBuffer strOut = new StringBuffer();
     int i = token.indexOf("@");
     while (i != -1) {
@@ -622,9 +622,10 @@
         + Sqlc.TransformaNombreColumna(token) + "\""));
   }
 
-  public static String getDisplayLogicText(String token, Vector<Object> vecFields,
+  public static String getDisplayLogicText(String _token, Vector<Object> vecFields,
       FieldsData[] parentsFieldsData, Vector<Object> vecAuxiliar, Vector<Object> vecDisplayLogic,
       String windowId, Vector<Object> vecContext, boolean save) {
+    String token = _token;
     StringBuffer strOut = new StringBuffer();
     int i = token.indexOf("@");
     while (i != -1) {
--- a/src-wad/src/org/openbravo/wad/controls/WADControl.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-wad/src/org/openbravo/wad/controls/WADControl.java	Tue Jun 02 12:57:37 2015 +0200
@@ -154,7 +154,8 @@
     return css;
   }
 
-  protected String replaceHTML(String text) {
+  protected String replaceHTML(String _text) {
+    String text = _text;
     text = text.replace("<HTML>", "");
     text = text.replace("<HEAD>", "");
     text = text.replace("<BODY>", "");
--- a/src-wad/src/org/openbravo/wad/controls/WADImage.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-wad/src/org/openbravo/wad/controls/WADImage.java	Tue Jun 02 12:57:37 2015 +0200
@@ -148,7 +148,8 @@
     return texto.toString();
   }
 
-  public int addAdditionDefaulSQLFields(Vector<Object> v, FieldsData fieldsDef, int itable) {
+  public int addAdditionDefaulSQLFields(Vector<Object> v, FieldsData fieldsDef, int _itable) {
+    int itable = _itable;
     if (fieldsDef.isdisplayed.equals("Y")) { // Image
       final FieldsData fd = new FieldsData();
       fd.adcolumnid = fieldsDef.adcolumnid + "_" + (itable++);
@@ -179,7 +180,8 @@
   }
 
   public int addAdditionDefaulJavaFields(StringBuffer strDefaultValues, FieldsData fieldsDef,
-      String tabName, int itable) {
+      String tabName, int _itable) {
+    int itable = _itable;
     if (fieldsDef.isdisplayed.equals("Y")) {
       strDefaultValues.append(", " + tabName + "Data.selectDef" + fieldsDef.adcolumnid + "_"
           + (itable++) + "(this, " + fieldsDef.defaultvalue + ")");
--- a/src-wad/src/org/openbravo/wad/controls/WADNumber.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-wad/src/org/openbravo/wad/controls/WADNumber.java	Tue Jun 02 12:57:37 2015 +0200
@@ -205,32 +205,32 @@
     }
   }
 
-  private boolean isDecimalNumber(String reference) {
+  private static boolean isDecimalNumber(String reference) {
     if (reference == null || reference.equals(""))
       return false;
     return (reference.equals("12") || reference.equals("22"));
   }
 
-  private boolean isGeneralNumber(String reference) {
+  private static boolean isGeneralNumber(String reference) {
     if (reference == null || reference.equals(""))
       return false;
     return reference.equals("800019");
   }
 
-  private boolean isQtyNumber(String reference) {
+  private static boolean isQtyNumber(String reference) {
     if (reference == null || reference.equals(""))
       return false;
     return reference.equals("29");
   }
 
-  private boolean isPriceNumber(String reference) {
+  private static boolean isPriceNumber(String reference) {
     if (reference == null || reference.equals(""))
       return false;
     return reference.equals("800008");
 
   }
 
-  private boolean isIntegerNumber(String reference) {
+  private static boolean isIntegerNumber(String reference) {
     if (reference == null || reference.equals(""))
       return false;
     return reference.equals("11");
--- a/src-wad/src/org/openbravo/wad/controls/WADSearch.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-wad/src/org/openbravo/wad/controls/WADSearch.java	Tue Jun 02 12:57:37 2015 +0200
@@ -270,7 +270,8 @@
     return true;
   }
 
-  public int addAdditionDefaulSQLFields(Vector<Object> v, FieldsData fieldsDef, int itable) {
+  public int addAdditionDefaulSQLFields(Vector<Object> v, FieldsData fieldsDef, int _itable) {
+    int itable = _itable;
     if (fieldsDef.isdisplayed.equals("Y")) {
       final FieldsData fd = new FieldsData();
       fd.adcolumnid = fieldsDef.adcolumnid + "_" + (itable++);
@@ -393,7 +394,8 @@
   }
 
   public int addAdditionDefaulJavaFields(StringBuffer strDefaultValues, FieldsData fieldsDef,
-      String tabName, int itable) {
+      String tabName, int _itable) {
+    int itable = _itable;
     if (fieldsDef.isdisplayed.equals("Y")) {
 
       HashMap<String, String> tableColumnName = getTableColumnName(fieldsDef);
--- a/src-wad/src/org/openbravo/wad/javasource.javaxml	Wed May 27 23:11:01 2015 +0200
+++ b/src-wad/src/org/openbravo/wad/javasource.javaxml	Tue Jun 02 12:57:37 2015 +0200
@@ -49,15 +49,12 @@
 import javax.servlet.http.*;
 import java.util.*;
 import java.sql.Connection;
-import org.apache.log4j.Logger;
-import java.util.List;
-import java.util.Arrays;
 
+// Generated old code, not worth to make i.e. java imports perfect
+@SuppressWarnings("unused")
 public class <PARAMETER_TMP id="class">Almacen</PARAMETER_TMP> extends HttpSecureAppServlet {
   private static final long serialVersionUID = 1L;
   
-  private static Logger log4j = Logger.getLogger(<PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>.class);
-  
   private static final String windowId = "<PARAMETER_TMP id="windowId">Almacen</PARAMETER_TMP>";
   private static final String tabId = "<PARAMETER_TMP id="tabId">Almacen</PARAMETER_TMP>";
   private static final String defaultTabView = "<PARAMETER_TMP id="defaultView">RELATION</PARAMETER_TMP>";
@@ -294,7 +291,6 @@
     } else if (vars.commandIn("EDIT")) {
 <PARAMETER_TMP id="parent">      String strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP> = vars.getGlobalVariable("inp<PARENT_TMP id="keyParentINP">Almacen</PARENT_TMP>", windowId + "|<PARENT_TMP id="keyParent">Almacen</PARENT_TMP>");
 </PARAMETER_TMP>
-      @SuppressWarnings("unused") // In Expense Invoice tab this variable is not used, to be fixed
       String str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP> = vars.getGlobalVariable("inp<KEY_TMP id="keyData">PosicionAlmacen</KEY_TMP>", windowId + "|<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>", "");
       vars.setSessionValue(tabId + "|<PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>.view", "EDIT");
 <PARAMETERS_TMP id="NothasReference">
@@ -503,7 +499,6 @@
 </FIELDS_TMP>
 <FIELDS_TMP id="sectionActionButtons3">    } else if (vars.commandIn("SAVE_BUTTON<FIELD_TMP id="ButtonRealName3">button</FIELD_TMP><FIELD_TMP id="ProcessID3">button</FIELD_TMP>")) {
         String str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP> = vars.getGlobalVariable("inpKey", windowId + "|<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>", "");
-        @SuppressWarnings("unused")
         String str<FIELD_TMP id="ButtonName3">name</FIELD_TMP> = vars.getStringParameter("inp<FIELD_TMP id="ButtonName3">name</FIELD_TMP>");
         String strProcessing = vars.getStringParameter("inpprocessing");
         OBError myMessage = null;
@@ -959,10 +954,13 @@
     out.close();
   }
 
-  private void printPageEdit(HttpServletResponse response, HttpServletRequest request, VariablesSecureApp vars,boolean boolNew, String str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP><PARAMETER_TMP id="parent">, String strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>, TableSQLData tableSQL)
+  private void printPageEdit(HttpServletResponse response, HttpServletRequest request, VariablesSecureApp vars,boolean _boolNew, String str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP><PARAMETER_TMP id="parent">, String strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>, TableSQLData tableSQL)
     throws IOException, ServletException {
     if (log4j.isDebugEnabled()) log4j.debug("Output: edit");
     
+    // copy param to variable as will be modified later
+    boolean boolNew = _boolNew;
+
     HashMap&#60;String, String&#62; usedButtonShortCuts;
   <PARAMETER_TMP id="buttonFixed">
     HashMap&#60;String, String&#62; reservedButtonShortCuts;
--- a/src-wad/src/org/openbravo/wad/validation/WADValidator.java	Wed May 27 23:11:01 2015 +0200
+++ b/src-wad/src/org/openbravo/wad/validation/WADValidator.java	Tue Jun 02 12:57:37 2015 +0200
@@ -31,6 +31,8 @@
   private String modules;
   private ConnectionProvider conn;
   private String checkAll;
+  @SuppressWarnings("unused")
+  // maybe planned some day, so lets keep
   private boolean friendlyWarnings;
 
   /**
--- a/src/org/openbravo/base/model/Column.java	Wed May 27 23:11:01 2015 +0200
+++ b/src/org/openbravo/base/model/Column.java	Tue Jun 02 12:57:37 2015 +0200
@@ -385,7 +385,7 @@
       return Collections.EMPTY_SET;
     }
     if (getDomainType() instanceof StringEnumerateDomainType) {
-      return (Set<String>) ((StringEnumerateDomainType) getDomainType()).getEnumerateValues();
+      return ((StringEnumerateDomainType) getDomainType()).getEnumerateValues();
     }
     return Collections.EMPTY_SET;
   }
--- a/src/org/openbravo/base/model/ModelProvider.java	Wed May 27 23:11:01 2015 +0200
+++ b/src/org/openbravo/base/model/ModelProvider.java	Tue Jun 02 12:57:37 2015 +0200
@@ -204,7 +204,6 @@
         if (TABLEBASEDTABLE.equals(t.getDataOrigin())) {
           tablesByTableName.put(t.getTableName().toLowerCase(), t);
         } else {
-          String dataOrigin = t.getDataOrigin();
           dataSourceTablesByName.put(t.getName().toLowerCase(), t);
         }
       }
@@ -465,7 +464,7 @@
       throw new OBException("No instances of " + clazz.getName()
           + " in the database, has the database been created and filled with data?");
     }
-    return (T) list.get(0);
+    return list.get(0);
 
   }
 
--- a/src/org/openbravo/base/provider/OBProviderConfigReader.java	Wed May 27 23:11:01 2015 +0200
+++ b/src/org/openbravo/base/provider/OBProviderConfigReader.java	Tue Jun 02 12:57:37 2015 +0200
@@ -39,8 +39,6 @@
 class OBProviderConfigReader {
   private static final Logger log = Logger.getLogger(OBProviderConfigReader.class);
 
-  private static final long serialVersionUID = 1L;
-
   void read(String prefix, InputStream is) {
     try {
       final SAXReader reader = new SAXReader();
--- a/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java	Wed May 27 23:11:01 2015 +0200
+++ b/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java	Tue Jun 02 12:57:37 2015 +0200
@@ -1214,7 +1214,7 @@
    * Render a jrxml based report using a {@link ScrollableFieldProvider} as its datasource.
    * 
    * @see #renderJR(VariablesSecureApp, HttpServletResponse, String, String, String, HashMap,
-   *      JRDatasource, HashMap)
+   *      JRDataSource, Map, boolean)
    */
   protected void renderJR(VariablesSecureApp variables, HttpServletResponse response,
       String strReportName, String strFileName, String strOutputType,
--- a/src/org/openbravo/base/secureApp/LoginUtils.java	Wed May 27 23:11:01 2015 +0200
+++ b/src/org/openbravo/base/secureApp/LoginUtils.java	Tue Jun 02 12:57:37 2015 +0200
@@ -414,10 +414,7 @@
   /**
    * Validates if a selected default value is null or empty String
    * 
-   * @param strValue
-   * @param strKey
-   * @param strError
-   * @throws Exeption
+   * @throws DefaultValidationException
    * */
   private static void validateDefault(String strValue, String strKey, String strError)
       throws DefaultValidationException {
--- a/src/org/openbravo/base/secureApp/OrgTree.java	Wed May 27 23:11:01 2015 +0200
+++ b/src/org/openbravo/base/secureApp/OrgTree.java	Tue Jun 02 12:57:37 2015 +0200
@@ -303,9 +303,6 @@
 
   /**
    * Returns the node matching the id, in case it does not exists it returns null
-   * 
-   * @param id
-   * @return
    */
   private OrgTreeNode getNodeById(String id) {
     if (nodes == null)
@@ -318,9 +315,6 @@
 
   /**
    * In case the node id is in the tree it returns true, if not false.
-   * 
-   * @param id
-   * @return
    */
   private boolean isNodeInTree(String id) {
     if (nodes == null)
@@ -333,9 +327,6 @@
 
   /**
    * Returns the list of the nodes that have a determinate node.
-   * 
-   * @param parentId
-   * @return
    */
   private List<OrgTreeNode> getNodesWithParent(String parentId) {
     List<OrgTreeNode> vecNodes = new ArrayList<OrgTreeNode>();
--- a/src/org/openbravo/base/session/HostNameTask.java	Wed May 27 23:11:01 2015 +0200
+++ b/src/org/openbravo/base/session/HostNameTask.java	Tue Jun 02 12:57:37 2015 +0200
@@ -36,7 +36,7 @@
  * It can be executed by <code>ant host.name</code> command.
  * </p>
  * 
- * @See ConfigParameters.overrideProperties
+ * @see org.openbravo.base.ConfigParameters#overrideProperties
  * 
  * @author alostale
  *
--- a/src/org/openbravo/base/session/OBYesNoType.java	Wed May 27 23:11:01 2015 +0200