Update to 3.0MP27 3.0MP27
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 16 Sep 2013 12:52:56 +0000
changeset 520 344a16b0016e
parent 519 36b16134600d
child 521 13b410cdafa6
Update to 3.0MP27
java/reference/java.japi.gz
js/productCharacteristicsProcess.js.details
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_MENU_PARAMETERS.xml
model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_NAVBAR_ROLE_ACCESS.xml
model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS_ACCESS.xml
model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REF_WINDOW.xml
model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_ROLE_ACCESS.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_REF_MASK.xml
model/modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_TEMPLATE_DEPENDENCY.xml
model/modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_UIDEFINITION.xml
model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_ACCESS.xml
model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_MENU.xml
model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_MENU_TRL.xml
model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_LIST.xml
model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_URL.xml
model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.querylist/src-db/database/model/tables/OBCQL_QUERY_COLUMN.xml
model/modules/org.openbravo.client.querylist/src-db/database/model/tables/OBCQL_WIDGET_QUERY.xml
model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.integration.openid/src-db/database/model/tables/OBSOID_USER_IDENTIFIER.xml
model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_FIELD.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/src-db/database/model/functions/C_COMMISSION_PROCESS.xml
model/src-db/database/model/functions/C_GENERATEPOFROMPROJECT.xml
model/src-db/database/model/functions/C_GENERATESOFROMPROJECT.xml
model/src-db/database/model/functions/C_GENERATESOFROMPROJECTORDER.xml
model/src-db/database/model/functions/C_GENERATESOFROMPROJECTPHASE.xml
model/src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml
model/src-db/database/model/functions/C_INVOICE_POST.xml
model/src-db/database/model/functions/C_ORDER_POST1.xml
model/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml
model/src-db/database/model/functions/M_INOUT_POST.xml
model/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml
model/src-db/database/model/functions/M_INVENTORY_LISTCREATE.xml
model/src-db/database/model/functions/M_INVENTORY_POST.xml
model/src-db/database/model/functions/M_MOVEMENT_POST.xml
model/src-db/database/model/functions/M_PRODUCTION_RUN.xml
model/src-db/database/model/functions/M_REQUISITION_POST.xml
model/src-db/database/model/functions/M_RESERVATION_POST.xml
model/src-db/database/model/tables/AD_ALERTRECIPIENT.xml
model/src-db/database/model/tables/AD_COLUMN.xml
model/src-db/database/model/tables/AD_DATASET_COLUMN.xml
model/src-db/database/model/tables/AD_DATASET_TABLE.xml
model/src-db/database/model/tables/AD_EP_PROCEDURES.xml
model/src-db/database/model/tables/AD_EXCEPTIONS.xml
model/src-db/database/model/tables/AD_FORM_ACCESS.xml
model/src-db/database/model/tables/AD_MODEL_OBJECT.xml
model/src-db/database/model/tables/AD_MODEL_OBJECT_MAPPING.xml
model/src-db/database/model/tables/AD_MODEL_OBJECT_PARA.xml
model/src-db/database/model/tables/AD_MODULE_DBPREFIX.xml
model/src-db/database/model/tables/AD_MODULE_DEPENDENCY.xml
model/src-db/database/model/tables/AD_ORG_ACCTSCHEMA.xml
model/src-db/database/model/tables/AD_ORG_WAREHOUSE.xml
model/src-db/database/model/tables/AD_PACKAGE.xml
model/src-db/database/model/tables/AD_PROCESS_ACCESS.xml
model/src-db/database/model/tables/AD_REF_SEARCH.xml
model/src-db/database/model/tables/AD_REF_SEARCH_COLUMN.xml
model/src-db/database/model/tables/AD_TABLE_ACCESS.xml
model/src-db/database/model/tables/AD_USER_ROLES.xml
model/src-db/database/model/tables/AD_WINDOW_ACCESS.xml
model/src-db/database/model/tables/A_AMORTIZATIONLINE.xml
model/src-db/database/model/tables/A_ASSET.xml
model/src-db/database/model/tables/C_ACCTSCHEMA_GL.xml
model/src-db/database/model/tables/C_ACCTSCHEMA_PROCESS.xml
model/src-db/database/model/tables/C_ACCTSCHEMA_TABLE_DOCTYPE.xml
model/src-db/database/model/tables/C_ACCT_RPT_GROUP.xml
model/src-db/database/model/tables/C_ACCT_RPT_NODE.xml
model/src-db/database/model/tables/C_BPARTNER_DISCOUNT.xml
model/src-db/database/model/tables/C_BP_GROUP_ACCT.xml
model/src-db/database/model/tables/C_BUDGETLINE.xml
model/src-db/database/model/tables/C_CITY.xml
model/src-db/database/model/tables/C_COMMISSIONDETAIL.xml
model/src-db/database/model/tables/C_CONVERSION_RATE.xml
model/src-db/database/model/tables/C_CONVERSION_RATE_DOCUMENT.xml
model/src-db/database/model/tables/C_DEBT_PAYMENT.xml
model/src-db/database/model/tables/C_DP_MANAGEMENTLINE.xml
model/src-db/database/model/tables/C_ELEMENTVALUE_OPERAND.xml
model/src-db/database/model/tables/C_EXTERNALPOS_CATEGORY.xml
model/src-db/database/model/tables/C_EXTERNALPOS_PRODUCT.xml
model/src-db/database/model/tables/C_INVOICE_DISCOUNT.xml
model/src-db/database/model/tables/C_INVOICE_REVERSE.xml
model/src-db/database/model/tables/C_NONBUSINESSDAY.xml
model/src-db/database/model/tables/C_ORDER.xml
model/src-db/database/model/tables/C_ORDER_DISCOUNT.xml
model/src-db/database/model/tables/C_PAYMENTTERMLINE.xml
model/src-db/database/model/tables/C_PHASE.xml
model/src-db/database/model/tables/C_POC_EMAILDEFINITION.xml
model/src-db/database/model/tables/C_PROJECTLINE.xml
model/src-db/database/model/tables/C_PROJECTPHASE.xml
model/src-db/database/model/tables/C_PROJECTPROPOSAL.xml
model/src-db/database/model/tables/C_PROJECTPROPOSALLINE.xml
model/src-db/database/model/tables/C_PROJECTPROPOSALTASK.xml
model/src-db/database/model/tables/C_PROJECTTASK.xml
model/src-db/database/model/tables/C_PROJECT_VENDOR.xml
model/src-db/database/model/tables/C_REMITTANCELINE.xml
model/src-db/database/model/tables/C_REMITTANCE_PARAMETER.xml
model/src-db/database/model/tables/C_SALARY_CATEGORY_COST.xml
model/src-db/database/model/tables/C_TASK.xml
model/src-db/database/model/tables/C_TAXREGISTER.xml
model/src-db/database/model/tables/C_TAXREGISTERLINE.xml
model/src-db/database/model/tables/C_TAXREGISTER_TYPE_LINES.xml
model/src-db/database/model/tables/C_TAX_ZONE.xml
model/src-db/database/model/tables/C_UOM_CONVERSION.xml
model/src-db/database/model/tables/FIN_BANKFILE_EXCEPTION.xml
model/src-db/database/model/tables/FIN_BANKSTATEMENT.xml
model/src-db/database/model/tables/FIN_BANKSTATEMENTLINE.xml
model/src-db/database/model/tables/FIN_DOUBTFUL_DEBT.xml
model/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml
model/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml
model/src-db/database/model/tables/FIN_PAYMENT_CREDIT.xml
model/src-db/database/model/tables/FIN_PAYMENT_RUN_PARA.xml
model/src-db/database/model/tables/FIN_PAYMENT_RUN_PAYMENT.xml
model/src-db/database/model/tables/FIN_PAY_EXEC_PROCESS_PARA.xml
model/src-db/database/model/tables/GL_JOURNAL.xml
model/src-db/database/model/tables/GL_JOURNALLINE.xml
model/src-db/database/model/tables/MA_CCP.xml
model/src-db/database/model/tables/MA_CCP_SHIFT.xml
model/src-db/database/model/tables/MA_COSTCENTER_EMPLOYEE.xml
model/src-db/database/model/tables/MA_COSTCENTER_IC.xml
model/src-db/database/model/tables/MA_COSTCENTER_MACHINE.xml
model/src-db/database/model/tables/MA_COSTCENTER_VERSION.xml
model/src-db/database/model/tables/MA_GLOBALUSE.xml
model/src-db/database/model/tables/MA_INDIRECT_COST_VALUE.xml
model/src-db/database/model/tables/MA_MACHINESTATION.xml
model/src-db/database/model/tables/MA_MACHINE_COST.xml
model/src-db/database/model/tables/MA_MAINTENANCE.xml
model/src-db/database/model/tables/MA_MAINT_PERIODICITY.xml
model/src-db/database/model/tables/MA_MAINT_SCHEDULED.xml
model/src-db/database/model/tables/MA_MAINT_WORKER.xml
model/src-db/database/model/tables/MA_MEASURE_GROUP.xml
model/src-db/database/model/tables/MA_MEASURE_TIME.xml
model/src-db/database/model/tables/MA_MEASURE_VALUES.xml
model/src-db/database/model/tables/MA_PC_TEST.xml
model/src-db/database/model/tables/MA_PC_VALUE.xml
model/src-db/database/model/tables/MA_PL_EMPLOYEE.xml
model/src-db/database/model/tables/MA_PL_IC.xml
model/src-db/database/model/tables/MA_PL_INVOICELINE.xml
model/src-db/database/model/tables/MA_PL_MACHINE.xml
model/src-db/database/model/tables/MA_PROCESS.xml
model/src-db/database/model/tables/MA_SEQUENCE_EMPLOYEE.xml
model/src-db/database/model/tables/MA_SEQUENCE_IC.xml
model/src-db/database/model/tables/MA_SEQUENCE_MACHINE.xml
model/src-db/database/model/tables/MA_TOOLSET.xml
model/src-db/database/model/tables/MA_TOOLSETPROCESS.xml
model/src-db/database/model/tables/MA_TOOLSETUSED.xml
model/src-db/database/model/tables/MA_WEEMPLOYEE.xml
model/src-db/database/model/tables/MA_WEINCIDENCE.xml
model/src-db/database/model/tables/MA_WRPHASEPRODUCT.xml
model/src-db/database/model/tables/MRP_PLANNINGMETHODLINE.xml
model/src-db/database/model/tables/MRP_SALESFORECASTLINE.xml
model/src-db/database/model/tables/M_ATTRIBUTEUSE.xml
model/src-db/database/model/tables/M_ATTRIBUTEVALUE.xml
model/src-db/database/model/tables/M_BRAND.xml
model/src-db/database/model/tables/M_CHARACTERISTIC.xml
model/src-db/database/model/tables/M_CH_SUBSET.xml
model/src-db/database/model/tables/M_CH_SUBSET_VALUE.xml
model/src-db/database/model/tables/M_CH_VALUE.xml
model/src-db/database/model/tables/M_DISCOUNTSCHEMALINE.xml
model/src-db/database/model/tables/M_FREIGHT.xml
model/src-db/database/model/tables/M_PRICELIST_VERSION.xml
model/src-db/database/model/tables/M_PRODUCT.xml
model/src-db/database/model/tables/M_PRODUCT_CH.xml
model/src-db/database/model/tables/M_PRODUCT_CH_CONF.xml
model/src-db/database/model/tables/M_PRODUCT_CH_VALUE.xml
model/src-db/database/model/tables/M_PRODUCT_ORG.xml
model/src-db/database/model/tables/M_RAPPEL_BPARTNER.xml
model/src-db/database/model/tables/M_RAPPEL_INVOICE.xml
model/src-db/database/model/tables/M_RAPPEL_PRODUCT.xml
model/src-db/database/model/tables/M_RAPPEL_PRODUCTCATEGORY.xml
model/src-db/database/model/tables/M_RAPPEL_SCALE.xml
model/src-db/database/model/tables/M_REQUISITIONLINE.xml
model/src-db/database/model/tables/M_REQUISITIONORDER.xml
model/src-db/database/model/tables/M_RESERVATION_STOCK.xml
model/src-db/database/model/tables/M_TRANSACTION.xml
model/src-db/database/model/tables/M_WAREHOUSE_SHIPPER.xml
model/src-db/database/model/tables/S_RESOURCEASSIGNMENT.xml
model/src-db/database/model/tables/S_RESOURCEUNAVAILABLE.xml
model/src-db/database/model/tables/S_TIMEEXPENSELINE.xml
model/src-db/database/model/triggers/AD_PROCESS_TRL_TRG.xml
model/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml
model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml
model/src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml
model/src-db/database/model/triggers/M_CHARACTERISTIC_TRG.xml
model/src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml
model/src-db/database/model/triggers/M_CH_VALUE_TRG.xml
model/src-db/database/model/triggers/M_CH_VALUE_TRG2.xml
model/src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml
model/src-db/database/model/triggers/M_INVENTORYLINE2_TRG.xml
model/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml
model/src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml
model/src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml
model/src-db/database/model/triggers/M_PRODUCT_TRG.xml
model/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml
model/src-db/database/model/triggers/M_RESERVATION_TRG.xml
model/src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml
model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml
model/src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml
model/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml
model/src-db/database/model/views/M_PRODUCT_PRICE_WAREHOUSE_V.xml
model/src-db/database/model/views/M_PRODUCT_STOCK_V.xml
model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
model/src-db/database/sourcedata/AD_CALLOUT.xml
model/src-db/database/sourcedata/AD_COLUMN.xml
model/src-db/database/sourcedata/AD_ELEMENT.xml
model/src-db/database/sourcedata/AD_FIELD.xml
model/src-db/database/sourcedata/AD_MENU.xml
model/src-db/database/sourcedata/AD_MESSAGE.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
model/src-db/database/sourcedata/AD_MODULE.xml
model/src-db/database/sourcedata/AD_PROCESS.xml
model/src-db/database/sourcedata/AD_REFERENCE.xml
model/src-db/database/sourcedata/AD_REF_LIST.xml
model/src-db/database/sourcedata/AD_REF_TABLE.xml
model/src-db/database/sourcedata/AD_TAB.xml
model/src-db/database/sourcedata/AD_TABLE.xml
model/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
model/src-db/database/sourcedata/AD_TREENODE.xml
model/src-db/database/sourcedata/AD_VAL_RULE.xml
model/src-db/database/sourcedata/AD_WINDOW.xml
model/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml
model/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml
model/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
model/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
model/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml
model/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
model/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Binary file java/reference/java.japi.gz has changed
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -69,6 +69,7 @@
 v_Line FIN_FINACC_TRANSACTION.LINE%TYPE;
 v_count NUMBER;
 v_PaymentPriority VARCHAR(32);
+v_InvoicePaid CHAR(1);
 v_creditmultiplier NUMBER:= 1;
 v_lang AD_User.Default_AD_Language%TYPE;
 v_orderno C_Order.DocumentNo%TYPE:=null;
@@ -132,6 +133,27 @@
 
   -- complete invoice
   IF (p_docaction = 'CO') THEN
+    -- Do not add payment for the reversal invoice if the voided invoice is not paid
+    SELECT COUNT(*)
+    INTO v_Count
+    FROM C_Invoice_Reverse
+    WHERE C_Invoice_ID = p_record_id;
+
+    IF(v_Count <> 0) THEN
+	SELECT COALESCE(ispaid, 'Y')
+	INTO v_InvoicePaid
+	FROM C_Invoice
+	WHERE C_Invoice_ID IN (
+		SELECT Reversed_C_Invoice_ID
+		FROM C_Invoice_Reverse
+		WHERE C_Invoice_Id = p_record_id
+	);
+
+	IF (v_InvoicePaid = 'N') THEN
+		RETURN;
+	END IF;
+    END IF;
+    	
     -- Checking Payment Method ID is available
     IF(v_PaymentMethod IS NULL) THEN
       RAISE_APPLICATION_ERROR(-20000, '@APRM_PAYMENTMETHOD_MISSING@');
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.21083]]></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>
@@ -25,7 +25,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time.
 Fixed issue 15305.]]></UPDATEINFO>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.21083]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -142,7 +142,7 @@
 <!--FF808181312DA8D801312DDE869B000C-->  <AD_REFERENCE_ID><![CDATA[FF808181312DA8D801312DDDAA750008]]></AD_REFERENCE_ID>
 <!--FF808181312DA8D801312DDE869B000C-->  <AD_TABLE_ID><![CDATA[208]]></AD_TABLE_ID>
 <!--FF808181312DA8D801312DDE869B000C-->  <AD_COLUMN_ID><![CDATA[1402]]></AD_COLUMN_ID>
-<!--FF808181312DA8D801312DDE869B000C-->  <WHERECLAUSE><![CDATA[e.active='Y']]></WHERECLAUSE>
+<!--FF808181312DA8D801312DDE869B000C-->  <WHERECLAUSE><![CDATA[e.active='Y' AND e.isGeneric='N']]></WHERECLAUSE>
 <!--FF808181312DA8D801312DDE869B000C-->  <FILTER_EXPRESSION><![CDATA[OB.getFilterExpression("org.openbravo.erpCommon.info.RMProductSelectorFilterExpression")]]></FILTER_EXPRESSION>
 <!--FF808181312DA8D801312DDE869B000C-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
 <!--FF808181312DA8D801312DDE869B000C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
--- a/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.21083]]></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>
@@ -22,7 +22,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
--- a/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.21083]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_MENU_PARAMETERS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_MENU_PARAMETERS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -66,8 +66,8 @@
         <reference local="AD_MENU_ID" foreign="AD_MENU_ID"/>
       </foreign-key>
       <unique name="OBUIAPP_MENU_PARAMETERS_NAME">
+        <unique-column name="AD_MENU_ID"/>
         <unique-column name="AD_CLIENT_ID"/>
-        <unique-column name="AD_MENU_ID"/>
         <unique-column name="NAME"/>
       </unique>
       <check name="OBUIAPP_MP_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_NAVBAR_ROLE_ACCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_NAVBAR_ROLE_ACCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -53,6 +53,9 @@
       <foreign-key foreignTable="OBUIAPP_NAVBAR_COMPONENT" name="OBUIAPP_NVBRA_NAVBACOMPONENT" onDelete="cascade">
         <reference local="OBUIAPP_NAVBAR_COMPONENT_ID" foreign="OBUIAPP_NAVBAR_COMPONENT_ID"/>
       </foreign-key>
+      <index name="OBUIAPP_NAVBARACC_NAVBAR_IDX" unique="false">
+        <index-column name="OBUIAPP_NAVBAR_COMPONENT_ID"/>
+      </index>
       <check name="OBUIAPP_NVBRA_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS_ACCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS_ACCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -60,6 +60,9 @@
       <index name="OBUIAPP_PROCESSACC_PROCESS_IDX" unique="false">
         <index-column name="OBUIAPP_PROCESS_ID"/>
       </index>
+      <index name="OBUIAPP_PROCESSACCESS_ROLE_IDX" unique="false">
+        <index-column name="AD_ROLE_ID"/>
+      </index>
       <check name="OBUIAPP_PROC_ACC_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_PROC_ACC_ISREADWR_CHK"><![CDATA[ISREADWRITE IN ('Y', 'N')]]></check>
     </table>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REF_WINDOW.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REF_WINDOW.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -53,6 +53,9 @@
       <foreign-key foreignTable="AD_WINDOW" name="OBUIAPP_REF_W_AD_WINDOW">
         <reference local="AD_WINDOW_ID" foreign="AD_WINDOW_ID"/>
       </foreign-key>
+      <index name="OBUIAPP_REFWINDOW_REF_IDX" unique="false">
+        <index-column name="AD_REFERENCE_ID"/>
+      </index>
       <check name="OBUIAPP_REF_W_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_ROLE_ACCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_ROLE_ACCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -53,6 +53,12 @@
       <foreign-key foreignTable="OBUIAPP_VIEW_IMPL" name="OBUIAPP_VIRA_VIEW" onDelete="cascade">
         <reference local="OBUIAPP_VIEW_IMPL_ID" foreign="OBUIAPP_VIEW_IMPL_ID"/>
       </foreign-key>
+      <index name="OBUIAPP_VIEWRCCESS_VIEWIMP_IDX" unique="false">
+        <index-column name="OBUIAPP_VIEW_IMPL_ID"/>
+      </index>
+      <index name="OBUIAPP_VIEWROLEACC_ROLE_IDX" unique="false">
+        <index-column name="AD_ROLE_ID"/>
+      </index>
       <check name="OBUIAPP_VIRA_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.21083]]></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>
@@ -22,7 +22,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.21083]]></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.20833]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.21083]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.21083]]></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>
@@ -21,7 +21,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.21083]]></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/model/modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_REF_MASK.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_REF_MASK.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -54,6 +54,9 @@
       <foreign-key foreignTable="AD_ORG" name="OBCLKER_REF_ORG_KEY">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="OBCLKER_REFMASK_REFERENCE_IDX" unique="false">
+        <index-column name="AD_REFERENCE_ID"/>
+      </index>
       <check name="OBCLKER_REF_MASK_ISCTV_CHCK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_TEMPLATE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_TEMPLATE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="OBCLKER_TEMPLATE" name="OBCLKER_TD_PARENT" onDelete="cascade">
         <reference local="OBCLKER_TEMPLATE_ID" foreign="OBCLKER_TEMPLATE_ID"/>
       </foreign-key>
+      <index name="OBCLKER_TEMPLATEDEP_TEMPL_IDX" unique="false">
+        <index-column name="OBCLKER_TEMPLATE_ID"/>
+      </index>
       <check name="OBCLKER_CTD_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_UIDEFINITION.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_UIDEFINITION.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="AD_ORG" name="OBCLKER_VI_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="OBCLKER_UIDEFINITION_REF_IDX" unique="false">
+        <index-column name="AD_REFERENCE_ID"/>
+      </index>
       <check name="OBCLKER_VUID_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.21083]]></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>
@@ -22,7 +22,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <UPDATEINFO><![CDATA[Bug fix for issue 15289]]></UPDATEINFO>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--4B828F4D03264080AA1D2057B13F613C--></AD_MODULE>
--- a/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.21083]]></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.20833]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.21083]]></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.20833]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.21083]]></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/model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_ACCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_ACCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -53,6 +53,12 @@
       <foreign-key foreignTable="OBKMO_WIDGET_CLASS" name="OBKMO_WIDCLASSACC_WIDGETCLASS" onDelete="cascade">
         <reference local="OBKMO_WIDGET_CLASS_ID" foreign="OBKMO_WIDGET_CLASS_ID"/>
       </foreign-key>
+      <index name="OBKMO_WDGTCLSACC_WDGTCLASS_IDX" unique="false">
+        <index-column name="OBKMO_WIDGET_CLASS_ID"/>
+      </index>
+      <index name="OBKMO_WGTCLASSACCESS_ROLE_IDX" unique="false">
+        <index-column name="AD_ROLE_ID"/>
+      </index>
       <check name="OBKMO_WIDCLASSACC_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_MENU.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_MENU.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -62,6 +62,9 @@
       <foreign-key foreignTable="OBKMO_WIDGET_CLASS" name="OBKMO_WIDCLASSMENU_WIDGETCLASS" onDelete="cascade">
         <reference local="OBKMO_WIDGET_CLASS_ID" foreign="OBKMO_WIDGET_CLASS_ID"/>
       </foreign-key>
+      <index name="OBKMO_WDGTCLSMENU_WDGTCLS_IDX" unique="false">
+        <index-column name="OBKMO_WIDGET_CLASS_ID"/>
+      </index>
       <check name="OBKMO_WIDCLMENU_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="OBKMO_WIDCLMENU_SEPARATOR_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
--- a/model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_MENU_TRL.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_CLASS_MENU_TRL.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="OBKMO_WIDGET_CLASS_MENU" name="OBKMO_WCLM_TR_WCLM" onDelete="cascade">
         <reference local="OBKMO_WIDGET_CLASS_MENU_ID" foreign="OBKMO_WIDGET_CLASS_MENU_ID"/>
       </foreign-key>
+      <index name="OBKMO_WDTCMENUTRL_WDTCMENU_IDX" unique="false">
+        <index-column name="OBKMO_WIDGET_CLASS_MENU_ID"/>
+      </index>
       <check name="OBKMO_WCLM_TRL_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="OBKMO_WCLM_TRL_ISTR_CHK"><![CDATA[ISTRANSLATED IN ('Y', 'N')]]></check>
     </table>
--- a/model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_LIST.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_LIST.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -50,6 +50,9 @@
       <foreign-key foreignTable="AD_ORG" name="OBKMO_WIDGET_LIST_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="OBKMO_WDTLIST_WDTCLS_IDX" unique="false">
+        <index-column name="OBKMO_WIDGET_CLASS_ID"/>
+      </index>
       <check name="OBKMO_WIDGET_LIST_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_URL.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_URL.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -50,6 +50,9 @@
       <foreign-key foreignTable="AD_ORG" name="OBKMO_WIDGET_URL_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="OBKMO_WDTURL_WDCLS_IDX" unique="false">
+        <index-column name="OBKMO_WIDGET_CLASS_ID"/>
+      </index>
       <check name="OBKMO_WIDGET_URL_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.21083]]></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>
@@ -23,7 +23,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <REFERENCEDATAINFO><![CDATA[Provides the infrastructure of workspace tab]]></REFERENCEDATAINFO>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--2758CD25B2704AF6BBAD10365FC82C06--></AD_MODULE>
--- a/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.21083]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/model/tables/OBCQL_QUERY_COLUMN.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/model/tables/OBCQL_QUERY_COLUMN.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -111,6 +111,9 @@
       <foreign-key foreignTable="AD_REFERENCE" name="OBCQL_QUERY_COLUMN_REFERENCE">
         <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
       </foreign-key>
