OFBiz › OFBiz - Commits

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

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

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

jleroux@apache.org
Author: jleroux
Date: Fri May  5 18:30:20 2017
New Revision: 1794092

URL: http://svn.apache.org/viewvc?rev=1794092&view=rev
Log:
Implemented: Removed most dependencies from OFBiz framework to plugins
(OFBIZ-9322)

Completes r1793170

Removes duplicates data that should rather be in the PartyDemoData.xml
Moves and merges data from DemoPaymentsInvoices.xml to PartyDemoData.xml
Moves and merges data from DemoOrderTestData.xml to PartyDemoData.xml

Note that if later we want to have data located with tests data like those moved
from DemoOrderTestData might need to be located again in order component. But
anyway then a lot of data would need to be moved. For now we rely on the
components loading order defined in applications component-load.xml

Tests pass

Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/data/DemoPaymentsInvoices.xml
    ofbiz/ofbiz-framework/trunk/applications/order/data/DemoOrderTestData.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=1794092&r1=1794091&r2=1794092&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/data/DemoPaymentsInvoices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/data/DemoPaymentsInvoices.xml Fri May  5 18:30:20 2017
@@ -75,18 +75,6 @@ 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"/>
 
-    <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-->
     <Invoice invoiceId="8002" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="AcctBigSupplier" partyId="Company" statusId="INVOICE_PAID" invoiceDate="2009-07-11 12:24:31.85" paidDate="2009-07-11 12:28:44.034" dueDate="2009-08-10 12:24:31.85" currencyUomId="USD"/>
     <Invoice invoiceId="8003" invoiceTypeId="PURCHASE_INVOICE" partyIdFrom="AcctBigSupplier" partyId="Company" statusId="INVOICE_PAID" invoiceDate="2009-07-11 12:25:26.085" paidDate="2009-07-11 12:28:44.034" dueDate="2009-08-10 12:25:26.085" currencyUomId="USD"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/data/DemoOrderTestData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/data/DemoOrderTestData.xml?rev=1794092&r1=1794091&r2=1794092&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/data/DemoOrderTestData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/data/DemoOrderTestData.xml Fri May  5 18:30:20 2017
@@ -63,9 +63,6 @@ under the License.
     <OrderItem orderId="DEMO10091" orderItemSeqId="00001" orderItemTypeId="PRODUCT_ORDER_ITEM" productId="GZ-2644" prodCatalogId="DemoCatalog" isPromo="N" quantity="5.0" selectedAmount="0.0" unitPrice="21.6" unitListPrice="0.0" isModifiedPrice="N" itemDescription="GZ-2644-5 Round Gizmo" statusId="ITEM_CREATED"/>
     <OrderItemPriceInfo orderItemPriceInfoId="10001" orderId="DEMO10091" orderItemSeqId="00001" description="SupplierProduct [minimumOrderQuantity:5.0, lastPrice: 21.6]"/>
     <OrderItemPriceInfo orderItemPriceInfoId="10002" orderId="DEMO10091" orderItemSeqId="00001" description="SupplierProduct [minimumOrderQuantity:0.0, lastPrice: 24.0]"/>
-    <PartyRole partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR"/>
-    <PartyRole partyId="DemoSupplier" roleTypeId="SHIP_FROM_VENDOR"/>
-    <PartyRole partyId="DemoSupplier" roleTypeId="SUPPLIER_AGENT"/>
     <OrderRole orderId="DEMO10091" partyId="Company" roleTypeId="BILL_TO_CUSTOMER"/>
     <OrderRole orderId="DEMO10091" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR"/>
     <OrderRole orderId="DEMO10091" partyId="DemoSupplier" roleTypeId="SHIP_FROM_VENDOR"/>
