[Product Services] Fixes after merge
authorAaron Calero <aaron.calero@openbravo.com>
Thu, 22 Oct 2015 18:06:41 +0200
changeset 28629 d677d6d0d6a5
parent 28628 c0c71c2626d6
child 28630 6897b6546a9b
[Product Services] Fixes after merge
src-db/database/model/tables/C_BPARTNER.xml
src-db/database/model/tables/M_INOUT.xml
src-db/database/model/tables/M_PRODUCT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/model/tables/C_BPARTNER.xml	Thu Oct 22 16:04:57 2015 +0200
+++ b/src-db/database/model/tables/C_BPARTNER.xml	Thu Oct 22 18:06:41 2015 +0200
@@ -468,18 +468,10 @@
         <index-column name="VALUE"/>
         <index-column name="C_BPARTNER_ID"/>
       </index>
-      <index name="C_BPARTNER_NAME_ID" unique="false">
-        <index-column name="NAME"/>
-        <index-column name="C_BPARTNER_ID"/>
-      </index>
       <index name="C_BPARTNER_REFERENCENO_ID" unique="false">
         <index-column name="REFERENCENO"/>
         <index-column name="C_BPARTNER_ID"/>
       </index>
-      <index name="C_BPARTNER_VALUE_ID" unique="false">
-        <index-column name="VALUE"/>
-        <index-column name="C_BPARTNER_ID"/>
-      </index>
       <unique name="C_BPARTNER_VALUE">
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="AD_ORG_ID"/>
--- a/src-db/database/model/tables/M_INOUT.xml	Thu Oct 22 16:04:57 2015 +0200
+++ b/src-db/database/model/tables/M_INOUT.xml	Thu Oct 22 18:06:41 2015 +0200
@@ -340,14 +340,6 @@
         <index-column name="MOVEMENTDATE"/>
         <index-column name="M_INOUT_ID"/>
       </index>
-      <index name="M_INOUT_DOCUMENTNO_ID" unique="false">
-        <index-column name="DOCUMENTNO"/>
-        <index-column name="M_INOUT_ID"/>
-      </index>
-      <index name="M_INOUT_MOVEMENTDATE_ID" unique="false">
-        <index-column name="MOVEMENTDATE"/>
-        <index-column name="M_INOUT_ID"/>
-      </index>
       <index name="M_INOUT_ORDER" unique="false">
         <index-column name="C_ORDER_ID"/>
       </index>
--- a/src-db/database/model/tables/M_PRODUCT.xml	Thu Oct 22 16:04:57 2015 +0200
+++ b/src-db/database/model/tables/M_PRODUCT.xml	Thu Oct 22 18:06:41 2015 +0200
@@ -384,6 +384,7 @@
       <column name="UNIQUE_PER_DOCUMENT" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <column name="RELATEPRODCATTOSERVICE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
         <default/>
         <onCreateDefault/>
@@ -484,10 +485,6 @@
         <index-column name="NAME"/>
         <index-column name="M_PRODUCT_ID"/>
       </index>
-      <index name="M_PRODUCT_NAME_ID" unique="false">
-        <index-column name="NAME"/>
-        <index-column name="M_PRODUCT_ID"/>
-      </index>
       <index name="M_PRODUCT_PRODUCTCATEGORY" unique="false">
         <index-column name="M_PRODUCT_CATEGORY_ID"/>
       </index>
@@ -499,14 +496,6 @@
         <index-column name="VALUE"/>
         <index-column name="M_PRODUCT_ID"/>
       </index>
-      <index name="M_PRODUCT_UPC_ID" unique="false">
-        <index-column name="UPC"/>
-        <index-column name="M_PRODUCT_ID"/>
-      </index>
-      <index name="M_PRODUCT_VALUE_ID" unique="false">
-        <index-column name="VALUE"/>
-        <index-column name="M_PRODUCT_ID"/>
-      </index>
       <unique name="M_PRODUCT_EXPENSETYPE">
         <unique-column name="S_EXPENSETYPE_ID"/>
       </unique>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Thu Oct 22 16:04:57 2015 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Thu Oct 22 18:06:41 2015 +0200
@@ -222935,7 +222935,7 @@
 <!--00F6B5BFE95E4F068C9E118E9BD9385B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--00F6B5BFE95E4F068C9E118E9BD9385B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--00F6B5BFE95E4F068C9E118E9BD9385B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--00F6B5BFE95E4F068C9E118E9BD9385B-->  <AD_ELEMENT_ID><![CDATA[21C6A21A85304F5B888D055BFC57DA52]]></AD_ELEMENT_ID>
+<!--00F6B5BFE95E4F068C9E118E9BD9385B-->  <AD_ELEMENT_ID><![CDATA[469]]></AD_ELEMENT_ID>
 <!--00F6B5BFE95E4F068C9E118E9BD9385B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--00F6B5BFE95E4F068C9E118E9BD9385B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--00F6B5BFE95E4F068C9E118E9BD9385B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -261849,41 +261849,6 @@
 <!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--5E02C5CF3E894313AE8EF4A35287843D--></AD_COLUMN>
 