+      <index name="OBCQL_QRYCOL_WDGTQRY_IDX" unique="false">
+        <index-column name="OBCQL_WIDGET_QUERY_ID"/>
+      </index>
       <check name="OBCQL_COLUMN_CANBEFILTERED_CHK"><![CDATA[CAN_BE_FILTERED IN ('Y', 'N')]]></check>
       <check name="OBCQL_COLUMN_WHERECLAUSE_CHK"><![CDATA[((CAN_BE_FILTERED = 'Y') AND (WHERECLAUSE_LEFT_PART IS NOT NULL)) OR (CAN_BE_FILTERED = 'N')]]></check>
       <check name="OBCQL_QUERY_COLUMN_ACTIVECHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/model/tables/OBCQL_WIDGET_QUERY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/model/tables/OBCQL_WIDGET_QUERY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="AD_ORG" name="OBCQL_WIDGET_QUERY_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="OBCQL_WDGTQRY_WDGTCLASS_IDX" unique="false">
+        <index-column name="OBKMO_WIDGET_CLASS_ID"/>
+      </index>
       <index name="OBCQL_WIDGET_QUERY_DS" unique="false">
         <index-column name="OBSERDS_DATASOURCE_ID"/>
       </index>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.21083]]></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>
@@ -21,7 +21,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC--></AD_MODULE>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.21083]]></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/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.21083]]></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>
@@ -22,7 +22,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080812D842086012D844F3CC0003E-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--FF8080812D842086012D844F3CC0003E-->  <UPDATEINFO><![CDATA[Added Currency Converter. Added Google Docs]]></UPDATEINFO>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080812D842086012D844F3CC0003E--></AD_MODULE>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.21083]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.21083]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
@@ -22,7 +22,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--2A5EE903D7974AC298C0504FBC4501A7--></AD_MODULE>
--- a/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.21083]]></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/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.21083]]></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>
@@ -19,7 +19,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--3A3A943684D64DEF9EC39F588A656848--></AD_MODULE>
--- a/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.21083]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.21083]]></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>
@@ -22,7 +22,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4--></AD_MODULE>
--- a/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.21083]]></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.20833]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.21083]]></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.20833]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.21083]]></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.20833]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.21083]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.21083]]></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.
@@ -18,7 +18,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813129ADA401312CA1222A0005-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080813129ADA401312CA1222A0005--></AD_MODULE>
--- a/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.21083]]></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.20833]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.21083]]></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/model/modules/org.openbravo.service.integration.openid/src-db/database/model/tables/OBSOID_USER_IDENTIFIER.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/model/tables/OBSOID_USER_IDENTIFIER.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -50,6 +50,9 @@
       <foreign-key foreignTable="AD_USER" name="OBSOID_USER_OID_AD_USER">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <index name="OBSOID_USERIDENTIFIER_USER_IDX" unique="false">
+        <index-column name="AD_USER_ID"/>
+      </index>
       <unique name="OBSOID_UN_IDENTIFIER">
         <unique-column name="OPENID_IDENTIFIER"/>
       </unique>
--- a/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.21083]]></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.
@@ -19,7 +19,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813141B198013141B86DD70003-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--FF8080813141B198013141B86DD70003-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080813141B198013141B86DD70003--></AD_MODULE>
--- a/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.21083]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.21083]]></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>
@@ -22,7 +22,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1--></AD_MODULE>
--- a/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.21083]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -136,8 +136,8 @@
         <reference local="VALUEFIELD_ID" foreign="OBUISEL_SELECTOR_FIELD_ID"/>
       </foreign-key>
       <unique name="OBUISEL_S_NAME">
+        <unique-column name="AD_REFERENCE_ID"/>
         <unique-column name="NAME"/>
-        <unique-column name="AD_REFERENCE_ID"/>
       </unique>
       <check name="OBUISEL_CUSTOM_QUERY_CHK"><![CDATA[CUSTOM_QUERY IN ('Y', 'N')]]></check>
       <check name="OBUISEL_SEL_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
--- a/model/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_FIELD.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_FIELD.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -138,6 +138,9 @@
       <foreign-key foreignTable="OBUISEL_SELECTOR" name="OBUISEL_SF_SELECTOR" onDelete="cascade">
         <reference local="OBUISEL_SELECTOR_ID" foreign="OBUISEL_SELECTOR_ID"/>
       </foreign-key>
+      <index name="OBUISEL_SELECTFLD_SELECTOR_IDX" unique="false">
+        <index-column name="OBUISEL_SELECTOR_ID"/>
+      </index>
       <check name="OBUISEL_SF_CM_CHECK"><![CDATA[ISCENTRALLYMAINTAINED IN ('Y', 'N')]]></check>
       <check name="OBUISEL_SF_FILTER_CHECK"><![CDATA[FILTER IN ('Y', 'N')]]></check>
       <check name="OBUISEL_SF_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
--- a/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.21083]]></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>
@@ -22,7 +22,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--5EB4F15C80684ACA904756BDC12ADBE5--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.21083]]></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.20833]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.21083]]></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.20833]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.21083]]></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.20833]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.21083]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.21083]]></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>
@@ -23,7 +23,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--96998CBC42744B3DBEE28AC8095C9335--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.21083]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.21083]]></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>
@@ -23,7 +23,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0
 Updated to new SmartClient 8.3d 26-May-2012]]></UPDATEINFO>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.21083]]></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.20833]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.21083]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.21083]]></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
@@ -28,7 +28,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <REFERENCEDATAINFO><![CDATA[Pre-configured collection of standard ERP roles]]></REFERENCEDATAINFO>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61--></AD_MODULE>
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.21083]]></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.20833]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.21083]]></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.20833]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.21083]]></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/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.21083]]></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>
@@ -24,7 +24,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <UPDATEINFO><![CDATA[minor bugfix release to include latest client.application 2.0.1, client.myob 2.0.2 and client.kernel 2.0.1]]></UPDATEINFO>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--7E48CDD73B7E493A8BED4F7253E7C989--></AD_MODULE>
--- a/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.21083]]></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.20833]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.21083]]></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.20833]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.21083]]></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.20833]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.21083]]></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.20833]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.21083]]></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.20833]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.21083]]></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.20833]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.21083]]></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/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.21083]]></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>
@@ -20,7 +20,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[MP26]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[MP27]]></VERSION_LABEL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>
--- a/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -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.20833]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.21083]]></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.20833]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.21083]]></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.20833]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.21083]]></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.20833]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.21083]]></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.20833]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.21083]]></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.20833]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.21083]]></STARTVERSION>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--FF8080813189932B013189B45B59003A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B45B59003A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.20833]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.21083]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--FF8080813189932B013189B4C00F003D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.20833]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.21083]]></STARTVERSION>
 <!--FF8080813189932B013189B4C00F003D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDANT_MODULE_NAME><![CDATA[Integration with Google APIs]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.20833]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.21083]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/src-db/database/model/functions/C_COMMISSION_PROCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/C_COMMISSION_PROCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -16,7 +16,7 @@
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
   * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2012 Openbravo S.L.U.
+  * Contributions are Copyright (C) 2001-2013 Openbravo S.L.U.
   ******************************************************************************/
   -- Logistice
   v_ResultStr VARCHAR2(2000):='';
@@ -46,6 +46,8 @@
     v_C_CommissionRun_ID VARCHAR2(32) ;
     v_NextNo VARCHAR2(32) ;
     v_DocumentNo VARCHAR(40) ;
+    v_isgeneric CHAR(1);
+    v_productname M_Product.Name%TYPE;
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || p_PInstance_ID) ;
@@ -80,16 +82,18 @@
     * Create Header + Determine DATE Range
     */
     v_ResultStr:='ReadingRecord';
-    SELECT AD_Client_ID,
-      AD_Org_ID,
-      Name,
-      FrequencyType,
-      DocBasisType,
-      ListDetails,
-      C_BPartner_ID, 
-      BasisStatus, 
-      BasisAmt, 
-      iscascade
+    SELECT c.AD_Client_ID,
+      c.AD_Org_ID,
+      c.Name,
+      c.FrequencyType,
+      c.DocBasisType,
+      c.ListDetails,
+      c.C_BPartner_ID, 
+      c.BasisStatus, 
+      c.BasisAmt, 
+      c.iscascade,
+      COALESCE(p.isgeneric, 'N'),
+      p.name
     INTO v_AD_Client_ID,
       v_AD_Org_ID,
       v_Name,
@@ -99,10 +103,17 @@
       v_SalesRep_ID, 
       v_BasisStatus, 
       v_BasisAmt, 
-      v_isCascade
-    FROM C_Commission
+      v_isCascade,
+      v_isgeneric,
+      v_productname
+    FROM C_Commission c
+        LEFT JOIN m_product p ON c.m_product_id = p.m_product_id
     WHERE C_Commission_ID=v_Record_ID;
     --
+    IF (v_isgeneric = 'Y') THEN
+      RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+    END IF;
+    
     SELECT ISO_Code
     INTO v_Currency
     FROM C_Currency cur,
--- a/model/src-db/database/model/functions/C_GENERATEPOFROMPROJECT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/C_GENERATEPOFROMPROJECT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2008 Openbravo SLU
+* All portions are Copyright (C) 2001-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -31,6 +31,8 @@
     v_C_OrderLine_ID VARCHAR2(32);
     v_C_DOCTYPE_ID VARCHAR2(32);
     v_DocumentNo NVARCHAR2(30) ;
+    v_isgeneric CHAR(1);
+    v_productname M_Product.Name%TYPE;
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || p_PInstance_ID) ;
@@ -207,6 +209,12 @@
             ORDER BY SEQNO ASC
             )
           LOOP
+            SELECT COALESCE(isgeneric, 'N'), name INTO v_isgeneric, v_productname
+            FROM m_product
+            WHERE m_product_id = cur_solines.m_product_id;
+            IF (v_isgeneric = 'Y') THEN
+              RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+            END IF;
 
             -- Take StdPrice, PriceList and PriceLimit from Price List Version
             SELECT COUNT(*)
--- a/model/src-db/database/model/functions/C_GENERATESOFROMPROJECT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/C_GENERATESOFROMPROJECT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2012 Openbravo SLU
+* All portions are Copyright (C) 2001-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -32,6 +32,8 @@
     v_C_OrderLine_ID VARCHAR2(32);
     v_C_DOCTYPE_ID VARCHAR2(32);
     v_DocumentNo NVARCHAR2(30) ;
+    v_isgeneric CHAR(1);
+    v_productname M_Product.Name%TYPE;
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || p_PInstance_ID) ;
@@ -181,6 +183,12 @@
             ORDER BY SEQNO ASC
             )
           LOOP
+            SELECT COALESCE(isgeneric, 'N'), name INTO v_isgeneric, v_productname
+            FROM m_product
+            WHERE m_product_id = cur_solines.m_product_id;
+            IF (v_isgeneric = 'Y') THEN
+              RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+            END IF;
 
             -- Take StdPrice, PriceList and PriceLimit from Price List Version
             SELECT COUNT(*)
--- a/model/src-db/database/model/functions/C_GENERATESOFROMPROJECTORDER.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/C_GENERATESOFROMPROJECTORDER.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2006 Openbravo SLU
+* All portions are Copyright (C) 2001-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -33,6 +33,8 @@
     v_C_OrderLine_ID VARCHAR2(32);
     v_C_DOCTYPE_ID VARCHAR2(32);
     v_DocumentNo VARCHAR(40);
+    v_isgeneric CHAR(1);
+    v_productname M_Product.Name%TYPE;
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || p_PInstance_ID) ;
@@ -125,6 +127,15 @@
           FOR SOLINES IN
             (SELECT * FROM C_PROJECTLINE WHERE C_PROJECT_ID=v_Record_ID)
           LOOP
+            IF (solines.m_product_id IS NOT NULL) THEN
+              SELECT isgeneric, name INTO v_isgeneric, v_productname
+              FROM m_product
+              WHERE m_product_id = solines.m_product_id;
+              IF (v_isgeneric = 'Y') THEN
+                RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+              END IF;
+            END IF;
+
             IF(SOLINES.M_PRODUCT_ID IS NOT NULL AND Cur_SO.M_PRICELIST_VERSION_ID IS NOT NULL) THEN
               v_ResultStr:='SOLINES1 - SO.M_PRICELIST_VERSION_ID - ' || Cur_SO.M_PRICELIST_VERSION_ID || ' - ' || SOLINES.M_PRODUCT_ID;
               SELECT COUNT(p.C_UOM_ID)
--- a/model/src-db/database/model/functions/C_GENERATESOFROMPROJECTPHASE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/C_GENERATESOFROMPROJECTPHASE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2008 Openbravo SLU
+* All portions are Copyright (C) 2001-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -191,14 +191,16 @@
             -- And if no price is defined in the price list, price is set to 0.
           FOR Cur_SOLINES IN
             (
-            SELECT 'phase' AS PROV, pp.SEQNO, pp.NAME AS LINE_NAME, pp.DESCRIPTION, pr.NAME AS PRODUCT_NAME, pp.M_PRODUCT_ID, pp.QTY, pp.PRICEACTUAL
+            SELECT 'phase' AS PROV, pp.SEQNO, pp.NAME AS LINE_NAME, pp.DESCRIPTION, pr.NAME AS PRODUCT_NAME, pp.M_PRODUCT_ID, pp.QTY, pp.PRICEACTUAL,
+              pr.isgeneric
             FROM C_PROJECTPHASE pp, M_PRODUCT pr
             WHERE pp.C_PROJECTPHASE_ID = v_Record_ID
               AND pp.M_PRODUCT_ID = pr.M_PRODUCT_ID
               AND pp.M_Product_ID IS NOT NULL
               AND pp.IsActive = 'Y'
             UNION
-            SELECT 'task' as PROV, pt.SEQNO, pt.NAME AS LINE_NAME, pt.DESCRIPTION, pr.NAME AS PRODUCT_NAME, pt.M_PRODUCT_ID, pt.QTY, pt.PRICEACTUAL
+            SELECT 'task' as PROV, pt.SEQNO, pt.NAME AS LINE_NAME, pt.DESCRIPTION, pr.NAME AS PRODUCT_NAME, pt.M_PRODUCT_ID, pt.QTY, pt.PRICEACTUAL,
+              pr.isgeneric
             FROM C_PROJECTTASK pt, C_PROJECTPHASE pp, M_PRODUCT pr
             WHERE pp.C_PROJECTPHASE_ID = v_Record_ID
               AND pp.C_PROJECTPHASE_ID = pt.C_PROJECTPHASE_ID
@@ -208,6 +210,9 @@
             ORDER BY PROV ASC, SEQNO ASC
             )
           LOOP
+            IF (cur_solines.isgeneric = 'Y') THEN
+              RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || cur_solines.product_name);
+            END IF;
 
             -- Take StdPrice, PriceList and PriceLimit from Price List Version
             SELECT COUNT(*)
--- a/model/src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -28,7 +28,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012 Openbravo SLU
+* All portions are Copyright (C) 2012-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -37,11 +37,15 @@
   v_message VARCHAR2(2000):='';
   v_NetPrice NUMBER;
   v_TaxAmount NUMBER;
+  v_calcPrecision NUMBER:=50;
 BEGIN --BODY
   IF (p_qty = 0 OR p_grossamt = 0) THEN
     RETURN 0;
   END IF;
-  v_TaxAmount := C_GET_TAX_AMT_FROM_NET(p_tax_id, p_grossamt, p_alternatetaxbaseamt, p_priceprecision, 0);
+  IF (p_priceprecision > 50) THEN
+    v_calcPrecision := p_priceprecision;
+  END IF;
+  v_TaxAmount := C_GET_TAX_AMT_FROM_NET(p_tax_id, p_grossamt, p_alternatetaxbaseamt, v_calcPrecision, 0);
   DBMS_OUTPUT.PUT_LINE('Unit tax ' || v_TaxAmount);
   v_NetPrice:= ROUND(p_grossamt * (p_grossamt  / (p_grossamt + v_TaxAmount)) / p_qty, p_priceprecision);
 
--- a/model/src-db/database/model/functions/C_INVOICE_POST.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_POST.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -169,7 +169,7 @@
   v_bpartner_blocked VARCHAR2(1):='N';
   v_invoiceBlocking VARCHAR2(1):='N';
   v_bpartner_name c_bpartner.name%TYPE;
-
+  v_productname m_product.name%TYPE;
     
 BEGIN
   IF (p_PInstance_ID IS NOT NULL) THEN
@@ -294,6 +294,21 @@
     IF (v_count=0) THEN
       RAISE_APPLICATION_ERROR(-20000, '@InvoicesNeedLines@');
     END IF;
+    SELECT count(*) INTO v_count
+    FROM dual
+    WHERE EXISTS (
+        SELECT 1
+        FROM c_invoiceline il JOIN m_product p ON il.m_product_id = p.m_product_id
+        WHERE p.isgeneric = 'Y'
+          AND il.c_invoice_id = v_record_id);
+    IF (v_count > 0) THEN
+      SELECT max(p.name) INTO v_productname
+      FROM c_invoiceline il JOIN m_product p ON il.m_product_id = p.m_product_id
+      WHERE p.isgeneric = 'Y'
+        AND il.c_invoice_id = v_record_id;
+      RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+    END IF;
+
     /*
      * Avoids repeating the same documentno for the same organization tree within the same fiscal year
      */
@@ -585,7 +600,7 @@
             v_UpdatedBy, IsSOTrx, v_RDocumentNo, 'DR',
              'CO', 'N', 'N', v_DoctypeReversed_ID,
             v_DoctypeReversed_ID, '(*R*: ' || DocumentNo || ') ' || Description, SalesRep_ID,
-            now(), NULL, 'N', now(),
+            now(), NULL, 'N', NULL,
             now(), C_PaymentTerm_ID, C_BPartner_ID, C_BPartner_Location_ID,
             AD_User_ID, POReference, DateOrdered, IsDiscountPrinted,
             C_Currency_ID, PaymentRule, C_Charge_ID, ChargeAmt * -1,
--- a/model/src-db/database/model/functions/C_ORDER_POST1.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/C_ORDER_POST1.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -117,6 +117,7 @@
   v_bpartner_blocked VARCHAR2(1):='N';
   v_orderBlocking VARCHAR2(1):='N';
   v_bpartner_name c_bpartner.name%TYPE;
+  v_productname m_product.name%TYPE;
 
   BEGIN
     IF (p_PInstance_ID IS NOT NULL) THEN
@@ -210,6 +211,21 @@
     SELECT name INTO v_Org_Name FROM AD_ORG WHERE ad_org_id = v_Org_ID;
     DBMS_OUTPUT.PUT_LINE('DocAction=' || v_DocAction || ', DocStatus=' || v_DocStatus || ', DocType_ID=' || v_DocType_ID || ', DocTypeTarget_ID=' || v_DocTypeTarget_ID || ', DocSubTypeSO=' || v_DocSubTypeSO) ;
 
+    SELECT count(*) INTO v_count
+    FROM dual
+    WHERE EXISTS (
+        SELECT 1
+        FROM c_orderline ol JOIN m_product p ON ol.m_product_id = p.m_product_id
+        WHERE ol.c_order_id = v_record_id
+          AND p.isgeneric = 'Y');
+    IF (v_count > 0) THEN
+      SELECT max(p.name) INTO v_productname
+      FROM c_orderline ol JOIN m_product p ON ol.m_product_id = p.m_product_id
+      WHERE ol.c_order_id = v_record_id
+        AND p.isgeneric = 'Y';
+      RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+    END IF;
+
     /** 
     * Quotations
     */
--- a/model/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2012 Openbravo SLU
+* All portions are Copyright (C) 2001-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -68,6 +68,7 @@
     v_prodline NUMBER;
     v_line NUMBER;
     v_AD_Pinstance_ID VARCHAR2(32);
+    v_productname m_product.name%TYPE;
   BEGIN
     -- Process Parameters
     IF(p_PInstance_ID IS NOT NULL) THEN
@@ -104,6 +105,25 @@
       v_Message:='@WorkEffortValidated@';
       RAISE_APPLICATION_ERROR(-20000, v_Message);
     END IF;
+    SELECT count(*) INTO v_count
+    FROM dual
+    WHERE EXISTS (
+        SELECT 1
+        FROM m_productionplan pp
+            JOIN m_productionline pl ON pp.m_productionplan_id = pl.m_productionplan_id
+            JOIN m_product p ON p.m_product_id = pl.m_product_id
+        WHERE pp.m_production_id = v_record_id
+          AND p.isgeneric = 'Y');
+    IF (v_count > 0) THEN
+      SELECT max(p.name) INTO v_productname
+      FROM m_productionplan pp
+          JOIN m_productionline pl ON pp.m_productionplan_id = pl.m_productionplan_id
+          JOIN m_product p ON p.m_product_id = pl.m_product_id
+      WHERE pp.m_production_id = v_record_id
+        AND p.isgeneric = 'Y';
+      RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+    END IF;
+    
     IF(NOT FINISH_PROCESS) THEN
       -- Check that there are some parts of the job and that theay are processed
       
--- a/model/src-db/database/model/functions/M_INOUT_POST.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/M_INOUT_POST.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -262,6 +262,21 @@
         RAISE_APPLICATION_ERROR(-20000, '@ReturnInOutNegativeQty@');
       END IF;
     END IF;
+      SELECT count(*) INTO v_count
+      FROM dual
+      WHERE EXISTS (
+          SELECT 1
+          FROM m_inoutline il JOIN m_product p ON il.m_product_id = p.m_product_id
+          WHERE il.m_inout_id = v_record_id
+            AND p.isgeneric = 'Y');
+      IF (v_count > 0) THEN
+        SELECT max(p.name) INTO v_productname
+        FROM m_inoutline il JOIN m_product p ON il.m_product_id = p.m_product_id
+        WHERE il.m_inout_id = v_record_id
+          AND p.isgeneric = 'Y';
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+      END IF;
+      
         -- Process Shipments
       SELECT COUNT(*) INTO v_Aux
       FROM M_InOutLine
--- a/model/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -22,7 +22,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012 Openbravo SLU
+* All portions are Copyright (C) 2012-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -47,6 +47,7 @@
   v_action VARCHAR2(60):='CO';
   v_status M_Internal_Consumption.status%TYPE;
   v_name M_Internal_Consumption.name%TYPE;
+  v_productname m_product.name%TYPE;
 BEGIN
   --  Update AD_PInstance
   IF (pinstance_id IS NOT NULL) THEN
@@ -113,6 +114,21 @@
   IF (v_Count = 0) THEN
     RAISE_APPLICATION_ERROR(-20000, '@InternalConsuptionNoLines@') ;
   END IF;
