svn commit: r679088 - in /ofbiz/trunk/applications/accounting/data: AccountingTypeData.xml DemoGlSetupData.xml

[jacopoc]

Author: jacopoc
Date: Wed Jul 23 06:46:26 2008
New Revision: 679088

URL: http://svn.apache.org/viewvc?rev=679088&view=rev
Log:
Initial data for purchase return invoices.

Modified:
    ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
    ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml

Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=679088&r1=679087&r2=679088&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Wed Jul 23 06:46:26 2008
@@ -436,6 +436,30 @@
     <InvoiceItemType description="Return Warranty" hasTable="N" invoiceItemTypeId="CRT_WARRANTY_ADJ" parentTypeId=""/>
     <InvoiceItemType description="Return Marketing Package Adjustment" hasTable="N" invoiceItemTypeId="CRT_MKTG_PKG_ADJ" parentTypeId=""/>
     <InvoiceItemType description="Return Manual Adjustment" hasTable="N" invoiceItemTypeId="CRT_MAN_ADJ" parentTypeId=""/>
+
+    <!-- invoice items for returns to suppliers -->
+    <InvoiceItemType description="Return Product Item" hasTable="N" invoiceItemTypeId="SRT_PROD_ITEM" parentTypeId=""/>
+    <InvoiceItemType description="Return Finished Good Item" hasTable="N" invoiceItemTypeId="SRT_FPROD_ITEM" parentTypeId="SRT_PROD_ITEM"/>
+    <InvoiceItemType description="Return Digital Good Item" hasTable="N" invoiceItemTypeId="SRT_DPROD_ITEM" parentTypeId="SRT_PROD_ITEM"/>
+    <InvoiceItemType description="Return Finished/Digital Good Item" hasTable="N" invoiceItemTypeId="SRT_FDPROD_ITEM" parentTypeId="SRT_PROD_ITEM"/>
+    <InvoiceItemType description="Return Product-Feature Item" hasTable="N" invoiceItemTypeId="SRT_PROD_FEATR_ITEM" parentTypeId="SRT_PROD_ITEM"/>
+    <InvoiceItemType description="Return Service Product Item" hasTable="N" invoiceItemTypeId="SRT_SPROD_ITEM" parentTypeId="SRT_PROD_ITEM"/>
+
+    <InvoiceItemType description="Return Work-Effort Item" hasTable="N" invoiceItemTypeId="SRT_WE_ITEM" parentTypeId=""/>
+    <InvoiceItemType description="Return Time-Entry Item" hasTable="N" invoiceItemTypeId="SRT_TE_ITEM" parentTypeId=""/>
+
+    <InvoiceItemType description="Return Promotion" hasTable="N" invoiceItemTypeId="SRT_PROMOTION_ADJ" parentTypeId=""/>
+    <InvoiceItemType description="Return Replacement" hasTable="N" invoiceItemTypeId="SRT_REPLACE_ADJ" parentTypeId=""/>
+    <InvoiceItemType description="Return Discount" hasTable="N" invoiceItemTypeId="SRT_DISCOUNT_ADJ" parentTypeId=""/>
+    <InvoiceItemType description="Return Fee" hasTable="N" invoiceItemTypeId="SRT_FEE_ADJ" parentTypeId=""/>
+    <InvoiceItemType description="Return Miscellaneous Charges" hasTable="N" invoiceItemTypeId="SRT_MISC_ADJ" parentTypeId=""/>
+    <InvoiceItemType description="Return Sales Tax" hasTable="N" invoiceItemTypeId="SRT_SALES_TAX_ADJ" parentTypeId=""/>
+    <InvoiceItemType description="Return Shipping and Handling" hasTable="N" invoiceItemTypeId="SRT_SHIPPING_ADJ" parentTypeId=""/>
+    <InvoiceItemType description="Return Surcharge" hasTable="N" invoiceItemTypeId="SRT_SURCHARGE_ADJ" parentTypeId=""/>
+    <InvoiceItemType description="Return Additional Feature" hasTable="N" invoiceItemTypeId="SRT_ADD_FEATURE_ADJ" parentTypeId=""/>
+    <InvoiceItemType description="Return Warranty" hasTable="N" invoiceItemTypeId="SRT_WARRANTY_ADJ" parentTypeId=""/>
+    <InvoiceItemType description="Return Marketing Package Adjustment" hasTable="N" invoiceItemTypeId="SRT_MKTG_PKG_ADJ" parentTypeId=""/>
+    <InvoiceItemType description="Return Manual Adjustment" hasTable="N" invoiceItemTypeId="SRT_MAN_ADJ" parentTypeId=""/>
     
     <!-- invoice item types for commission invoices -->
     <InvoiceItemType description="Commission Invoice Line Item" hasTable="N" invoiceItemTypeId="COMM_INV_ITEM" parentTypeId=""/>
@@ -444,6 +468,7 @@
     <InvoiceType description="Purchase Invoice" hasTable="N" invoiceTypeId="PURCHASE_INVOICE" parentTypeId="PURCHASE_INVOICE"/>
     <InvoiceType description="Sales Invoice" hasTable="N" invoiceTypeId="SALES_INVOICE" parentTypeId="SALES_INVOICE"/>
     <InvoiceType description="Customer Return" hasTable="N" invoiceTypeId="CUST_RTN_INVOICE" parentTypeId="PURCHASE_INVOICE"/>
