svn commit: r1297417 - in /ofbiz/branches/release11.04: applications/accounting/data/DemoPaymentsInvoices.xml specialpurpose/ecommerce/ofbiz-component.xml

[lektran]

Author: lektran
Date: Tue Mar  6 10:58:31 2012
New Revision: 1297417

URL: http://svn.apache.org/viewvc?rev=1297417&view=rev
Log:
Merged from trunk r1297416:
Demo data bugfix: productTypeId is a required field of Product and records shouldn't be put into the db without supplying a value for it.

Modified:
    ofbiz/branches/release11.04/applications/accounting/data/DemoPaymentsInvoices.xml
    ofbiz/branches/release11.04/specialpurpose/ecommerce/ofbiz-component.xml

Modified: ofbiz/branches/release11.04/applications/accounting/data/DemoPaymentsInvoices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/data/DemoPaymentsInvoices.xml?rev=1297417&r1=1297416&r2=1297417&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/accounting/data/DemoPaymentsInvoices.xml (original)
+++ ofbiz/branches/release11.04/applications/accounting/data/DemoPaymentsInvoices.xml Tue Mar  6 10:58:31 2012
@@ -159,8 +159,8 @@ under the License.
     <!-- Demo invoice data for sales invoice with INVOICE_PAID status -->
     <Party partyId="DemoCustAgent"/>
     <PartyRole partyId="DemoCustAgent" roleTypeId="SALES_REP"/>
-    <Product productId="WG-9943"/>
-    <Product productId="WG-9943-B3"/>
+    <Product productId="WG-9943" productTypeId="FINISHED_GOOD"/>
+    <Product productId="WG-9943-B3" productTypeId="FINISHED_GOOD"/>
 
     <Agreement agreementId="8000" partyIdFrom="Company" partyIdTo="DemoCustAgent" agreementTypeId="COMMISSION_AGREEMENT" description="Commission Agreement with DemoCustAgent"/>
     <AgreementItem agreementId="8000" agreementItemSeqId="0001" agreementItemTypeId="AGREEMENT_COMMISSION" currencyUomId="USD" agreementText="Commission in USD"/>

Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/ofbiz-component.xml?rev=1297417&r1=1297416&r2=1297417&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/ofbiz-component.xml (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/ofbiz-component.xml Tue Mar  6 10:58:31 2012
@@ -26,7 +26,6 @@ under the License.
     <classpath type="dir" location="config"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceTypeData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProduct.xml"/>
-    <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProductImages.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoSurvey.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRentalShipping.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoShipping.xml"/>
@@ -39,6 +38,7 @@ under the License.
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRelatedData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoConfigurator.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoRentalProduct.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProductImages.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoTaxAuthority.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoOrderPeopleData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoOrderTestData.xml"/>