+
+  SELECT count(*) INTO v_count
+  FROM dual
+  WHERE EXISTS (
+      SELECT 1
+      FROM m_internal_consumptionline icl JOIN m_product p ON icl.m_product_id = p.m_product_id
+      WHERE icl.m_internal_consumption_id = record_id
+        AND p.isgeneric = 'Y');
+  IF (v_count > 0) THEN
+    SELECT max(p.name) INTO v_productname
+    FROM m_internal_consumptionline icl JOIN m_product p ON icl.m_product_id = p.m_product_id
+    WHERE icl.m_internal_consumption_id = record_id
+      AND p.isgeneric = 'Y';
+    RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+  END IF;
   
   IF (v_action IN ('CO')) THEN
     /**
--- a/model/src-db/database/model/functions/M_INVENTORY_LISTCREATE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/M_INVENTORY_LISTCREATE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -19,7 +19,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-2013 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -165,6 +165,7 @@
           FROM M_Product p
           WHERE p.AD_Client_ID=v_Client_ID
             AND IsStocked='Y'
+            AND p.isgeneric = 'N'
             AND NOT EXISTS
             (SELECT *
             FROM M_Storage_Detail s
@@ -240,6 +241,7 @@
 		 AND COALESCE(QTYORDERONHAND,0) = 0
 		 AND PREQTYONHAND=0
 		 AND COALESCE(PREQTYORDERONHAND,0) = 0) OR v_QtyRange = '=')
+        AND p.isgeneric = 'N'
       ORDER BY s.M_Locator_ID,
         p.Value,
         s.Created
--- a/model/src-db/database/model/functions/M_INVENTORY_POST.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/M_INVENTORY_POST.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -19,7 +19,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2010 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2013 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -63,6 +63,7 @@
     END_PROCESS BOOLEAN:=false;
     END_PROCESSING BOOLEAN:=false;
     rowcount NUMBER;
+    v_productname m_product.name%TYPE;
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing') ;
@@ -132,6 +133,21 @@
     IF v_Count<>0 THEN
       RAISE_APPLICATION_ERROR(-20000, '@Inline@'||' '||v_line||' '||'@productWithoutAttributeSet@') ;
     END IF;
+    SELECT count(*) INTO v_count
+    FROM dual
+    WHERE EXISTS (
+        SELECT 1
+        FROM m_inventoryline il JOIN m_product p ON il.m_product_id = p.m_product_id
+        WHERE il.m_inventory_id = v_record_id
+          AND p.isgeneric = 'Y');
+    IF (v_count > 0) THEN
+      SELECT max(p.name) INTO v_productname
+      FROM m_inventoryline il JOIN m_product p ON il.m_product_id = p.m_product_id
+      WHERE il.m_inventory_id = v_record_id
+        AND p.isgeneric = 'Y';
+      RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+    END IF;
+
   END IF;--PROCESS_ERROR
   IF(NOT PROCESS_ERROR AND NOT END_PROCESS AND NOT END_PROCESSING) THEN
     -- Check for products in multiple lines
--- a/model/src-db/database/model/functions/M_MOVEMENT_POST.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/M_MOVEMENT_POST.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -19,7 +19,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2010 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2013 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -55,6 +55,7 @@
     v_isacctle AD_OrgType.IsAcctLegalEntity%TYPE;
     v_org_bule_id AD_Org.AD_Org_ID%TYPE;
     END_PROCESS BOOLEAN:=false;
+    v_productname m_product.name%TYPE;
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || PInstance_ID) ;
@@ -117,6 +118,14 @@
       IF v_Count<>0 THEN
        RAISE_APPLICATION_ERROR(-20000, '@Inline@'||' '||v_line||' '||'@productWithoutAttributeSet@') ;
       END IF;
+      SELECT count(*), max(p.name)
+        INTO v_count, v_productname
+      FROM m_movementline ml JOIN m_product p ON ml.m_product_id = p.m_product_id
+      WHERE ml.m_movement_id = v_record_id
+        AND COALESCE(p.isgeneric, 'N') = 'Y';
+      IF (v_count > 0) THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+      END IF;
     END IF;--END_PROCESS
     IF(NOT END_PROCESS) THEN
       -- Start Processing ------------------------------------------------------
--- a/model/src-db/database/model/functions/M_PRODUCTION_RUN.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/M_PRODUCTION_RUN.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -19,7 +19,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2012 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2013 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -45,6 +45,7 @@
   -- Parameter
   TYPE RECORD IS REF CURSOR;
     Cur_Parameter RECORD;
+    CUR_ProductionPlan RECORD;
     CUR_PP RECORD;
     CUR_PLineBOM RECORD;
     CUR_BOM_PRODUCT RECORD;
@@ -59,7 +60,7 @@
   v_Line NUMBER;
   v_Count NUMBER;
   p_User VARCHAR2(32);
-  v_Product_Name VARCHAR2(2000):='';
+  v_Product_Name m_product.name%TYPE;
   -- Stocked BOMs
   -- Proposed stock from given warehouse is priorized.
   CURSOR CUR_STOCK (v_ad_pinstance_id VARCHAR) IS
@@ -456,6 +457,77 @@
       v_Message:='@Product@'||' "' ||v_Product_Name ||'" ' || '@ProductWithoutAttributeSet@';
       RAISE_APPLICATION_ERROR(-20000, v_Message);
     END IF;
+
+    SELECT COUNT(M_ProductionPlan_ID)
+    INTO v_count
+    FROM M_ProductionPlan pp
+    WHERE pp.M_Production_ID = v_Record_ID
+    AND NOT EXISTS (SELECT 1 FROM M_ProductionLine WHERE M_ProductionPlan_ID = pp.M_ProductionPlan_ID AND MovementQty > 0);
+
+    v_Message := NULL;      
+    IF(v_count <> 0) THEN
+      FOR CUR_ProductionPlan IN (
+	SELECT DISTINCT(pp.line)
+	FROM M_ProductionPlan pp
+	WHERE pp.M_Production_ID = v_Record_ID
+	AND NOT EXISTS (SELECT 1 FROM M_ProductionLine WHERE M_ProductionPlan_ID = pp.M_ProductionPlan_ID AND MovementQty > 0)
+	ORDER BY Line
+        )
+      LOOP
+        IF v_Message IS NULL THEN
+          v_Message := CUR_ProductionPlan.line;
+        ELSE
+	  v_Message := v_Message || ', ' || CUR_ProductionPlan.line;
+	END IF;
+      END LOOP;
+      v_Message := '@ProducedProductWithNegativeQty@' || ' @ReferProductionPlanLines@' || ': ' || v_Message;
+      RAISE_APPLICATION_ERROR(-20000, v_Message);
+    END IF;   
+
+    SELECT COUNT(M_ProductionPlan_ID)
+    INTO v_count
+    FROM M_ProductionPlan pp
+    WHERE pp.M_Production_ID = v_Record_ID
+    AND (SELECT COUNT(M_ProductionLine_ID) FROM M_ProductionLine WHERE M_ProductionPlan_ID = pp.M_ProductionPlan_ID AND movementQty > 0) > 1;
+    
+    IF (v_count <> 0) THEN
+      FOR CUR_ProductionPlan IN (
+	SELECT DISTINCT(pp.line)
+	FROM M_ProductionPlan pp
+	WHERE pp.M_Production_ID = v_Record_ID
+	AND (SELECT COUNT(M_ProductionLine_ID) FROM M_ProductionLine WHERE M_ProductionPlan_ID = pp.M_ProductionPlan_ID AND movementQty > 0) > 1
+	ORDER BY Line
+      )
+      LOOP
+        IF v_Message IS NULL THEN
+          v_Message := CUR_ProductionPlan.line;
+        ELSE
+	  v_Message := v_Message || ', ' || CUR_ProductionPlan.line;
+	END IF;
+      END LOOP;
+      v_Message:= '@ConsumedProductWithPostiveQty@' || ' @ReferProductionPlanLines@' || ': ' || v_Message;
+      RAISE_APPLICATION_ERROR(-20000, v_Message);
+    END IF;
+    
+    SELECT count(*) INTO v_count
+    FROM dual
+    WHERE EXISTS (
+        SELECT 1
+        FROM m_productionplan pp
+            JOIN m_productionline pl ON pp.m_productionplan_id = pl.m_productionplan_id
+            JOIN m_product p ON pl.m_product_id = p.m_product_id
+        WHERE pp.m_production_id = v_record_id
+          AND p.isgeneric = 'Y');
+    IF (v_count > 0) THEN
+      SELECT max(p.name) INTO v_product_name
+      FROM m_productionplan pp
+          JOIN m_productionline pl ON pp.m_productionplan_id = pl.m_productionplan_id
+          JOIN m_product p ON pl.m_product_id = p.m_product_id
+      WHERE pp.m_production_id = v_record_id
+        AND p.isgeneric = 'Y';
+      RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_product_Name);
+    END IF;
+
     -- All Production Lines
     FOR CUR_PL_Post IN (
         SELECT pl.M_ProductionLine_ID, pl.AD_Client_ID, pl.AD_Org_ID, p.MovementDate,
--- a/model/src-db/database/model/functions/M_REQUISITION_POST.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/M_REQUISITION_POST.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2006 Openbravo SLU
+* All portions are Copyright (C) 2001-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -33,6 +33,7 @@
   v_bpartner_blocked VARCHAR2(1):='N';
   v_inOutBlocking VARCHAR2(1):='N';
   v_bpartner_name c_bpartner.name%TYPE;
+  v_productname m_product.name%TYPE;
 
   --  Parameter
   TYPE RECORD IS REF CURSOR;
@@ -61,6 +62,7 @@
     SELECT DocAction, DocStatus , c_bpartner_id INTO v_DocAction, v_DocStatus, v_bpartner
     FROM M_REQUISITION
     WHERE M_REquisition_ID = v_Record_ID;
+    
     IF (v_DocAction = 'CO' AND v_bpartner IS NOT NULL) THEN
       SELECT  vendor_blocking , po_order_blocking, name  
       INTO v_bpartner_blocked, v_inOutBlocking, v_bpartner_name
@@ -105,6 +107,21 @@
       END IF;
     END IF;
 
+    SELECT count(*) INTO v_aux
+    FROM dual
+    WHERE EXISTS (
+        SELECT 1
+        FROM m_requisitionline rl JOIN m_product p ON rl.m_product_id = p.m_product_id
+        WHERE rl.m_requisition_id = v_record_id
+          AND p.isgeneric = 'Y');
+    IF (v_aux > 0) THEN
+      SELECT max(p.name) INTO v_productname
+      FROM m_requisitionline rl JOIN m_product p ON rl.m_product_id = p.m_product_id
+      WHERE rl.m_requisition_id = v_record_id
+        AND p.isgeneric = 'Y';
+      RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+    END IF;
+
     /**
     * Order Closed, Voided or Reversed - No action possible
     */
--- a/model/src-db/database/model/functions/M_RESERVATION_POST.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/functions/M_RESERVATION_POST.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -25,7 +25,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012 Openbravo SLU
+* All portions are Copyright (C) 2012-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -46,6 +46,7 @@
   v_count           NUMBER;
   v_quantity        NUMBER;
   v_reservedqty     NUMBER;
+  v_productname     m_product.name%TYPE;
 
 TYPE RECORD IS REF CURSOR;
   Cur_Parameter RECORD;
@@ -86,6 +87,21 @@
   FROM m_reservation
   WHERE m_reservation_id = v_reservation_id;
   