-<!--5E02C5CF3E894313AE8EF4A35287843D--><AD_COLUMN>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <AD_COLUMN_ID><![CDATA[5E02C5CF3E894313AE8EF4A35287843D]]></AD_COLUMN_ID>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <NAME><![CDATA[Overdue_Return_Days]]></NAME>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <DESCRIPTION><![CDATA[Indicates if a Service is Returnable how many days has the customer to return it after buying]]></DESCRIPTION>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <HELP><![CDATA[Indicates if a Service is Returnable how many days has the customer to return it after buying]]></HELP>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <COLUMNNAME><![CDATA[Overdue_Return_Days]]></COLUMNNAME>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <AD_TABLE_ID><![CDATA[208]]></AD_TABLE_ID>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <SEQNO><![CDATA[620]]></SEQNO>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <AD_ELEMENT_ID><![CDATA[A11314C983E0497AA506DACC73FFB0C6]]></AD_ELEMENT_ID>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <POSITION><![CDATA[96]]></POSITION>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--5E02C5CF3E894313AE8EF4A35287843D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--5E02C5CF3E894313AE8EF4A35287843D--></AD_COLUMN>
-
 <!--5E168828581F4A39847C969F9D3646A1--><AD_COLUMN>
 <!--5E168828581F4A39847C969F9D3646A1-->  <AD_COLUMN_ID><![CDATA[5E168828581F4A39847C969F9D3646A1]]></AD_COLUMN_ID>
 <!--5E168828581F4A39847C969F9D3646A1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -343258,40 +343223,6 @@
 <!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ENTITY_ALIAS><![CDATA[sol.lineNo]]></ENTITY_ALIAS>
 <!--F2E3FEB60A004EB6A237CFE7F32C1262--></AD_COLUMN>
 
-<!--F2E3FEB60A004EB6A237CFE7F32C1262--><AD_COLUMN>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <AD_COLUMN_ID><![CDATA[F2E3FEB60A004EB6A237CFE7F32C1262]]></AD_COLUMN_ID>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <NAME><![CDATA[lineNo]]></NAME>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <HELP><![CDATA[Number of the line]]></HELP>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <COLUMNNAME><![CDATA[lineNo]]></COLUMNNAME>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <AD_TABLE_ID><![CDATA[15EAF61631484A11B6921AB05A342E8B]]></AD_TABLE_ID>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <SEQNO><![CDATA[120]]></SEQNO>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <AD_ELEMENT_ID><![CDATA[800017]]></AD_ELEMENT_ID>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262-->  <ENTITY_ALIAS><![CDATA[sol.lineNo]]></ENTITY_ALIAS>
-<!--F2E3FEB60A004EB6A237CFE7F32C1262--></AD_COLUMN>
-
 <!--F3068D25956B4C8093F10627B1AD71F5--><AD_COLUMN>
 <!--F3068D25956B4C8093F10627B1AD71F5-->  <AD_COLUMN_ID><![CDATA[F3068D25956B4C8093F10627B1AD71F5]]></AD_COLUMN_ID>
 <!--F3068D25956B4C8093F10627B1AD71F5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Oct 22 16:04:57 2015 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Oct 22 18:06:41 2015 +0200
@@ -26958,18 +26958,6 @@
 <!--F4F23BF40CD04B969BDCBE7860D3574E-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--F4F23BF40CD04B969BDCBE7860D3574E--></AD_MESSAGE>
 
-<!--F4F23BF40CD04B969BDCBE7860D3574E--><AD_MESSAGE>
-<!--F4F23BF40CD04B969BDCBE7860D3574E-->  <AD_MESSAGE_ID><![CDATA[F4F23BF40CD04B969BDCBE7860D3574E]]></AD_MESSAGE_ID>
-<!--F4F23BF40CD04B969BDCBE7860D3574E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--F4F23BF40CD04B969BDCBE7860D3574E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--F4F23BF40CD04B969BDCBE7860D3574E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F4F23BF40CD04B969BDCBE7860D3574E-->  <VALUE><![CDATA[ServicePriceRuleVersionNotFound]]></VALUE>
-<!--F4F23BF40CD04B969BDCBE7860D3574E-->  <MSGTEXT><![CDATA[No active and valid service price rule version found for Service Product:]]></MSGTEXT>
-<!--F4F23BF40CD04B969BDCBE7860D3574E-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
-<!--F4F23BF40CD04B969BDCBE7860D3574E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F4F23BF40CD04B969BDCBE7860D3574E-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--F4F23BF40CD04B969BDCBE7860D3574E--></AD_MESSAGE>
-
 <!--F572F66AA4F344769920F13B233D0B01--><AD_MESSAGE>
 <!--F572F66AA4F344769920F13B233D0B01-->  <AD_MESSAGE_ID><![CDATA[F572F66AA4F344769920F13B233D0B01]]></AD_MESSAGE_ID>
 <!--F572F66AA4F344769920F13B233D0B01-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>