You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2007/08/10 13:43:21 UTC
svn commit: r564564 - in /ofbiz/trunk/applications:
accounting/data/AccountingTypeData.xml product/data/ProductSecurityData.xml
product/data/ShipmentTypeData.xml
Author: jonesde
Date: Fri Aug 10 04:43:20 2007
New Revision: 564564
URL: http://svn.apache.org/viewvc?view=rev&rev=564564
Log:
Fixed some seed data errors found with the new entity xml data check feature
Modified:
ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
ofbiz/trunk/applications/product/data/ProductSecurityData.xml
ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?view=diff&rev=564564&r1=564563&r2=564564
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Fri Aug 10 04:43:20 2007
@@ -388,7 +388,7 @@
<!-- map return items to invoice items -->
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_FPROD_ITEM" invoiceItemTypeId="CRT_FPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_DPROD_ITEM" invoiceItemTypeId="CRT_DPROD_ITEM"/>
- <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_DPROD_ITEM" invoiceItemTypeId="CRT_FDPROD_ITEM"/>
+ <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_FDPROD_ITEM" invoiceItemTypeId="CRT_FDPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_PROMOTION_ADJ" invoiceItemTypeId="CRT_PROMOTION_ADJ"/>
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_REPLACE_ADJ" invoiceItemTypeId="CRT_REPLACE_ADJ"/>
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_DISCOUNT_ADJ" invoiceItemTypeId="CRT_DISCOUNT_ADJ"/>
@@ -457,7 +457,6 @@
<PaymentType description="POS Paid In" hasTable="N" parentTypeId="RECEIPT" paymentTypeId="POS_PAID_IN"/>
<StatusType description="Budget" hasTable="N" parentTypeId="" statusTypeId="BUDGET_STATUS"/>
- <StatusType description="Invoice" hasTable="N" parentTypeId="" statusTypeId="INVOICE_STATUS"/>
<StatusType description="Party Asset" hasTable="N" parentTypeId="" statusTypeId="PARTY_ASSET_STATUS"/>
<!-- invoice status -->
@@ -519,7 +518,7 @@
<!-- tax forms for accounting preferences -->
<EnumerationType description="Tax Forms" enumTypeId="TAX_FORMS" hasTable="N" parentTypeId=""/>
<Enumeration description="Form 1120 (US IRS)" enumCode="1120" enumId="US_IRS_1120" sequenceId="01" enumTypeId="TAX_FORMS"/>
- <Enumeration description="Form 1120S (US IRS)" enumCode="1120S" enumId="US_IRS_1120" sequenceId="02" enumTypeId="TAX_FORMS"/>
+ <Enumeration description="Form 1120S (US IRS)" enumCode="1120S" enumId="US_IRS_1120S" sequenceId="02" enumTypeId="TAX_FORMS"/>
<Enumeration description="Form 1065 (US IRS)" enumCode="1065" enumId="US_IRS_1065" sequenceId="03" enumTypeId="TAX_FORMS"/>
<Enumeration description="Form 990 (US IRS)" enumCode="990" enumId="US_IRS_990" sequenceId="04" enumTypeId="TAX_FORMS"/>
<Enumeration description="Form 990-PF (US IRS)" enumCode="990PF" enumId="US_IRS_990PF" sequenceId="05" enumTypeId="TAX_FORMS"/>
Modified: ofbiz/trunk/applications/product/data/ProductSecurityData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductSecurityData.xml?view=diff&rev=564564&r1=564563&r2=564564
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductSecurityData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductSecurityData.xml Fri Aug 10 04:43:20 2007
@@ -43,8 +43,8 @@
<SecurityGroupPermission groupId="CATALOGADMIN" permissionId="CATALOG_ADMIN"/>
<SecurityGroupPermission groupId="CATALOGADMIN" permissionId="CATALOG_PRICE_MAINT"/>
<SecurityGroupPermission groupId="CATALOGADMIN" permissionId="OFBTOOLS_VIEW"/>
+ <!-- NOTE DEJ20070810 where did this come from? has duplicate ID of that above: <SecurityGroup description="Catalog Admin View and Purchase Allow Products" groupId="CATALOGADMIN"/> -->
- <SecurityGroup description="Catalog Admin View and Purchase Allow Products" groupId="CATALOGADMIN"/>
<SecurityGroupPermission groupId="FLEXADMIN" permissionId="CATALOG_VIEW_ALLOW"/>
<SecurityGroupPermission groupId="FLEXADMIN" permissionId="CATALOG_PURCHASE_ALLOW"/>
Modified: ofbiz/trunk/applications/product/data/ShipmentTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ShipmentTypeData.xml?view=diff&rev=564564&r1=564563&r2=564564
==============================================================================
--- ofbiz/trunk/applications/product/data/ShipmentTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ShipmentTypeData.xml Fri Aug 10 04:43:20 2007
@@ -30,7 +30,7 @@
<ShipmentContactMechType description="Ship-To Telecom Number" shipmentContactMechTypeId="SHIP_TO_TELECOM"/>
<ShipmentContactMechType description="Ship-From Telecom Number" shipmentContactMechTypeId="SHIP_FROM_TELECOM"/>
<ShipmentContactMechType description="Ship-To E-Mail" shipmentContactMechTypeId="SHIP_TO_EMAIL"/>
- <ShipmentContactMechType description="Ship-From E-Mail" shipmentContactMechTypeId="SHIP_TO_EMAIL"/>
+ <ShipmentContactMechType description="Ship-From E-Mail" shipmentContactMechTypeId="SHIP_FROM_EMAIL"/>
<ShipmentType description="Incoming" hasTable="N" parentTypeId="" shipmentTypeId="INCOMING_SHIPMENT"/>
<ShipmentType description="Outgoing" hasTable="N" parentTypeId="" shipmentTypeId="OUTGOING_SHIPMENT"/>