+  SELECT count(*) INTO v_count
+  FROM dual
+  WHERE EXISTS (
+      SELECT 1
+      FROM m_product p 
+      WHERE p.m_product_id = v_product_id
+        AND p.isgeneric = 'Y');
+  IF (v_count > 0) THEN
+    SELECT max(p.name) INTO v_productname
+    FROM m_product p 
+    WHERE p.m_product_id = v_product_id
+      AND p.isgeneric = 'Y';
+    RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
+  END IF;
+  
   IF (v_resaction = 'PR') THEN
   /*
     Reservation Complete Process
--- a/model/src-db/database/model/tables/AD_ALERTRECIPIENT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_ALERTRECIPIENT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -64,5 +64,8 @@
       <foreign-key foreignTable="AD_USER" name="AD_ALERTRECIPIENT_AD_USER">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <index name="AD_ALERTRECIP_ALERTRULE_IDX" unique="false">
+        <index-column name="AD_ALERTRULE_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/AD_COLUMN.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_COLUMN.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -235,6 +235,12 @@
       <foreign-key foreignTable="AD_VAL_RULE" name="AD_VALRULE_COLUMN">
         <reference local="AD_VAL_RULE_ID" foreign="AD_VAL_RULE_ID"/>
       </foreign-key>
+      <index name="AD_COLUMN_ELEMENT_IDX" unique="false">
+        <index-column name="AD_ELEMENT_ID"/>
+      </index>
+      <index name="AD_COLUMN_PROCESS" unique="false">
+        <index-column name="AD_PROCESS_ID"/>
+      </index>
       <index name="AD_COLUMN_TABLE" unique="false">
         <index-column name="AD_TABLE_ID"/>
       </index>
--- a/model/src-db/database/model/tables/AD_DATASET_COLUMN.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_DATASET_COLUMN.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -64,6 +64,9 @@
       <foreign-key foreignTable="AD_ORG" name="AD_DATASET_COLUMN_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="AD_DSCOLUMN_DSTABLE_IDX" unique="false">
+        <index-column name="AD_DATASET_TABLE_ID"/>
+      </index>
       <check name="AD_DATASET_COLUMN_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_DATASET_COLUMN_ISEXCLUD_CHK"><![CDATA[ISEXCLUDED IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/AD_DATASET_TABLE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_DATASET_TABLE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -80,6 +80,9 @@
       <foreign-key foreignTable="AD_TABLE" name="AD_DATASET_TABLE_AD_TABLE">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
+      <index name="AD_DATASETTABLE_DATASET_IDX" unique="false">
+        <index-column name="AD_DATASET_ID"/>
+      </index>
       <check name="AD_DATASET_TABLE_INCLUDEAL_CHK"><![CDATA[INCLUDEALLCOLUMNS IN ('Y', 'N')]]></check>
       <check name="AD_DATASET_TABLE_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_DATASET_TABLE_ISBUSINES_CHK"><![CDATA[ISBUSINESSOBJECT IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/AD_EP_PROCEDURES.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_EP_PROCEDURES.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="AD_ORG" name="AD_ORG_ADEPPROCEDURES">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="AD_EPPROC_EXTENSIONPOINT_IDX" unique="false">
+        <index-column name="AD_EXTENSION_POINTS_ID"/>
+      </index>
       <check name="AD_EP_PROC_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/AD_EXCEPTIONS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_EXCEPTIONS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <index name="AD_EXCEPTIONS_CLIENT_IDX" unique="false">
         <index-column name="AD_CLIENT_ID"/>
       </index>
+      <index name="AD_EXCEPTIONS_MODULE_IDX" unique="false">
+        <index-column name="AD_MODULE_ID"/>
+      </index>
       <index name="AD_EXCEPTIONS_ORG_IDX" unique="false">
         <index-column name="AD_ORG_ID"/>
       </index>
--- a/model/src-db/database/model/tables/AD_FORM_ACCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_FORM_ACCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
         <index-column name="AD_ROLE_ID"/>
         <index-column name="AD_FORM_ID"/>
       </index>
+      <index name="AD_FORMACCESS_FORM_IDX" unique="false">
+        <index-column name="AD_FORM_ID"/>
+      </index>
       <check name="AD_FORM_ACCESS_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_FORM_ACCESS_ISREADWRITE_CHK"><![CDATA[ISREADWRITE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/AD_MODEL_OBJECT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_MODEL_OBJECT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -109,6 +109,18 @@
       <foreign-key foreignTable="AD_TAB" name="AD_MODEL_OBJECT_AD_TAB" onDelete="cascade">
         <reference local="AD_TAB_ID" foreign="AD_TAB_ID"/>
       </foreign-key>
+      <index name="AD_MODELOBJECT_CALLOUT_IDX" unique="false">
+        <index-column name="AD_CALLOUT_ID"/>
+      </index>
+      <index name="AD_MODELOBJECT_FORM_IDX" unique="false">
+        <index-column name="AD_FORM_ID"/>
+      </index>
+      <index name="AD_MODELOBJECT_PROCESS_IDX" unique="false">
+        <index-column name="AD_PROCESS_ID"/>
+      </index>
+      <index name="AD_MODELOBJECT_REFERENCE_IDX" unique="false">
+        <index-column name="AD_REFERENCE_ID"/>
+      </index>
       <check name="AD_MODEL_OBJECT_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_MODEL_OBJECT_ISDEFAULT_CHK"><![CDATA[ISDEFAULT IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/AD_MODEL_OBJECT_MAPPING.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_MODEL_OBJECT_MAPPING.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -54,6 +54,9 @@
       <foreign-key foreignTable="AD_ORG" name="AD_MODEL_OBJECT_MAPPING_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="AD_MODELOBJMAP_MODELOBJ_IDX" unique="false">
+        <index-column name="AD_MODEL_OBJECT_ID"/>
+      </index>
       <check name="AD_MODEL_OBJECT_MAPPING_IS_CH1"><![CDATA[ISDEFAULT IN ('Y', 'N')]]></check>
       <check name="AD_MODEL_OBJECT_MAPPING_IS_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/AD_MODEL_OBJECT_PARA.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_MODEL_OBJECT_PARA.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -58,6 +58,9 @@
       <foreign-key foreignTable="AD_ORG" name="AD_MODEL_OBJECT_PARA_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="AD_MODELOJTPARA_MODELOBJ_IDX" unique="false">
+        <index-column name="AD_MODEL_OBJECT_ID"/>
+      </index>
       <check name="AD_MOD_OBJ_PARA_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/AD_MODULE_DBPREFIX.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_MODULE_DBPREFIX.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -50,6 +50,9 @@
       <foreign-key foreignTable="AD_ORG" name="AD_MODULE_DBPREFIX_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="AD_MODULEDBPREFIX_MODULE_IDX" unique="false">
+        <index-column name="AD_MODULE_ID"/>
+      </index>
       <unique name="AD_MODULE_DB_PREFIX_UN">
         <unique-column name="NAME"/>
       </unique>
--- a/model/src-db/database/model/tables/AD_MODULE_DEPENDENCY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_MODULE_DEPENDENCY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -81,6 +81,9 @@
       <foreign-key foreignTable="AD_ORG" name="AD_MODULE_DEPENDENCY_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="AD_MODULEDEPENDENCY_MODULE_IDX" unique="false">
+        <index-column name="AD_MODULE_ID"/>
+      </index>
       <check name="AD_MODULE_DEPENDENCY_ISACT_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_MODULE_ISINCLUDED_CHK"><![CDATA[ISINCLUDED IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/AD_ORG_ACCTSCHEMA.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_ORG_ACCTSCHEMA.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -76,6 +76,9 @@
       <foreign-key foreignTable="C_ACCTSCHEMA" name="AD_ORG_ACCTSCHEMA_C_ACCTSCHEMA">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
+      <index name="AD_ORGACCTSCHEMA_ORG_IDX" unique="false">
+        <index-column name="AD_ORG_ID"/>
+      </index>
       <check name="AD_ORG_ACCTSCHEMA_BPFIELDS_CHK"><![CDATA[(ISBPNEWACCOUNT = 'N') OR ((((ISBPNEWACCOUNT = 'Y') AND (AD_SEQUENCE_BP_ID IS NOT NULL)) AND (ACCT_LENGTH IS NOT NULL)) AND (SUBACCT_LENGTH IS NOT NULL))]]></check>
       <check name="AD_ORG_ACCTSCHEMA_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_ORG_ACCTSCHEMA_ISBPNEWA_CHK"><![CDATA[ISBPNEWACCOUNT IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/AD_ORG_WAREHOUSE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_ORG_WAREHOUSE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -50,6 +50,9 @@
       <foreign-key foreignTable="M_WAREHOUSE" name="AD_ORG_WAREHOUSE_WAREHOUSE">
         <reference local="M_WAREHOUSE_ID" foreign="M_WAREHOUSE_ID"/>
       </foreign-key>
+      <index name="AD_ORGWAREHOUSE_ORG_IDX" unique="false">
+        <index-column name="AD_ORG_ID"/>
+      </index>
       <check name="AD_ORG_WAREHOUSE_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/AD_PACKAGE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_PACKAGE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -58,6 +58,9 @@
       <foreign-key foreignTable="AD_ORG" name="AD_PACKAGE_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="AD_PACKAGE_MODULE_IDX" unique="false">
+        <index-column name="AD_MODULE_ID"/>
+      </index>
       <unique name="AD_PACKAGE_JAVANAME">
         <unique-column name="JAVAPACKAGE"/>
       </unique>
--- a/model/src-db/database/model/tables/AD_PROCESS_ACCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_PROCESS_ACCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
         <index-column name="AD_ROLE_ID"/>
         <index-column name="AD_PROCESS_ID"/>
       </index>
+      <index name="AD_PROCESSACCESS_PROCESS_IDX" unique="false">
+        <index-column name="AD_PROCESS_ID"/>
+      </index>
       <check name="AD_PROCESS_ACCESS_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_PROCESS_ACCESS_ISREADWR_CHK"><![CDATA[ISREADWRITE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/AD_REF_SEARCH.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_REF_SEARCH.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -60,6 +60,9 @@
       <foreign-key foreignTable="AD_TABLE" name="AD_REF_SEARCH_AD_TABLE">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
+      <index name="AD_REFSEARCH_REFERENCE_IDX" unique="false">
+        <index-column name="AD_REFERENCE_ID"/>
+      </index>
       <check name="AD_REF_SEARCH_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/AD_REF_SEARCH_COLUMN.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_REF_SEARCH_COLUMN.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -62,6 +62,9 @@
       <foreign-key foreignTable="AD_REF_SEARCH" name="AD_REF_SEARCH_COLUMN_AD_REF_SE">
         <reference local="AD_REF_SEARCH_ID" foreign="AD_REF_SEARCH_ID"/>
       </foreign-key>
+      <index name="AD_REFSEARCHCOL_REFSEARCH_IDX" unique="false">
+        <index-column name="AD_REF_SEARCH_ID"/>
+      </index>
       <check name="AD_REF_SEARCH_C_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/AD_TABLE_ACCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_TABLE_ACCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="AD_TABLE" name="AD_TABLE_ACCESS_AD_TABLE" onDelete="cascade">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
+      <index name="AD_TABLEACCESS_TABLE_IDX" unique="false">
+        <index-column name="AD_TABLE_ID"/>
+      </index>
       <unique name="AD_TABLE_ACCESS_ROLE_TABLE_UN">
         <unique-column name="AD_ROLE_ID"/>
         <unique-column name="AD_TABLE_ID"/>
--- a/model/src-db/database/model/tables/AD_USER_ROLES.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_USER_ROLES.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="AD_ORG" name="AD_USERROLESORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="AD_USERROLES_ROLE_IDX" unique="false">
+        <index-column name="AD_ROLE_ID"/>
+      </index>
       <unique name="AD_USER_ROLES_USER_ROLE_UN">
         <unique-column name="AD_USER_ID"/>
         <unique-column name="AD_ROLE_ID"/>
--- a/model/src-db/database/model/tables/AD_WINDOW_ACCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/AD_WINDOW_ACCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
         <index-column name="AD_ROLE_ID"/>
         <index-column name="AD_WINDOW_ID"/>
       </index>
+      <index name="AD_WINDOWACCESS_WINDOW_IDX" unique="false">
+        <index-column name="AD_WINDOW_ID"/>
+      </index>
       <check name="AD_WINDOW_ACCESS_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_WINDOW_ACCESS_ISREADWRI_CHK"><![CDATA[ISREADWRITE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/A_AMORTIZATIONLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/A_AMORTIZATIONLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -104,6 +104,12 @@
       <foreign-key foreignTable="USER2" name="A_AMORTLINE_USER2">
         <reference local="USER2_ID" foreign="USER2_ID"/>
       </foreign-key>
+      <index name="A_AMORTIZATIONLINE_AMORTIZ_IDX" unique="false">
+        <index-column name="A_AMORTIZATION_ID"/>
+      </index>
+      <index name="A_AMORTIZATIONLINE_ASSET_IDX" unique="false">
+        <index-column name="A_ASSET_ID"/>
+      </index>
       <check name="A_AMORTIZATIONL_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/A_ASSET.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/A_ASSET.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -289,6 +289,9 @@
       <foreign-key foreignTable="M_PRODUCT" name="A_ASSET_M_PRODUCT">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <index name="A_ASSET_BPARTNER_IDX" unique="false">
+        <index-column name="C_BPARTNER_ID"/>
+      </index>
       <check name="A_ASSET_IS30DAYMONTH_CHK"><![CDATA[IS30DAYMONTH IN ('Y', 'N')]]></check>
       <check name="A_ASSET_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="A_ASSET_ISDISPOSED_CHK"><![CDATA[ISDISPOSED IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/C_ACCTSCHEMA_GL.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_ACCTSCHEMA_GL.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -125,6 +125,9 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="C_ACCTSCHM_GL_C_VLDCMBNTN">
         <reference local="CFS_ORDER_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <index name="C_ACCTSCHEMAGL_ACCTSCHEMA_IDX" unique="false">
+        <index-column name="C_ACCTSCHEMA_ID"/>
+      </index>
       <check name="C_ACCTSCHEMA_GL_CREATECL_CHK"><![CDATA[CREATECLOSING IN ('Y', 'N')]]></check>
       <check name="C_ACCTSCHEMA_GL_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="C_ACCTSCHEMA_GL_USECURRENC_CHK"><![CDATA[USECURRENCYBALANCING IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/C_ACCTSCHEMA_PROCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_ACCTSCHEMA_PROCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="C_ACCTSCHEMA" name="C_ACCTSCHEMA_PROCESS_C_ACCTSCH">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
+      <index name="C_ACCTSCHEMAPRC_ACCTSCHEMA_IDX" unique="false">
+        <index-column name="C_ACCTSCHEMA_ID"/>
+      </index>
       <check name="C_ACCTSCHEMA_PROCESS_ISACT_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="C_ACCTSCHEMA_PROCESS_ISDAT_CHK"><![CDATA[ISDATASET IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/C_ACCTSCHEMA_TABLE_DOCTYPE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_ACCTSCHEMA_TABLE_DOCTYPE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="C_ACCTSCHEMA_TABLE" name="C_CCTSCHM_TBL_D_C_CCTSCHM_TBL">
         <reference local="C_ACCTSCHEMA_TABLE_ID" foreign="C_ACCTSCHEMA_TABLE_ID"/>
       </foreign-key>
+      <index name="C_ACCSCHTBLDOCTP_ACCSCHTBL_IDX" unique="false">
+        <index-column name="C_ACCTSCHEMA_TABLE_ID"/>
+      </index>
       <check name="C_ACCTSCH_TA_DO_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="C_ACCTSCH_TA_DO_NEGATIVE_CHECK"><![CDATA[ALLOWNEGATIVE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/C_ACCT_RPT_GROUP.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_ACCT_RPT_GROUP.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -58,5 +58,8 @@
       <foreign-key foreignTable="C_ACCT_RPT" name="C_ACCT_RPT_GROUP_C_ACCT_RPT">
         <reference local="C_ACCT_RPT_ID" foreign="C_ACCT_RPT_ID"/>
       </foreign-key>
+      <index name="C_ACCTRPTGROUP_ACCTRPT_IDX" unique="false">
+        <index-column name="C_ACCT_RPT_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_ACCT_RPT_NODE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_ACCT_RPT_NODE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -65,5 +65,8 @@
       <foreign-key foreignTable="C_ELEMENTVALUE" name="C_ACCT_RPT_NODE_C_ELEMENTVALUE">
         <reference local="C_ELEMENTVALUE_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <index name="C_ACCTRPTNODE_ACCTRPTGROUP_IDX" unique="false">
+        <index-column name="C_ACCT_RPT_GROUP_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_BPARTNER_DISCOUNT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_BPARTNER_DISCOUNT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -73,6 +73,9 @@
       <foreign-key foreignTable="C_DISCOUNT" name="C_BPARTNER_DISCOUNT_C_DISCOUNT">
         <reference local="C_DISCOUNT_ID" foreign="C_DISCOUNT_ID"/>
       </foreign-key>
+      <index name="C_BPARTNERDISCOUNT_BP_IDX" unique="false">
+        <index-column name="C_BPARTNER_ID"/>
+      </index>
       <check name="C_BPDISC_APPLYINORDER_CHECK"><![CDATA[APPLYINORDER IN ('N', 'Y')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_BP_GROUP_ACCT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_BP_GROUP_ACCT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -209,8 +209,8 @@
         <reference local="WRITEOFF_REV_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <unique name="C_BP_GROUP_ACCT_SCHEM_GROUP_UN">
+        <unique-column name="C_BP_GROUP_ID"/>
         <unique-column name="C_ACCTSCHEMA_ID"/>
-        <unique-column name="C_BP_GROUP_ID"/>
       </unique>
       <check name="C_BP_GROUP_ACCT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/C_BUDGETLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_BUDGETLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -196,6 +196,9 @@
       <foreign-key foreignTable="M_PRODUCT_CATEGORY" name="M_PRODUCT_CATEGORY_CBUDGETLINE">
         <reference local="M_PRODUCT_CATEGORY_ID" foreign="M_PRODUCT_CATEGORY_ID"/>
       </foreign-key>
+      <index name="C_BUDGETLINE_BUDGET_IDX" unique="false">
+        <index-column name="C_BUDGET_ID"/>
+      </index>
       <check name="C_BUDGETLINE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_CITY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_CITY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -73,6 +73,9 @@
       <foreign-key foreignTable="AD_ORG" name="C_CITYORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="C_CITY_REGION_IDX" unique="false">
+        <index-column name="C_REGION_ID"/>
+      </index>
       <check name="C_CITY_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_COMMISSIONDETAIL.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_COMMISSIONDETAIL.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -91,6 +91,9 @@
       <foreign-key foreignTable="C_ORDERLINE" name="C_COMMISSIONDETAIL_C_ORDERLINE">
         <reference local="C_ORDERLINE_ID" foreign="C_ORDERLINE_ID"/>
       </foreign-key>
+      <index name="C_COMMISSIONDET_COMMISSAMT_IDX" unique="false">
+        <index-column name="C_COMMISSIONAMT_ID"/>
+      </index>
       <check name="C_COMMISSIONDET_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="C_COMMISSIONDET_ISCOSTCALC"><![CDATA[ISCOSTCALCULATED IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/C_CONVERSION_RATE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_CONVERSION_RATE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -74,10 +74,10 @@
         <reference local="C_CURRENCY_ID_TO" foreign="C_CURRENCY_ID"/>
       </foreign-key>
       <unique name="C_CONVERSIONRATE_ONCE">
+        <unique-column name="C_CURRENCY_ID"/>
+        <unique-column name="C_CURRENCY_ID_TO"/>
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="AD_ORG_ID"/>
-        <unique-column name="C_CURRENCY_ID"/>
-        <unique-column name="C_CURRENCY_ID_TO"/>
         <unique-column name="CONVERSIONRATETYPE"/>
         <unique-column name="VALIDFROM"/>
       </unique>
--- a/model/src-db/database/model/tables/C_CONVERSION_RATE_DOCUMENT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_CONVERSION_RATE_DOCUMENT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -89,10 +89,16 @@
       <foreign-key foreignTable="C_CURRENCY" name="C_CURRENCYRATEDOCRATETO">
         <reference local="C_CURRENCY_ID_TO" foreign="C_CURRENCY_ID"/>
       </foreign-key>
+      <index name="C_CONVRATEDOC_FINACCTRX_IDX" unique="false">
+        <index-column name="FIN_FINACC_TRANSACTION_ID"/>
+      </index>
+      <index name="C_CONVRATEDOC_PAYMENT_IDX" unique="false">
+        <index-column name="FIN_PAYMENT_ID"/>
+      </index>
       <unique name="C_CONVERSIONRATEDOC_ONCE">
+        <unique-column name="C_INVOICE_ID"/>
         <unique-column name="C_CURRENCY_ID"/>
         <unique-column name="C_CURRENCY_ID_TO"/>
-        <unique-column name="C_INVOICE_ID"/>
         <unique-column name="FIN_PAYMENT_ID"/>
         <unique-column name="APRM_FINACC_TRANSACTION_V_ID"/>
       </unique>
--- a/model/src-db/database/model/tables/C_DEBT_PAYMENT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_DEBT_PAYMENT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -214,6 +214,9 @@
       <index name="C_DEBT_PAYMENT_SETTGENERAT_IDX" unique="false">
         <index-column name="C_SETTLEMENT_GENERATE_ID"/>
       </index>
+      <index name="C_DEBTPAYMENT_ORDER_IDX" unique="false">
+        <index-column name="C_ORDER_ID"/>
+      </index>
       <check name="C_DEBT_PAYMENT_C_BANKSTATE_CHK"><![CDATA[((C_BANKSTATEMENTLINE_ID IS NULL) AND (C_CASHLINE_ID IS NULL)) OR (ISPAID = 'Y')]]></check>
       <check name="C_DEBT_PAYMENT_C_BPARTNER__CHK"><![CDATA[C_BPARTNER_ID IS NOT NULL]]></check>
       <check name="C_DEBT_PAYMENT_C_CASHLINE__CHK"><![CDATA[(C_CASHLINE_ID IS NULL) OR (C_BANKSTATEMENTLINE_ID IS NULL)]]></check>
--- a/model/src-db/database/model/tables/C_DP_MANAGEMENTLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_DP_MANAGEMENTLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -65,5 +65,8 @@
       <foreign-key foreignTable="C_DP_MANAGEMENT" name="C_DP_MANAGEMENTLINE_C_DP_MANAG">
         <reference local="C_DP_MANAGEMENT_ID" foreign="C_DP_MANAGEMENT_ID"/>
       </foreign-key>
+      <index name="C_DPMGTLINE_DPMGT_IDX" unique="false">
+        <index-column name="C_DP_MANAGEMENT_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_ELEMENTVALUE_OPERAND.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_ELEMENTVALUE_OPERAND.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="C_ELEMENTVALUE" name="C_ELEMENTVALUE_OPERAND_C_ELEME">
         <reference local="C_ELEMENTVALUE_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <index name="C_ELEMENTVALOPER_ELEMTVAL_IDX" unique="false">
+        <index-column name="C_ELEMENTVALUE_ID"/>
+      </index>
       <check name="C_ELEMENTVALUE_OPERAND_ISA_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_EXTERNALPOS_CATEGORY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_EXTERNALPOS_CATEGORY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -54,8 +54,8 @@
         <reference local="M_PRODUCT_CATEGORY_ID" foreign="M_PRODUCT_CATEGORY_ID"/>
       </foreign-key>
       <unique name="C_EXTPOSCAT_PRODCATEGORY_UN">
+        <unique-column name="C_EXTERNALPOS_ID"/>
         <unique-column name="M_PRODUCT_CATEGORY_ID"/>
-        <unique-column name="C_EXTERNALPOS_ID"/>
       </unique>
       <check name="C_EXTERNALPOS_C_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/C_EXTERNALPOS_PRODUCT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_EXTERNALPOS_PRODUCT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -54,8 +54,8 @@
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
       <unique name="C_EXTPOSPROD_PRODUCT_UN">
+        <unique-column name="C_EXTERNALPOS_ID"/>
         <unique-column name="M_PRODUCT_ID"/>
-        <unique-column name="C_EXTERNALPOS_ID"/>
       </unique>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_INVOICE_DISCOUNT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_INVOICE_DISCOUNT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,5 +61,8 @@
       <foreign-key foreignTable="C_INVOICE" name="C_INVOICE_DISCOUNT_C_INVOICE">
         <reference local="C_INVOICE_ID" foreign="C_INVOICE_ID"/>
       </foreign-key>
+      <index name="C_INVOICEDISCOUNT_INVOICE_IDX" unique="false">
+        <index-column name="C_INVOICE_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_INVOICE_REVERSE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_INVOICE_REVERSE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -53,5 +53,8 @@
       <foreign-key foreignTable="C_INVOICE" name="C_INVOICE_REVERSE_REVERSED_C_I">
         <reference local="REVERSED_C_INVOICE_ID" foreign="C_INVOICE_ID"/>
       </foreign-key>
+      <index name="C_INVOICEREVERSE_INVOICE_IDX" unique="false">
+        <index-column name="C_INVOICE_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_NONBUSINESSDAY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_NONBUSINESSDAY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -54,6 +54,9 @@
       <foreign-key foreignTable="AD_ORG" name="C_NONBUSINESDAYSORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="C_NONBUSINESSDAY_CALENDAR_IDX" unique="false">
+        <index-column name="C_CALENDAR_ID"/>
+      </index>
       <check name="C_NONBUSINESSDA_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_ORDER.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_ORDER.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -329,6 +329,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="CREATE_POLINES" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="C_DOCTYPE" name="C_DOCTYPE_CORDER">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/C_ORDER_DISCOUNT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_ORDER_DISCOUNT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,5 +61,8 @@
       <foreign-key foreignTable="C_ORDER" name="C_ORDER_DISCOUNT_C_ORDER">
         <reference local="C_ORDER_ID" foreign="C_ORDER_ID"/>
       </foreign-key>
+      <index name="C_ORDERDISCOUNT_ORDER_IDX" unique="false">
+        <index-column name="C_ORDER_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_PAYMENTTERMLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_PAYMENTTERMLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -109,6 +109,9 @@
       <foreign-key foreignTable="FIN_PAYMENTMETHOD" name="C_PAYMENTTERMLINE_FIN_PAY_FK1">
         <reference local="FIN_PAYMENTMETHOD_ID" foreign="FIN_PAYMENTMETHOD_ID"/>
       </foreign-key>
+      <index name="C_PAYMENTTERMLINE_PAYMENTT_IDX" unique="false">
+        <index-column name="C_PAYMENTTERM_ID"/>
+      </index>
       <check name="C_PAYMENTTERMLINE_EXCLUDET_CHK"><![CDATA[EXCLUDETAX IN ('Y', 'N')]]></check>
       <check name="C_PAYMENTTERMLINE_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="C_PAYMENTTERMLINE_ISDUEFIX_CHK"><![CDATA[ISDUEFIXED IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/C_PHASE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_PHASE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -77,5 +77,8 @@
       <foreign-key foreignTable="M_PRODUCT" name="C_PHASE_M_PRODUCT">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <index name="C_PHASE_PROJECTTYPE_IDX" unique="false">
+        <index-column name="C_PROJECTTYPE_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_POC_EMAILDEFINITION.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_POC_EMAILDEFINITION.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -65,5 +65,8 @@
       <foreign-key foreignTable="C_POC_DOCTYPE_TEMPLATE" name="C_POC_EMAILDEFINITION_C_POC_DO">
         <reference local="C_POC_DOCTYPE_TEMPLATE_ID" foreign="C_POC_DOCTYPE_TEMPLATE_ID"/>
       </foreign-key>
+      <index name="C_POCEMAILDEF_DOCTYPETEMPL_IDX" unique="false">
+        <index-column name="C_POC_DOCTYPE_TEMPLATE_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_PROJECTLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_PROJECTLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -156,6 +156,9 @@
       <foreign-key foreignTable="C_TAX" name="C_TAX_FK_PROJECTLINE">
         <reference local="C_TAX_ID" foreign="C_TAX_ID"/>
       </foreign-key>
+      <index name="C_PROJECTLINE_PROJECT_IDX" unique="false">
+        <index-column name="C_PROJECT_ID"/>
+      </index>
       <check name="C_PROJECTLINE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_PROJECTPHASE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_PROJECTPHASE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -119,5 +119,8 @@
       <foreign-key foreignTable="M_PRODUCT" name="C_PROJECTPHASE_M_PRODUCT">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <index name="C_PROJECTPHASE_PROJECT_IDX" unique="false">
+        <index-column name="C_PROJECT_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_PROJECTPROPOSAL.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_PROJECTPROPOSAL.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -109,6 +109,9 @@
       <foreign-key foreignTable="FIN_PAYMENTMETHOD" name="C_PROJECTPROPOSAL_FINPAYMETHOD">
         <reference local="FIN_PAYMENTMETHOD_ID" foreign="FIN_PAYMENTMETHOD_ID"/>
       </foreign-key>
+      <index name="C_PROJECTPROPOSAL_PROJECT_IDX" unique="false">
+        <index-column name="C_PROJECT_ID"/>
+      </index>
       <check name="C_PROJECTPROPOS_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_PROJECTPROPOSALLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_PROJECTPROPOSALLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -81,6 +81,9 @@
       <foreign-key foreignTable="M_PRODUCT" name="C_PROJECTPROPOSALLINE_M_PRODUC">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <index name="C_PRJPROPOSALLN_PRJPROPOS_IDX" unique="false">
+        <index-column name="C_PROJECTPROPOSAL_ID"/>
+      </index>
       <check name="C_PROJECTPROPOSALLINE_ISAC_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_PROJECTPROPOSALTASK.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_PROJECTPROPOSALTASK.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="C_PROJECTPROPOSAL" name="C_PROJECTPROPOSALTASK_C_PROJEC">
         <reference local="C_PROJECTPROPOSAL_ID" foreign="C_PROJECTPROPOSAL_ID"/>
       </foreign-key>
+      <index name="C_PRJPROPOSTASK_PRJPROPOS_IDX" unique="false">
+        <index-column name="C_PROJECTPROPOSAL_ID"/>
+      </index>
       <check name="C_PRPROPTK_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_PROJECTTASK.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_PROJECTTASK.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -108,5 +108,8 @@
       <foreign-key foreignTable="M_PRODUCT" name="C_PROJECTTASK_M_PRODUCT">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <index name="C_PROJECTTASK_PROJECTPHASE_IDX" unique="false">
+        <index-column name="C_PROJECTPHASE_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_PROJECT_VENDOR.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_PROJECT_VENDOR.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -86,6 +86,9 @@
       <foreign-key foreignTable="M_PRICELIST_VERSION" name="C_PROJECT_VENDOR_M_PRICELIST_V">
         <reference local="M_PRICELIST_VERSION_ID" foreign="M_PRICELIST_VERSION_ID"/>
       </foreign-key>
+      <index name="C_PROJECTVENDOR_PROJECT_IDX" unique="false">
+        <index-column name="C_PROJECT_ID"/>
+      </index>
       <check name="C_PROJECT_VENDO_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_REMITTANCELINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_REMITTANCELINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -68,5 +68,8 @@
       <foreign-key foreignTable="C_DEBT_PAYMENT" name="C_REMITTANCELINE_C_DEBT_PAYMEN">
         <reference local="C_DEBT_PAYMENT_ID" foreign="C_DEBT_PAYMENT_ID"/>
       </foreign-key>
+      <index name="C_REMITLINE_REMIT_IDX" unique="false">
+        <index-column name="C_REMITTANCE_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_REMITTANCE_PARAMETER.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_REMITTANCE_PARAMETER.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -54,5 +54,8 @@
       <foreign-key foreignTable="C_REMITTANCE_TYPE" name="C_REMITTANCE_PARAMETER_C_REMIT">
         <reference local="C_REMITTANCE_TYPE_ID" foreign="C_REMITTANCE_TYPE_ID"/>
       </foreign-key>
+      <index name="C_REMITPARAMETER_REMITTYPE_IDX" unique="false">
+        <index-column name="C_REMITTANCE_TYPE_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_SALARY_CATEGORY_COST.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_SALARY_CATEGORY_COST.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -54,5 +54,8 @@
       <foreign-key foreignTable="C_SALARY_CATEGORY" name="C_SALARY_CATEGORY_COST_C_SALAR">
         <reference local="C_SALARY_CATEGORY_ID" foreign="C_SALARY_CATEGORY_ID"/>
       </foreign-key>
+      <index name="C_SALCTGCOST_SALACTG_IDX" unique="false">
+        <index-column name="C_SALARY_CATEGORY_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_TASK.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_TASK.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -77,5 +77,8 @@
       <foreign-key foreignTable="M_PRODUCT" name="C_TASK_M_PRODUCT">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <index name="C_TASK_PHASE_IDX" unique="false">
+        <index-column name="C_PHASE_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_TAXREGISTER.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_TAXREGISTER.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -69,5 +69,8 @@
       <foreign-key foreignTable="C_TAXREGISTER_TYPE" name="C_TAXREGISTER_C_TAXREGISTER_TY">
         <reference local="C_TAXREGISTER_TYPE_ID" foreign="C_TAXREGISTER_TYPE_ID"/>
       </foreign-key>
+      <index name="C_TAXREGISTER_TAXPAYMENT_IDX" unique="false">
+        <index-column name="C_TAXPAYMENT_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_TAXREGISTERLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_TAXREGISTERLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -96,5 +96,8 @@
       <foreign-key foreignTable="C_TAXREGISTER" name="C_TAXREGISTERLINE_C_TAXREGISTE">
         <reference local="C_TAXREGISTER_ID" foreign="C_TAXREGISTER_ID"/>
       </foreign-key>
+      <index name="C_TAXREGISTERLINE_TAXREGIS_IDX" unique="false">
+        <index-column name="C_TAXREGISTER_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_TAXREGISTER_TYPE_LINES.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_TAXREGISTER_TYPE_LINES.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -60,5 +60,8 @@
       <foreign-key foreignTable="C_TAX" name="C_TAXREGISTER_TYPE_LINES_C_TAX">
         <reference local="C_TAX_ID" foreign="C_TAX_ID"/>
       </foreign-key>
+      <index name="C_TAXREGTYPELIN_TAXREGTYPE_IDX" unique="false">
+        <index-column name="C_TAXREGISTER_TYPE_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_TAX_ZONE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_TAX_ZONE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -74,5 +74,8 @@
       <foreign-key foreignTable="C_REGION" name="C_TO_REGION_C_TAX_ZONE">
         <reference local="TO_REGION_ID" foreign="C_REGION_ID"/>
       </foreign-key>
+      <index name="C_TAXZONE_TAX_IDX" unique="false">
+        <index-column name="C_TAX_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_UOM_CONVERSION.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/C_UOM_CONVERSION.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="C_UOM" name="C_UOMCONVERSIONTO">
         <reference local="C_UOM_TO_ID" foreign="C_UOM_ID"/>
       </foreign-key>
+      <index name="C_UOMCONVERSION_UOM_IDX" unique="false">
+        <index-column name="C_UOM_ID"/>
+      </index>
       <check name="C_UOM_CONVERSIO_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/FIN_BANKFILE_EXCEPTION.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/FIN_BANKFILE_EXCEPTION.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="FIN_FINANCIAL_ACCOUNT" name="FIN_BANKFILE_EXCEPTION_FA">
         <reference local="FIN_FINANCIAL_ACCOUNT_ID" foreign="FIN_FINANCIAL_ACCOUNT_ID"/>
       </foreign-key>
+      <index name="FIN_BNKFILEEXC_BNKFILEFRMT_IDX" unique="false">
+        <index-column name="FIN_BANKFILE_FORMAT_ID"/>
+      </index>
       <check name="FIN_BANKFILE_EX_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/FIN_BANKSTATEMENT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/FIN_BANKSTATEMENT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -96,6 +96,9 @@
       <foreign-key foreignTable="FIN_RECONCILIATION" name="FIN_BANKSTAT_FINRECONCILIATION">
         <reference local="FIN_RECONCILIATION_ID" foreign="FIN_RECONCILIATION_ID"/>
       </foreign-key>
+      <index name="FIN_BNKSTMT_FINACCT_IDX" unique="false">
+        <index-column name="FIN_FINANCIAL_ACCOUNT_ID"/>
+      </index>
       <check name="FIN_BANKSTAT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="FIN_BANKSTAT_PROCESSED_CHECK"><![CDATA[PROCESSED IN ('Y', 'N')]]></check>
       <check name="FIN_BANKSTAT_PROCESSING_CHECK"><![CDATA[PROCESSING IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/FIN_BANKSTATEMENTLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/FIN_BANKSTATEMENTLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -102,6 +102,9 @@
       <index name="FIN_BANKSTATEMENTLINE_TRX" unique="false">
         <index-column name="FIN_FINACC_TRANSACTION_ID"/>
       </index>
+      <index name="FIN_BNKSTMTLINE_BNKSTMT_IDX" unique="false">
+        <index-column name="FIN_BANKSTATEMENT_ID"/>
+      </index>
       <check name="FIN_BANKSTATLINE_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/FIN_DOUBTFUL_DEBT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/FIN_DOUBTFUL_DEBT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -158,6 +158,9 @@
       <foreign-key foreignTable="USER2" name="FIN_DOUBTFUL_DEBT_USER2">
         <reference local="USER2_ID" foreign="USER2_ID"/>
       </foreign-key>
+      <index name="FIN_DOUBTDBT_DOUBTDBTRUN_IDX" unique="false">
+        <index-column name="FIN_DOUBTFUL_DEBT_RUN_ID"/>
+      </index>
       <check name="FIN_DOUBTDEBT_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="FIN_DOUBTDEBT_PROCESSED"><![CDATA[PROCESSED IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -143,6 +143,9 @@
       <foreign-key foreignTable="FIN_PAY_EXEC_PROCESS" name="FIN_FINACCMETH_PAYOUTEXECPROC">
         <reference local="PAYOUT_EXECUTION_PROCESS_ID" foreign="FIN_PAY_EXEC_PROCESS_ID"/>
       </foreign-key>
+      <index name="FIN_FINACCTPYMTMETH_FINACC_IDX" unique="false">
+        <index-column name="FIN_FINANCIAL_ACCOUNT_ID"/>
+      </index>
       <unique name="FIN_FINACC_PAYMENTMETHOD_UN">
         <unique-column name="FIN_PAYMENTMETHOD_ID"/>
         <unique-column name="FIN_FINANCIAL_ACCOUNT_ID"/>
--- a/model/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -162,6 +162,9 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="FIN_FINACC_ACCT_WITHDRAWAL">
         <reference local="FIN_WITHDRAWAL_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <index name="FIN_FINACCT_ACCTSCHEMA_IDX" unique="false">
+        <index-column name="C_ACCTSCHEMA_ID"/>
+      </index>
       <unique name="FIN_FINACC_ACCT_ACCTSCHEMA_UN">
         <unique-column name="FIN_FINANCIAL_ACCOUNT_ID"/>
         <unique-column name="C_ACCTSCHEMA_ID"/>
--- a/model/src-db/database/model/tables/FIN_PAYMENT_CREDIT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/FIN_PAYMENT_CREDIT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -64,6 +64,9 @@
       <foreign-key foreignTable="FIN_PAYMENT" name="FIN_CR_FIN_PAYMENT_USED">
         <reference local="FIN_PAYMENT_ID_USED" foreign="FIN_PAYMENT_ID"/>
       </foreign-key>
+      <index name="FIN_PAYMENTCREDIT_PAYMENT_IDX" unique="false">
+        <index-column name="FIN_PAYMENT_ID"/>
+      </index>
       <check name="FIN_CR_PAYMENT_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/FIN_PAYMENT_RUN_PARA.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/FIN_PAYMENT_RUN_PARA.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="FIN_PAY_EXEC_PROCESS_PARA" name="FIN_PAYRUNPARA_PAYEXECPROCPARA">
         <reference local="FIN_PAY_EXEC_PROCESS_PARA_ID" foreign="FIN_PAY_EXEC_PROCESS_PARA_ID"/>
       </foreign-key>
+      <index name="FIN_PYMTRUNPARA_PYMTRUN_IDX" unique="false">
+        <index-column name="FIN_PAYMENT_RUN_ID"/>
+      </index>
       <check name="FIN_PAYMENTRUNPARA_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/FIN_PAYMENT_RUN_PAYMENT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/FIN_PAYMENT_RUN_PAYMENT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="AD_CLIENT" name="FIN_PAYMENTRUNPAYMENT_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
+      <index name="FIN_PYMTRUNPYMT_PYMTRUN_IDX" unique="false">
+        <index-column name="FIN_PAYMENT_RUN_ID"/>
+      </index>
       <check name="FIN_PAYMENTRUNPAY_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="FIN_PAYMENTRUNPAY_VALCHK_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/FIN_PAY_EXEC_PROCESS_PARA.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/FIN_PAY_EXEC_PROCESS_PARA.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -82,6 +82,9 @@
       <foreign-key foreignTable="FIN_PAY_EXEC_PROCESS" name="FIN_PAYEXECPROCPARA_PAYEXECPRO">
         <reference local="FIN_PAY_EXEC_PROCESS_ID" foreign="FIN_PAY_EXEC_PROCESS_ID"/>
       </foreign-key>
+      <index name="FIN_PAYEXCPRCPAR_PAYEXCPRC_IDX" unique="false">
+        <index-column name="FIN_PAY_EXEC_PROCESS_ID"/>
+      </index>
       <check name="FIN_PAYEXECPROCPARA_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="FIN_PAYEXECPROCPARA_MANDAT_CHK"><![CDATA[ISMANDATORY IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/GL_JOURNAL.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/GL_JOURNAL.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -209,6 +209,9 @@
       <foreign-key foreignTable="USER2" name="GL_JOURNAL_USER2">
         <reference local="USER2_ID" foreign="USER2_ID"/>
       </foreign-key>
+      <index name="GL_JOURNAL_JOURNALBATCH_IDX" unique="false">
+        <index-column name="GL_JOURNALBATCH_ID"/>
+      </index>
       <unique name="GL_JOURNAL_DOCNO">
         <unique-column name="AD_ORG_ID"/>
         <unique-column name="C_PERIOD_ID"/>
--- a/model/src-db/database/model/tables/GL_JOURNALLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/GL_JOURNALLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -238,6 +238,9 @@
       <foreign-key foreignTable="USER2" name="GL_JOURNALLINE_USER2">
         <reference local="USER2_ID" foreign="USER2_ID"/>
       </foreign-key>
+      <index name="GL_JOURNALLINE_JOURNAL_IDX" unique="false">
+        <index-column name="GL_JOURNAL_ID"/>
+      </index>
       <check name="GL_JOURNALLINE_C_TAX_ID_CHK"><![CDATA[(C_TAX_ID IS NULL) OR (C_WITHHOLDING_ID IS NULL)]]></check>
       <check name="GL_JOURNALLINE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="GL_JOURNALLINE_ISGENERATED_CHK"><![CDATA[ISGENERATED IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/MA_CCP.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_CCP.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -70,6 +70,9 @@
       <foreign-key foreignTable="MA_CCP_GROUP" name="MA_CCP_GROUP_MACCP">
         <reference local="MA_CCP_GROUP_ID" foreign="MA_CCP_GROUP_ID"/>
       </foreign-key>
+      <index name="MA_CCP_CCPGROUP_IDX" unique="false">
+        <index-column name="MA_CCP_GROUP_ID"/>
+      </index>
       <check name="MA_CCP_CRITICAL_CHECK"><![CDATA[CRITICAL IN ('Y', 'N')]]></check>
       <check name="MA_CCP_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/MA_CCP_SHIFT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_CCP_SHIFT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -58,6 +58,9 @@
       <foreign-key foreignTable="AD_CLIENT" name="MA_CCP_SHIFT_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
+      <index name="MA_CCPSHIFT_CCPGROUP_IDX" unique="false">
+        <index-column name="MA_CCP_GROUP_ID"/>
+      </index>
       <check name="MA_CCP_SHIFT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_COSTCENTER_EMPLOYEE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_COSTCENTER_EMPLOYEE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -65,6 +65,9 @@
       <foreign-key foreignTable="MA_COSTCENTER_VERSION" name="MA_COSTCENTER_EMPLOYEE_MA_COST">
         <reference local="MA_COSTCENTER_VERSION_ID" foreign="MA_COSTCENTER_VERSION_ID"/>
       </foreign-key>
+      <index name="MA_COSTCNTREMP_COSTCNTRVER_IDX" unique="false">
+        <index-column name="MA_COSTCENTER_VERSION_ID"/>
+      </index>
       <check name="MA_COSTCENTER_E_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="MA_COSTCENTER_E_SPLIT_CHECK"><![CDATA[SPLIT IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/MA_COSTCENTER_IC.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_COSTCENTER_IC.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -53,6 +53,9 @@
       <foreign-key foreignTable="MA_INDIRECT_COST" name="MA_COSTCENTER_IC_MA_INDIRECT_C">
         <reference local="MA_INDIRECT_COST_ID" foreign="MA_INDIRECT_COST_ID"/>
       </foreign-key>
+      <index name="MA_COSTCNTRIC_COSTCNTRVER_IDX" unique="false">
+        <index-column name="MA_COSTCENTER_VERSION_ID"/>
+      </index>
       <check name="MA_COSTCENTER_I_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_COSTCENTER_MACHINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_COSTCENTER_MACHINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="MA_MACHINE" name="MA_COSTCENTER_MACHINE_MA_MACHI">
         <reference local="MA_MACHINE_ID" foreign="MA_MACHINE_ID"/>
       </foreign-key>
+      <index name="MA_COSTCNTRMAC_COSTCNTRVER_IDX" unique="false">
+        <index-column name="MA_COSTCENTER_VERSION_ID"/>
+      </index>
       <check name="MA_COSTCENTER_M_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_COSTCENTER_VERSION.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_COSTCENTER_VERSION.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -62,6 +62,9 @@
       <foreign-key foreignTable="MA_COSTCENTER" name="MA_COSTCENTER_VERSION_MA_COSTC">
         <reference local="MA_COSTCENTER_ID" foreign="MA_COSTCENTER_ID"/>
       </foreign-key>
+      <index name="MA_COSTCNTRVER_COSTCNTR_IDX" unique="false">
+        <index-column name="MA_COSTCENTER_ID"/>
+      </index>
       <check name="MA_COSTCENTER_V_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_GLOBALUSE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_GLOBALUSE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -89,6 +89,9 @@
       <foreign-key foreignTable="M_PRODUCTION" name="MA_GLOBALUSE_M_PRODUCTION">
         <reference local="M_PRODUCTION_ID" foreign="M_PRODUCTION_ID"/>
       </foreign-key>
+      <index name="MA_GLOBALUSE_PRODUCTION_IDX" unique="false">
+        <index-column name="M_PRODUCTION_ID"/>
+      </index>
       <check name="MA_GLOBALUSE_CHECK1"><![CDATA[((QUANTITYORDER IS NULL) AND (M_PRODUCT_UOM_ID IS NULL)) OR ((QUANTITYORDER IS NOT NULL) AND (M_PRODUCT_UOM_ID IS NOT NULL))]]></check>
       <check name="MA_GLOBALUSE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/MA_INDIRECT_COST_VALUE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_INDIRECT_COST_VALUE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -74,6 +74,9 @@
       <foreign-key foreignTable="MA_INDIRECT_COST" name="MA_INDIRECT_COST_VALUE_MA_INDI">
         <reference local="MA_INDIRECT_COST_ID" foreign="MA_INDIRECT_COST_ID"/>
       </foreign-key>
+      <index name="MA_INDCOSTVALUE_INDCOST_IDX" unique="false">
+        <index-column name="MA_INDIRECT_COST_ID"/>
+      </index>
       <check name="MA_INDIRECT_COST_VALUE_CAL_CH1"><![CDATA[CALCULATED IN ('Y', 'N')]]></check>
       <check name="MA_INDIRECT_COST_VALUE_CAL_CHK"><![CDATA[CALCULATE IN ('Y', 'N')]]></check>
       <check name="MA_INDIRECT_COST_VALUE_ISA_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/MA_MACHINESTATION.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_MACHINESTATION.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -53,6 +53,9 @@
       <foreign-key foreignTable="MA_WORKSTATION" name="MA_WORKSTATION_MAMACHINSTAT">
         <reference local="MA_WORKSTATION_ID" foreign="MA_WORKSTATION_ID"/>
       </foreign-key>
+      <index name="MA_MACHINESTATION_WKST_IDX" unique="false">
+        <index-column name="MA_WORKSTATION_ID"/>
+      </index>
       <check name="MA_MACHINESTATI_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_MACHINE_COST.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_MACHINE_COST.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -94,6 +94,9 @@
       <foreign-key foreignTable="MA_MACHINE" name="MA_MACHINE_COST_MA_MACHINE">
         <reference local="MA_MACHINE_ID" foreign="MA_MACHINE_ID"/>
       </foreign-key>
+      <index name="MA_MACHINECOST_MACHINE_IDX" unique="false">
+        <index-column name="MA_MACHINE_ID"/>
+      </index>
       <check name="MA_MACHINE_COST_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_MAINTENANCE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_MAINTENANCE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -80,6 +80,12 @@
       <foreign-key foreignTable="MA_MAINT_OPERATION" name="MA_MAINTENANCE_MA_MAINT_OPERAT">
         <reference local="MA_MAINT_OPERATION_ID" foreign="MA_MAINT_OPERATION_ID"/>
       </foreign-key>
+      <index name="MA_MAINTENANCE_MACHINE_IDX" unique="false">
+        <index-column name="MA_MACHINE_ID"/>
+      </index>
+      <index name="MA_MAINTENANCE_MACHINETYPE_IDX" unique="false">
+        <index-column name="MA_MACHINE_TYPE_ID"/>
+      </index>
       <check name="MA_MAINTENANCE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_MAINT_PERIODICITY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_MAINT_PERIODICITY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -70,6 +70,9 @@
       <foreign-key foreignTable="MA_MAINTENANCE" name="MA_MAINT_PERIODICITY_MA_MAINTE">
         <reference local="MA_MAINTENANCE_ID" foreign="MA_MAINTENANCE_ID"/>
       </foreign-key>
+      <index name="MA_MAINTPERIOD_MAINTENANCE_IDX" unique="false">
+        <index-column name="MA_MAINTENANCE_ID"/>
+      </index>
       <check name="MA_MAINT_PERIODICITY_EXCLU_CHK"><![CDATA[EXCLUDEWEEKEND IN ('Y', 'N')]]></check>
       <check name="MA_MAINT_PERIODICITY_ISACT_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/MA_MAINT_SCHEDULED.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_MAINT_SCHEDULED.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -113,6 +113,9 @@
       <foreign-key foreignTable="MA_MAINTENANCE" name="MA_MAINT_SCHEDULED_MA_MAINTENA">
         <reference local="MA_MAINTENANCE_ID" foreign="MA_MAINTENANCE_ID"/>
       </foreign-key>
+      <index name="MA_MAINTSCD_MAINTPART_IDX" unique="false">
+        <index-column name="MA_MAINT_PART_ID"/>
+      </index>
       <check name="MA_MAINT_SCHEDU_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_MAINT_WORKER.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_MAINT_WORKER.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -53,6 +53,9 @@
       <foreign-key foreignTable="MA_MAINT_PART" name="MA_MAINT_WORKER_MA_MAINT_PART">
         <reference local="MA_MAINT_PART_ID" foreign="MA_MAINT_PART_ID"/>
       </foreign-key>
+      <index name="MA_MAINTWORKER_MAINTPART_IDX" unique="false">
+        <index-column name="MA_MAINT_PART_ID"/>
+      </index>
       <check name="MA_MAINT_WORKER_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_MEASURE_GROUP.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_MEASURE_GROUP.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="MA_MEASURE_SHIFT" name="MA_MEASURESHIFT_MAMEASUREGROUP">
         <reference local="MA_MEASURE_SHIFT_ID" foreign="MA_MEASURE_SHIFT_ID"/>
       </foreign-key>
+      <index name="MA_MEASUREGRP_MEASURESHIFT_IDX" unique="false">
+        <index-column name="MA_MEASURE_SHIFT_ID"/>
+      </index>
       <check name="MA_MEASURE_GROU_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_MEASURE_TIME.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_MEASURE_TIME.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -58,6 +58,9 @@
       <foreign-key foreignTable="AD_CLIENT" name="MA_MEASURE_TIME_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
+      <index name="MA_MEASURETIME_MEASUREGRP_IDX" unique="false">
+        <index-column name="MA_MEASURE_GROUP_ID"/>
+      </index>
       <check name="MA_MEASURE_TIME_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_MEASURE_VALUES.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_MEASURE_VALUES.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -73,6 +73,9 @@
       <foreign-key foreignTable="MA_MEASURE_TIME" name="MA_MEASURETIME_MAMEASUREVALUES">
         <reference local="MA_MEASURE_TIME_ID" foreign="MA_MEASURE_TIME_ID"/>
       </foreign-key>
+      <index name="MA_MEASUREVAL_MEASURETIME_IDX" unique="false">
+        <index-column name="MA_MEASURE_TIME_ID"/>
+      </index>
       <check name="MA_MEASURE_VALU_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_PC_TEST.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_PC_TEST.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -58,6 +58,9 @@
       <foreign-key foreignTable="MA_PERIODIC_CONTROL" name="MA_PERIODIC_CONTROL_MAPCTEST">
         <reference local="MA_PERIODIC_CONTROL_ID" foreign="MA_PERIODIC_CONTROL_ID"/>
       </foreign-key>
+      <index name="MA_PCTEST_PERIODICCONTROL_IDX" unique="false">
+        <index-column name="MA_PERIODIC_CONTROL_ID"/>
+      </index>
       <check name="MA_PC_TEST_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_PC_VALUE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_PC_VALUE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="MA_PC_TEST" name="MA_PC_TEST_MAPCVALUE">
         <reference local="MA_PC_TEST_ID" foreign="MA_PC_TEST_ID"/>
       </foreign-key>
+      <index name="MA_PCVALUE_PCCASE_IDX" unique="false">
+        <index-column name="MA_PC_CASE_ID"/>
+      </index>
       <check name="MA_PC_VALUE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_PL_EMPLOYEE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_PL_EMPLOYEE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -72,6 +72,9 @@
       <foreign-key foreignTable="M_PRODUCTIONPLAN" name="MA_PL_EMPLOYEE_M_PRODUCTIONPLA">
         <reference local="M_PRODUCTIONPLAN_ID" foreign="M_PRODUCTIONPLAN_ID"/>
       </foreign-key>
+      <index name="MA_PLEMPLOYEE_PRODUCTIONPL_IDX" unique="false">
+        <index-column name="M_PRODUCTIONPLAN_ID"/>
+      </index>
       <check name="MA_PL_EMPLOYEE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_PL_IC.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_PL_IC.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="MA_INDIRECT_COST" name="MA_PL_IC_MA_INDIRECT_COST">
         <reference local="MA_INDIRECT_COST_ID" foreign="MA_INDIRECT_COST_ID"/>
       </foreign-key>
+      <index name="MA_PLIC_PRODUCTIONPLAN_IDX" unique="false">
+        <index-column name="M_PRODUCTIONPLAN_ID"/>
+      </index>
       <check name="MA_PL_IC_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_PL_INVOICELINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_PL_INVOICELINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="M_PRODUCTIONPLAN" name="MA_PL_INVOICELINE_M_PRODUCTION">
         <reference local="M_PRODUCTIONPLAN_ID" foreign="M_PRODUCTIONPLAN_ID"/>
       </foreign-key>
+      <index name="MA_PLINVOICELINE_PRODPLAN_IDX" unique="false">
+        <index-column name="M_PRODUCTIONPLAN_ID"/>
+      </index>
       <check name="MA_PL_INVOICELI_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_PL_MACHINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_PL_MACHINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="MA_MACHINE" name="MA_PL_MACHINE_MA_MACHINE">
         <reference local="MA_MACHINE_ID" foreign="MA_MACHINE_ID"/>
       </foreign-key>
+      <index name="MA_PLMACHINE_PRODPLAN_IDX" unique="false">
+        <index-column name="M_PRODUCTIONPLAN_ID"/>
+      </index>
       <check name="MA_PL_MACHINE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_PROCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_PROCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -65,6 +65,9 @@
       <foreign-key foreignTable="MA_WORKSTATION" name="MA_WORKSTATION_MAPROCESS">
         <reference local="MA_WORKSTATION_ID" foreign="MA_WORKSTATION_ID"/>
       </foreign-key>
+      <index name="MA_PROCESS_WORKSTATION_IDX" unique="false">
+        <index-column name="MA_WORKSTATION_ID"/>
+      </index>
       <check name="MA_PROCESS_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_SEQUENCE_EMPLOYEE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_SEQUENCE_EMPLOYEE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="MA_SEQUENCE" name="MA_SEQUENCE_EMPLOYEE_MA_SEQUEN">
         <reference local="MA_SEQUENCE_ID" foreign="MA_SEQUENCE_ID"/>
       </foreign-key>
+      <index name="MA_SEQUENCEEMPLOYEE_SEQ_IDX" unique="false">
+        <index-column name="MA_SEQUENCE_ID"/>
+      </index>
       <check name="MA_SEQUENCE_EMPLOYEE_ISACT_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_SEQUENCE_IC.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_SEQUENCE_IC.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="MA_SEQUENCE" name="MA_SEQUENCE_IC_MA_SEQUENCE">
         <reference local="MA_SEQUENCE_ID" foreign="MA_SEQUENCE_ID"/>
       </foreign-key>
+      <index name="MA_SEQUENCEIC_SEQUENCE_IDX" unique="false">
+        <index-column name="MA_SEQUENCE_ID"/>
+      </index>
       <check name="MA_SEQUENCE_IC_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_SEQUENCE_MACHINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_SEQUENCE_MACHINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="MA_SEQUENCE" name="MA_SEQUENCE_MACHINE_MA_SEQUENC">
         <reference local="MA_SEQUENCE_ID" foreign="MA_SEQUENCE_ID"/>
       </foreign-key>
+      <index name="MA_SEQUENCEMACHINE_SEQ_IDX" unique="false">
+        <index-column name="MA_SEQUENCE_ID"/>
+      </index>
       <check name="MA_SEQUENCE_MACHINE_ISACTI_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_TOOLSET.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_TOOLSET.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -65,6 +65,9 @@
       <foreign-key foreignTable="MA_TOOLSET_TYPE" name="MA_TOOLSET_TYPEMATOOLSET">
         <reference local="MA_TOOLSET_TYPE_ID" foreign="MA_TOOLSET_TYPE_ID"/>
       </foreign-key>
+      <index name="MA_TOOLSET_TOOLSETTYPE_IDX" unique="false">
+        <index-column name="MA_TOOLSET_TYPE_ID"/>
+      </index>
       <check name="MA_TOOLSET_DISCARDED_CHECK"><![CDATA[DISCARDED IN ('Y', 'N')]]></check>
       <check name="MA_TOOLSET_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/MA_TOOLSETPROCESS.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_TOOLSETPROCESS.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="MA_TOOLSET_TYPE" name="MA_TOOLSETTYPEMATOOLSETPROCESS">
         <reference local="MA_TOOLSET_TYPE_ID" foreign="MA_TOOLSET_TYPE_ID"/>
       </foreign-key>
+      <index name="MA_TOOLSETPROCESS_PROCESS_IDX" unique="false">
+        <index-column name="MA_PROCESS_ID"/>
+      </index>
       <check name="MA_TOOLSETPROCE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_TOOLSETUSED.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_TOOLSETUSED.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="AD_CLIENT" name="MA_TOOLSETUSED_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
+      <index name="MA_TOOLSETUSED_PRODPLAN_IDX" unique="false">
+        <index-column name="M_PRODUCTIONPLAN_ID"/>
+      </index>
       <check name="MA_TOOLSETUSED_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_WEEMPLOYEE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_WEEMPLOYEE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -53,6 +53,9 @@
       <foreign-key foreignTable="AD_CLIENT" name="MA_WEEMPLOYEE_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
+      <index name="MA_WEEMPLOYEE_PRODUCTION_IDX" unique="false">
+        <index-column name="M_PRODUCTION_ID"/>
+      </index>
       <check name="MA_WEEMPLOYEE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_WEINCIDENCE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_WEINCIDENCE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -72,6 +72,12 @@
       <foreign-key foreignTable="M_PRODUCTIONPLAN" name="MA_WEINCIDENCE_M_PRODUCTIONPLA">
         <reference local="M_PRODUCTIONPLAN_ID" foreign="M_PRODUCTIONPLAN_ID"/>
       </foreign-key>
+      <index name="MA_WEINCIDENCE_PRODPLAN_IDX" unique="false">
+        <index-column name="M_PRODUCTIONPLAN_ID"/>
+      </index>
+      <index name="MA_WEINCIDENCE_PRODUCTION_IDX" unique="false">
+        <index-column name="M_PRODUCTION_ID"/>
+      </index>
       <check name="MA_WEINCIDENCE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MA_WRPHASEPRODUCT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MA_WRPHASEPRODUCT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -105,6 +105,9 @@
         <index-column name="M_PRODUCT_ID"/>
         <index-column name="MA_WRPHASE_ID"/>
       </index>
+      <index name="MA_WRPHASEPRODUCT_WRPHASE_IDX" unique="false">
+        <index-column name="MA_WRPHASE_ID"/>
+      </index>
       <check name="MA_WRPHASEPRODUCT_CHECK1"><![CDATA[((QUANTITYORDER IS NULL) AND (M_PRODUCT_UOM_ID IS NULL)) OR ((QUANTITYORDER IS NOT NULL) AND (M_PRODUCT_UOM_ID IS NOT NULL))]]></check>
       <check name="MA_WRPHASEPRODUCT_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="MA_WRPHASEPRODUCT_PRODUCTI_CHK"><![CDATA[PRODUCTIONTYPE IN ('+', '-')]]></check>
--- a/model/src-db/database/model/tables/MRP_PLANNINGMETHODLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MRP_PLANNINGMETHODLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -66,6 +66,9 @@
       <foreign-key foreignTable="MRP_PLANNINGMETHOD" name="MRP_PLANNINGMETHOD_PMLINE">
         <reference local="MRP_PLANNINGMETHOD_ID" foreign="MRP_PLANNINGMETHOD_ID"/>
       </foreign-key>
+      <index name="MRP_PLANMETLINE_PLANMET_IDX" unique="false">
+        <index-column name="MRP_PLANNINGMETHOD_ID"/>
+      </index>
       <check name="MRP_PLANNINGMETHODLINE_ISA_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/MRP_SALESFORECASTLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/MRP_SALESFORECASTLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -61,6 +61,9 @@
       <foreign-key foreignTable="MRP_SALESFORECAST" name="MRP_SALESFORECASTLINE_MRP_SALE">
         <reference local="MRP_SALESFORECAST_ID" foreign="MRP_SALESFORECAST_ID"/>
       </foreign-key>
+      <index name="MRP_SALEFRCTLINE_SALEFRCT_IDX" unique="false">
+        <index-column name="MRP_SALESFORECAST_ID"/>
+      </index>
       <check name="MRP_SALESFORECASTLINE_ISAC_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/M_ATTRIBUTEUSE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_ATTRIBUTEUSE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="M_ATTRIBUTESET" name="M_ATTRIBUTEUSE_M_ATTRIBUTESET">
         <reference local="M_ATTRIBUTESET_ID" foreign="M_ATTRIBUTESET_ID"/>
       </foreign-key>
+      <index name="M_ATTRIBUTEUSE_ATTRIBSET_IDX" unique="false">
+        <index-column name="M_ATTRIBUTESET_ID"/>
+      </index>
       <unique name="M_ATTRIBUTEUSE_ATTRIBUTE_AT_UN">
         <unique-column name="M_ATTRIBUTE_ID"/>
         <unique-column name="M_ATTRIBUTESET_ID"/>
--- a/model/src-db/database/model/tables/M_ATTRIBUTEVALUE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_ATTRIBUTEVALUE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -58,6 +58,9 @@
       <foreign-key foreignTable="M_ATTRIBUTE" name="M_ATTRIBUTEVALUE_M_ATTRIBUTE" onDelete="cascade">
         <reference local="M_ATTRIBUTE_ID" foreign="M_ATTRIBUTE_ID"/>
       </foreign-key>
+      <index name="M_ATTRIBUTEVALUE_ATTRIBUTE_IDX" unique="false">
+        <index-column name="M_ATTRIBUTE_ID"/>
+      </index>
       <check name="M_ATTRIBUTEVALU_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/M_BRAND.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_BRAND">
+    <table name="M_BRAND" primaryKey="M_BRAND_KEY">
+      <column name="M_BRAND_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="NAME" primaryKey="false" required="true" type="NVARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DESCRIPTION" primaryKey="false" required="false" type="NVARCHAR" size="2000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_BRAND_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_BRAND_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <check name="M_BRAND_ISACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/M_CHARACTERISTIC.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_CHARACTERISTIC">
+    <table name="M_CHARACTERISTIC" primaryKey="M_CHARACTERISTIC_KEY">
+      <column name="M_CHARACTERISTIC_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="NAME" primaryKey="false" required="true" type="NVARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DESCRIPTION" primaryKey="false" required="false" type="NVARCHAR" size="2000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_TREE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISVARIANT" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_CHARACTERISTIC_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_CHARACTERISTIC_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_TREE" name="M_PRODUCT_TREE">
+        <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
+      </foreign-key>
+      <check name="M_CHARACTERISTIC_ISACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="M_CHARACTERISTIC_VARIANT"><![CDATA[ISVARIANT IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/M_CH_SUBSET.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_CH_SUBSET">
+    <table name="M_CH_SUBSET" primaryKey="M_CH_SUBSET_KEY">
+      <column name="M_CH_SUBSET_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CHARACTERISTIC_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="NAME" primaryKey="false" required="true" type="NVARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DESCRIPTION" primaryKey="false" required="false" type="NVARCHAR" size="2000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_CH_SUBSET_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_CH_SUBSET_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CHARACTERISTIC" name="M_CH_SUBSET_CHARACTERISTIC">
+        <reference local="M_CHARACTERISTIC_ID" foreign="M_CHARACTERISTIC_ID"/>
+      </foreign-key>
+      <index name="M_CH_SUBSET_CHARACTERISTIC" unique="false">
+        <index-column name="M_CHARACTERISTIC_ID"/>
+      </index>
+      <unique name="M_CH_SUBSET_NAME">
+        <unique-column name="M_CHARACTERISTIC_ID"/>
+        <unique-column name="NAME"/>
+      </unique>
+      <check name="M_CH_SUBSET_ISACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/M_CH_SUBSET_VALUE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_CH_SUBSET_VALUE">
+    <table name="M_CH_SUBSET_VALUE" primaryKey="M_CH_SUBSET_VALUE_KEY">
+      <column name="M_CH_SUBSET_VALUE_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CH_SUBSET_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CH_VALUE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="SKCODE" primaryKey="false" required="false" type="NVARCHAR" size="10" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_CH_SUBSET_VALUE_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_CH_SUBSET_VALUE_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CH_SUBSET" name="M_CH_SUBSET_VALUE_CH_SUBSET">
+        <reference local="M_CH_SUBSET_ID" foreign="M_CH_SUBSET_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CH_VALUE" name="M_CH_SUBSET_VALUE_CH_VALUE">
+        <reference local="M_CH_VALUE_ID" foreign="M_CH_VALUE_ID"/>
+      </foreign-key>
+      <index name="M_CH_SUBSET_VALUE_CH_SUBSET" unique="false">
+        <index-column name="M_CH_SUBSET_ID"/>
+      </index>
+      <index name="M_CH_SUBSET_VALUE_SS_VAL" unique="true">
+        <index-column name="M_CH_SUBSET_ID"/>
+        <index-column name="M_CH_VALUE_ID"/>
+      </index>
+      <check name="M_CH_SUBSET_VALUE_ISACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/M_CH_VALUE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_CH_VALUE">
+    <table name="M_CH_VALUE" primaryKey="M_CH_VALUE_KEY">
+      <column name="M_CH_VALUE_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CHARACTERISTIC_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="NAME" primaryKey="false" required="true" type="NVARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="SKCODE" primaryKey="false" required="false" type="NVARCHAR" size="10" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DESCRIPTION" primaryKey="false" required="false" type="NVARCHAR" size="255" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ADD_PRODUCTS" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_CH_VALUE_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_CH_VALUE_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CHARACTERISTIC" name="M_CH_VALUE_CHARACTERISTIC">
+        <reference local="M_CHARACTERISTIC_ID" foreign="M_CHARACTERISTIC_ID"/>
+      </foreign-key>
+      <index name="M_CH_VALUE_CHARACTERISTIC" unique="false">
+        <index-column name="M_CHARACTERISTIC_ID"/>
+      </index>
+      <check name="M_CH_VALUE_ISACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="M_CH_VALUE_ISSUMMARY"><![CDATA[ISSUMMARY IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/model/src-db/database/model/tables/M_DISCOUNTSCHEMALINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_DISCOUNTSCHEMALINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -175,6 +175,9 @@
       <foreign-key foreignTable="M_PRODUCT" name="M_DISCOUNTSCHEMALINE_M_PRODUCT" onDelete="setnull">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <index name="M_DISCTSCHMLINE_DISCTSCHM_IDX" unique="false">
+        <index-column name="M_DISCOUNTSCHEMA_ID"/>
+      </index>
       <check name="M_DISCOUNTSCHEMALINE_ISACT_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/M_FREIGHT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_FREIGHT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -120,5 +120,8 @@
       <foreign-key foreignTable="C_REGION" name="M_FREIGHT_TO_REGION">
         <reference local="TO_REGION_ID" foreign="C_REGION_ID"/>
       </foreign-key>
+      <index name="M_FREIGHT_SHIPPER_IDX" unique="false">
+        <index-column name="M_SHIPPER_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/M_PRICELIST_VERSION.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_PRICELIST_VERSION.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -81,9 +81,9 @@
         <reference local="M_PRICELIST_ID" foreign="M_PRICELIST_ID"/>
       </foreign-key>
       <unique name="M_PRICELIST_NAME_VALIDFROM">
+        <unique-column name="M_PRICELIST_ID"/>
+        <unique-column name="VALIDFROM"/>
         <unique-column name="NAME"/>
-        <unique-column name="VALIDFROM"/>
-        <unique-column name="M_PRICELIST_ID"/>
       </unique>
       <check name="M_PRICELIST_VERSION_ISACTI_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="M_PRICELIST_VERSION_M_PRIC_CHK"><![CDATA[M_PRICELIST_VERSION_GENERATE IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/M_PRODUCT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_PRODUCT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -325,6 +325,34 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="M_BRAND_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISGENERIC" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
+      <column name="GENERIC_PRODUCT_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEVARIANTS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="CHARACTERISTIC_DESC" primaryKey="false" required="false" type="NVARCHAR" size="2000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEINVARIANTS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="MANAGEVARIANTS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_ORG" name="AD_ORG_MPRODUCT">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
@@ -337,6 +365,9 @@
       <foreign-key foreignTable="AD_USER" name="M_PRODUCT_AD_USER">
         <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_BRAND" name="M_PRODUCT_BRAND">
+        <reference local="M_BRAND_ID" foreign="M_BRAND_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="M_PRODUCT_C_BPARTNER">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
@@ -346,6 +377,9 @@
       <foreign-key foreignTable="C_UOM" name="M_PRODUCT_C_UOM">
         <reference local="C_UOM_ID" foreign="C_UOM_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_PRODUCT" name="M_PRODUCT_GENERICPRODUCT">
+        <reference local="GENERIC_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="M_ATTRIBUTESET" name="M_PRODUCT_M_ATTRIBUTESET" onDelete="cascade">
         <reference local="M_ATTRIBUTESET_ID" foreign="M_ATTRIBUTESET_ID"/>
       </foreign-key>
@@ -379,9 +413,15 @@
       <foreign-key foreignTable="MA_PROCESSPLAN" name="MA_PROCESSPLAN_MPRODUCT">
         <reference local="MA_PROCESSPLAN_ID" foreign="MA_PROCESSPLAN_ID"/>
       </foreign-key>
+      <index name="M_PRODUC_ISGENERID_IDX" unique="false">
+        <index-column name="ISGENERIC"/>
+      </index>
       <index name="M_PRODUCT_BPARTNER" unique="false">
         <index-column name="C_BPARTNER_ID"/>
       </index>
+      <index name="M_PRODUCT_GEN_PROD" unique="false">
+        <index-column name="GENERIC_PRODUCT_ID"/>
+      </index>
       <index name="M_PRODUCT_NAME" unique="false">
         <index-column name="NAME"/>
       </index>
@@ -408,6 +448,7 @@
       <check name="M_PRODUCT_ISBOM_CHECK"><![CDATA[ISBOM IN ('Y', 'N')]]></check>
       <check name="M_PRODUCT_ISEXPDEFCOMPLETE_CHK"><![CDATA[(ISDEFERREDEXPENSE = 'N') OR ((((ISDEFERREDEXPENSE = 'Y') AND (EXPPLANTYPE IS NOT NULL)) AND (DEFAULTPERIOD_EXP IS NOT NULL)) AND (PERIODNUMBER_EXP IS NOT NULL))]]></check>
       <check name="M_PRODUCT_ISEXPDEFERRED_CHK"><![CDATA[ISDEFERREDEXPENSE IN ('Y', 'N')]]></check>
+      <check name="M_PRODUCT_ISGENERIC"><![CDATA[ISGENERIC IN ('Y', 'N')]]></check>
       <check name="M_PRODUCT_ISINVOICEPRINTDE_CHK"><![CDATA[ISINVOICEPRINTDETAILS IN ('Y', 'N')]]></check>
       <check name="M_PRODUCT_ISPICKLISTPRINTD_CHK"><![CDATA[ISPICKLISTPRINTDETAILS IN ('Y', 'N')]]></check>
       <check name="M_PRODUCT_ISPURCHASED_CHECK"><![CDATA[ISPURCHASED IN ('Y', 'N')]]></check>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/M_PRODUCT_CH.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_PRODUCT_CH">
+    <table name="M_PRODUCT_CH" primaryKey="M_PRODUCT_CH_KEY">
+      <column name="M_PRODUCT_CH_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CHARACTERISTIC_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISVARIANT" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
+      <column name="M_CH_SUBSET_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DEFINE_PRICE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
+      <column name="DEFINE_IMAGE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
+      <column name="PRICELIST_TYPE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[SALES]]></default>
+        <onCreateDefault><![CDATA['ALL']]></onCreateDefault>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_PRODUCT_CH_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_PRODUCT_CH_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CHARACTERISTIC" name="M_PRODUCT_CH_M_CHARACTERISTIC">
+        <reference local="M_CHARACTERISTIC_ID" foreign="M_CHARACTERISTIC_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_PRODUCT" name="M_PRODUCT_CH_M_PRODUCT">
+        <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CH_SUBSET" name="M_PRODUCT_CH_SUBSET">
+        <reference local="M_CH_SUBSET_ID" foreign="M_CH_SUBSET_ID"/>
+      </foreign-key>
+      <index name="M_PRODUCT_CH_CHARACTERISTIC" unique="true">
+        <index-column name="M_PRODUCT_ID"/>
+        <index-column name="M_CHARACTERISTIC_ID"/>
+      </index>
+      <check name="M_PRODUCT_CH_DEFINE_IMAGE_CHK"><![CDATA[DEFINE_IMAGE IN ('Y', 'N')]]></check>
+      <check name="M_PRODUCT_CH_DEFINE_PRICE_CHK"><![CDATA[DEFINE_PRICE IN ('Y', 'N')]]></check>
+      <check name="M_PRODUCT_CH_ISACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="M_PRODUCT_CH_VARIANT"><![CDATA[ISVARIANT IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/M_PRODUCT_CH_CONF.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_PRODUCT_CH_CONF">
+    <table name="M_PRODUCT_CH_CONF" primaryKey="M_PRODUCT_CH_CONF_KEY">
+      <column name="M_PRODUCT_CH_CONF_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_PRODUCT_CH_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CH_VALUE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="SKCODE" primaryKey="false" required="false" type="NVARCHAR" size="10" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="PRICE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_PRODUCT_CH_CONF_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_PRODUCT_CH_CONF_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_IMAGE" name="M_PRODUCT_CH_CONF_IMAGE">
+        <reference local="AD_IMAGE_ID" foreign="AD_IMAGE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CH_VALUE" name="M_PRODUCT_CH_CONF_M_CHVALUE" onDelete="cascade">
+        <reference local="M_CH_VALUE_ID" foreign="M_CH_VALUE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_PRODUCT_CH" name="M_PRODUCT_CH_CONF_M_PRODUCT_CH">
+        <reference local="M_PRODUCT_CH_ID" foreign="M_PRODUCT_CH_ID"/>
+      </foreign-key>
+      <index name="M_PRODUCT_CH_CONF_CHAR" unique="false">
+        <index-column name="M_PRODUCT_CH_ID"/>
+      </index>
+      <check name="M_PRODUCT_CH_CONF_ISACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/M_PRODUCT_CH_VALUE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_PRODUCT_CH_VALUE">
+    <table name="M_PRODUCT_CH_VALUE" primaryKey="M_PRODUCT_CH_VALUE_KEY">
+      <column name="M_PRODUCT_CH_VALUE_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CHARACTERISTIC_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CH_VALUE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_PRODUCT_CH_VALUE_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_PRODUCT_CH_VALUE_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CHARACTERISTIC" name="M_PRODUCT_CH_VALUE_CHARACT">
+        <reference local="M_CHARACTERISTIC_ID" foreign="M_CHARACTERISTIC_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CH_VALUE" name="M_PRODUCT_CH_VALUE_M_CHVALUE">
+        <reference local="M_CH_VALUE_ID" foreign="M_CH_VALUE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_PRODUCT" name="M_PRODUCT_CH_VALUE_M_PRODUCT">
+        <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
+      </foreign-key>
+      <index name="M_PRODUCT_CH_VALUE_VALUE" unique="true">
+        <index-column name="M_PRODUCT_ID"/>
+        <index-column name="M_CH_VALUE_ID"/>
+      </index>
+      <index name="M_PRODUCT_CH_VALUE_VALUE_IDX" unique="false">
+        <index-column name="M_CH_VALUE_ID"/>
+      </index>
+      <check name="M_PRODUCT_CH_VALUE_ISACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/model/src-db/database/model/tables/M_PRODUCT_ORG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_PRODUCT_ORG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -111,8 +111,8 @@
         <reference local="M_PRODUCT_PO_ID" foreign="M_PRODUCT_PO_ID"/>
       </foreign-key>
       <unique name="M_PRODUCT_ORG_ORG_PRODUCT_UN">
+        <unique-column name="M_PRODUCT_ID"/>
         <unique-column name="AD_ORG_ID"/>
-        <unique-column name="M_PRODUCT_ID"/>
       </unique>
       <check name="M_PRODUCT_ORG_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/M_RAPPEL_BPARTNER.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_RAPPEL_BPARTNER.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -73,6 +73,12 @@
       <foreign-key foreignTable="M_RAPPEL" name="M_RAPPEL_M_RAPPEL_BPARTNER">
         <reference local="M_RAPPEL_ID" foreign="M_RAPPEL_ID"/>
       </foreign-key>
+      <index name="M_RAPPELBPARTNER_BPARTNER_IDX" unique="false">
+        <index-column name="C_BPARTNER_ID"/>
+      </index>
+      <index name="M_RAPPELBPARTNER_RAPPEL_IDX" unique="false">
+        <index-column name="M_RAPPEL_ID"/>
+      </index>
       <check name="M_RAPPEL_BPARTNER_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="M_RAPPEL_BPARTNER_ISSOTRX_CHK"><![CDATA[ISSOTRX IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/M_RAPPEL_INVOICE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_RAPPEL_INVOICE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="M_RAPPEL_BPARTNER" name="M_RAPPEL_INVOICE_M_RAPPEL_BPAR">
         <reference local="M_RAPPEL_BPARTNER_ID" foreign="M_RAPPEL_BPARTNER_ID"/>
       </foreign-key>
+      <index name="M_RAPPELINVOICE_RAPPELBP_IDX" unique="false">
+        <index-column name="M_RAPPEL_BPARTNER_ID"/>
+      </index>
       <check name="M_RAPPEL_INVOIC_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/M_RAPPEL_PRODUCT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_RAPPEL_PRODUCT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -53,5 +53,8 @@
       <foreign-key foreignTable="AD_ORG" name="M_RAPPEL_PRODUCT_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="M_RAPPELPRODUCT_RAPPEL_IDX" unique="false">
+        <index-column name="M_RAPPEL_ID"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/M_RAPPEL_PRODUCTCATEGORY.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_RAPPEL_PRODUCTCATEGORY.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -53,6 +53,9 @@
       <foreign-key foreignTable="M_PRODUCT_CATEGORY" name="M_RAPPEL_PRODUCTCATEGORY_M_PRO">
         <reference local="M_PRODUCT_CATEGORY_ID" foreign="M_PRODUCT_CATEGORY_ID"/>
       </foreign-key>
+      <index name="M_RAPPELPRODUCTCTG_RAPPEL_IDX" unique="false">
+        <index-column name="M_RAPPEL_ID"/>
+      </index>
       <check name="M_RAPPEL_PRODUCTCATEGORY_I_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/M_RAPPEL_SCALE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_RAPPEL_SCALE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -58,6 +58,9 @@
       <foreign-key foreignTable="AD_ORG" name="M_RAPPEL_SCALE_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="M_RAPPELSCALE_RAPPEL_IDX" unique="false">
+        <index-column name="M_RAPPEL_ID"/>
+      </index>
       <check name="M_RAPPEL_SCALE_DISCOUNT_CHK"><![CDATA[(DISCOUNT >= 0) AND (DISCOUNT <= 100)]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/M_REQUISITIONLINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_REQUISITIONLINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -186,6 +186,9 @@
       <foreign-key foreignTable="C_CURRENCY" name="M_REQUISITIONLINE_C_CURRENCY">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
+      <index name="M_REQUISITIONLN_REQUISIT_IDX" unique="false">
+        <index-column name="M_REQUISITION_ID"/>
+      </index>
       <check name="M_REQUISITIONLI_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/M_REQUISITIONORDER.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_REQUISITIONORDER.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="M_REQUISITIONLINE" name="M_REQUISITIONORDER_M_REQUISITI">
         <reference local="M_REQUISITIONLINE_ID" foreign="M_REQUISITIONLINE_ID"/>
       </foreign-key>
+      <index name="M_REQUISITIONORDER_REQLINE_IDX" unique="false">
+        <index-column name="M_REQUISITIONLINE_ID"/>
+      </index>
       <check name="M_REQORDER_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/M_RESERVATION_STOCK.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_RESERVATION_STOCK.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -92,6 +92,9 @@
       <index name="M_RESERVATION_STOCK_SD" unique="false">
         <index-column name="M_STORAGE_DETAIL_ID"/>
       </index>
+      <index name="M_RESERVSTOCK_ORDERLINE_IDX" unique="false">
+        <index-column name="C_ORDERLINE_ID"/>
+      </index>
       <check name="M_RESERVATION_STOCK_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="M_RESERVATION_STOCK_ALLOC_CHK"><![CDATA[ISALLOCATED IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/M_TRANSACTION.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_TRANSACTION.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -168,6 +168,9 @@
       <index name="M_TRANSACTION_INVENTORYLINE" unique="false">
         <index-column name="M_INVENTORYLINE_ID"/>
       </index>
+      <index name="M_TRANSACTION_LOCATOR_IDX" unique="false">
+        <index-column name="M_LOCATOR_ID"/>
+      </index>
       <index name="M_TRANSACTION_MOVEMENTLINE" unique="false">
         <index-column name="M_MOVEMENTLINE_ID"/>
       </index>
--- a/model/src-db/database/model/tables/M_WAREHOUSE_SHIPPER.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/M_WAREHOUSE_SHIPPER.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,6 +57,12 @@
       <foreign-key foreignTable="M_WAREHOUSE" name="M_WAREHOUSE_SHIPPER_M_WAREHOUS">
         <reference local="M_WAREHOUSE_ID" foreign="M_WAREHOUSE_ID"/>
       </foreign-key>
+      <index name="M_WAREHOUSESHIPPER_BP_IDX" unique="false">
+        <index-column name="C_BPARTNER_ID"/>
+      </index>
+      <index name="M_WRHSSHIPPER_WRHS_IDX" unique="false">
+        <index-column name="M_WAREHOUSE_ID"/>
+      </index>
       <check name="M_WAREHOUSE_SHI_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/S_RESOURCEASSIGNMENT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/S_RESOURCEASSIGNMENT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -70,6 +70,9 @@
       <foreign-key foreignTable="S_RESOURCE" name="S_RESOURCEASSIGNMENT_S_RESOURC">
         <reference local="S_RESOURCE_ID" foreign="S_RESOURCE_ID"/>
       </foreign-key>
+      <index name="S_RESOURCEASSIGNMENT_RESRC_IDX" unique="false">
+        <index-column name="S_RESOURCE_ID"/>
+      </index>
       <check name="S_RESOURCEASSIGNMENT_ISACT_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="S_RESOURCEASSIGNMENT_ISCON_CHK"><![CDATA[ISCONFIRMED IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/S_RESOURCEUNAVAILABLE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/S_RESOURCEUNAVAILABLE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -58,6 +58,9 @@
       <foreign-key foreignTable="S_RESOURCE" name="S_RESOURCEUNAVAILABLE_S_RESOUR" onDelete="cascade">
         <reference local="S_RESOURCE_ID" foreign="S_RESOURCE_ID"/>
       </foreign-key>
+      <index name="S_RESRCUNAVAILABLE_RESRC_IDX" unique="false">
+        <index-column name="S_RESOURCE_ID"/>
+      </index>
       <check name="S_RESOURCEUNAVA_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/S_TIMEEXPENSELINE.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/tables/S_TIMEEXPENSELINE.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -205,6 +205,12 @@
       <foreign-key foreignTable="USER2" name="S_TIMEXPLINE_USER2">
         <reference local="USER2_ID" foreign="USER2_ID"/>
       </foreign-key>
+      <index name="S_TIMEEXPENSELINE_BPARTNER_IDX" unique="false">
+        <index-column name="C_BPARTNER_ID"/>
+      </index>
+      <index name="S_TIMEEXPENSELN_TIMEEXPESE_IDX" unique="false">
+        <index-column name="S_TIMEEXPENSE_ID"/>
+      </index>
       <check name="S_TIMEEXPENSELINE_CHECK1"><![CDATA[(ISINVOICED = 'N') OR (C_BPARTNER_ID IS NOT NULL)]]></check>
       <check name="S_TIMEEXPENSELINE_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="S_TIMEEXPENSELINE_ISINVOIC_CHK"><![CDATA[ISINVOICED IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/triggers/AD_PROCESS_TRL_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/AD_PROCESS_TRL_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -55,12 +55,12 @@
              Description = :NEW.Description,
              HELP = :NEW.HELP,             
              Updated = now()
-       WHERE AD_Field_ID IN (
-               SELECT F.AD_Field_ID
+       WHERE F.IsCentrallyMaintained = 'Y'
+         AND EXISTS (
+               SELECT 1
                  FROM AD_Column C, ad_module m
                 WHERE F.AD_Column_ID = C.AD_Column_ID
                   AND C.AD_Process_ID = :NEW.AD_Process_ID
-                  AND F.IsCentrallyMaintained = 'Y'
                   and m.ad_module_id = f.ad_module_id
                   and m.ad_language = :new.ad_language);
                   
--- a/model/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -18,7 +18,7 @@
     * under the License.
     * The Original Code is Openbravo ERP.
     * The Initial Developer of the Original Code is Openbravo SLU
-    * All portions are Copyright (C) 2001-2012 Openbravo SLU
+    * All portions are Copyright (C) 2001-2013 Openbravo SLU
     * All Rights Reserved.
     * Contributor(s):  ______________________________________.
     ************************************************************************/
