--- a/src-db/database/model/tables/A_AMORTIZATION.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/A_AMORTIZATION.xml Wed Nov 14 19:42:13 2012 +0100
@@ -114,8 +114,8 @@
<foreign-key foreignTable="USER1" name="A_AMORTIZATION_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="A_AMORTIZATION_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="A_AMORTIZATION_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<check name="A_AMORTIZATION_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
</table>
--- a/src-db/database/model/tables/A_AMORTIZATIONLINE.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/A_AMORTIZATIONLINE.xml Wed Nov 14 19:42:13 2012 +0100
@@ -73,7 +73,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="C_USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <column name="USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
@@ -98,12 +98,12 @@
<foreign-key foreignTable="C_PROJECT" name="A_AMORTLINE_C_PROJECT">
<reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="A_AMORTLINE_C_USER2">
- <reference local="C_USER2_ID" foreign="C_USER2_ID"/>
- </foreign-key>
<foreign-key foreignTable="USER1" name="A_AMORTLINE_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
+ <foreign-key foreignTable="USER2" name="A_AMORTLINE_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
<check name="A_AMORTIZATIONL_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
</table>
</database>
--- a/src-db/database/model/tables/A_AMORTLINE_ACCTDIMENSION.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/A_AMORTLINE_ACCTDIMENSION.xml Wed Nov 14 19:42:13 2012 +0100
@@ -53,7 +53,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="C_USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <column name="USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
@@ -104,8 +104,8 @@
<foreign-key foreignTable="USER1" name="A_AMORTLINE_ACCTD_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="A_AMORTLINE_ACCTD_USER2">
- <reference local="C_USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="A_AMORTLINE_ACCTD_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<foreign-key foreignTable="AD_ORG" name="A_AMORTLINE_ACCTDIMENSION_A1">
<reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
--- a/src-db/database/model/tables/C_BUDGETLINE.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/C_BUDGETLINE.xml Wed Nov 14 19:42:13 2012 +0100
@@ -166,12 +166,12 @@
<foreign-key foreignTable="C_PERIOD" name="C_BUDGETLINE_C_PERIOD">
<reference local="C_PERIOD_ID" foreign="C_PERIOD_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="C_BUDGETLINE_C_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
- </foreign-key>
<foreign-key foreignTable="USER1" name="C_BUDGETLINE_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
+ <foreign-key foreignTable="USER2" name="C_BUDGETLINE_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
<foreign-key foreignTable="C_BPARTNER" name="C_BUSPARTNER_C_BUDGETLINE">
<reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
</foreign-key>
--- a/src-db/database/model/tables/C_CASH.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/C_CASH.xml Wed Nov 14 19:42:13 2012 +0100
@@ -122,12 +122,12 @@
<foreign-key foreignTable="C_PROJECT" name="C_CASH_C_PROJECT">
<reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="C_CASH_C_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
- </foreign-key>
<foreign-key foreignTable="USER1" name="C_CASH_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
+ <foreign-key foreignTable="USER2" name="C_CASH_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
<index name="C_CASH_UPDATED" unique="false">
<index-column name="UPDATED"/>
</index>
--- a/src-db/database/model/tables/C_DP_MANAGEMENT.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/C_DP_MANAGEMENT.xml Wed Nov 14 19:42:13 2012 +0100
@@ -114,11 +114,11 @@
<foreign-key foreignTable="C_PROJECT" name="C_DP_MANAGEMENT_C_PROJECT">
<reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="C_DP_MANAGEMENT_C_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
- </foreign-key>
<foreign-key foreignTable="USER1" name="C_DP_MANAGEMENT_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
+ <foreign-key foreignTable="USER2" name="C_DP_MANAGEMENT_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
</table>
</database>
--- a/src-db/database/model/tables/C_INVOICE.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/C_INVOICE.xml Wed Nov 14 19:42:13 2012 +0100
@@ -335,8 +335,8 @@
<foreign-key foreignTable="USER1" name="C_INVOICE_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="C_INVOICE_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="C_INVOICE_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<foreign-key foreignTable="FIN_PAYMENT_PRIORITY" name="FIN_INVOICE_PAYMENT_PRIORITY">
<reference local="FIN_PAYMENT_PRIORITY_ID" foreign="FIN_PAYMENT_PRIORITY_ID"/>
--- a/src-db/database/model/tables/C_INVOICELINE.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/C_INVOICELINE.xml Wed Nov 14 19:42:13 2012 +0100
@@ -205,7 +205,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="C_USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <column name="USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
@@ -275,8 +275,8 @@
<foreign-key foreignTable="USER1" name="C_INVOICELINE_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="C_INVOICELINE_USER2">
- <reference local="C_USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="C_INVOICELINE_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<index name="C_INVOICELINE_INOUTLINE" unique="false">
<index-column name="M_INOUTLINE_ID"/>
--- a/src-db/database/model/tables/C_INVOICELINE_ACCTDIMENSION.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/C_INVOICELINE_ACCTDIMENSION.xml Wed Nov 14 19:42:13 2012 +0100
@@ -104,8 +104,8 @@
<foreign-key foreignTable="USER1" name="C_INVOICELINE_ACCTD_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="C_INVOICELINE_ACCTD_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="C_INVOICELINE_ACCTD_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<foreign-key foreignTable="AD_ORG" name="C_INVOICELINE_ACCTDIMENSION_A1">
<reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
--- a/src-db/database/model/tables/C_ORDER.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/C_ORDER.xml Wed Nov 14 19:42:13 2012 +0100
@@ -385,9 +385,6 @@
<foreign-key foreignTable="C_RETURN_REASON" name="C_ORDER_C_RETURN_REASON">
<reference local="C_RETURN_REASON_ID" foreign="C_RETURN_REASON_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="C_ORDER_C_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
- </foreign-key>
<foreign-key foreignTable="C_BPARTNER" name="C_ORDER_DROPSHIP_BPARTNER">
<reference local="DROPSHIP_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
</foreign-key>
@@ -421,6 +418,9 @@
<foreign-key foreignTable="USER1" name="C_ORDER_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
+ <foreign-key foreignTable="USER2" name="C_ORDER_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
<foreign-key foreignTable="FIN_PAYMENT_PRIORITY" name="FIN_ORDER_PAYMENT_PRIORITY">
<reference local="FIN_PAYMENT_PRIORITY_ID" foreign="FIN_PAYMENT_PRIORITY_ID"/>
</foreign-key>
--- a/src-db/database/model/tables/C_ORDERLINE.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/C_ORDERLINE.xml Wed Nov 14 19:42:13 2012 +0100
@@ -237,7 +237,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="C_USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <column name="USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
@@ -287,9 +287,6 @@
<foreign-key foreignTable="C_UOM" name="C_ORDERLINE_C_UOM">
<reference local="C_UOM_ID" foreign="C_UOM_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="C_ORDERLINE_C_USER2">
- <reference local="C_USER2_ID" foreign="C_USER2_ID"/>
- </foreign-key>
<foreign-key foreignTable="M_INOUTLINE" name="C_ORDERLINE_INOUTLINE">
<reference local="M_INOUTLINE_ID" foreign="M_INOUTLINE_ID"/>
</foreign-key>
@@ -323,6 +320,9 @@
<foreign-key foreignTable="USER1" name="C_ORDERLINE_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
+ <foreign-key foreignTable="USER2" name="C_ORDERLINE_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
<foreign-key foreignTable="M_WAREHOUSE_RULE" name="C_ORDERLINE_WAREHOUSERULE">
<reference local="M_WAREHOUSE_RULE_ID" foreign="M_WAREHOUSE_RULE_ID"/>
</foreign-key>
--- a/src-db/database/model/tables/C_ORDERLINE_ACCTDIMENSION.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/C_ORDERLINE_ACCTDIMENSION.xml Wed Nov 14 19:42:13 2012 +0100
@@ -53,7 +53,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="C_USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <column name="USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
@@ -104,8 +104,8 @@
<foreign-key foreignTable="USER1" name="C_ORDERLINE_ACCTD_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="C_ORDERLINE_ACCTD_USER2">
- <reference local="C_USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="C_ORDERLINE_ACCTD_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<foreign-key foreignTable="AD_ORG" name="C_ORDERLINE_ACCTDIMENSION_A1">
<reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
--- a/src-db/database/model/tables/C_SETTLEMENT.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/C_SETTLEMENT.xml Wed Nov 14 19:42:13 2012 +0100
@@ -150,12 +150,12 @@
<foreign-key foreignTable="C_PROJECT" name="C_SETTLEMENT_C_PROJECT">
<reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="C_SETTLEMENT_C_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
- </foreign-key>
<foreign-key foreignTable="USER1" name="C_SETTLEMENT_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
+ <foreign-key foreignTable="USER2" name="C_SETTLEMENT_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
<index name="C_SETTLEMENT_UPDATED" unique="false">
<index-column name="UPDATED"/>
</index>
--- a/src-db/database/model/tables/C_USER2.xml Wed Nov 14 19:03:27 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
- <database name="TABLE C_USER2">
- <table name="C_USER2" primaryKey="C_USER2_KEY">
- <column name="C_USER2_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="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false">
- <default/>
- <onCreateDefault/>
- </column>
- <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
- <default/>
- <onCreateDefault/>
- </column>
- <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false">
- <default/>
- <onCreateDefault/>
- </column>
- <column name="ISSUMMARY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
- <default><![CDATA[N]]></default>
- <onCreateDefault/>
- </column>
- <foreign-key foreignTable="AD_CLIENT" name="C_USER2_AD_CLIENT">
- <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
- </foreign-key>
- <foreign-key foreignTable="AD_ORG" name="C_USER2_AD_ORG">
- <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
- </foreign-key>
- <unique name="C_USER2_VALUE">
- <unique-column name="AD_CLIENT_ID"/>
- <unique-column name="VALUE"/>
- </unique>
- <check name="C_USER2_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
- <check name="C_USER2_ISSUMMARY_CHK"><![CDATA[ISSUMMARY IN ('Y', 'N')]]></check>
- </table>
- </database>
--- a/src-db/database/model/tables/C_VALIDCOMBINATION.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/C_VALIDCOMBINATION.xml Wed Nov 14 19:42:13 2012 +0100
@@ -143,8 +143,8 @@
<foreign-key foreignTable="USER1" name="C_VALIDCOMBINATION_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="C_VALIDCOMBINATION_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="C_VALIDCOMBINATION_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<index name="C_VALIDCOMBINATION_ALIAS" unique="false">
<index-column name="AD_CLIENT_ID"/>
--- a/src-db/database/model/tables/FACT_ACCT.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/FACT_ACCT.xml Wed Nov 14 19:42:13 2012 +0100
@@ -273,8 +273,8 @@
<foreign-key foreignTable="USER1" name="FACT_ACCT_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="FACT_ACCT_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="FACT_ACCT_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<foreign-key foreignTable="M_PRODUCT" name="M_PRODUCT_FACT_ACCT">
<reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
--- a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Wed Nov 14 19:42:13 2012 +0100
@@ -181,8 +181,8 @@
<foreign-key foreignTable="USER1" name="FIN_FINACC_TRANS_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="FIN_FINACC_TRANS_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="FIN_FINACC_TRANS_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<foreign-key foreignTable="FIN_FINANCIAL_ACCOUNT" name="FIN_FINANCIAL_TRANSACTION">
<reference local="FIN_FINANCIAL_ACCOUNT_ID" foreign="FIN_FINANCIAL_ACCOUNT_ID"/>
--- a/src-db/database/model/tables/FIN_PAYMENT.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/FIN_PAYMENT.xml Wed Nov 14 19:42:13 2012 +0100
@@ -177,8 +177,8 @@
<foreign-key foreignTable="USER1" name="FIN_PAYMENT_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="FIN_PAYMENT_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="FIN_PAYMENT_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<check name="FIN_PAYMENT_BP_CREDIT_CHECK"><![CDATA[((C_BPARTNER_ID IS NULL) AND (COALESCE(GENERATED_CREDIT, 0) = 0)) OR (C_BPARTNER_ID IS NOT NULL)]]></check>
<check name="FIN_PAYMENT_CREATE_ALGORIT_CHK"><![CDATA[CREATEDBYALGORITHM IN ('Y', 'N')]]></check>
--- a/src-db/database/model/tables/GL_JOURNAL.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/GL_JOURNAL.xml Wed Nov 14 19:42:13 2012 +0100
@@ -178,8 +178,8 @@
<foreign-key foreignTable="USER1" name="GL_JOURNAL_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="GL_JOURNAL_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="GL_JOURNAL_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<unique name="GL_JOURNAL_DOCNO">
<unique-column name="AD_ORG_ID"/>
--- a/src-db/database/model/tables/GL_JOURNALLINE.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/GL_JOURNALLINE.xml Wed Nov 14 19:42:13 2012 +0100
@@ -185,8 +185,8 @@
<foreign-key foreignTable="USER1" name="GL_JOURNALLINE_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="GL_JOURNALLINE_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="GL_JOURNALLINE_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<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>
--- a/src-db/database/model/tables/M_INOUT.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/M_INOUT.xml Wed Nov 14 19:42:13 2012 +0100
@@ -304,9 +304,6 @@
<foreign-key foreignTable="C_PROJECT" name="M_INOUT_C_PROJECT">
<reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="M_INOUT_C_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
- </foreign-key>
<foreign-key foreignTable="M_CONDITION_GOODS" name="M_INOUT_CONDITION">
<reference local="M_CONDITION_GOODS_ID" foreign="M_CONDITION_GOODS_ID"/>
</foreign-key>
@@ -325,6 +322,9 @@
<foreign-key foreignTable="USER1" name="M_INOUT_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
+ <foreign-key foreignTable="USER2" name="M_INOUT_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
<index name="M_INOUT_BPARTNER" unique="false">
<index-column name="C_BPARTNER_ID"/>
</index>
--- a/src-db/database/model/tables/M_INOUTLINE.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/M_INOUTLINE.xml Wed Nov 14 19:42:13 2012 +0100
@@ -101,7 +101,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="C_USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <column name="USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
@@ -144,9 +144,6 @@
<foreign-key foreignTable="C_UOM" name="M_INOUTLINE_C_UOM">
<reference local="C_UOM_ID" foreign="C_UOM_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="M_INOUTLINE_C_USER2">
- <reference local="C_USER2_ID" foreign="C_USER2_ID"/>
- </foreign-key>
<foreign-key foreignTable="M_INOUTLINE" name="M_INOUTLINE_CANCELED_INOUTLINE">
<reference local="CANCELED_INOUTLINE_ID" foreign="M_INOUTLINE_ID"/>
</foreign-key>
@@ -168,6 +165,9 @@
<foreign-key foreignTable="USER1" name="M_INOUTLINE_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
+ <foreign-key foreignTable="USER2" name="M_INOUTLINE_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
<index name="M_INOUTLINE_INOUT" unique="false">
<index-column name="M_INOUT_ID"/>
</index>
--- a/src-db/database/model/tables/M_INOUTLINE_ACCTDIMENSION.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/M_INOUTLINE_ACCTDIMENSION.xml Wed Nov 14 19:42:13 2012 +0100
@@ -53,7 +53,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="C_USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <column name="USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
@@ -104,8 +104,8 @@
<foreign-key foreignTable="USER1" name="M_INOUTLINE_ACCTD_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="M_INOUTLINE_ACCTD_USER2">
- <reference local="C_USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="M_INOUTLINE_ACCTD_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<foreign-key foreignTable="AD_ORG" name="M_INOUTLINE_ACCTDIMENSION_A1">
<reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
--- a/src-db/database/model/tables/M_INVENTORY.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/M_INVENTORY.xml Wed Nov 14 19:42:13 2012 +0100
@@ -117,8 +117,8 @@
<foreign-key foreignTable="USER1" name="M_INVENTORY_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="M_INVENTORY_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
+ <foreign-key foreignTable="USER2" name="M_INVENTORY_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
</foreign-key>
<check name="M_INVENTORY_GENERATELIST_CHK"><![CDATA[GENERATELIST IN ('Y', 'N')]]></check>
<check name="M_INVENTORY_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
--- a/src-db/database/model/tables/M_MOVEMENT.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/M_MOVEMENT.xml Wed Nov 14 19:42:13 2012 +0100
@@ -107,12 +107,12 @@
<foreign-key foreignTable="C_PROJECT" name="M_MOVEMENT_C_PROJECT">
<reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="M_MOVEMENT_C_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
- </foreign-key>
<foreign-key foreignTable="USER1" name="M_MOVEMENT_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
+ <foreign-key foreignTable="USER2" name="M_MOVEMENT_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
<check name="M_MOVEMENT_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
<check name="M_MOVEMENT_MOVE_FROMTO_LOC_CHK"><![CDATA[MOVE_FROMTO_LOCATOR IN ('Y', 'N')]]></check>
<check name="M_MOVEMENT_PROCESSED_CHK"><![CDATA[PROCESSED IN ('Y', 'N')]]></check>
--- a/src-db/database/model/tables/M_PRODUCTION.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/model/tables/M_PRODUCTION.xml Wed Nov 14 19:42:13 2012 +0100
@@ -123,12 +123,12 @@
<foreign-key foreignTable="C_PROJECT" name="M_PRODUCTION_C_PROJECT">
<reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
</foreign-key>
- <foreign-key foreignTable="C_USER2" name="M_PRODUCTION_C_USER2">
- <reference local="USER2_ID" foreign="C_USER2_ID"/>
- </foreign-key>
<foreign-key foreignTable="USER1" name="M_PRODUCTION_USER1">
<reference local="USER1_ID" foreign="USER1_ID"/>
</foreign-key>
+ <foreign-key foreignTable="USER2" name="M_PRODUCTION_USER2">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
<check name="M_PRODUCTION_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
<check name="M_PRODUCTION_ISCREATED_CHECK"><![CDATA[ISCREATED IN ('Y', 'N')]]></check>
<check name="M_PRODUCTION_PROCESSED_CHECK"><![CDATA[PROCESSED IN ('Y', 'N')]]></check>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/USER2.xml Wed Nov 14 19:42:13 2012 +0100
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+ <database name="TABLE USER2">
+ <table name="USER2" primaryKey="USER2_KEY">
+ <column name="USER2_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="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ISSUMMARY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault/>
+ </column>
+ <foreign-key foreignTable="AD_CLIENT" name="USER2_AD_CLIENT">
+ <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="AD_ORG" name="USER2_AD_ORG">
+ <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+ </foreign-key>
+ <unique name="USER2_VALUE">
+ <unique-column name="AD_CLIENT_ID"/>
+ <unique-column name="VALUE"/>
+ </unique>
+ <check name="USER2_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+ <check name="USER2_ISSUMMARY_CHK"><![CDATA[ISSUMMARY IN ('Y', 'N')]]></check>
+ </table>
+ </database>
--- a/src-db/database/model/triggers/C_USER2_TRG.xml Wed Nov 14 19:03:27 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
- <database name="TRIGGER C_USER2_TRG">
- <trigger name="C_USER2_TRG" table="C_USER2" fires="after" insert="true" update="true" 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) 2012 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
-
- -- Create TreeNode --
- SELECT c.AD_Tree_User2_ID
- INTO v_Tree_ID
- FROM AD_ClientInfo c
- WHERE c.AD_Client_ID=:new.AD_Client_ID;
-
- -- 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, :new.AD_Org_ID, :new.IsActive,
- :new.Created, :new.CreatedBy, :new.Updated,
- :new.UpdatedBy, v_Tree_ID, :new.C_User2_ID,
- '0',(
- CASE :new.IsSummary
- WHEN 'Y'
- THEN 100
- ELSE 999
- END
- )
- );
-
- ELSIF (DELETING) THEN
- -- Delete TreeNode --
- -- get AD_Tree_ID
- SELECT c.AD_Tree_User2_ID
- INTO v_Tree_ID
- FROM AD_ClientInfo c
- WHERE c.AD_Client_ID=:old.AD_Client_ID;
-
- SELECT COUNT(*)
- INTO v_count
- FROM AD_TREENODE
- WHERE parent_id=:old.C_User2_ID
- AND AD_TREE_ID=v_Tree_ID;
-
- IF(v_count>0) THEN
- RAISE_APPLICATION_ERROR(-20000, '@DimensionHasChildren@');
- 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.C_User2_ID;
- END IF;
-END C_USER2_TRG
-]]></body>
- </trigger>
- </database>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/triggers/USER2_TRG.xml Wed Nov 14 19:42:13 2012 +0100
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+ <database name="TRIGGER USER2_TRG">
+ <trigger name="USER2_TRG" table="USER2" fires="after" insert="true" update="true" 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) 2012 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
+
+ -- Create TreeNode --
+ SELECT c.AD_Tree_User2_ID
+ INTO v_Tree_ID
+ FROM AD_ClientInfo c
+ WHERE c.AD_Client_ID=:new.AD_Client_ID;
+
+ -- 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, :new.AD_Org_ID, :new.IsActive,
+ :new.Created, :new.CreatedBy, :new.Updated,
+ :new.UpdatedBy, v_Tree_ID, :new.User2_ID,
+ '0',(
+ CASE :new.IsSummary
+ WHEN 'Y'
+ THEN 100
+ ELSE 999
+ END
+ )
+ );
+
+ ELSIF (DELETING) THEN
+ -- Delete TreeNode --
+ -- get AD_Tree_ID
+ SELECT c.AD_Tree_User2_ID
+ INTO v_Tree_ID
+ FROM AD_ClientInfo c
+ WHERE c.AD_Client_ID=:old.AD_Client_ID;
+
+ SELECT COUNT(*)
+ INTO v_count
+ FROM AD_TREENODE
+ WHERE parent_id=:old.User2_ID
+ AND AD_TREE_ID=v_Tree_ID;
+
+ IF(v_count>0) THEN
+ RAISE_APPLICATION_ERROR(-20000, '@DimensionHasChildren@');
+ 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.User2_ID;
+ END IF;
+END USER2_TRG
+]]></body>
+ </trigger>
+ </database>
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Nov 14 19:42:13 2012 +0100
@@ -224888,7 +224888,7 @@
<!--2196ADEA92B24FDEA41EFB04AA5DBE66--> <NAME><![CDATA[2nd Dimension]]></NAME>
<!--2196ADEA92B24FDEA41EFB04AA5DBE66--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
<!--2196ADEA92B24FDEA41EFB04AA5DBE66--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
-<!--2196ADEA92B24FDEA41EFB04AA5DBE66--> <COLUMNNAME><![CDATA[C_User2_ID]]></COLUMNNAME>
+<!--2196ADEA92B24FDEA41EFB04AA5DBE66--> <COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
<!--2196ADEA92B24FDEA41EFB04AA5DBE66--> <AD_TABLE_ID><![CDATA[7103F2A1BBE64BE5A7EF75F0E9315D69]]></AD_TABLE_ID>
<!--2196ADEA92B24FDEA41EFB04AA5DBE66--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
<!--2196ADEA92B24FDEA41EFB04AA5DBE66--> <AD_REFERENCE_VALUE_ID><![CDATA[0E0D1661E18E4E05A118785A7CF146B8]]></AD_REFERENCE_VALUE_ID>
@@ -232943,7 +232943,7 @@
<!--52754591BC824E07885F5D9985A8D5DF--> <NAME><![CDATA[2nd Dimension]]></NAME>
<!--52754591BC824E07885F5D9985A8D5DF--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
<!--52754591BC824E07885F5D9985A8D5DF--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
-<!--52754591BC824E07885F5D9985A8D5DF--> <COLUMNNAME><![CDATA[C_User2_ID]]></COLUMNNAME>
+<!--52754591BC824E07885F5D9985A8D5DF--> <COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
<!--52754591BC824E07885F5D9985A8D5DF--> <AD_TABLE_ID><![CDATA[61F97E1F887D4167A7795FF67A921D91]]></AD_TABLE_ID>
<!--52754591BC824E07885F5D9985A8D5DF--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
<!--52754591BC824E07885F5D9985A8D5DF--> <AD_REFERENCE_VALUE_ID><![CDATA[0E0D1661E18E4E05A118785A7CF146B8]]></AD_REFERENCE_VALUE_ID>
@@ -233590,7 +233590,7 @@
<!--5614E4E936C2456586AD9C7F3247283F--> <NAME><![CDATA[2nd Dimension]]></NAME>
<!--5614E4E936C2456586AD9C7F3247283F--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
<!--5614E4E936C2456586AD9C7F3247283F--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
-<!--5614E4E936C2456586AD9C7F3247283F--> <COLUMNNAME><![CDATA[C_User2_ID]]></COLUMNNAME>
+<!--5614E4E936C2456586AD9C7F3247283F--> <COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
<!--5614E4E936C2456586AD9C7F3247283F--> <AD_TABLE_ID><![CDATA[7309051A30494738A6CFBA1CBA50DF6D]]></AD_TABLE_ID>
<!--5614E4E936C2456586AD9C7F3247283F--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
<!--5614E4E936C2456586AD9C7F3247283F--> <AD_REFERENCE_VALUE_ID><![CDATA[0E0D1661E18E4E05A118785A7CF146B8]]></AD_REFERENCE_VALUE_ID>
@@ -234790,7 +234790,7 @@
<!--569D91AEB07C42C69831058080FEE7F6--> <NAME><![CDATA[2nd Dimension]]></NAME>
<!--569D91AEB07C42C69831058080FEE7F6--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
<!--569D91AEB07C42C69831058080FEE7F6--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
-<!--569D91AEB07C42C69831058080FEE7F6--> <COLUMNNAME><![CDATA[C_User2_ID]]></COLUMNNAME>
+<!--569D91AEB07C42C69831058080FEE7F6--> <COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
<!--569D91AEB07C42C69831058080FEE7F6--> <AD_TABLE_ID><![CDATA[333]]></AD_TABLE_ID>
<!--569D91AEB07C42C69831058080FEE7F6--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
<!--569D91AEB07C42C69831058080FEE7F6--> <AD_REFERENCE_VALUE_ID><![CDATA[0E0D1661E18E4E05A118785A7CF146B8]]></AD_REFERENCE_VALUE_ID>
@@ -251747,7 +251747,7 @@
<!--69EFBAC452404EDCA43212FA04D9464D--> <NAME><![CDATA[2nd Dimension]]></NAME>
<!--69EFBAC452404EDCA43212FA04D9464D--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
<!--69EFBAC452404EDCA43212FA04D9464D--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
-<!--69EFBAC452404EDCA43212FA04D9464D--> <COLUMNNAME><![CDATA[C_User2_ID]]></COLUMNNAME>
+<!--69EFBAC452404EDCA43212FA04D9464D--> <COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
<!--69EFBAC452404EDCA43212FA04D9464D--> <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
<!--69EFBAC452404EDCA43212FA04D9464D--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
<!--69EFBAC452404EDCA43212FA04D9464D--> <AD_REFERENCE_VALUE_ID><![CDATA[0E0D1661E18E4E05A118785A7CF146B8]]></AD_REFERENCE_VALUE_ID>
@@ -252135,7 +252135,7 @@
<!--6C4D8B6F831947FEAE47B218DD43E9D2--> <NAME><![CDATA[2nd Dimension]]></NAME>
<!--6C4D8B6F831947FEAE47B218DD43E9D2--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
<!--6C4D8B6F831947FEAE47B218DD43E9D2--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
-<!--6C4D8B6F831947FEAE47B218DD43E9D2--> <COLUMNNAME><![CDATA[C_User2_ID]]></COLUMNNAME>
+<!--6C4D8B6F831947FEAE47B218DD43E9D2--> <COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
<!--6C4D8B6F831947FEAE47B218DD43E9D2--> <AD_TABLE_ID><![CDATA[EADDFEC95B5841D881BBA81A8D942CD2]]></AD_TABLE_ID>
<!--6C4D8B6F831947FEAE47B218DD43E9D2--> <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
<!--6C4D8B6F831947FEAE47B218DD43E9D2--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
@@ -283678,7 +283678,7 @@
<!--A0D07DC8AC204F4FB743ED217BFDBB81--> <NAME><![CDATA[2nd Dimension]]></NAME>
<!--A0D07DC8AC204F4FB743ED217BFDBB81--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
<!--A0D07DC8AC204F4FB743ED217BFDBB81--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
-<!--A0D07DC8AC204F4FB743ED217BFDBB81--> <COLUMNNAME><![CDATA[C_User2_ID]]></COLUMNNAME>
+<!--A0D07DC8AC204F4FB743ED217BFDBB81--> <COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
<!--A0D07DC8AC204F4FB743ED217BFDBB81--> <AD_TABLE_ID><![CDATA[320]]></AD_TABLE_ID>
<!--A0D07DC8AC204F4FB743ED217BFDBB81--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
<!--A0D07DC8AC204F4FB743ED217BFDBB81--> <AD_REFERENCE_VALUE_ID><![CDATA[0E0D1661E18E4E05A118785A7CF146B8]]></AD_REFERENCE_VALUE_ID>
@@ -292805,7 +292805,7 @@
<!--B96201EC1EC945309D886057D484C07D--> <NAME><![CDATA[2nd Dimension]]></NAME>
<!--B96201EC1EC945309D886057D484C07D--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
<!--B96201EC1EC945309D886057D484C07D--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
-<!--B96201EC1EC945309D886057D484C07D--> <COLUMNNAME><![CDATA[C_User2_ID]]></COLUMNNAME>
+<!--B96201EC1EC945309D886057D484C07D--> <COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
<!--B96201EC1EC945309D886057D484C07D--> <AD_TABLE_ID><![CDATA[800061]]></AD_TABLE_ID>
<!--B96201EC1EC945309D886057D484C07D--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
<!--B96201EC1EC945309D886057D484C07D--> <AD_REFERENCE_VALUE_ID><![CDATA[0E0D1661E18E4E05A118785A7CF146B8]]></AD_REFERENCE_VALUE_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Wed Nov 14 19:42:13 2012 +0100
@@ -29026,7 +29026,7 @@
<!--BDC51EB4B3284866A2919ED98022A14F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--BDC51EB4B3284866A2919ED98022A14F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--BDC51EB4B3284866A2919ED98022A14F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--BDC51EB4B3284866A2919ED98022A14F--> <COLUMNNAME><![CDATA[C_User2_ID]]></COLUMNNAME>
+<!--BDC51EB4B3284866A2919ED98022A14F--> <COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
<!--BDC51EB4B3284866A2919ED98022A14F--> <NAME><![CDATA[2nd Dimension]]></NAME>
<!--BDC51EB4B3284866A2919ED98022A14F--> <PRINTNAME><![CDATA[2nd Dimension]]></PRINTNAME>
<!--BDC51EB4B3284866A2919ED98022A14F--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
--- a/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml Wed Nov 14 19:42:13 2012 +0100
@@ -108,6 +108,15 @@
<!--CDD7216821494D928ED06EB7B50147CB--> <NAME><![CDATA[AU]]></NAME>
<!--CDD7216821494D928ED06EB7B50147CB--></AD_MODULE_DBPREFIX>
+<!--D32EE74546764BE5ABC1308742A16655--><AD_MODULE_DBPREFIX>
+<!--D32EE74546764BE5ABC1308742A16655--> <AD_MODULE_DBPREFIX_ID><![CDATA[D32EE74546764BE5ABC1308742A16655]]></AD_MODULE_DBPREFIX_ID>
+<!--D32EE74546764BE5ABC1308742A16655--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D32EE74546764BE5ABC1308742A16655--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D32EE74546764BE5ABC1308742A16655--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D32EE74546764BE5ABC1308742A16655--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D32EE74546764BE5ABC1308742A16655--> <NAME><![CDATA[USER2]]></NAME>
+<!--D32EE74546764BE5ABC1308742A16655--></AD_MODULE_DBPREFIX>
+
<!--D4A069FA951611DD8D54001B388C61A4--><AD_MODULE_DBPREFIX>
<!--D4A069FA951611DD8D54001B388C61A4--> <AD_MODULE_DBPREFIX_ID><![CDATA[D4A069FA951611DD8D54001B388C61A4]]></AD_MODULE_DBPREFIX_ID>
<!--D4A069FA951611DD8D54001B388C61A4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml Wed Nov 14 19:42:13 2012 +0100
@@ -4439,7 +4439,7 @@
<!--3AE2B2C5C5F640EC83A5E77B0484C316--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--3AE2B2C5C5F640EC83A5E77B0484C316--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--3AE2B2C5C5F640EC83A5E77B0484C316--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3AE2B2C5C5F640EC83A5E77B0484C316--> <NAME><![CDATA[C_User2]]></NAME>
+<!--3AE2B2C5C5F640EC83A5E77B0484C316--> <NAME><![CDATA[User2]]></NAME>
<!--3AE2B2C5C5F640EC83A5E77B0484C316--> <DESCRIPTION><![CDATA[Refers the user dimension 2 table]]></DESCRIPTION>
<!--3AE2B2C5C5F640EC83A5E77B0484C316--> <HELP><![CDATA[Refers the user dimension 2 table]]></HELP>
<!--3AE2B2C5C5F640EC83A5E77B0484C316--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
--- a/src-db/database/sourcedata/AD_TABLE.xml Wed Nov 14 19:03:27 2012 +0100
+++ b/src-db/database/sourcedata/AD_TABLE.xml Wed Nov 14 19:42:13 2012 +0100
@@ -10212,7 +10212,7 @@
<!--EADDFEC95B5841D881BBA81A8D942CD2--> <NAME><![CDATA[UserDimension2]]></NAME>
<!--EADDFEC95B5841D881BBA81A8D942CD2--> <DESCRIPTION><![CDATA[User Defined Dimension 2]]></DESCRIPTION>
<!--EADDFEC95B5841D881BBA81A8D942CD2--> <HELP><![CDATA[User Defined Dimension 2]]></HELP>
-<!--EADDFEC95B5841D881BBA81A8D942CD2--> <TABLENAME><![CDATA[C_User2]]></TABLENAME>
+<!--EADDFEC95B5841D881BBA81A8D942CD2--> <TABLENAME><![CDATA[User2]]></TABLENAME>
<!--EADDFEC95B5841D881BBA81A8D942CD2--> <CLASSNAME><![CDATA[UserDimension2]]></CLASSNAME>
<!--EADDFEC95B5841D881BBA81A8D942CD2--> <ISVIEW><![CDATA[N]]></ISVIEW>
<!--EADDFEC95B5841D881BBA81A8D942CD2--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Wed Nov 14 19:03:27 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Wed Nov 14 19:42:13 2012 +0100
@@ -1608,7 +1608,7 @@
priceStd, lineNetAmt.toString(), priceGross, grossAmt.toString(),
priceListGross.toString(), priceStdGross.toString(), isDeferred, planType,
periodNumber, startingPeriodId,
- data[i].aAssetId, data[i].cProjectId, data[i].cCostcenterId, data[i].user1Id, data[i].cUser2Id);
+ data[i].aAssetId, data[i].cProjectId, data[i].cCostcenterId, data[i].user1Id, data[i].user2Id);
if (!data[i].mInoutlineId.isEmpty() && strType.equals("SHIPMENT")) {
CreateFromInvoiceData.insertShipmentAcctDimension(conn, this, strSequence,
@@ -1810,7 +1810,7 @@
CreateFromShipmentData.isInvoiced(conn, this, data[i].cInvoicelineId),
(qtyIsNegative ? "-" + total : total), data[i].mProductUomId,
strmAttributesetinstanceId, data[i].aAssetId, data[i].cProjectId,
- data[i].cCostcenterId, data[i].user1Id, data[i].cUser2Id);
+ data[i].cCostcenterId, data[i].user1Id, data[i].user2Id);
if (strType.equals("INVOICE") && !data[i].cInvoicelineId.isEmpty()) {
CreateFromShipmentData.insertInvoiceAcctDimension(conn, this, strSequence,
@@ -1841,7 +1841,7 @@
CreateFromShipmentData.isInvoiced(conn, this, data[i].cInvoicelineId),
strQuantityorder, strProductUomId, strmAttributesetinstanceId,
data[i].aAssetId, data[i].cProjectId, data[i].cCostcenterId, data[i].user1Id,
- data[i].cUser2Id);
+ data[i].user2Id);
if (strType.equals("INVOICE") && !data[i].cInvoicelineId.isEmpty()) {
CreateFromShipmentData.insertInvoiceAcctDimension(conn, this, strSequence,
@@ -2015,7 +2015,7 @@
CreateFromShipmentData.isInvoiced(conn, this, data[i].cInvoicelineId),
(qtyIsNegative ? "-" + total : total), data[i].mProductUomId,
data[i].mAttributesetinstanceId, data[i].aAssetId, data[i].cProjectId,
- data[i].cCostcenterId, data[i].user1Id, data[i].cUser2Id);
+ data[i].cCostcenterId, data[i].user1Id, data[i].user2Id);
if (strType.equals("INVOICE") && !data[i].cInvoicelineId.isEmpty()) {
CreateFromShipmentData.insertInvoiceAcctDimension(conn, this, strSequence,
@@ -2047,7 +2047,7 @@
CreateFromShipmentData.isInvoiced(conn, this, data[i].cInvoicelineId),
data[i].quantityorder, data[i].mProductUomId, data[i].mAttributesetinstanceId,
data[i].aAssetId, data[i].cProjectId, data[i].cCostcenterId, data[i].user1Id,
- data[i].cUser2Id);
+ data[i].user2Id);
if (strType.equals("INVOICE") && !data[i].cInvoicelineId.isEmpty()) {
CreateFromShipmentData.insertInvoiceAcctDimension(conn, this, strSequence,
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql Wed Nov 14 19:03:27 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql Wed Nov 14 19:42:13 2012 +0100
@@ -38,7 +38,7 @@
'' as M_InOutLine_ID, '' AS PriceActual, '' AS PriceList, '' AS PriceLimit, '' AS Description, '' as PriceStd,
'' AS QUANTITYORDER, '' AS M_Product_UOM_ID, '' AS M_ATTRIBUTESETINSTANCE_ID, '' AS M_Offer_ID, '' AS PricePrecision,
l.taxbaseamt, l.CancelPriceAD, '' AS Rate, '' AS gross_unit_price, '' AS grosspricelist, '' AS grosspricestd,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM C_ORDERLINE l left join M_MATCHPO m on l.C_OrderLine_ID=m.C_OrderLine_ID
AND m.C_InvoiceLine_ID IS NOT NULL,
C_ORDER o, C_UOM uom, M_PRODUCT p
@@ -58,7 +58,7 @@
HAVING (SUM(COALESCE(CI.QtyINVOICED, 0))-(COALESCE(CO.QtyORDERED,0)-SUM(COALESCE(m.Qty,0)))) >= 0 )
GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal, l.QtyOrdered,l.C_UOM_ID,
uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID, l.ad_org_id, l.taxbaseamt,l.CancelPriceAD,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
HAVING (l.QtyOrdered-SUM(COALESCE(m.Qty,0))) <> 0
ORDER BY NAME, l.Line
]]>
@@ -106,7 +106,7 @@
SELECT o.C_ORDER_ID as ID, Ad_Column_Identifier(to_char('C_Order'), to_char(o.c_order_id), to_char(?)) AS NAME,o.DocumentNo AS NAMEORDER,
l.QtyOrdered-COALESCE(l.QTYINVOICED,0) AS QTY, l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,
Ad_Column_Identifier(to_char('M_Product'), to_char(l.m_product_id), to_char(?)) AS RELATION_NAME,
- l.C_OrderLine_ID,l.Line, l.ad_Org_id, l.taxbaseamt, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.C_OrderLine_ID,l.Line, l.ad_Org_id, l.taxbaseamt, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM C_INVOICE_CANDIDATE_V ic, C_UOM uom, C_ORDER o, C_ORDERLINE l, M_PRODUCT p
WHERE l.C_UOM_ID=uom.C_UOM_ID
AND o.C_ORDER_ID = ic.C_ORDER_ID
@@ -117,7 +117,7 @@
AND ic.C_Order_ID = ?
GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal, l.QtyOrdered,
l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID, l.QTYINVOICED, l.ad_org_id,
- l.taxbaseamt, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.taxbaseamt, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
ORDER BY NAME, l.Line
]]>
</Sql>
@@ -241,10 +241,10 @@
A.C_OrderLine_ID,A.Line, uom.stdprecision AS stdprecision, cur.priceprecision,
B.M_InOutLine_ID, A.Description, (CASE WHEN B.M_InOutLine_ID IS NULL THEN A.quantityOrder ELSE B.quantityOrder END) AS quantityOrder,
(CASE WHEN B.M_InOutLine_ID IS NULL THEN A.M_Product_UOM_ID ELSE B.M_Product_UOM_ID END) AS M_Product_UOM_ID, A.M_ATTRIBUTESETINSTANCE_ID, A.ad_org_id,
- A.taxbaseamt, A.a_asset_id, A.c_project_id, A.c_costcenter_id, A.user1_id, A.c_user2_id
+ A.taxbaseamt, A.a_asset_id, A.c_project_id, A.c_costcenter_id, A.user1_id, A.user2_id
FROM c_currency cur,C_UOM uom, M_PRODUCT p,
(SELECT l.a_asset_id, l.c_project_id, l.c_costcenter_id,
- l.user1_id, l.c_user2_id, l.ad_org_id,l.C_CURRENCY_ID,l.C_UOM_ID, l.M_Product_ID, l.Line, l.Description, l.C_OrderLine_ID, (l.QtyOrdered-SUM(COALESCE(mp.Qty,0))-
+ l.user1_id, l.user2_id, l.ad_org_id,l.C_CURRENCY_ID,l.C_UOM_ID, l.M_Product_ID, l.Line, l.Description, l.C_OrderLine_ID, (l.QtyOrdered-SUM(COALESCE(mp.Qty,0))-
COALESCE((SELECT SUM(COALESCE(CI.QtyINVOICED, 0))
FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID
WHERE CI.C_INVOICE_ID=? AND CO.C_ORDERLINE_ID = l.c_orderline_id
@@ -257,7 +257,7 @@
FROM C_ORDERLINE l left join M_MATCHPO mp on l.C_OrderLine_ID=mp.C_OrderLine_ID
and mp.C_InvoiceLine_ID IS NOT NULL
GROUP BY l.ad_org_id,l.C_CURRENCY_ID,l.C_UOM_ID, l.M_Product_ID, l.Line, l.Description, l.C_OrderLine_ID, l.QtyOrdered, l.quantityOrder, l.M_Product_UOM_ID,
- l.M_ATTRIBUTESETINSTANCE_ID, l.taxbaseamt, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id) A left join
+ l.M_ATTRIBUTESETINSTANCE_ID, l.taxbaseamt, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id) A left join
(SELECT il.M_InOutLine_ID, il.C_OrderLine_ID, (il.MovementQty-SUM(COALESCE(mi.Qty,0))) AS QTY,
il.quantityOrder*C_DIVIDE((il.MovementQty-SUM(COALESCE(mi.Qty,0))),(il.MovementQty)) as quantityOrder, il.M_Product_UOM_ID
FROM M_INOUTLINE il left join M_MATCHINV mi on il.M_InOutLine_ID=mi.M_InOutLine_ID,
@@ -287,7 +287,7 @@
l.C_OrderLine_ID,l.Line, max(uom.stdprecision) AS stdprecision, cur.priceprecision, il.M_InOutLine_ID as M_InOutLine_ID, l.Description,
(CASE WHEN il.M_INOUTLINE_ID IS NULL THEN l.quantityOrder*C_DIVIDE((l.QtyOrdered-COALESCE(l.QTYINVOICED ,0)),(l.QtyOrdered)) ELSE il.quantityOrder END) AS quantityOrder,
(CASE WHEN il.M_INOUTLINE_ID IS NULL THEN l.M_Product_UOM_ID ELSE il.M_Product_UOM_ID END) AS M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id,
- l.taxbaseamt, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.taxbaseamt, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM C_ORDERLINE l left join (SELECT M_InOutLine.* FROM M_InOutLine, M_InOut
WHERE M_InOut.M_InOut_ID = M_InOutLine.M_InOut_ID
AND M_InOutLine.IsInvoiced = 'N'
@@ -298,7 +298,7 @@
GROUP BY l.QtyOrdered,l.qtydelivered,l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID,
l.QTYINVOICED, il.M_InOutLine_ID, il.MovementQty, l.Description, l.quantityOrder, il.quantityOrder,
l.M_Product_UOM_ID, il.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID,l.ad_org_id, cur.priceprecision,
- l.taxbaseamt, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.taxbaseamt, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
HAVING (l.QtyOrdered-COALESCE(l.QTYINVOICED ,0)) <> 0
ORDER BY l.Line
]]>
@@ -459,7 +459,7 @@
s.DocumentNo AS NAMESHIPMENT,
(l.MovementQty-SUM(COALESCE(mi.Qty,0))) AS QTY, l.C_UOM_ID, COALESCE(uomt.UOMSymbol, uom.UOMSymbol) AS UOMSymbol,
l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'), to_char(l.m_product_id), to_char(?))||' '||(CASE WHEN ma.serno IS NOT NULL THEN TO_CHAR('('||' '||ma.serno||' '||')') ELSE TO_CHAR('') END) AS RELATION_NAME, l.M_InOutLine_ID,l.Line, l.M_InOutLine_ID as C_OrderLine_ID,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM M_INOUTLINE l
left join M_ATTRIBUTESETINSTANCE ma on l.M_ATTRIBUTESETINSTANCE_ID = ma.M_ATTRIBUTESETINSTANCE_ID
left join M_MATCHINV mi on l.M_InOutLine_ID=mi.M_InOutLine_ID
@@ -480,7 +480,7 @@
AND (l.c_orderline_id is null OR pl.istaxincluded = ?)
GROUP BY s.M_InOut_ID, s.DocumentNo, s.MovementDate, l.MovementQty,l.C_UOM_ID,uom.UOMSymbol, uomt.UOMSymbol,
l.M_Product_ID,p.NAME, ma.serno, l.M_InOutLine_ID,l.Line,l.C_OrderLine_ID,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
HAVING (l.MovementQty-SUM(COALESCE(mi.Qty,0))) <> 0
ORDER BY NAME, l.Line
]]>
@@ -502,7 +502,7 @@
s.DocumentNo AS NAMESHIPMENT,
l.MovementQty AS QTY, l.C_UOM_ID,COALESCE(uomt.UOMSymbol, uom.UOMSymbol) AS UOMSymbol,
l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'), to_char(l.m_product_id), to_char(?))||' '|| (CASE WHEN ma.serno IS NOT NULL THEN TO_CHAR('('||' '||ma.serno||' '||')') ELSE TO_CHAR('') END) AS RELATION_NAME, l.M_InOutLine_ID,l.Line, l.M_InOutLine_ID as C_OrderLine_ID,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM M_INOUTLINE l
left join M_ATTRIBUTESETINSTANCE ma on l.M_ATTRIBUTESETINSTANCE_ID = ma.M_ATTRIBUTESETINSTANCE_ID
left join c_orderline ol on l.c_orderline_id = ol.c_orderline_id
@@ -523,7 +523,7 @@
AND (l.c_orderline_id is null OR pl.istaxincluded = ?)
GROUP BY s.M_InOut_ID, s.DocumentNo, s.MovementDate, l.MovementQty,l.C_UOM_ID,uom.UOMSymbol, uomt.UOMSymbol,
l.M_Product_ID,p.NAME,ma.serno, l.M_InOutLine_ID,l.Line,l.C_OrderLine_ID,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
ORDER BY NAME, l.Line
]]>
</Sql>
@@ -543,14 +543,14 @@
SELECT (l.MovementQty-SUM(COALESCE(mi.Qty,0))) AS ID, l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'), to_char(l.m_product_id), to_char(?)) AS NAME,
l.M_InOutLine_ID,l.Line, l.C_OrderLine_ID, max(uom.STDPRECISION) as stdprecision, l.Description, l.quantityOrder*C_DIVIDE((l.MovementQty-SUM(COALESCE(mi.Qty,0))),l.MovementQty) as quantityOrder,
l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, COALESCE(co.taxbaseamt,0) * C_DIVIDE((l.MovementQty-SUM(COALESCE(mi.Qty,0))),COALESCE(co.qtyordered,1)) as taxbaseamt,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM M_INOUTLINE l left join M_MATCHINV mi on l.M_InOutLine_ID=mi.M_InOutLine_ID
left join C_ORDERLINE co ON co.C_ORDERLINE_ID=l.C_ORDERLINE_ID,
C_UOM uom, M_PRODUCT p
WHERE l.C_UOM_ID=uom.C_UOM_ID
AND l.M_Product_ID=p.M_Product_ID
GROUP BY l.MovementQty,l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME, l.M_InOutLine_ID,l.Line,l.C_OrderLine_ID, l.Description,l.quantityOrder, l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, co.taxbaseamt,co.qtyordered,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
ORDER BY l.Line
]]>
</Sql>
@@ -564,13 +564,13 @@
SELECT l.MovementQty AS ID, l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'), to_char(l.m_product_id), to_char(?)) AS NAME, l.M_InOutLine_ID,l.Line,
l.C_OrderLine_ID, max(uom.STDPRECISION) as stdprecision, l.Description,l.quantityOrder, l.M_Product_UOM_ID,
l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM C_UOM uom, M_INOUTLINE l, M_PRODUCT p
WHERE l.C_UOM_ID=uom.C_UOM_ID
AND l.M_Product_ID=p.M_Product_ID
AND l.isinvoiced = 'N'
GROUP BY l.MovementQty,l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME, l.M_InOutLine_ID,l.Line,l.C_OrderLine_ID, l.Description, l.quantityOrder, l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
ORDER BY l.Line
]]>
</Sql>
@@ -646,7 +646,7 @@
M_Attributesetinstance_ID, PriceStd, taxbaseamt, excludeforwithholding,
gross_unit_price, line_gross_amount, grosspricelist, grosspricestd,
isdeferred, defplantype, periodnumber, c_period_id,
- a_asset_id, c_project_id, c_costcenter_id, user1_id, c_user2_id
+ a_asset_id, c_project_id, c_costcenter_id, user1_id, user2_id
)
VALUES
(?, ?, ?, ?, 'Y',
@@ -697,7 +697,7 @@
<Parameter name="cProjectId"/>
<Parameter name="cCostcenterId"/>
<Parameter name="user1Id"/>
- <Parameter name="cUser2Id"/>
+ <Parameter name="user2Id"/>
</SqlMethod>
<SqlMethod name="insertAcctDimension" type="preparedStatement" connection="true" return="rowCount">
<SqlMethodComment>Copies the order line accounting dimensions to invoice lines</SqlMethodComment>
@@ -711,7 +711,7 @@
)
(SELECT GET_UUID(), ?, ?, ?, 'Y',
now(), ?, now(), ?, C_Project_ID, C_Campaign_ID,
- User1_ID, C_User2_ID, C_Activity_ID, C_Costcenter_Id,
+ User1_ID, User2_ID, C_Activity_ID, C_Costcenter_Id,
C_BPartner_ID, M_Product_ID, A_Asset_ID, Amt
FROM C_OrderLine_AcctDimension
WHERE C_OrderLine_ID = ?
@@ -737,7 +737,7 @@
)
(SELECT GET_UUID(), ?, ?, ?, 'Y',
now(), ?, now(), ?, C_Project_ID, C_Campaign_ID,
- User1_ID, C_User2_ID, C_Activity_ID, C_Costcenter_Id,
+ User1_ID, User2_ID, C_Activity_ID, C_Costcenter_Id,
C_BPartner_ID, M_Product_ID, A_Asset_ID,
(Quantity*(SELECT PriceActual FROM C_InvoiceLine WHERE C_InvoiceLine_ID = ?))
FROM M_InOutLine_AcctDimension
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql Wed Nov 14 19:03:27 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql Wed Nov 14 19:42:13 2012 +0100
@@ -39,7 +39,7 @@
l.M_ATTRIBUTESETINSTANCE_ID = M_ATTRIBUTESETINSTANCE.M_ATTRIBUTESETINSTANCE_ID) as ATTRIBUTESETINSTANCENAME,
(SELECT C_UOM.NAME FROM M_PRODUCT_UOM, C_UOM WHERE M_PRODUCT_UOM_ID = l.M_PRODUCT_UOM_ID AND M_PRODUCT_UOM.C_UOM_ID = C_UOM.C_UOM_ID) as SECUOMSYMBOL,
COALESCE(l.M_PRODUCT_UOM_ID,null,'0') as HAVESEC,'' as HAVESECUOM,'' AS LOCATOR,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM C_ORDERLINE l left join M_MATCHPO m on l.C_OrderLine_ID=m.C_OrderLine_ID
and m.M_InOutLine_ID IS NOT NULL,
C_ORDER o, C_UOM uom, M_PRODUCT p, C_DOCTYPE dt
@@ -54,7 +54,7 @@
AND l.M_Product_ID=p.M_Product_ID
AND l.C_Order_ID = ?
GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal, l.QtyOrdered,l.qtydelivered,
- l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID, l.ad_org_id, l.DESCRIPTION, l.QUANTITYORDER, l.M_PRODUCT_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID, l.ad_org_id, l.DESCRIPTION, l.QUANTITYORDER, l.M_PRODUCT_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
HAVING (l.QtyOrdered-SUM(COALESCE(m.Qty,0))) <> 0
ORDER BY NAME, l.Line
]]>
@@ -100,7 +100,7 @@
l.QtyOrdered-COALESCE(l.qtydelivered,0) AS QTY, l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,
Ad_Column_Identifier(TO_CHAR('M_Product'), TO_CHAR(l.m_product_id), TO_CHAR(?)) AS RELATION_NAME,
l.C_OrderLine_ID,l.Line, l.C_OrderLine_ID AS ID, l.DESCRIPTION AS DESCRIPTION,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM M_INOUT_CANDIDATE_V ic, C_ORDER o, C_UOM uom, C_ORDERLINE l, M_PRODUCT p
WHERE o.C_ORDER_ID = l.C_ORDER_ID
AND o.C_ORDER_ID = ic.C_ORDER_ID
@@ -112,7 +112,7 @@
AND l.QtyOrdered <> COALESCE(l.qtydelivered,0)
GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal, l.QtyOrdered,l.qtydelivered,
l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID, l.ad_org_id, l.DESCRIPTION,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
ORDER BY NAME, l.Line
]]>
</Sql>
@@ -227,7 +227,7 @@
MAX(mu.C_UOM_ID) AS C_UOM_ID_Conversion, MAX(uom1.STDPRECISION) AS STDPRECISION,
l.QUANTITYORDER*C_DIVIDE((l.QtyOrdered-SUM(COALESCE(m.Qty,0))),(l.QtyOrdered)) AS quantityOrder, l.M_Product_UOM_ID,
l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, l.DESCRIPTION AS DESCRIPTION,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM C_ORDERLINE l left join M_MATCHPO m on l.C_OrderLine_ID=m.C_OrderLine_ID
and m.M_InOutLine_ID IS NOT NULL
left join M_Product_UOM mu on l.M_Product_UOM_ID = mu.M_Product_UOM_ID
@@ -237,7 +237,7 @@
AND l.M_Product_ID=p.M_Product_ID
GROUP BY l.QtyOrdered,l.qtydelivered,l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID,
uom1.BREAKDOWN, l.QUANTITYORDER, l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, l.DESCRIPTION,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
ORDER BY l.Line
]]>
</Sql>
@@ -254,7 +254,7 @@
MAX(mu.C_UOM_ID) AS C_UOM_ID_Conversion, MAX(uom1.STDPRECISION) AS STDPRECISION,
l.QUANTITYORDER*C_DIVIDE((l.QtyOrdered - COALESCE(l.QTYDELIVERED,0)),(l.QtyOrdered)) as quantityOrder, l.M_Product_UOM_ID,
l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, l.DESCRIPTION AS DESCRIPTION,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM C_ORDERLINE l left join M_Product_UOM mu on l.M_Product_UOM_ID = mu.M_Product_UOM_ID
left join C_UOM uom1 on mu.C_UOM_ID = uom1.C_UOM_ID ,
C_UOM uom, M_PRODUCT p
@@ -262,7 +262,7 @@
AND l.M_Product_ID=p.M_Product_ID
GROUP BY l.QtyOrdered,l.qtydelivered,l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID,
uom1.BREAKDOWN, l.QUANTITYORDER, l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, l.DESCRIPTION,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
HAVING l.QtyOrdered - COALESCE(l.QTYDELIVERED,0)<>0
ORDER BY l.Line
]]>
@@ -278,7 +278,7 @@
SELECT i.C_Invoice_ID, Ad_Column_Identifier(TO_CHAR('C_Invoice'), TO_CHAR(i.C_Invoice_ID), TO_CHAR(?)) AS NAME,
l.QtyInvoiced-SUM(COALESCE(mi.Qty,0)) AS QTY, l.C_UOM_ID,uom.UOMSymbol,
l.M_Product_ID,Ad_Column_Identifier(TO_CHAR('M_Product'), TO_CHAR(l.m_product_id), TO_CHAR(?)) AS RELATION_NAME,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id,
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id,
l.C_InvoiceLine_ID,l.Line, l.C_OrderLine_ID, l.C_InvoiceLine_ID AS ID, l.DESCRIPTION AS DESCRIPTION,
((l.QtyInvoiced-SUM(COALESCE(mi.Qty,0)))/COALESCE(
(SELECT MULTIPLYRATE FROM C_UOM_CONVERSION WHERE C_UOM_CONVERSION.C_UOM_ID =
@@ -300,7 +300,7 @@
AND l.M_Product_ID=p.M_Product_ID
AND l.C_Invoice_ID = ?
GROUP BY i.C_Invoice_ID, i.DocumentNo, DateInvoiced, GrandTotal, l.QtyInvoiced,
- l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME, l.C_InvoiceLine_ID,l.Line,l.C_OrderLine_ID, l.DESCRIPTION,l.QUANTITYORDER, l.M_PRODUCT_UOM_ID,l.M_ATTRIBUTESETINSTANCE_ID, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME, l.C_InvoiceLine_ID,l.Line,l.C_OrderLine_ID, l.DESCRIPTION,l.QUANTITYORDER, l.M_PRODUCT_UOM_ID,l.M_ATTRIBUTESETINSTANCE_ID, l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
HAVING (l.QtyInvoiced-SUM(COALESCE(mi.Qty,0))) <> 0
ORDER BY NAME, l.Line
]]>
@@ -321,7 +321,7 @@
l.M_Product_ID,Ad_Column_Identifier(TO_CHAR('M_Product'), TO_CHAR(l.m_product_id), TO_CHAR(?)) AS RELATION_NAME,
l.C_InvoiceLine_ID,l.Line, l.C_OrderLine_ID, l.C_InvoiceLine_ID AS ID,
l.DESCRIPTION AS DESCRIPTION,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM C_INVOICELINE l left join M_INOUTLINE mi on l.M_INOUTLINE_ID = mi.M_INOUTLINE_ID,
C_INVOICE i, C_UOM uom, M_PRODUCT p
WHERE i.C_INVOICE_ID = l.C_INVOICE_ID
@@ -332,7 +332,7 @@
AND l.C_Invoice_ID = ?
GROUP BY i.C_Invoice_ID, i.DocumentNo, DateInvoiced, GrandTotal, l.QtyInvoiced,
l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME, l.C_InvoiceLine_ID,l.Line,l.C_OrderLine_ID, l.DESCRIPTION,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
HAVING (l.QtyInvoiced-SUM(COALESCE(mi.MOVEMENTQTY,0))) <> 0
ORDER BY NAME, l.Line
]]>
@@ -446,7 +446,7 @@
l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'), to_char(l.m_product_id), to_char(?)) AS NAME, l.C_InvoiceLine_ID,l.Line, l.C_OrderLine_ID, COALESCE(uom1.BREAKDOWN, 'N') AS BREAKDOWN,
MAX(mu.C_UOM_ID) AS C_UOM_ID_Conversion, MAX(uom1.STDPRECISION) AS STDPRECISION, l.QUANTITYORDER, l.M_Product_UOM_ID,
l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, l.DESCRIPTION AS DESCRIPTION, l.C_INVOICE_ID,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM C_INVOICELINE l left join M_Product_UOM mu on l.M_Product_UOM_ID = mu.M_Product_UOM_ID
left join C_UOM uom1 on mu.C_UOM_ID = uom1.C_UOM_ID
left join M_MATCHINV mi on l.C_InvoiceLine_ID=mi.C_InvoiceLine_ID,
@@ -456,7 +456,7 @@
GROUP BY l.QtyInvoiced,
l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME, l.C_InvoiceLine_ID,l.Line,l.C_OrderLine_ID,
uom1.BREAKDOWN, l.QUANTITYORDER, l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, l.DESCRIPTION, l.C_INVOICE_ID,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
HAVING l.QtyInvoiced-SUM(COALESCE(mi.Qty,0))<>0
ORDER BY l.Line
]]>
@@ -473,7 +473,7 @@
l.M_Product_ID,Ad_Column_Identifier(to_char('M_Product'), to_char(l.m_product_id), to_char(?)) AS NAME, l.C_InvoiceLine_ID,l.Line, l.C_OrderLine_ID, COALESCE(uom1.BREAKDOWN, 'N') AS BREAKDOWN,
MAX(mu.C_UOM_ID) AS C_UOM_ID_Conversion, MAX(uom1.STDPRECISION) AS STDPRECISION, l.QUANTITYORDER, l.M_Product_UOM_ID,
l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, l.DESCRIPTION AS DESCRIPTION,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
FROM C_INVOICELINE l left join M_Product_UOM mu on l.M_Product_UOM_ID = mu.M_Product_UOM_ID
left join C_UOM uom1 on mu.C_UOM_ID = uom1.C_UOM_ID
left join M_INOUTLINE mi on l.M_INOUTLINE_ID=mi.M_INOUTLINE_ID,
@@ -485,7 +485,7 @@
GROUP BY l.QtyInvoiced,
l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME, l.C_InvoiceLine_ID,l.Line,l.C_OrderLine_ID,
uom1.BREAKDOWN, l.QUANTITYORDER, l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, l.DESCRIPTION,
- l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.c_user2_id
+ l.a_asset_id, l.c_project_id, l.c_costcenter_id, l.user1_id, l.user2_id
HAVING l.QtyInvoiced-SUM(COALESCE(mi.MOVEMENTQTY,0))<>0
ORDER BY l.Line
]]>
@@ -530,7 +530,7 @@
M_Locator_ID,IsInvoiced, QUANTITYORDER,
M_PRODUCT_UOM_ID, M_ATTRIBUTESETINSTANCE_ID,
A_ASSET_ID, C_PROJECT_ID, C_COSTCENTER_ID,
- USER1_ID, C_USER2_ID)
+ USER1_ID, USER2_ID)
VALUES
(?, ?, ?, ?,
'Y', now(), ?, now(), ?,
@@ -562,7 +562,7 @@
<Parameter name="cProjectId"/>
<Parameter name="cCostcenterId"/>
<Parameter name="user1Id"/>
- <Parameter name="cUser2Id"/>
+ <Parameter name="user2Id"/>
</SqlMethod>
<SqlMethod name="insertAcctDimension" type="preparedStatement" connection="true" return="rowCount">
<SqlMethodComment>Copies the order line accounting dimensions to In/Out lines</SqlMethodComment>
@@ -571,13 +571,13 @@
(M_InOutLine_AcctDimension_ID,M_InOutLine_ID, AD_Client_ID,AD_Org_ID,IsActive,
Created,CreatedBy,Updated,UpdatedBy,
C_Project_ID, C_Campaign_ID, User1_ID,
- C_User2_ID, C_Activity_ID, C_Costcenter_ID,
+ User2_ID, C_Activity_ID, C_Costcenter_ID,
C_BPartner_ID, M_Product_ID, A_Asset_ID,
Quantity
)
(SELECT GET_UUID(), ?, ?, ?, 'Y',
now(), ?, now(), ?, C_Project_ID, C_Campaign_ID,
- User1_ID, C_User2_ID, C_Activity_ID, C_Costcenter_Id,
+ User1_ID, User2_ID, C_Activity_ID, C_Costcenter_Id,
C_BPartner_ID, M_Product_ID, A_Asset_ID,
(Amt/(SELECT PriceActual FROM C_OrderLine WHERE C_OrderLine_ID = ?))
FROM C_OrderLine_AcctDimension
@@ -599,7 +599,7 @@
(M_InOutLine_AcctDimension_ID,M_InOutLine_ID, AD_Client_ID,AD_Org_ID,IsActive,
Created,CreatedBy,Updated,UpdatedBy,
C_Project_ID, C_Campaign_ID, User1_ID,
- C_User2_ID, C_Activity_ID, C_Costcenter_ID,
+ User2_ID, C_Activity_ID, C_Costcenter_ID,
C_BPartner_ID, M_Product_ID, A_Asset_ID,
Quantity
)
--- a/src/org/openbravo/erpCommon/ad_forms/DocLineInOut_data.xsql Wed Nov 14 19:03:27 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocLineInOut_data.xsql Wed Nov 14 19:42:13 2012 +0100
@@ -29,7 +29,7 @@
SELECT COALESCE(A.AD_ORG_ID,IO.AD_ORG_ID) AS AD_ORG_ID, IO.M_PRODUCT_ID, IO.LINE, IO.DESCRIPTION,
IO.C_UOM_ID, IO.M_INOUTLINE_ID, COALESCE(A.Quantity, IO.MOVEMENTQTY) as MOVEMENTQTY, IO.M_LOCATOR_ID,
A.C_Campaign_ID, COALESCE(A.C_Project_Id, IO.C_Project_Id) AS C_Project_Id, COALESCE(A.User1_ID, IO.User1_ID) AS user1Id,
- COALESCE(A.C_User2_ID, IO.C_User2_ID) AS user2Id, COALESCE(A.C_Costcenter_ID, IO.C_Costcenter_ID) AS C_Costcenter_ID,
+ COALESCE(A.User2_ID, IO.User2_ID) AS user2Id, COALESCE(A.C_Costcenter_ID, IO.C_Costcenter_ID) AS C_Costcenter_ID,
COALESCE(A.A_Asset_ID,IO.A_Asset_ID) AS A_Asset_ID, COALESCE(A.C_BPartner_ID, IO.C_BPartner_ID) AS C_BPartner_ID, A.C_Activity_ID
FROM M_InOutLine IO left join M_InOutLine_AcctDimension A ON IO.M_InOutLine_ID = A.M_InOutLine_ID
WHERE M_InOut_ID=?
--- a/src/org/openbravo/erpCommon/ad_forms/DocLineInvoice_data.xsql Wed Nov 14 19:03:27 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocLineInvoice_data.xsql Wed Nov 14 19:42:13 2012 +0100
@@ -36,7 +36,7 @@
C_INVOICELINE.ISDESCRIPTION, C_INVOICELINE.QUANTITYORDER, C_INVOICELINE.M_PRODUCT_UOM_ID,
C_INVOICELINE_ACCTDIMENSION.C_CAMPAIGN_ID, COALESCE(C_INVOICELINE_ACCTDIMENSION.C_PROJECT_ID, C_INVOICELINE.C_PROJECT_ID) AS C_PROJECT_ID,
COALESCE(C_INVOICELINE_ACCTDIMENSION.USER1_ID,C_INVOICELINE.USER1_ID) AS user1Id,
- COALESCE(C_INVOICELINE_ACCTDIMENSION.USER2_ID,C_INVOICELINE.C_USER2_ID) AS user2Id,
+ COALESCE(C_INVOICELINE_ACCTDIMENSION.USER2_ID,C_INVOICELINE.USER2_ID) AS user2Id,
COALESCE(C_INVOICELINE_ACCTDIMENSION.C_COSTCENTER_ID,C_INVOICELINE.C_COSTCENTER_ID) AS C_COSTCENTER_ID,
COALESCE(C_INVOICELINE_ACCTDIMENSION.A_ASSET_ID,C_INVOICELINE.A_ASSET_ID) AS A_ASSET_ID,
COALESCE(C_INVOICELINE_ACCTDIMENSION.C_BPARTNER_ID,C_INVOICELINE.C_BPARTNER_ID) AS C_BPARTNER_ID, C_INVOICELINE_ACCTDIMENSION.C_ACTIVITY_ID,
@@ -65,7 +65,7 @@
C_INVOICELINE.ISDESCRIPTION, SUM(C_INVOICELINE.QUANTITYORDER) AS QUANTITYORDER, C_INVOICELINE.M_PRODUCT_UOM_ID,
C_INVOICELINE_ACCTDIMENSION.C_CAMPAIGN_ID, COALESCE(C_INVOICELINE_ACCTDIMENSION.C_PROJECT_ID, C_INVOICELINE.C_PROJECT_ID) AS C_PROJECT_ID,
COALESCE(C_INVOICELINE_ACCTDIMENSION.USER1_ID,C_INVOICELINE.USER1_ID) AS user1Id,
- COALESCE(C_INVOICELINE_ACCTDIMENSION.USER2_ID,C_INVOICELINE.C_USER2_ID) AS user2Id,
+ COALESCE(C_INVOICELINE_ACCTDIMENSION.USER2_ID,C_INVOICELINE.USER2_ID) AS user2Id,
COALESCE(C_INVOICELINE_ACCTDIMENSION.C_COSTCENTER_ID,C_INVOICELINE.C_COSTCENTER_ID) AS C_COSTCENTER_ID,
COALESCE(C_INVOICELINE_ACCTDIMENSION.A_ASSET_ID,C_INVOICELINE.A_ASSET_ID) AS A_ASSET_ID,
COALESCE(C_INVOICELINE_ACCTDIMENSION.C_BPARTNER_ID,C_INVOICELINE.C_BPARTNER_ID) AS C_BPARTNER_ID, C_INVOICELINE_ACCTDIMENSION.C_ACTIVITY_ID,
@@ -78,7 +78,7 @@
C_INVOICELINE.M_ATTRIBUTESETINSTANCE_ID,C_INVOICELINE.ISDESCRIPTION, C_INVOICELINE.M_PRODUCT_UOM_ID,
C_INVOICELINE_ACCTDIMENSION.C_CAMPAIGN_ID, COALESCE(C_INVOICELINE_ACCTDIMENSION.C_PROJECT_ID, C_INVOICELINE.C_PROJECT_ID),
COALESCE(C_INVOICELINE_ACCTDIMENSION.USER1_ID,C_INVOICELINE.USER1_ID),
- COALESCE(C_INVOICELINE_ACCTDIMENSION.USER2_ID,C_INVOICELINE.C_USER2_ID),
+ COALESCE(C_INVOICELINE_ACCTDIMENSION.USER2_ID,C_INVOICELINE.USER2_ID),
COALESCE(C_INVOICELINE_ACCTDIMENSION.C_COSTCENTER_ID,C_INVOICELINE.C_COSTCENTER_ID),
COALESCE(C_INVOICELINE_ACCTDIMENSION.A_ASSET_ID,C_INVOICELINE.A_ASSET_ID),
COALESCE(C_INVOICELINE_ACCTDIMENSION.C_BPARTNER_ID,C_INVOICELINE.C_BPARTNER_ID), C_INVOICELINE_ACCTDIMENSION.C_ACTIVITY_ID,
--- a/src/org/openbravo/erpCommon/utility/WindowTreeUtility.java Wed Nov 14 19:03:27 2012 +0100
+++ b/src/org/openbravo/erpCommon/utility/WindowTreeUtility.java Wed Nov 14 19:42:13 2012 +0100
@@ -63,7 +63,7 @@
TreeType = "CC";
else if (keyColumnName.equals("User1_ID"))
TreeType = "U1";
- else if (keyColumnName.equals("C_User2_ID"))
+ else if (keyColumnName.equals("User2_ID"))
TreeType = "U2";
else if (keyColumnName.equals("M_BOM_ID"))
TreeType = "BB";
--- a/src/org/openbravo/erpCommon/utility/WindowTree_data.xsql Wed Nov 14 19:03:27 2012 +0100
+++ b/src/org/openbravo/erpCommon/utility/WindowTree_data.xsql Wed Nov 14 19:42:13 2012 +0100
@@ -134,10 +134,10 @@
<SqlMethod name="selectUser2" type="preparedStatement" return="multiple">
<SqlMethodComment></SqlMethodComment>
<Sql>
- SELECT tn.Node_ID,tn.Parent_ID,tn.SeqNo, u2.C_User2_ID AS ID, u2.Name, u2.Description, u2.IsSummary
+ SELECT tn.Node_ID,tn.Parent_ID,tn.SeqNo, u2.User2_ID AS ID, u2.Name, u2.Description, u2.IsSummary
FROM AD_TreeNode tn,
- C_User2 u2
- WHERE tn.Node_ID = u2.C_User2_ID
+ User2 u2
+ WHERE tn.Node_ID = u2.User2_ID
AND tn.AD_Tree_ID = ?
ORDER BY COALESCE(tn.Parent_ID, '-1'), tn.SeqNo
</Sql>