svn commit: r1793170 - in /ofbiz/ofbiz-framework/trunk/applications: accounting/data/DemoPaymentsInvoices.xml party/data/PartyDemoData.xml

[Taher Alkhateeb]

Author: taher
Date: Sat Apr 29 07:07:29 2017
New Revision: 1793170

URL: http://svn.apache.org/viewvc?rev=1793170&view=rev
Log:
Fixed: Remove all dependencies from OFBiz framework to plugins
(OFBIZ-9322)

Further removed dependencies on demo data defined in ecommerce by modifying
the following data items:
- Move the DemoSupplier demo data from ecommerce to accounting
- Move the PartyIdentificationType of "CARD_ID" from ecommerce to party

This brings down total failing tests to only two

Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/data/DemoPaymentsInvoices.xml
    ofbiz/ofbiz-framework/trunk/applications/party/data/PartyDemoData.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/data/DemoPaymentsInvoices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/data/DemoPaymentsInvoices.xml?rev=1793170&r1=1793169&r2=1793170&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/data/DemoPaymentsInvoices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/data/DemoPaymentsInvoices.xml Sat Apr 29 07:07:29 2017
@@ -74,13 +74,17 @@ under the License.
     
     <Invoice invoiceId="8001" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="AcctBigSupplier" partyId="Company" statusId="INVOICE_READY" currencyUomId="USD" invoiceDate="2009-07-06 16:48:40.952" paidDate="2009-07-06 16:52:52.901" dueDate="2009-08-05 16:48:40.952"/>
     <InvoiceItem invoiceId="8001" invoiceItemSeqId="1" invoiceItemTypeId="PINV_SURCHARGE_ADJ" taxableFlag="Y" quantity="1.000000" amount="10.000"/>
-    
-    <!--
-         plugins components are loaded after applications components. DemoSupplier & AcctBigSupplier data exists in ecommerce component.
-         So it creates foreign key violation as accounting component is loaded first and it tries to find 'DemoSupplier' and 'AcctBigSupplier' party.
-         This change will help to load test data without producing any foreign key error.
-     -->
-    <Party partyId="DemoSupplier"/>
+
+    <Party partyId="DemoSupplier" partyTypeId="PARTY_GROUP"/>
+    <PartyGroup partyId="DemoSupplier" groupName="Demo Supplier"/>
+    <PartyRole partyId="DemoSupplier" roleTypeId="SUPPLIER"/>
+    <ContactMech contactMechId="9001" contactMechTypeId="POSTAL_ADDRESS"/>
+    <PartyContactMech partyId="DemoSupplier" contactMechId="9001" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
+    <PostalAddress contactMechId="9001" toName="Demo Supplier Company" address1="2004 Factory Blvd" city="City of Industry" postalCode="90000" countryGeoId="USA" stateProvinceGeoId="CA"/>
+    <PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
+    <PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
+    <PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
+    <UserLogin userLoginId="DemoSupplier" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" partyId="DemoSupplier"/>
     <Party partyId="AcctBigSupplier"/>
     
     <!--demo data for testCancelCheckRunPayments-->

Modified: ofbiz/ofbiz-framework/trunk/applications/party/data/PartyDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/data/PartyDemoData.xml?rev=1793170&r1=1793169&r2=1793170&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/data/PartyDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/data/PartyDemoData.xml Sat Apr 29 07:07:29 2017
@@ -40,6 +40,7 @@
     <Party partyId="DemoSupplier" statusId="PARTY_ENABLED"/>
     <PartyRole partyId="DemoSupplier" roleTypeId="ACCOUNT"/>
     <PartyStatus partyId="DemoSupplier" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
+    <PartyIdentificationType partyIdentificationTypeId="CARD_ID" description="Person card identification number"/>
     <PartyIdentificationType partyIdentificationTypeId="SIRET" description="French company identification number (SIRET)"/>
     <PartyIdentification partyId="DemoSupplier" partyIdentificationTypeId="SIRET" idValue="1234 5678 90123"/>