@@ -27,6 +27,8 @@
   v_C_INVOICE_ID VARCHAR2(32) ;
   v_Prec NUMBER:=2;
   v_Currency     VARCHAR2(32);
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
     
 BEGIN
     
@@ -102,6 +104,16 @@
     END IF;
     
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;
 END C_INVLINE_CHK_RESTRICTIONS_TRG
 ]]></body>
     </trigger>
--- a/model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -14,7 +14,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2012 Openbravo SLU
+* All portions are Copyright (C) 2001-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -27,6 +27,8 @@
   v_IsSOTrx CHAR(1);
   v_Message VARCHAR2(2000):='';
   v_QTYVARIABLE CHAR(1);
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
     
 BEGIN
     
@@ -97,6 +99,16 @@
     RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
   END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;
 END C_ORDLINE_CHK_RESTRICTIONS_TRG
 ]]></body>
     </trigger>
--- a/model/src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -15,12 +15,14 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010 Openbravo SLU
+* All portions are Copyright (C) 2010-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
   v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
 
 BEGIN
   IF AD_isTriggerEnabled()='N' THEN RETURN;
@@ -38,6 +40,16 @@
     END IF;
    END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;
 END MA_GLOBALUSE_TRG
 ]]></body>
     </trigger>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/triggers/M_CHARACTERISTIC_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER M_CHARACTERISTIC_TRG">
