details: https://code.openbravo.com/erp/devel/pi/rev/bea2418527bf changeset: 18266:bea2418527bf user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Mon Oct 22 12:39:12 2012 +0200 summary: Fixed issue 22063 Accrual and deferrals plans for product (Sale)
details: https://code.openbravo.com/erp/devel/pi/rev/3ae1a7bf1d80 changeset: 18267:3ae1a7bf1d80 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Mon Oct 22 13:23:13 2012 +0200 summary: Related to issue 22063 Accrual and deferrals plans for product (Purchase) diffstat: src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml | 6 +- src-db/database/model/functions/M_PRODUCT_CATEGORY_ACCT_COPY.xml | 8 +- src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml | 14 + src-db/database/model/tables/C_INVOICELINE.xml | 44 + src-db/database/model/tables/M_PRODUCT.xml | 30 + src-db/database/model/tables/M_PRODUCT_ACCT.xml | 14 + src-db/database/model/tables/M_PRODUCT_CATEGORY_ACCT.xml | 14 + src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml | 16 +- src-db/database/model/triggers/M_PRODUCT_CATEGORY_TRG.xml | 4 +- src-db/database/model/triggers/M_PRODUCT_TRG.xml | 18 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 + src-db/database/sourcedata/AD_COLUMN.xml | 734 +++++++++- src-db/database/sourcedata/AD_ELEMENT.xml | 142 + src-db/database/sourcedata/AD_FIELD.xml | 605 ++++++++ src-db/database/sourcedata/AD_FIELDGROUP.xml | 18 + src-db/database/sourcedata/AD_MESSAGE.xml | 66 + src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/AD_REF_LIST.xml | 12 + src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java | 57 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 5 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 282 +++- src/org/openbravo/erpCommon/ad_forms/DocLine.java | 42 +- src/org/openbravo/erpCommon/ad_forms/DocLineInvoice_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_forms/DocLine_Invoice.java | 83 +- src/org/openbravo/erpCommon/ad_forms/ProductInfo.java | 14 +- src/org/openbravo/erpCommon/ad_forms/ProductInfo_data.xsql | 6 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 10 + 28 files changed, 2235 insertions(+), 51 deletions(-) diffs (truncated from 3267 to 300 lines): diff -r 021d7e0895a3 -r 3ae1a7bf1d80 src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml --- a/src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml Tue Oct 23 11:35:08 2012 +0200 +++ b/src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml Mon Oct 22 13:23:13 2012 +0200 @@ -108,6 +108,8 @@ UPDATE M_Product_Category_Acct SET P_Revenue_Acct=Cur_Acct.P_Revenue_Acct, P_Revenue_Return_Acct=Cur_Acct.P_Revenue_Return_Acct, + P_Def_Revenue_Acct=Cur_Acct.P_Def_Revenue_Acct, + P_Def_Expense_Acct=Cur_Acct.P_Def_Expense_Acct, P_Expense_Acct=Cur_Acct.P_Expense_Acct, P_Asset_Acct=Cur_Acct.P_Asset_Acct, P_CoGs_Acct=Cur_Acct.P_CoGs_Acct, @@ -133,13 +135,13 @@ ( M_Product_Category_Acct_ID, M_Product_Category_ID, C_AcctSchema_ID, AD_Client_ID, AD_Org_ID, IsActive, Created, CreatedBy, Updated, - UpdatedBy, P_Revenue_Acct, P_Revenue_Return_Acct, P_Expense_Acct, P_Asset_Acct, + UpdatedBy, P_Revenue_Acct, P_Def_Revenue_Acct, P_Revenue_Return_Acct, P_Expense_Acct, P_Def_Expense_Acct, P_Asset_Acct, P_CoGs_Acct, P_CoGs_Return_Acct, P_PurchasePriceVariance_Acct, P_InvoicePriceVariance_Acct, P_TradeDiscountRec_Acct, P_TradeDiscountGrant_Acct ) SELECT get_uuid(), p.M_Product_Category_ID, Cur_Acct.C_AcctSchema_ID, p.AD_Client_ID, p.AD_Org_ID, 'Y', now(), '0', now(), - '0', Cur_Acct.P_Revenue_Acct, Cur_Acct.P_Revenue_Return_Acct, Cur_Acct.P_Expense_Acct, + '0', Cur_Acct.P_Revenue_Acct, Cur_Acct.P_Def_Revenue_Acct, Cur_Acct.P_Revenue_Return_Acct, Cur_Acct.P_Expense_Acct, Cur_Acct.P_Def_Expense_Acct, Cur_Acct.P_Asset_Acct, Cur_Acct.P_CoGs_Acct, Cur_Acct.P_CoGs_Return_Acct, Cur_Acct.P_PurchasePriceVariance_Acct, Cur_Acct.P_InvoicePriceVariance_Acct, Cur_Acct.P_TradeDiscountRec_Acct, Cur_Acct.P_TradeDiscountGrant_Acct FROM M_Product_Category p diff -r 021d7e0895a3 -r 3ae1a7bf1d80 src-db/database/model/functions/M_PRODUCT_CATEGORY_ACCT_COPY.xml --- a/src-db/database/model/functions/M_PRODUCT_CATEGORY_ACCT_COPY.xml Tue Oct 23 11:35:08 2012 +0200 +++ b/src-db/database/model/functions/M_PRODUCT_CATEGORY_ACCT_COPY.xml Mon Oct 22 13:23:13 2012 +0200 @@ -25,7 +25,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-2012 Openbravo, S.L.U. * * Specifically, this derivative work is based upon the following Compiere * file and version. @@ -111,8 +111,10 @@ -- Update existing Products UPDATE M_Product_Acct SET P_Revenue_Acct=Cur_Acct.P_Revenue_Acct, + P_Def_Revenue_Acct=Cur_Acct.P_Def_Revenue_Acct, P_Revenue_Return_Acct=Cur_Acct.P_Revenue_Return_Acct, P_Expense_Acct=Cur_Acct.P_Expense_Acct, + P_Def_Expense_Acct=Cur_Acct.P_Def_Expense_Acct, P_Asset_Acct=Cur_Acct.P_Asset_Acct, P_CoGs_Acct=Cur_Acct.P_CoGs_Acct, P_CoGs_Return_Acct=Cur_Acct.P_CoGs_Return_Acct, @@ -138,14 +140,14 @@ ( M_Product_Acct_ID, M_Product_ID, C_AcctSchema_ID, AD_Client_ID, AD_Org_ID, IsActive, Created, CreatedBy, Updated, - UpdatedBy, P_Revenue_Acct, P_Revenue_Return_Acct, P_Expense_Acct, P_Asset_Acct, + UpdatedBy, P_Revenue_Acct, P_Def_Revenue_Acct, P_Revenue_Return_Acct, P_Expense_Acct, P_Def_Expense_Acct,P_Asset_Acct, P_CoGs_Acct, P_CoGs_Return_Acct, P_PurchasePriceVariance_Acct, P_InvoicePriceVariance_Acct, P_TradeDiscountRec_Acct, P_TradeDiscountGrant_Acct ) SELECT get_uuid(), p.M_Product_ID, Cur_Acct.C_AcctSchema_ID, p.AD_Client_ID, p.AD_Org_ID, 'Y', now(), '0', now(), '0', - Cur_Acct.P_Revenue_Acct, Cur_Acct.P_Revenue_Return_Acct, Cur_Acct.P_Expense_Acct, Cur_Acct.P_Asset_Acct, Cur_Acct.P_CoGs_Acct, Cur_Acct.P_CoGs_Return_Acct, + Cur_Acct.P_Revenue_Acct, Cur_Acct.P_Def_Revenue_Acct, Cur_Acct.P_Revenue_Return_Acct, Cur_Acct.P_Expense_Acct, Cur_Acct.P_Def_Expense_Acct, Cur_Acct.P_Asset_Acct, Cur_Acct.P_CoGs_Acct, Cur_Acct.P_CoGs_Return_Acct, Cur_Acct.P_PurchasePriceVariance_Acct, Cur_Acct.P_InvoicePriceVariance_Acct, Cur_Acct.P_TradeDiscountRec_Acct, Cur_Acct.P_TradeDiscountGrant_Acct FROM M_Product p WHERE p.M_Product_Category_ID=Cur_Acct.M_Product_Category_ID diff -r 021d7e0895a3 -r 3ae1a7bf1d80 src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml --- a/src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml Tue Oct 23 11:35:08 2012 +0200 +++ b/src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml Mon Oct 22 13:23:13 2012 +0200 @@ -297,6 +297,20 @@ <default/> <onCreateDefault/> </column> + <column name="P_DEF_REVENUE_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="P_DEF_EXPENSE_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <foreign-key foreignTable="C_VALIDCOMBINATION" name="C_ACCTSCH_DEF_P_PURCHASEPRICE"> + <reference local="P_DEF_REVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/> + </foreign-key> + <foreign-key foreignTable="C_VALIDCOMBINATION" name="C_ACCTSCH_DEF_P_SALEPRICE"> + <reference local="P_DEF_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/> + </foreign-key> <foreign-key foreignTable="C_VALIDCOMBINATION" name="C_ACCTSCHEMA_DEF_WRITEOFF_REV"> <reference local="WRITEOFF_REV_ACCT" foreign="C_VALIDCOMBINATION_ID"/> </foreign-key> diff -r 021d7e0895a3 -r 3ae1a7bf1d80 src-db/database/model/tables/C_INVOICELINE.xml --- a/src-db/database/model/tables/C_INVOICELINE.xml Tue Oct 23 11:35:08 2012 +0200 +++ b/src-db/database/model/tables/C_INVOICELINE.xml Mon Oct 22 13:23:13 2012 +0200 @@ -161,14 +161,46 @@ <default><![CDATA[0]]></default> <onCreateDefault/> </column> + <column name="PERIODNUMBER" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <column name="GROSSPRICESTD" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"> <default><![CDATA[0]]></default> <onCreateDefault/> </column> + <column name="REVPLANTYPE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <column name="GROSSPRICELIST" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"> <default><![CDATA[0]]></default> <onCreateDefault/> </column> + <column name="ISDEFERREDREVENUE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[N]]></default> + <onCreateDefault/> + </column> + <column name="C_PERIOD_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="EXPPLANTYPE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="ISDEFERREDEXPENSE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[N]]></default> + <onCreateDefault/> + </column> + <column name="C_PERIOD_EXP_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="PERIODNUMBER_EXP" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="C_INVOICELINE_AD_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> @@ -190,6 +222,12 @@ <foreign-key foreignTable="C_ORDERLINE" name="C_INVOICELINE_C_ORDERLINE"> <reference local="C_ORDERLINE_ID" foreign="C_ORDERLINE_ID"/> </foreign-key> + <foreign-key foreignTable="C_PERIOD" name="C_INVOICELINE_C_PERIOD"> + <reference local="C_PERIOD_ID" foreign="C_PERIOD_ID"/> + </foreign-key> + <foreign-key foreignTable="C_PERIOD" name="C_INVOICELINE_C_PERIODEXP"> + <reference local="C_PERIOD_EXP_ID" foreign="C_PERIOD_ID"/> + </foreign-key> <foreign-key foreignTable="C_PROJECTLINE" name="C_INVOICELINE_C_PROJECTLINE"> <reference local="C_PROJECTLINE_ID" foreign="C_PROJECTLINE_ID"/> </foreign-key> @@ -229,8 +267,14 @@ <index name="C_INVOICELINE_PRODUCT" unique="false"> <index-column name="M_PRODUCT_ID"/> </index> + <check name="C_INVLINE_ISEXPDEFERRED_CHK"><![CDATA[ISDEFERREDEXPENSE IN ('Y', 'N')]]></check> + <check name="C_INVLINE_ISREVDEFERRED_CHK"><![CDATA[ISDEFERREDREVENUE IN ('Y', 'N')]]></check> + <check name="C_INVLINE_PERIODNUMBER_CHK"><![CDATA[((ISDEFERREDREVENUE = 'Y') AND (PERIODNUMBER > 0)) OR (ISDEFERREDREVENUE = 'N')]]></check> + <check name="C_INVLINE_PERIODNUMBEREXP_CHK"><![CDATA[((ISDEFERREDEXPENSE = 'Y') AND (PERIODNUMBER_EXP > 0)) OR (ISDEFERREDEXPENSE = 'N')]]></check> <check name="C_INVOICELINE_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="C_INVOICELINE_CHECK2"><![CDATA[(LINENETAMT = 0) OR (C_TAX_ID IS NOT NULL)]]></check> + <check name="C_INVOICELINE_CHECK3"><![CDATA[(((((ISDEFERREDREVENUE = 'Y') AND (C_PERIOD_ID IS NOT NULL)) AND (REVPLANTYPE IS NOT NULL)) AND (M_PRODUCT_ID IS NOT NULL)) AND (PERIODNUMBER IS NOT NULL)) OR (ISDEFERREDREVENUE = 'N')]]></check> + <check name="C_INVOICELINE_CHECK4"><![CDATA[(((((ISDEFERREDEXPENSE = 'Y') AND (C_PERIOD_EXP_ID IS NOT NULL)) AND (EXPPLANTYPE IS NOT NULL)) AND (M_PRODUCT_ID IS NOT NULL)) AND (PERIODNUMBER_EXP IS NOT NULL)) OR (ISDEFERREDEXPENSE = 'N')]]></check> <check name="C_INVOICELINE_FIN_INVLINE_CHK"><![CDATA[FINANCIAL_INVOICE_LINE IN ('Y', 'N')]]></check> <check name="C_INVOICELINE_FINACCT_CHK"><![CDATA[((FINANCIAL_INVOICE_LINE = 'Y') AND (ACCOUNT_ID IS NOT NULL)) OR ((FINANCIAL_INVOICE_LINE = 'N') AND (ACCOUNT_ID IS NULL))]]></check> <check name="C_INVOICELINE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check> diff -r 021d7e0895a3 -r 3ae1a7bf1d80 src-db/database/model/tables/M_PRODUCT.xml --- a/src-db/database/model/tables/M_PRODUCT.xml Tue Oct 23 11:35:08 2012 +0200 +++ b/src-db/database/model/tables/M_PRODUCT.xml Mon Oct 22 13:23:13 2012 +0200 @@ -285,6 +285,30 @@ <default><![CDATA[N]]></default> <onCreateDefault><![CDATA['N']]></onCreateDefault> </column> + <column name="ISDEFERREDREVENUE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[N]]></default> + <onCreateDefault/> + </column> + <column name="REVPLANTYPE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="PERIODNUMBER" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="ISDEFERREDEXPENSE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[N]]></default> + <onCreateDefault/> + </column> + <column name="EXPPLANTYPE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="PERIODNUMBER_EXP" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_ORG" name="AD_ORG_MPRODUCT"> <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/> </foreign-key> @@ -363,12 +387,18 @@ <check name="M_PRODUCT_ENFORCE_ATTRIBUT_CHK"><![CDATA[ENFORCE_ATTRIBUTE IN ('Y', 'N')]]></check> <check name="M_PRODUCT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check> <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 (PERIODNUMBER_EXP IS NOT NULL))]]></check> + <check name="M_PRODUCT_ISEXPDEFERRED_CHK"><![CDATA[ISDEFERREDEXPENSE 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> <check name="M_PRODUCT_ISQTYVAR_CHECK"><![CDATA[ISQUANTITYVARIABLE IN ('Y', 'N')]]></check> + <check name="M_PRODUCT_ISREVDEFCOMPLETE_CHK"><![CDATA[(ISDEFERREDREVENUE = 'N') OR (((ISDEFERREDREVENUE = 'Y') AND (REVPLANTYPE IS NOT NULL)) AND (PERIODNUMBER IS NOT NULL))]]></check> + <check name="M_PRODUCT_ISREVDEFERRED_CHK"><![CDATA[ISDEFERREDREVENUE IN ('Y', 'N')]]></check> <check name="M_PRODUCT_ISSOLD_CHECK"><![CDATA[ISSOLD IN ('Y', 'N')]]></check> <check name="M_PRODUCT_ISSTOCKED_CHECK"><![CDATA[ISSTOCKED IN ('Y', 'N')]]></check> <check name="M_PRODUCT_ISVERIFIED_CHECK"><![CDATA[ISVERIFIED IN ('Y', 'N')]]></check> + <check name="M_PRODUCT_PERIODNUMBER_CHK"><![CDATA[((ISDEFERREDREVENUE = 'Y') AND (PERIODNUMBER > 0)) OR (ISDEFERREDREVENUE = 'N')]]></check> + <check name="M_PRODUCT_PERIODNUMEXP_CHK"><![CDATA[((ISDEFERREDEXPENSE = 'Y') AND (PERIODNUMBER_EXP > 0)) OR (ISDEFERREDEXPENSE = 'N')]]></check> </table> </database> diff -r 021d7e0895a3 -r 3ae1a7bf1d80 src-db/database/model/tables/M_PRODUCT_ACCT.xml --- a/src-db/database/model/tables/M_PRODUCT_ACCT.xml Tue Oct 23 11:35:08 2012 +0200 +++ b/src-db/database/model/tables/M_PRODUCT_ACCT.xml Mon Oct 22 13:23:13 2012 +0200 @@ -81,6 +81,14 @@ <default/> <onCreateDefault/> </column> + <column name="P_DEF_REVENUE_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="P_DEF_EXPENSE_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="M_PRODUCT_ACCT_AD_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> @@ -99,6 +107,12 @@ <foreign-key foreignTable="C_VALIDCOMBINATION" name="M_PRODUCT_ACCT_P_COGS_RETURN"> <reference local="P_COGS_RETURN_ACCT" foreign="C_VALIDCOMBINATION_ID"/> </foreign-key> + <foreign-key foreignTable="C_VALIDCOMBINATION" name="M_PRODUCT_ACCT_P_DEF_EXP_ACCT"> + <reference local="P_DEF_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/> + </foreign-key> + <foreign-key foreignTable="C_VALIDCOMBINATION" name="M_PRODUCT_ACCT_P_DEF_REV_ACCT"> + <reference local="P_DEF_REVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/> + </foreign-key> <foreign-key foreignTable="C_VALIDCOMBINATION" name="M_PRODUCT_ACCT_P_EXPENSE_ACCT"> <reference local="P_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/> </foreign-key> diff -r 021d7e0895a3 -r 3ae1a7bf1d80 src-db/database/model/tables/M_PRODUCT_CATEGORY_ACCT.xml --- a/src-db/database/model/tables/M_PRODUCT_CATEGORY_ACCT.xml Tue Oct 23 11:35:08 2012 +0200 +++ b/src-db/database/model/tables/M_PRODUCT_CATEGORY_ACCT.xml Mon Oct 22 13:23:13 2012 +0200 @@ -85,6 +85,20 @@ <default/> <onCreateDefault/> </column> + <column name="P_DEF_REVENUE_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="P_DEF_EXPENSE_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <foreign-key foreignTable="C_VALIDCOMBINATION" name="M_PROD_CAT_ACCT_P_DEFEXPENSE"> + <reference local="P_DEF_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/> + </foreign-key> + <foreign-key foreignTable="C_VALIDCOMBINATION" name="M_PROD_CAT_ACCT_P_DEFREVENUE"> + <reference local="P_DEF_REVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/> + </foreign-key> <foreign-key foreignTable="AD_CLIENT" name="M_PRODUCT_CATEGORY_ACCT_AD_CLI"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> diff -r 021d7e0895a3 -r 3ae1a7bf1d80 src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml --- a/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml Tue Oct 23 11:35:08 2012 +0200 +++ b/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml Mon Oct 22 13:23:13 2012 +0200 @@ -23,6 +23,7 @@ * Contributor(s): ______________________________________. ************************************************************************/ v_Processed VARCHAR(60) ; + v_Posted VARCHAR(60) ; v_C_INVOICE_ID VARCHAR2(32) ; v_Prec NUMBER:=2; v_Currency VARCHAR2(32); @@ -38,9 +39,9 @@ ELSE v_C_INVOICE_ID:=:OLD.C_INVOICE_ID; END IF; - SELECT PROCESSED, + SELECT PROCESSED, POSTED, C_CURRENCY_ID - INTO v_Processed, + INTO v_Processed, v_Posted, v_Currency FROM C_INVOICE ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_sfd2d_oct _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