+    <InvoiceType description="Purchase Return" hasTable="N" invoiceTypeId="PURC_RTN_INVOICE" parentTypeId="SALES_INVOICE"/>
     <InvoiceType description="Commission" hasTable="N" invoiceTypeId="COMMISSION_INVOICE" parentTypeId="PURCHASE_INVOICE"/>
     <InvoiceType description="Interest" hasTable="N" invoiceTypeId="INTEREST_INVOICE" parentTypeId="SALES_INVOICE"/>
     <InvoiceType description="Invoice Template" hasTable="N" invoiceTypeId="TEMPLATE"/>
@@ -505,6 +530,22 @@
     <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_MAN_ADJ" invoiceItemTypeId="CRT_MAN_ADJ"/>
     <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_MKTG_PKG_ADJ" invoiceItemTypeId="CRT_MKTG_PKG_ADJ"/>
 
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_FPROD_ITEM" invoiceItemTypeId="SRT_FPROD_ITEM"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_DPROD_ITEM" invoiceItemTypeId="SRT_DPROD_ITEM"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_FDPROD_ITEM" invoiceItemTypeId="SRT_FDPROD_ITEM"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_PROMOTION_ADJ" invoiceItemTypeId="SRT_PROMOTION_ADJ"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_REPLACE_ADJ" invoiceItemTypeId="SRT_REPLACE_ADJ"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_DISCOUNT_ADJ" invoiceItemTypeId="SRT_DISCOUNT_ADJ"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_FEE_ADJ" invoiceItemTypeId="SRT_FEE_ADJ"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_MISC_CHARGE_ADJ" invoiceItemTypeId="SRT_MISC_ADJ"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_SALES_TAX_ADJ" invoiceItemTypeId="SRT_SALES_TAX_ADJ"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_SHIPPING_ADJ" invoiceItemTypeId="SRT_SHIPPING_ADJ"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_SURCHARGE_ADJ" invoiceItemTypeId="SRT_SURCHARGE_ADJ"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_ADD_FEATURE_ADJ" invoiceItemTypeId="SRT_ADD_FEATURE_ADJ"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_WARRANTY_ADJ" invoiceItemTypeId="SRT_WARRANTY_ADJ"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_MAN_ADJ" invoiceItemTypeId="SRT_MAN_ADJ"/>
+    <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_MKTG_PKG_ADJ" invoiceItemTypeId="SRT_MKTG_PKG_ADJ"/>
+
     <!-- items for commission invoices -->
     <InvoiceItemTypeMap invoiceTypeId="COMMISSION_INVOICE" invoiceItemMapKey="COM_COMM_ITEM" invoiceItemTypeId="COMM_INV_ITEM"/>
     <InvoiceItemTypeMap invoiceTypeId="COMMISSION_INVOICE" invoiceItemMapKey="COM_COMM_ADJ" invoiceItemTypeId="COMM_INV_ADJ"/>

Modified: ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml?rev=679088&r1=679087&r2=679088&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml Wed Jul 23 06:46:26 2008
@@ -119,6 +119,30 @@
     <InvoiceItemType invoiceItemTypeId="CRT_MKTG_PKG_ADJ" defaultGlAccountId="423000"/>
     <InvoiceItemType invoiceItemTypeId="CRT_MAN_ADJ" defaultGlAccountId="423000"/>
 
+    <!-- invoice items for returns to suppliers -->
+    <InvoiceItemType invoiceItemTypeId="SRT_PROD_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_FPROD_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_DPROD_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_FDPROD_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_PROD_FEATR_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_SPROD_ITEM" defaultGlAccountId="401000"/>
+
+    <InvoiceItemType invoiceItemTypeId="SRT_WE_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_TE_ITEM" defaultGlAccountId="401000"/>
+
+    <InvoiceItemType invoiceItemTypeId="SRT_PROMOTION_ADJ" defaultGlAccountId="410000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_REPLACE_ADJ" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_DISCOUNT_ADJ" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_FEE_ADJ" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_MISC_ADJ" defaultGlAccountId="409000"/>
+    <!-- <InvoiceItemType invoiceItemTypeId="SRT_SALES_TAX_ADJ" defaultGlAccountId=""/> --> <!-- Use InvoiceItem.overrideGlAccountId -->
+    <InvoiceItemType invoiceItemTypeId="SRT_SHIPPING_ADJ" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_SURCHARGE_ADJ" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_ADD_FEATURE_ADJ" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_WARRANTY_ADJ" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_MKTG_PKG_ADJ" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="SRT_MAN_ADJ" defaultGlAccountId="409000"/>
+
     <!-- invoice item types for commission invoices -->
     <InvoiceItemType invoiceItemTypeId="COMM_INV_ITEM" defaultGlAccountId="601300"/>
     <InvoiceItemType invoiceItemTypeId="COMM_INV_ADJ" defaultGlAccountId="601400"/>