+    <trigger name="M_CHARACTERISTIC_TRG" table="M_CHARACTERISTIC" fires="before" insert="true" update="false" delete="false" foreach="row">
+      <body><![CDATA[
+/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2013 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+  v_tree_id           VARCHAR2(32);
+  v_count             NUMBER;
+
+BEGIN
+  IF (AD_isTriggerEnabled()='N') THEN
+    RETURN;
+  END IF;
+
+  IF INSERTING THEN
+    IF (:NEW.ad_tree_id IS NULL) THEN
+      SELECT count(*), max(ad_tree_id)
+        INTO v_count, v_tree_id
+      FROM ad_tree
+      WHERE treetype = 'CH'
+        AND isactive = 'Y'
+        AND ad_client_id = :NEW.ad_client_id;
+      IF (v_count > 0) THEN
+        :NEW.ad_tree_id := v_tree_id;
+      ELSE
+        -- Create new tree
+        v_tree_id := get_uuid();
+        INSERT INTO ad_tree (
+            ad_tree_id, ad_client_id, ad_org_id, isactive,
+            created, createdby, updated, updatedby,
+            name, description, treetype, isallnodes
+        ) VALUES (
+            v_tree_id, :NEW.ad_client_id, '0', :NEW.isactive,
+            now(), :NEW.createdby, now(), :NEW.updatedby,
+            'Product Characteristic tree', null, 'CH', 'Y'
+        );
+        :NEW.ad_tree_id := v_tree_id;
+      END IF;
+    END IF;
+  END IF;
+END M_CHARACTERISTIC_TRG
+]]></body>
+    </trigger>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER M_CH_SUBSET_VALUE_TRG">
+    <trigger name="M_CH_SUBSET_VALUE_TRG" table="M_CH_SUBSET_VALUE" fires="after" insert="true" update="false" delete="false" foreach="row">
+      <body><![CDATA[
+/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2013 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+  v_characteristic_id NVARCHAR2(32);
+BEGIN
+  IF (AD_isTriggerEnabled()='N') THEN
+    RETURN;
+  END IF;
+  -- Insert values in generic products using the subset
+  IF (INSERTING) THEN
+    SELECT m_characteristic_id INTO v_characteristic_id
+    FROM m_ch_subset
+    WHERE :new.m_ch_subset_id = m_ch_subset_id;
+    INSERT INTO m_product_ch_conf (
+      m_product_ch_conf_id, ad_client_id, ad_org_id, isactive,
+      created, createdby, updated, updatedby,
+      m_product_ch_id, m_ch_value_id, skcode
+    ) SELECT
+      get_uuid(), :new.ad_client_id, :new.ad_org_id, 'N',
+      now(), :new.createdby, now(), :new.updatedby,
+      pch.m_product_ch_id, :new.m_ch_value_id, :new.skcode
+      FROM m_product_ch pch
+      WHERE pch.m_characteristic_id = v_characteristic_id
+        AND pch.m_ch_subset_id = :new.m_ch_subset_id;
+  END IF;
+END M_CH_SUBSET_VALUE_TRG
+]]></body>
+    </trigger>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/triggers/M_CH_VALUE_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER M_CH_VALUE_TRG">
+    <trigger name="M_CH_VALUE_TRG" table="M_CH_VALUE" fires="after" insert="true" update="false" delete="true" foreach="row">
+      <body><![CDATA[
+/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2013 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+  v_Tree_ID           VARCHAR2(32);
+  v_Parent_ID         VARCHAR2(32);
+  v_NextNo            VARCHAR2(32);
+  v_count             NUMBER;
+
+BEGIN
+  IF (AD_isTriggerEnabled()='N') THEN
+    RETURN;
+  END IF;
+  -- Insert C_ElementValue Trigger
+  --  for Translation
+  --  and TreeNode
+  IF INSERTING THEN
+    --  Create TreeNode --
+    --  get AD_Tree_ID + ParentID
+    SELECT ch.ad_tree_id, n.node_id
+      INTO v_tree_id, v_parent_id
+    FROM m_characteristic ch JOIN ad_treenode n ON ch.ad_tree_id = n.ad_tree_id
+    WHERE n.parent_id IS NULL
+      AND ch.m_characteristic_id = :NEW.m_characteristic_id;
+
+    SELECT count(*) INTO v_count
+    FROM ad_treenode
+    WHERE node_id = :NEW.m_ch_value_id
+      AND ad_tree_id = v_tree_id;
+
+    IF (v_Count = 0) THEN 
+      --  Insert into TreeNode
+      INSERT INTO ad_treenode (
+          ad_treenode_id, ad_client_id, ad_org_id, isactive,
+          created, createdby, updated, updatedby,
+          ad_tree_id, node_id, parent_id,
+          seqno
+      ) VALUES (
+          get_uuid(), :NEW.ad_client_id, '0', :NEW.isactive,
+          :NEW.created, :NEW.createdby, :NEW.updated, :NEW.updatedby,
+          v_tree_id, :NEW.m_ch_value_id, v_parent_id,
+          -- Summary Nodes first
+          CASE :NEW.issummary
+            WHEN 'Y' THEN 100
+            ELSE 999
+          END
+      );
+    END IF;
+    INSERT INTO m_product_ch_conf (
+      m_product_ch_conf_id, ad_client_id, ad_org_id, isactive,
+      created, createdby, updated, updatedby,
+      m_product_ch_id, m_ch_value_id, skcode
+    ) SELECT
+      get_uuid(), :new.ad_client_id, :new.ad_org_id, 'N',
+      now(), :new.createdby, now(), :new.updatedby,
+      pch.m_product_ch_id, :new.m_ch_value_id, :new.skcode
+      FROM m_product_ch pch
+      WHERE pch.m_characteristic_id = :new.m_characteristic_id
+        AND pch.m_ch_subset_id IS NULL;
+  END IF;
+
+  IF DELETING THEN
+    --  Delete TreeNode --
+    SELECT ch.ad_tree_id INTO v_tree_id
+    FROM m_characteristic ch
+    WHERE ch.m_characteristic_id = :OLD.m_characteristic_id;
+
+    SELECT count(*) INTO v_count
+    FROM ad_treenode
+    WHERE ad_client_id = :OLD.ad_client_id
+      AND ad_tree_id = v_tree_id
+      AND parent_id = :OLD.m_ch_value_id;
+    IF (v_count>0) THEN
+      RAISE_APPLICATION_ERROR(-20000, '@ElementHasChildren@');
+    END IF;
+
+    DELETE FROM ad_treenode
+    WHERE ad_client_id = :OLD.ad_client_id
+      AND ad_tree_id = v_tree_id
+      AND node_id = :OLD.m_ch_value_id;
+
+  END IF;
+EXCEPTION
+WHEN NO_DATA_FOUND THEN
+  -- No tree found in the characteristic
+  RAISE_APPLICATION_ERROR(-20000, '@20013@') ;
+END M_CH_VALUE_TRG
+]]></body>
+    </trigger>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/triggers/M_CH_VALUE_TRG2.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER M_CH_VALUE_TRG2">
+    <trigger name="M_CH_VALUE_TRG2" table="M_CH_VALUE" fires="after" insert="true" update="true" delete="false" foreach="statement">
+      <body><![CDATA[
+
+/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2013 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+  v_Count     NUMBER;
+  v_ch_name   M_CHARACTERISTIC.NAME%TYPE;
+  v_chv_name  M_CH_VALUE.NAME%TYPE;
+
+BEGIN
+  IF AD_isTriggerEnabled()='N' THEN RETURN;
+  END IF;
+
+  --check for duplicated names in variant characteristics
+  SELECT count(*)  INTO v_count
+  FROM dual
+  WHERE EXISTS (SELECT 1
+                FROM m_ch_value chv
+                    JOIN m_characteristic ch ON chv.m_characteristic_id = ch.m_characteristic_id AND ch.isvariant = 'Y'
+                GROUP BY chv.name, chv.m_characteristic_id
+                HAVING count(*) > 1);
+
+  IF (v_Count > 0) THEN
+    RAISE_APPLICATION_ERROR(-20000, '@DuplicatedChValueName@');
+  END IF;
+
+END M_CH_VALUE_TRG2
+]]></body>
+    </trigger>
+  </database>
--- a/model/src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -2,16 +2,6 @@
   <database name="TRIGGER M_INTERNAL_CONSUMPTIONLINE_TRG">
     <trigger name="M_INTERNAL_CONSUMPTIONLINE_TRG" table="M_INTERNAL_CONSUMPTIONLINE" fires="after" insert="true" update="true" delete="true" foreach="row">
       <body><![CDATA[
-
-
-
-
-  v_ID VARCHAR2(32);
-  v_RO            NUMBER;
-  V_STOCKED       NUMBER;
-  v_MOVEMENTQTY   NUMBER;
-  v_QUANTITYORDER NUMBER;
-  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
 /*************************************************************************
 * The contents of this file are subject to the Openbravo  Public  License
 * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
@@ -24,10 +14,19 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2012 Openbravo SLU
+* All portions are Copyright (C) 2001-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
+
+  v_ID VARCHAR2(32);
+  v_RO            NUMBER;
+  V_STOCKED       NUMBER;
+  v_MOVEMENTQTY   NUMBER;
+  v_QUANTITYORDER NUMBER;
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
     
 BEGIN
     
@@ -90,6 +89,16 @@
     END IF;
    END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;
 
 END M_INTERNAL_CONSUMPTIONLINE_TRG
 ]]></body>
--- a/model/src-db/database/model/triggers/M_INVENTORYLINE2_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/M_INVENTORYLINE2_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -18,10 +18,12 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2006 Openbravo SLU
+* All portions are Copyright (C) 2001-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
         
 BEGIN
     
@@ -41,7 +43,16 @@
     :NEW.QuantityOrderBook:=NULL;
   END IF;
  END IF;
-END M_INVENTORYLINE2_TRG
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;END M_INVENTORYLINE2_TRG
 ]]></body>
     </trigger>
   </database>
--- a/model/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -19,7 +19,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2012 Openbravo SLU
+* All portions are Copyright (C) 2001-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -27,6 +27,8 @@
   v_DocStatus VARCHAR(60) ;
   v_M_INOUT_ID VARCHAR2(32) ;
   v_Posted VARCHAR(60) ;
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
     
 BEGIN
     
@@ -68,6 +70,16 @@
   IF((DELETING OR INSERTING) AND v_Processed='Y') THEN
     RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;
 END M_IOLINE_CHK_RESTRICTIONS_TRG
 ]]></body>
     </trigger>
--- a/model/src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -10,6 +10,8 @@
   v_RO      NUMBER;
   V_STOCKED NUMBER;
   v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
   /******************************************************************************
   * The contents of this file are subject to the   Compiere License  Version 1.1
   * ("License"); You may not use this file except in compliance with the License
@@ -22,7 +24,7 @@
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
   * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2012 Openbravo S.L.U.
+  * Contributions are Copyright (C) 2001-2013 Openbravo S.L.U.
   ******************************************************************************/
     
 BEGIN
@@ -85,6 +87,16 @@
     END IF;
    END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;
 END M_MOVEMENTLINE_TRG
 ]]></body>
     </trigger>