@@ -88,9 +85,6 @@ under the License.
     <OrderHeader orderId="Demo1001" orderTypeId="PURCHASE_ORDER" orderName="Demo Purchase Order " salesChannelEnumId="UNKNWN_SALES_CHANNEL" orderDate="2009-08-13 17:45:50.419" priority="2" entryDate="2009-08-13 17:45:50.419" statusId="ORDER_COMPLETED" currencyUom="USD" webSiteId="OrderEntry" remainingSubTotal="48.00" grandTotal="48.00"/>
     <OrderItem orderId="Demo1001" orderItemSeqId="00001" orderItemTypeId="PRODUCT_ORDER_ITEM" productId="GZ-2644" prodCatalogId="DemoCatalog" isPromo="N" quantity="2.000000" selectedAmount="0.000000" unitPrice="24.00" unitListPrice="0.00" isModifiedPrice="N" itemDescription="GZ-2644-0 Round Gizmo" statusId="ITEM_COMPLETED" estimatedDeliveryDate="2009-08-13 17:43:53.0"/>
     <OrderItemPriceInfo orderItemPriceInfoId="9001" orderId="Demo1001" orderItemSeqId="00001" description="SupplierProduct [minimumOrderQuantity:0.000000, lastPrice: 24.000]"/>
-    <PartyRole partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR"/>
-    <PartyRole partyId="DemoSupplier" roleTypeId="SHIP_FROM_VENDOR"/>
-    <PartyRole partyId="DemoSupplier" roleTypeId="SUPPLIER_AGENT"/>
     <OrderRole orderId="Demo1001" partyId="Company" roleTypeId="BILL_TO_CUSTOMER" />
     <OrderRole orderId="Demo1001" partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR"/>
     <OrderRole orderId="Demo1001" partyId="DemoSupplier" roleTypeId="SHIP_FROM_VENDOR"/>

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=1794092&r1=1794091&r2=1794092&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/data/PartyDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/data/PartyDemoData.xml Fri May  5 18:30:20 2017
@@ -37,13 +37,27 @@
     <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="admin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0"/>
 
     <!-- Party Identification numbers-->
-    <Party partyId="DemoSupplier" statusId="PARTY_ENABLED"/>
+    <Party partyId="DemoSupplier" statusId="PARTY_ENABLED" partyTypeId="PARTY_GROUP"/>
+    <PartyGroup partyId="DemoSupplier" groupName="Demo Supplier"/>
     <PartyRole partyId="DemoSupplier" roleTypeId="ACCOUNT"/>
+    <PartyRole partyId="DemoSupplier" roleTypeId="SUPPLIER"/>
+    <PartyRole partyId="DemoSupplier" roleTypeId="BILL_FROM_VENDOR"/>
+    <PartyRole partyId="DemoSupplier" roleTypeId="SHIP_FROM_VENDOR"/>
+    <PartyRole partyId="DemoSupplier" roleTypeId="SUPPLIER_AGENT"/>
     <PartyStatus partyId="DemoSupplier" statusId="PARTY_ENABLED" statusDate="2001-01-01 12:00:00.0"/>
+    <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"/>
     <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"/>
 
+    <Party partyId="AcctBigSupplier"/>
+
     <!-- email from an unknown party -->
     <CommunicationEvent communicationEventId="9000" communicationEventTypeId="EMAIL_COMMUNICATION" statusId="COM_UNKNOWN_PARTY" contactMechTypeId="EMAIL_ADDRESS" contactMechIdTo="admin" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" partyIdTo="admin" entryDate="2008-07-28 13:55:55.827" datetimeStarted="2008-07-28 13:55:19.0" subject="Why i would use the OFBiz system" contentMimeTypeId="text/plain" content="Every time i think of you, only you...you are always on my mind......." note="Sent from: [hidden email]; Sent Name from: Jo Easy User; Sent to: [hidden email]; Delivered-To: [hidden email]; " fromString="[hidden email]" toString="[hidden email]"/>
     <PartyRole partyId="admin" roleTypeId="ADDRESSEE"/>


Free forum by Nabble Edit this page