--- a/model/src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -14,6 +14,8 @@
   v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
   v_PRODUCTION_ID VARCHAR2(32);
   v_LINE NUMBER;
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
   /*************************************************************************
   * The contents of this file are subject to the Compiere Public
   * License 1.1 ("License"); You may not use this file except in
@@ -29,7 +31,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2012 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2013 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -138,6 +140,16 @@
     END IF;
    END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;
 END M_PRODUCTIONLINE_TRG
 ]]></body>
     </trigger>
--- a/model/src-db/database/model/triggers/M_PRODUCT_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/M_PRODUCT_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -57,7 +57,10 @@
   
  -- Do not allow to de-activate products with OnHand Qty
  -- or Change the attribute set
-  IF ((:new.IsActive='N' AND :old.IsActive='Y') OR (COALESCE(:new.m_attributeset_id,'null') <> COALESCE(:old.m_attributeset_id,'null')) OR (COALESCE(:new.c_uom_id,'null') <> COALESCE(:old.c_uom_id,'null'))) OR (:old.isStocked='Y' AND :new.isStocked='N') THEN
+  IF ((:new.IsActive='N' AND :old.IsActive='Y')
+      OR (COALESCE(:new.m_attributeset_id,'null') <> COALESCE(:old.m_attributeset_id,'null'))
+      OR (COALESCE(:new.c_uom_id,'null') <> COALESCE(:old.c_uom_id,'null'))
+      OR (:old.isStocked='Y' AND :new.isStocked='N')) THEN
    SELECT  COALESCE(SUM(QtyOnHand)+SUM(QtyReserved)*.111+SUM(QtyOrdered)*999, 0) INTO v_ControlNo
    FROM (SELECT QtyOnHand, 0 AS QtyReserved, 0 AS QtyOrdered
    FROM M_Storage_Detail s
@@ -78,14 +81,26 @@
     END IF;
    END IF;
   END IF;
-	
+
   IF( COALESCE(:old.Name,'.') <> COALESCE(:new.Name,'.')  OR COALESCE(:old.documentnote,'.') <> COALESCE(:new.documentnote,'.') ) THEN   
-    
     UPDATE M_PRODUCT_Trl
       SET IsTranslated='N'
     WHERE M_PRODUCT_ID=:new.M_PRODUCT_ID;
   END IF;
 
+  -- Do not allow to set as generic a product used in documents.
+  IF (:OLD.isgeneric = 'N' AND :NEW.isgeneric = 'Y') THEN
+    SELECT count(*) INTO v_count
+    FROM dual
+    WHERE EXISTS (SELECT 1 FROM c_orderline WHERE m_product_id = :NEW.m_product_id)
+       OR EXISTS (SELECT 1 FROM c_invoiceline WHERE m_product_id = :NEW.m_product_id)
+       OR EXISTS (SELECT 1 FROM m_storage_detail WHERE m_product_id = :NEW.m_product_id)
+       OR EXISTS (SELECT 1 FROM m_transaction WHERE m_product_id = :NEW.m_product_id);
+    IF (v_count > 0) THEN
+      RAISE_APPLICATION_ERROR(-20000, '@CannotSetAsGenericProduct@');
+    END IF;
+  END IF;
+
  ELSIF (INSERTING) THEN
   v_C_AcctSchema_ID:=null;
   --   For all AcctSchema create ...
--- a/model/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -14,15 +14,16 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2012 Openbravo SLU
+* All portions are Copyright (C) 2008-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   v_DocStatus VARCHAR(60);
   v_ReqStatus VARCHAR(60);
   v_OrderedQty NUMBER;
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
 
-      
 BEGIN
     
     IF AD_isTriggerEnabled()='N' THEN RETURN;
@@ -87,6 +88,16 @@
     END IF;
   END IF;
 
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;
 END M_REQUISITIONLINE_TRG
 ]]></body>
     </trigger>
--- a/model/src-db/database/model/triggers/M_RESERVATION_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/M_RESERVATION_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -15,7 +15,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012 Openbravo SLU
+* All portions are Copyright (C) 2012-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -26,6 +26,8 @@
   v_reservedcount       NUMBER;
   v_count               NUMBER;
   v_dummy               VARCHAR2(2000);
+  v_productname         m_product.name%TYPE;
+  v_isgeneric           CHAR(1);
 BEGIN
   IF (AD_isTriggerEnabled()='N') THEN
     RETURN;
@@ -103,6 +105,16 @@
       WHERE c_order_id = v_sales_order_id;
     END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;
 END M_RESERVATION_TRG
 ]]></body>
     </trigger>
--- a/model/src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -15,12 +15,14 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010 Openbravo SLU
+* All portions are Copyright (C) 2010-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
   v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
 
 BEGIN
   IF AD_isTriggerEnabled()='N' THEN RETURN;
@@ -38,6 +40,16 @@
     END IF;
    END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;
 END M_STORAGE_DETAIL_TRG
 ]]></body>
     </trigger>
--- a/model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -22,6 +22,8 @@
   v_onhand      NUMBER;
   v_reserved    NUMBER;
   v_count       NUMBER;
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
   v_product     VARCHAR(60);
   v_attr_description    VARCHAR2(255);
   v_product_value       VARCHAR2(40);
@@ -89,6 +91,14 @@
         END IF;
       END IF;
     END IF;
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
   END IF;
 END M_TRANSACTION_TRG2
 ]]></body>
--- a/model/src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -14,7 +14,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2012 Openbravo SLU
+* All portions are Copyright (C) 2001-2013 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -30,6 +30,8 @@
   v_BP_PL_Currency_ID VARCHAR2(32);
   v_Count NUMBER;
   v_Posted VARCHAR(60);
+  v_productname m_product.name%TYPE;
+  v_isgeneric   CHAR(1);
     
 BEGIN
     
@@ -149,6 +151,16 @@
       END IF;
     END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+    IF (:NEW.m_product_id IS NOT NULL) THEN
+      SELECT isgeneric, name INTO v_isgeneric, v_productname
+      FROM m_product
+      WHERE m_product_id = :NEW.m_product_id;
+      IF (v_isgeneric = 'Y') THEN
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+      END IF;
+    END IF;
+  END IF;
 
 END S_TIMEEXPENSELINE_TRG
 ]]></body>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+  <database name="VIEW M_CREATEPOLINES_PE_V">
+    <view name="M_CREATEPOLINES_PE_V"><![CDATA[SELECT pp.m_productprice_id AS m_createpolines_pe_v_id, pp.ad_client_id, pp.ad_org_id, pp.isactive, pp.created, pp.createdby, pp.updated, pp.updatedby, 'N' AS ob_selected, pp.m_product_id, plv.m_pricelist_id, pp.pricestd, NULL AS qtyordered FROM m_productprice pp JOIN m_product p ON pp.m_product_id = p.m_product_id AND COALESCE(p.isgeneric, 'N') = 'N' JOIN m_pricelist_version plv ON pp.m_pricelist_version_id = plv.m_pricelist_version_id JOIN m_pricelist pl ON pl.m_pricelist_id = plv.m_pricelist_id WHERE pl.issopricelist = 'N' AND plv.validfrom = ((SELECT max(plv2.validfrom) AS max FROM m_pricelist_version plv2 WHERE plv2.m_pricelist_id = pl.m_pricelist_id AND plv2.validfrom <= now()))]]></view>
+  </database>
--- a/model/src-db/database/model/views/M_PRODUCT_PRICE_WAREHOUSE_V.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/views/M_PRODUCT_PRICE_WAREHOUSE_V.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_PRODUCT_PRICE_WAREHOUSE_V">
-    <view name="M_PRODUCT_PRICE_WAREHOUSE_V"><![CDATA[SELECT COALESCE(w.m_warehouse_id, '-') || pp.m_productprice_id AS m_product_price_warehouse_v_id, p.ad_client_id, p.ad_org_id, p.isactive, p.updated, p.updatedby, p.created, p.createdby, p.m_product_id, w.m_warehouse_id, pp.m_productprice_id, CASE WHEN p.producttype <> 'I' OR p.isstocked = 'N' THEN 99999 ELSE COALESCE(pwq.qtyonhand - pwq.qtyreserved, 0) END AS qty_available, CASE WHEN p.producttype <> 'I' OR p.isstocked = 'N' THEN 99999 ELSE COALESCE(pwq.qtyonhand, 0) END AS qty_onhand, CASE WHEN p.producttype <> 'I' OR p.isstocked = 'N' THEN 0 ELSE COALESCE(pwq.qtyreserved, 0) END AS qty_reserved, CASE WHEN p.producttype <> 'I' OR p.isstocked = 'N' THEN 0 ELSE COALESCE(pwq.qtyordered, 0) END AS qty_ordered, pp.pricelist, pp.pricestd, pp.pricelimit, COALESCE(w.ad_org_id, '0') AS orgwarehouse FROM m_productprice pp LEFT JOIN m_warehouse w ON pp.ad_client_id = w.ad_client_id LEFT JOIN m_product p ON p.m_product_id = pp.m_product_id LEFT JOIN m_product_warehouse_qtys_v pwq ON pwq.m_product_id = pp.m_product_id AND pwq.m_warehouse_id = w.m_warehouse_id]]></view>
+    <view name="M_PRODUCT_PRICE_WAREHOUSE_V"><![CDATA[SELECT COALESCE(w.m_warehouse_id, '-') || pp.m_productprice_id AS m_product_price_warehouse_v_id, p.ad_client_id, p.ad_org_id, p.isactive, p.updated, p.updatedby, p.created, p.createdby, p.m_product_id, w.m_warehouse_id, pp.m_productprice_id, CASE WHEN p.producttype <> 'I' OR p.isstocked = 'N' THEN 99999 ELSE COALESCE(pwq.qtyonhand - pwq.qtyreserved, 0) END AS qty_available, CASE WHEN p.producttype <> 'I' OR p.isstocked = 'N' THEN 99999 ELSE COALESCE(pwq.qtyonhand, 0) END AS qty_onhand, CASE WHEN p.producttype <> 'I' OR p.isstocked = 'N' THEN 0 ELSE COALESCE(pwq.qtyreserved, 0) END AS qty_reserved, CASE WHEN p.producttype <> 'I' OR p.isstocked = 'N' THEN 0 ELSE COALESCE(pwq.qtyordered, 0) END AS qty_ordered, pp.pricelist, pp.pricestd, pp.pricelimit, COALESCE(w.ad_org_id, '0') AS orgwarehouse FROM m_productprice pp LEFT JOIN m_warehouse w ON pp.ad_client_id = w.ad_client_id LEFT JOIN m_product p ON p.m_product_id = pp.m_product_id LEFT JOIN m_product_warehouse_qtys_v pwq ON pwq.m_product_id = pp.m_product_id AND pwq.m_warehouse_id = w.m_warehouse_id WHERE p.isgeneric = 'N']]></view>
   </database>
--- a/model/src-db/database/model/views/M_PRODUCT_STOCK_V.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/model/views/M_PRODUCT_STOCK_V.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_PRODUCT_STOCK_V">
-    <view name="M_PRODUCT_STOCK_V"><![CDATA[SELECT p.m_product_id || sd.m_storage_detail_id AS m_product_stock_v_id, l.ad_client_id, l.ad_org_id, l.isactive, sd.created, sd.createdby, sd.updated, sd.updatedby, sd.m_product_id, sd.qtyonhand, sd.qtyorderonhand, sd.preqtyonhand, sd.preqtyorderonhand, sd.c_uom_id, sd.m_product_uom_id, sd.m_attributesetinstance_id, sd.m_locator_id, 'Y' AS stocked FROM m_storage_detail sd JOIN m_locator l ON sd.m_locator_id = l.m_locator_id JOIN m_product p ON sd.m_product_id = p.m_product_id AND p.isactive = 'Y' WHERE sd.qtyonhand <> 0 OR COALESCE(sd.qtyorderonhand, 0) <> 0 UNION ALL SELECT p.m_product_id AS m_product_stock_v_id, p.ad_client_id, p.ad_org_id, p.isactive, p.created, p.createdby, p.updated, p.updatedby, p.m_product_id, 0 AS qtyonhand, NULL AS qtyorderonhand, 0 AS preqtyonhand, NULL AS preqtyorderonhand, p.c_uom_id, NULL AS m_product_uom_id, CASE p.attrsetvaluetype WHEN 'D' THEN p.m_attributesetinstance_id ELSE NULL END AS m_attributesetinstance_id, NULL AS m_locator_id, 'N' AS stocked FROM m_product p]]></view>
+    <view name="M_PRODUCT_STOCK_V"><![CDATA[SELECT p.m_product_id || sd.m_storage_detail_id AS m_product_stock_v_id, l.ad_client_id, l.ad_org_id, l.isactive, sd.created, sd.createdby, sd.updated, sd.updatedby, sd.m_product_id, sd.qtyonhand, sd.qtyorderonhand, sd.preqtyonhand, sd.preqtyorderonhand, sd.c_uom_id, sd.m_product_uom_id, sd.m_attributesetinstance_id, sd.m_locator_id, 'Y' AS stocked FROM m_storage_detail sd JOIN m_locator l ON sd.m_locator_id = l.m_locator_id JOIN m_product p ON sd.m_product_id = p.m_product_id AND p.isactive = 'Y' WHERE sd.qtyonhand <> 0 OR COALESCE(sd.qtyorderonhand, 0) <> 0 UNION ALL SELECT p.m_product_id AS m_product_stock_v_id, p.ad_client_id, p.ad_org_id, p.isactive, p.created, p.createdby, p.updated, p.updatedby, p.m_product_id, 0 AS qtyonhand, NULL AS qtyorderonhand, 0 AS preqtyonhand, NULL AS preqtyorderonhand, p.c_uom_id, NULL AS m_product_uom_id, CASE p.attrsetvaluetype WHEN 'D' THEN p.m_attributesetinstance_id ELSE NULL END AS m_attributesetinstance_id, NULL AS m_locator_id, 'N' AS stocked FROM m_product p WHERE p.isgeneric = 'N']]></view>
   </database>
--- a/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -3177,6 +3177,17 @@
 <!--E5295F791A5840A2B28868ED6A7634D3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--E5295F791A5840A2B28868ED6A7634D3--></AD_AUXILIARINPUT>
 
+<!--E63B6F9E7F2849D8837B8CD083A35597--><AD_AUXILIARINPUT>
+<!--E63B6F9E7F2849D8837B8CD083A35597-->  <AD_AUXILIARINPUT_ID><![CDATA[E63B6F9E7F2849D8837B8CD083A35597]]></AD_AUXILIARINPUT_ID>
+<!--E63B6F9E7F2849D8837B8CD083A35597-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E63B6F9E7F2849D8837B8CD083A35597-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E63B6F9E7F2849D8837B8CD083A35597-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E63B6F9E7F2849D8837B8CD083A35597-->  <AD_TAB_ID><![CDATA[180]]></AD_TAB_ID>
+<!--E63B6F9E7F2849D8837B8CD083A35597-->  <NAME><![CDATA[HasInvariants]]></NAME>
+<!--E63B6F9E7F2849D8837B8CD083A35597-->  <CODE><![CDATA[@SQL=select  (CASE COUNT(*) WHEN 0 THEN 0 ELSE 1 END) AS TOTAL from m_product_ch where m_product_id=@M_Product_ID@ and isvariant='N']]></CODE>
+<!--E63B6F9E7F2849D8837B8CD083A35597-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E63B6F9E7F2849D8837B8CD083A35597--></AD_AUXILIARINPUT>
+
 <!--E8459A62A91F4BD4A0F3B30B97F4C185--><AD_AUXILIARINPUT>
 <!--E8459A62A91F4BD4A0F3B30B97F4C185-->  <AD_AUXILIARINPUT_ID><![CDATA[E8459A62A91F4BD4A0F3B30B97F4C185]]></AD_AUXILIARINPUT_ID>
 <!--E8459A62A91F4BD4A0F3B30B97F4C185-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_CALLOUT.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/sourcedata/AD_CALLOUT.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -959,6 +959,15 @@
 <!--82D4C96A30324E08969EB848395D0287-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--82D4C96A30324E08969EB848395D0287--></AD_CALLOUT>
 
+<!--8896DB516AF14588AE9D9B56FC23156C--><AD_CALLOUT>
+<!--8896DB516AF14588AE9D9B56FC23156C-->  <AD_CALLOUT_ID><![CDATA[8896DB516AF14588AE9D9B56FC23156C]]></AD_CALLOUT_ID>
+<!--8896DB516AF14588AE9D9B56FC23156C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8896DB516AF14588AE9D9B56FC23156C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8896DB516AF14588AE9D9B56FC23156C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8896DB516AF14588AE9D9B56FC23156C-->  <NAME><![CDATA[SL_ProductCh_Characteristic]]></NAME>
+<!--8896DB516AF14588AE9D9B56FC23156C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8896DB516AF14588AE9D9B56FC23156C--></AD_CALLOUT>
+
 <!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18--><AD_CALLOUT>
 <!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18-->  <AD_CALLOUT_ID><![CDATA[8D5A298D3BEF4E14BB9B9C2A7D0CFA18]]></AD_CALLOUT_ID>
 <!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_COLUMN.xml	Wed Aug 21 11:01:45 2013 +0200
+++ b/model/src-db/database/sourcedata/AD_COLUMN.xml	Mon Sep 16 12:52:56 2013 +0000
@@ -27789,8 +27789,8 @@
 <!--2064-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
 <!--2064-->  <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME>
 <!--2064-->  <AD_TABLE_ID><![CDATA[251]]></AD_TABLE_ID>
-<!--2064-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--2064-->  <AD_REFERENCE_VALUE_ID><![CDATA[800011]]></AD_REFERENCE_VALUE_ID>
+<!--2064-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--2064-->  <AD_REFERENCE_VALUE_ID><![CDATA[D65D16C78404437AAB008E8040715D2F]]></AD_REFERENCE_VALUE_ID>
 <!--2064-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
 <!--2064-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--2064-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
@@ -208583,7 +208583,11 @@
     * @our_ref@: The reference of the document
     * @cus_nam@: The name of the customer
     * @sal_nam@: The name of the sales rep.
-]]></HELP>
+    * @bp_nam@: The Business Partner name
+    * @doc_date@: The document date
+    * @doc_desc@: The document description
+    * @doc_nextduedate@: The next due date (if document has associated any payment plan)
+    * @doc_lastduedate@: The last due date (if document has associated any payment plan)]]></HELP>
 <!--1000500041-->  <COLUMNNAME><![CDATA[Subject]]></COLUMNNAME>
 <!--1000500041-->  <AD_TABLE_ID><![CDATA[1000500002]]></AD_TABLE_ID>
 <!--1000500041-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
@@ -208624,7 +208628,11 @@
     * @our_ref@: The reference of the document
     * @cus_nam@: The name of the customer
     * @sal_nam@: The name of the sales rep.
-]]></HELP>
+    * @bp_nam@: The Business Partner name
+    * @doc_date@: The document date
+    * @doc_desc@: The document description
+    * @doc_nextduedate@: The next due date (if document has associated any payment plan)
+    * @doc_lastduedate@: The last due date (if document has associated any payment plan)]]></HELP>
 <!--1000500042-->  <COLUMNNAME><![CDATA[Body]]></COLUMNNAME>
 <!--1000500042-->  <AD_TABLE_ID><![CDATA[1000500002]]></AD_TABLE_ID>
 <!--1000500042-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
@@ -209472,7 +209480,11 @@
     * @our_ref@: The reference of the document
     * @cus_nam@: The name of the customer
     * @sal_nam@: The name of the sales rep.
-]]></HELP>
+    * @bp_nam@: The Business Partner name
+    * @doc_date@: The document date
+    * @doc_desc@: The document description
+    * @doc_nextduedate@: The next due date (if document has associated any payment plan)
+    * @doc_lastduedate@: The last due date (if document has associated any payment plan)]]></HELP>
 <!--1000500066-->  <COLUMNNAME><![CDATA[Subject]]></COLUMNNAME>
 <!--1000500066-->  <AD_TABLE_ID><![CDATA[1000500004]]></AD_TABLE_ID>
 <!--1000500066-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
@@ -209513,7 +209525,11 @@
     * @our_ref@: The reference of the document
     * @cus_nam@: The name of the customer
     * @sal_nam@: The name of the sales rep.
-]]></HELP>
+    * @bp_nam@: The Business Partner name
+    * @doc_date@: The document date
+    * @doc_desc@: The document description
+    * @doc_nextduedate@: The next due date (if document has associated any payment plan)
+    * @doc_lastduedate@: The last due date (if document has associated any payment plan)]]></HELP>
 <!--1000500067-->  <COLUMNNAME><![CDATA[Body]]></COLUMNNAME>
 <!--1000500067-->  <AD_TABLE_ID><![CDATA[1000500004]]></AD_TABLE_ID>
 <!--1000500067-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
@@ -222805,6 +222821,40 @@
 <!--11F755DE7007411FA9D61421815A71E1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--11F755DE7007411FA9D61421815A71E1--></AD_COLUMN>
 
+<!--123A02634DBA47D3A9250043ADA5BD90--><AD_COLUMN>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <AD_COLUMN_ID><![CDATA[123A02634DBA47D3A9250043ADA5BD90]]></AD_COLUMN_ID>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <COLUMNNAME><![CDATA[UpdatedBy]]></COLUMNNAME>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <AD_TABLE_ID><![CDATA[147D4D709FAC4AF0B611ABFED328FA12]]></AD_TABLE_ID>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--123A02634DBA47D3A9250043ADA5BD90-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--123A02634DBA47D3A9250043ADA5BD90--></AD_COLUMN>
+
 <!--123ECC9DA80E47D6BBE8D3C8E9ACC59C--><AD_COLUMN>
 <!--123ECC9DA80E47D6BBE8D3C8E9ACC59C-->  <AD_COLUMN_ID><![CDATA[123ECC9DA80E47D6BBE8D3C8E9ACC59C]]></AD_COLUMN_ID>
 <!--123ECC9DA80E47D6BBE8D3C8E9ACC59C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -223225,7 +223275,7 @@
 <!--154B76A81BCB4CD2AE569E0CC25A12FD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--154B76A81BCB4CD2AE569E0CC25A12FD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--154B76A81BCB4CD2AE569E0CC25A12FD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--154B76A81BCB4CD2AE569E0CC25A12FD-->  <POSITION><![CDATA[75]]></POSITION>
+<!--154B76A81BCB4CD2AE569E0CC25A12FD-->  <POSITION><![CDATA[78]]></POSITION>
 <!--154B76A81BCB4CD2AE569E0CC25A12FD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--154B76A81BCB4CD2AE569E0CC25A12FD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--154B76A81BCB4CD2AE569E0CC25A12FD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -225480,7 +225530,7 @@
 <!--1E2AD60A472147B38A1C52F8CE473F19-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1E2AD60A472147B38A1C52F8CE473F19-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1E2AD60A472147B38A1C52F8CE473F19-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1E2AD60A472147B38A1C52F8CE473F19-->  <POSITION><![CDATA[77]]></POSITION>
+<!--1E2AD60A472147B38A1C52F8CE473F19-->  <POSITION><![CDATA[80]]></POSITION>
 <!--1E2AD60A472147B38A1C52F8CE473F19-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1E2AD60A472147B38A1C52F8CE473F19-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--1E2AD60A472147B38A1C52F8CE473F19-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -227662,6 +227712,38 @@
 <!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2AA57E9B932549BCB74C9DD283840AD2--></AD_COLUMN>
 
+<!--2B115DCD9D4E456E971C13184959060B--><AD_COLUMN>
+<!--2B115DCD9D4E456E971C13184959060B-->  <AD_COLUMN_ID><![CDATA[2B115DCD9D4E456E971C13184959060B]]></AD_COLUMN_ID>
+<!--2B115DCD9D4E456E971C13184959060B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2B115DCD9D4E456E971C13184959060B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2B115DCD9D4E456E971C13184959060B-->  <NAME><![CDATA[c_ob_selected]]></NAME>
+<!--2B115DCD9D4E456E971C13184959060B-->  <COLUMNNAME><![CDATA[OB_Selected]]></COLUMNNAME>
+<!--2B115DCD9D4E456E971C13184959060B-->  <AD_TABLE_ID><![CDATA[147D4D709FAC4AF0B611ABFED328FA12]]></AD_TABLE_ID>
+<!--2B115DCD9D4E456E971C13184959060B-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--2B115DCD9D4E456E971C13184959060B-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2B115DCD9D4E456E971C13184959060B-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2B115DCD9D4E456E971C13184959060B-->  <AD_ELEMENT_ID><![CDATA[B13BBED95C5B262CE040007F01005E70]]></AD_ELEMENT_ID>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2B115DCD9D4E456E971C13184959060B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2B115DCD9D4E456E971C13184959060B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2B115DCD9D4E456E971C13184959060B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2B115DCD9D4E456E971C13184959060B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2B115DCD9D4E456E971C13184959060B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2B115DCD9D4E456E971C13184959060B--></AD_COLUMN>
+
 <!--2B1857B270ED4D5A9AC956BB6AA78F24--><AD_COLUMN>
 <!--2B1857B270ED4D5A9AC956BB6AA78F24-->  <AD_COLUMN_ID><![CDATA[2B1857B270ED4D5A9AC956BB6AA78F24]]></AD_COLUMN_ID>
 <!--2B1857B270ED4D5A9AC956BB6AA78F24-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -228450,6 +228532,40 @@
 <!--2FD790AF217148AE8D7628ECC9F3D7C3-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2FD790AF217148AE8D7628ECC9F3D7C3--></AD_COLUMN>
 
+<!--2FD8B69C24B94912B1BB4E508C7AC77B--><AD_COLUMN>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <AD_COLUMN_ID><![CDATA[2FD8B69C24B94912B1BB4E508C7AC77B]]></AD_COLUMN_ID>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <NAME><![CDATA[Updated]]></NAME>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <AD_TABLE_ID><![CDATA[147D4D709FAC4AF0B611ABFED328FA12]]></AD_TABLE_ID>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2FD8B69C24B94912B1BB4E508C7AC77B--></AD_COLUMN>
+
 <!--3016237232444E83962F47A938F811CD--><AD_COLUMN>
 <!--3016237232444E83962F47A938F811CD-->  <AD_COLUMN_ID><![CDATA[3016237232444E83962F47A938F811CD]]></AD_COLUMN_ID>
 <!--3016237232444E83962F47A938F811CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -229577,7 +229693,7 @@
 <!--367DCAA9CF4442ADB9A76F6539102217-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--367DCAA9CF4442ADB9A76F6539102217-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--367DCAA9CF4442ADB9A76F6539102217-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--367DCAA9CF4442ADB9A76F6539102217-->  <POSITION><![CDATA[79]]></POSITION>
+<!--367DCAA9CF4442ADB9A76F6539102217-->  <POSITION><![CDATA[81]]></POSITION>
 <!--367DCAA9CF4442ADB9A76F6539102217-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--367DCAA9CF4442ADB9A76F6539102217-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--367DCAA9CF4442ADB9A76F6539102217-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -230678,6 +230794,40 @@
 <!--3C63F1EC9A9B4DC8ACFBE312A72CDE5A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3C63F1EC9A9B4DC8ACFBE312A72CDE5A--></AD_COLUMN>
 
+<!--3C711021198A4818A1C4F5E4CB7A7C9A--><AD_COLUMN>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <AD_COLUMN_ID><![CDATA[3C711021198A4818A1C4F5E4CB7A7C9A]]></AD_COLUMN_ID>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <NAME><![CDATA[Organization]]></NAME>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <AD_TABLE_ID><![CDATA[147D4D709FAC4AF0B611ABFED328FA12]]></AD_TABLE_ID>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3C711021198A4818A1C4F5E4CB7A7C9A--></AD_COLUMN>
+
 <!--3C96A94065F14A29B64ACA59226F7AC8--><AD_COLUMN>
 <!--3C96A94065F14A29B64ACA59226F7AC8-->  <AD_COLUMN_ID><![CDATA[3C96A94065F14A29B64ACA59226F7AC8]]></AD_COLUMN_ID>
 <!--3C96A94065F14A29B64ACA59226F7AC8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -231881,6 +232031,42 @@
 <!--43130E70F0A2464CB670B5D48F2D2BA5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--43130E70F0A2464CB670B5D48F2D2BA5--></AD_COLUMN>
 
+<!--442764EA454D4BDBB5B96EA324AC70A5--><AD_COLUMN>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <AD_COLUMN_ID><![CDATA[442764EA454D4BDBB5B96EA324AC70A5]]></AD_COLUMN_ID>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <NAME><![CDATA[Active]]></NAME>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <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>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <COLUMNNAME><![CDATA[IsActive]]></COLUMNNAME>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <AD_TABLE_ID><![CDATA[147D4D709FAC4AF0B611ABFED328FA12]]></AD_TABLE_ID>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--442764EA454D4BDBB5B96EA324AC70A5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--442764EA454D4BDBB5B96EA324AC70A5--></AD_COLUMN>
+
 <!--44639EB55C5F4D899889466C9B6A3463--><AD_COLUMN>
 <!--44639EB55C5F4D899889466C9B6A3463-->  <AD_COLUMN_ID><![CDATA[44639EB55C5F4D899889466C9B6A3463]]></AD_COLUMN_ID>
 <!--44639EB55C5F4D899889466C9B6A3463-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -233454,6 +233640,40 @@
 <!--4BDAB25F4E75423DBF487DA8533282BD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--4BDAB25F4E75423DBF487DA8533282BD--></AD_COLUMN>
 
+<!--4C217290DD1F40EAAD2265B4CE72EDED--><AD_COLUMN>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <AD_COLUMN_ID><![CDATA[4C217290DD1F40EAAD2265B4CE72EDED]]></AD_COLUMN_ID>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <NAME><![CDATA[Client]]></NAME>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <AD_TABLE_ID><![CDATA[147D4D709FAC4AF0B611ABFED328FA12]]></AD_TABLE_ID>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4C217290DD1F40EAAD2265B4CE72EDED-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4C217290DD1F40EAAD2265B4CE72EDED--></AD_COLUMN>
+
 <!--4C34FD5CD5F947049A55B6CCEFA15960--><AD_COLUMN>
 <!--4C34FD5CD5F947049A55B6CCEFA15960-->  <AD_COLUMN_ID><![CDATA[4C34FD5CD5F947049A55B6CCEFA15960]]></AD_COLUMN_ID>
 <!--4C34FD5CD5F947049A55B6CCEFA15960-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -233950,6 +234170,42 @@
 <!--505825A28B744B71A0E2FE85C814F3A5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--505825A28B744B71A0E2FE85C814F3A5--></AD_COLUMN>
 
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6--><AD_COLUMN>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <AD_COLUMN_ID><![CDATA[5083D0CC53914FCFAAE3489FFB0D0CE6]]></AD_COLUMN_ID>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <NAME><![CDATA[Search Key]]></NAME>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <DESCRIPTION><![CDATA[A fast method for finding a particular record.]]></DESCRIPTION>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the  "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order).
+
+Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]></HELP>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <COLUMNNAME><![CDATA[value]]></COLUMNNAME>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <AD_TABLE_ID><![CDATA[147D4D709FAC4AF0B611ABFED328FA12]]></AD_TABLE_ID>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <AD_ELEMENT_ID><![CDATA[620]]></AD_ELEMENT_ID>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--5083D0CC53914FCFAAE3489FFB0D0CE6--></AD_COLUMN>
+
 <!--50C572BF5B0E46319FC8F32201A8408E--><AD_COLUMN>
 <!--50C572BF5B0E46319FC8F32201A8408E-->  <AD_COLUMN_ID><![CDATA[50C572BF5B0E46319FC8F32201A8408E]]></AD_COLUMN_ID>
 <!--50C572BF5B0E46319FC8F32201A8408E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -236660,6 +236916,40 @@
 <!--5614E4E936C2456586AD9C7F3247283F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--5614E4E936C2456586AD9C7F3247283F--></AD_COLUMN>
 
+<!--562EC839781F44709457CFC501748DC2--><AD_COLUMN>
+<!--562EC839781F44709457CFC501748DC2-->  <AD_COLUMN_ID><![CDATA[562EC839781F44709457CFC501748DC2]]></AD_COLUMN_ID>
+<!--562EC839781F44709457CFC501748DC2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--562EC839781F44709457CFC501748DC2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--562EC839781F44709457CFC501748DC2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--562EC839781F44709457CFC501748DC2-->  <NAME><![CDATA[Created By]]></NAME>
+<!--562EC839781F44709457CFC501748DC2-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--562EC839781F44709457CFC501748DC2-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--562EC839781F44709457CFC501748DC2-->  <COLUMNNAME><![CDATA[CreatedBy]]></COLUMNNAME>
+<!--562EC839781F44709457CFC501748DC2-->  <AD_TABLE_ID><![CDATA[147D4D709FAC4AF0B611ABFED328FA12]]></AD_TABLE_ID>
+<!--562EC839781F44709457CFC501748DC2-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--562EC839781F44709457CFC501748DC2-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--562EC839781F44709457CFC501748DC2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--562EC839781F44709457CFC501748DC2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--562EC839781F44709457CFC501748DC2-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--562EC839781F44709457CFC501748DC2-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--562EC839781F44709457CFC501748DC2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--562EC839781F44709457CFC501748DC2-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--562EC839781F44709457CFC501748DC2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--562EC839781F44709457CFC501748DC2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--562EC839781F44709457CFC501748DC2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--562EC839781F44709457CFC501748DC2-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--562EC839781F44709457CFC501748DC2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--562EC839781F44709457CFC501748DC2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--562EC839781F44709457CFC501748DC2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--562EC839781F44709457CFC501748DC2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--562EC839781F44709457CFC501748DC2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--562EC839781F44709457CFC501748DC2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--562EC839781F44709457CFC501748DC2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--562EC839781F44709457CFC501748DC2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--562EC839781F44709457CFC501748DC2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--562EC839781F44709457CFC501748DC2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--562EC839781F44709457CFC501748DC2--></AD_COLUMN>
+
 <!--565E56DF64D99042E040007F01002829--><AD_COLUMN>
 <!--565E56DF64D99042E040007F01002829-->  <AD_COLUMN_ID><![CDATA[565E56DF64D99042E040007F01002829]]></AD_COLUMN_ID>
 <!--565E56DF64D99042E040007F01002829-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -255999,7 +256289,7 @@
 <!--6CF3E69515CE4C3595538750AE208570-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--6CF3E69515CE4C3595538750AE208570-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--6CF3E69515CE4C3595538750AE208570-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6CF3E69515CE4C3595538750AE208570-->  <POSITION><![CDATA[76]]></POSITION>
+<!--6CF3E69515CE4C3595538750AE208570-->  <POSITION><![CDATA[77]]></POSITION>
 <!--6CF3E69515CE4C3595538750AE208570-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--6CF3E69515CE4C3595538750AE208570-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--6CF3E69515CE4C3595538750AE208570-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -257290,6 +257580,40 @@
 <!--6F61A8993BCC5E52E040007F01005AF5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--6F61A8993BCC5E52E040007F01005AF5--></AD_COLUMN>
 
+<!--6F8BC2231616458999E3DFE7414E41F5--><AD_COLUMN>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <AD_COLUMN_ID><![CDATA[6F8BC2231616458999E3DFE7414E41F5]]></AD_COLUMN_ID>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <AD_TABLE_ID><![CDATA[147D4D709FAC4AF0B611ABFED328FA12]]></AD_TABLE_ID>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6F8BC2231616458999E3DFE7414E41F5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6F8BC2231616458999E3DFE7414E41F5--></AD_COLUMN>
+
 <!--6F8E1F092B774401A63F331EFEE83496--><AD_COLUMN>
 <!--6F8E1F092B774401A63F331EFEE83496-->  <AD_COLUMN_ID><![CDATA[6F8E1F092B774401A63F331EFEE83496]]></AD_COLUMN_ID>
 <!--6F8E1F092B774401A63F331EFEE83496-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -285154,6 +285478,38 @@
 <!--93050F02630B4CB08F1D48FF71C1D2BD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--93050F02630B4CB08F1D48FF71C1D2BD--></AD_COLUMN>
 
+<!--937E801D62F2425F91A90372901FB189--><AD_COLUMN>
+<!--937E801D62F2425F91A90372901FB189-->  <AD_COLUMN_ID><![CDATA[937E801D62F2425F91A90372901FB189]]></AD_COLUMN_ID>
+<!--937E801D62F2425F91A90372901FB189-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--937E801D62F2425F91A90372901FB189-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--937E801D62F2425F91A90372901FB189-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--937E801D62F2425F91A90372901FB189-->  <NAME><![CDATA[Variant Created]]></NAME>
+<!--937E801D62F2425F91A90372901FB189-->  <COLUMNNAME><![CDATA[isVariantCreated]]></COLUMNNAME>
+<!--937E801D62F2425F91A90372901FB189-->  <AD_TABLE_ID><![CDATA[147D4D709FAC4AF0B611ABFED328FA12]]></AD_TABLE_ID>
+<!--937E801D62F2425F91A90372901FB189-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--937E801D62F2425F91A90372901FB189-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--937E801D62F2425F91A90372901FB189-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--937E801D62F2425F91A90372901FB189-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--937E801D62F2425F91A90372901FB189-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--937E801D62F2425F91A90372901FB189-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--937E801D62F2425F91A90372901FB189-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--937E801D62F2425F91A90372901FB189-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--937E801D62F2425F91A90372901FB189-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--937E801D62F2425F91A90372901FB189-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--937E801D62F2425F91A90372901FB189-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--937E801D62F2425F91A90372901FB189-->  <AD_ELEMENT_ID><![CDATA[E070B0DC2831C229E040007F010016E6]]></AD_ELEMENT_ID>
+<!--937E801D62F2425F91A90372901FB189-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--937E801D62F2425F91A90372901FB189-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--937E801D62F2425F91A90372901FB189-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--937E801D62F2425F91A90372901FB189-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--937E801D62F2425F91A90372901FB189-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--937E801D62F2425F91A90372901FB189-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--937E801D62F2425F91A90372901FB189-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--937E801D62F2425F91A90372901FB189-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--937E801D62F2425F91A90372901FB189-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--937E801D62F2425F91A90372901FB189-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--937E801D62F2425F91A90372901FB189--></AD_COLUMN>
+
 <!--9382FCA58F4EAF36E040A8C021013A93--><AD_COLUMN>
 <!--9382FCA58F4EAF36E040A8C021013A93-->  <AD_COLUMN_ID><![CDATA[9382FCA58F4EAF36E040A8C021013A93]]></AD_COLUMN_ID>
 <!--9382FCA58F4EAF36E040A8C021013A93-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -286316,7 +286672,7 @@
 <!--98ADA80EF26D40C6A8FDB4FD9AFA6763-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--98ADA80EF26D40C6A8FDB4FD9AFA6763-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--98ADA80EF26D40C6A8FDB4FD9AFA6763-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--98ADA80EF26D40C6A8FDB4FD9AFA6763-->  <POSITION><![CDATA[78]]></POSITION>
+<!--98ADA80EF26D40C6A8FDB4FD9AFA6763-->  <POSITION><![CDATA[76]]></POSITION>
 <!--98ADA80EF26D40C6A8FDB4FD9AFA6763-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--98ADA80EF26D40C6A8FDB4FD9AFA6763-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--98ADA80EF26D40C6A8FDB4FD9AFA6763-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -297029,6 +297385,38 @@
 <!--B46323A21354425EAA2FB28EA4D86B37-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B46323A21354425EAA2FB28EA4D86B37--></AD_COLUMN>
 
+<!--B4CB4875970144F9B42C357DC1129576--><AD_COLUMN>
+<!--B4CB4875970144F9B42C357DC1129576-->  <AD_COLUMN_ID><![CDATA[B4CB4875970144F9B42C357DC1129576]]></AD_COLUMN_ID>
+<!--B4CB4875970144F9B42C357DC1129576-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B4CB4875970144F9B42C357DC1129576-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B4CB4875970144F9B42C357DC1129576-->  <NAME><![CDATA[id]]></NAME>
+<!--B4CB4875970144F9B42C357DC1129576-->  <COLUMNNAME><![CDATA[id]]></COLUMNNAME>
+<!--B4CB4875970144F9B42C357DC1129576-->  <AD_TABLE_ID><![CDATA[147D4D709FAC4AF0B611ABFED328FA12]]></AD_TABLE_ID>
+<!--B4CB4875970144F9B42C357DC1129576-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--B4CB4875970144F9B42C357DC1129576-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B4CB4875970144F9B42C357DC1129576-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B4CB4875970144F9B42C357DC1129576-->  <AD_ELEMENT_ID><![CDATA[E01FC8107518BAEFE040007F010005CC]]></AD_ELEMENT_ID>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B4CB4875970144F9B42C357DC1129576-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B4CB4875970144F9B42C357DC1129576-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B4CB4875970144F9B42C357DC1129576-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B4CB4875970144F9B42C357DC1129576-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B4CB4875970144F9B42C357DC1129576-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B4CB4875970144F9B42C357DC1129576--></AD_COLUMN>
+
 <!--B515858C2040417D9BC41BA12F936B78--><AD_COLUMN>
 <!--B515858C2040417D9BC41BA12F936B78-->  <AD_COLUMN_ID><![CDATA[B515858C2040417D9BC41BA12F936B78]]></AD_COLUMN_ID>
 <!--B515858C2040417D9BC41BA12F936B78-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -303467,6 +303855,40 @@
 <!--C841F501E357494787B88485EF7992B8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--C841F501E357494787B88485EF7992B8--></AD_COLUMN>
 
+<!--C850E75FC2C640B59B4FEC12423F4251--><AD_COLUMN>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <AD_COLUMN_ID><![CDATA[C850E75FC2C640B59B4FEC12423F4251]]></AD_COLUMN_ID>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <NAME><![CDATA[UpdateInvariants]]></NAME>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <COLUMNNAME><![CDATA[Updateinvariants]]></COLUMNNAME>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <AD_TABLE_ID><![CDATA[208]]></AD_TABLE_ID>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <SEQNO><![CDATA[470]]></SEQNO>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <AD_ELEMENT_ID><![CDATA[DFE350A1830B4F7FE040007F010031A1]]></AD_ELEMENT_ID>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <POSITION><![CDATA[86]]></POSITION>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C850E75FC2C640B59B4FEC12423F4251-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[7DC2C8DC186B4C1DB18E147911950861]]></EM_OBUIAPP_PROCESS_ID>
+<!--C850E75FC2C640B59B4FEC12423F4251--></AD_COLUMN>
+
 <!--C8AE5CAA0579450D801E70F9BF497D46--><AD_COLUMN>
 <!--C8AE5CAA0579450D801E70F9BF497D46-->  <AD_COLUMN_ID><![CDATA[C8AE5CAA0579450D801E70F9BF497D46]]></AD_COLUMN_ID>
 <!--C8AE5CAA0579450D801E70F9BF497D46-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -307547,7 +307969,7 @@
 <!--CE4E26D99C2EC060E040007F010027BD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--CE4E26D99C2EC060E040007F010027BD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--CE4E26D99C2EC060E040007F010027BD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--CE4E26D99C2EC060E040007F010027BD-->  <POSITION><![CDATA[75]]></POSITION>
+<!--CE4E26D99C2EC060E040007F010027BD-->  <POSITION><![CDATA[82]]></POSITION>
 <!--CE4E26D99C2EC060E040007F010027BD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--CE4E26D99C2EC060E040007F010027BD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--CE4E26D99C2EC060E040007F010027BD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -310253,6 +310675,1535 @@
 <!--D68088FB742A4925AD7EF196FE51E0BA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D68088FB742A4925AD7EF196FE51E0BA--></AD_COLUMN>
 
+<!--D69FF5B78C39C471E040007F010015B2--><AD_COLUMN>
+<!--D69FF5B78C39C471E040007F010015B2-->  <AD_COLUMN_ID><![CDATA[D69FF5B78C39C471E040007F010015B2]]></AD_COLUMN_ID>
+<!--D69FF5B78C39C471E040007F010015B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D69FF5B78C39C471E040007F010015B2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D69FF5B78C39C471E040007F010015B2-->  <NAME><![CDATA[Characteristic]]></NAME>
+<!--D69FF5B78C39C471E040007F010015B2-->  <HELP><![CDATA[Definition of a Product Characteristic]]></HELP>
+<!--D69FF5B78C39C471E040007F010015B2-->  <COLUMNNAME><![CDATA[M_Characteristic_ID]]></COLUMNNAME>
+<!--D69FF5B78C39C471E040007F010015B2-->  <AD_TABLE_ID><![CDATA[91C26DEA4B3D4C05B4F277D009220872]]></AD_TABLE_ID>
+<!--D69FF5B78C39C471E040007F010015B2-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--D69FF5B78C39C471E040007F010015B2-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D69FF5B78C39C471E040007F010015B2-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D69FF5B78C39C471E040007F010015B2-->  <AD_ELEMENT_ID><![CDATA[D69FE5544E75D667E040007F01001784]]></AD_ELEMENT_ID>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D69FF5B78C39C471E040007F010015B2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D69FF5B78C39C471E040007F010015B2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D69FF5B78C39C471E040007F010015B2-->  <POSITION><![CDATA[1]]></POSITION>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D69FF5B78C39C471E040007F010015B2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D69FF5B78C39C471E040007F010015B2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D69FF5B78C39C471E040007F010015B2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D69FF5B78C39C471E040007F010015B2--></AD_COLUMN>
+
+<!--D69FF5B78C3AC471E040007F010015B2--><AD_COLUMN>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <AD_COLUMN_ID><![CDATA[D69FF5B78C3AC471E040007F010015B2]]></AD_COLUMN_ID>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <NAME><![CDATA[Client]]></NAME>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <AD_TABLE_ID><![CDATA[91C26DEA4B3D4C05B4F277D009220872]]></AD_TABLE_ID>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <POSITION><![CDATA[2]]></POSITION>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D69FF5B78C3AC471E040007F010015B2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D69FF5B78C3AC471E040007F010015B2--></AD_COLUMN>
+
+<!--D69FF5B78C3BC471E040007F010015B2--><AD_COLUMN>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <AD_COLUMN_ID><![CDATA[D69FF5B78C3BC471E040007F010015B2]]></AD_COLUMN_ID>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <NAME><![CDATA[Organization]]></NAME>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <AD_TABLE_ID><![CDATA[91C26DEA4B3D4C05B4F277D009220872]]></AD_TABLE_ID>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <POSITION><![CDATA[3]]></POSITION>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D69FF5B78C3BC471E040007F010015B2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D69FF5B78C3BC471E040007F010015B2--></AD_COLUMN>
+
+<!--D69FF5B78C3CC471E040007F010015B2--><AD_COLUMN>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <AD_COLUMN_ID><![CDATA[D69FF5B78C3CC471E040007F010015B2]]></AD_COLUMN_ID>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <NAME><![CDATA[Active]]></NAME>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <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>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <AD_TABLE_ID><![CDATA[91C26DEA4B3D4C05B4F277D009220872]]></AD_TABLE_ID>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D69FF5B78C3CC471E040007F010015B2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEV