svn commit: r1825195 - in /ofbiz/branches/release16.11: applications/datamodel/entitydef/party-entitymodel.xml specialpurpose/webpos/data/PosSyncSettings.xml specialpurpose/webpos/entitydef/entitymodel.xml

[Arun Patidar-4]

Author: arunpatidar
Date: Sat Feb 24 08:05:46 2018
New Revision: 1825195

URL: http://svn.apache.org/viewvc?rev=1825195&view=rev
Log:
Reverted: Reverted unwanted changes committed at r#1825194

Modified:
    ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml
    ofbiz/branches/release16.11/specialpurpose/webpos/data/PosSyncSettings.xml
    ofbiz/branches/release16.11/specialpurpose/webpos/entitydef/entitymodel.xml

Modified: ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml?rev=1825195&r1=1825194&r2=1825195&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml (original)
+++ ofbiz/branches/release16.11/applications/datamodel/entitydef/party-entitymodel.xml Sat Feb 24 08:05:46 2018
@@ -3056,7 +3056,7 @@ under the License.
         </view-link>
     </view-entity>
     
-    <view-entity entity-name="PartyClassificationGroupAndType" package-name="org.apache.ofbiz.party.party" title="PartyClassificationGroup and PartyClassificationTypeView">
+    <view-entity entity-name="PartyClassificationGroupAndType" package-name="org.ofbiz.party.party" title="PartyClassificationGroup and PartyClassificationTypeView">
         <member-entity entity-alias="PCG" entity-name="PartyClassificationGroup"/>
         <member-entity entity-alias="PCT" entity-name="PartyClassificationType"/>
         <alias-all entity-alias="PCG"/>

Modified: ofbiz/branches/release16.11/specialpurpose/webpos/data/PosSyncSettings.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/webpos/data/PosSyncSettings.xml?rev=1825195&r1=1825194&r2=1825195&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/webpos/data/PosSyncSettings.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/webpos/data/PosSyncSettings.xml Sat Feb 24 08:05:46 2018
@@ -24,54 +24,54 @@ under the License.
 <!-- MCS->PSS Central Server to Per Store Server -->
     <EntityGroup entityGroupId="5500" entityGroupName="POS: Central Server to Per Store Server"/>
     <!-- these are used to update sync settings on the POS terminals from the central server -->
-    <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.apache.ofbiz.entity.group" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.ofbiz.entity.group" applEnumId="ESIA_INCLUDE"/>
     <!-- this is the general product information needed for pricing, promotions, basic product info, etc; the per store server will also include inventory, etc information -->
-    <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.apache.ofbiz.product" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.apache.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.apache.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.ofbiz.product" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
     <EntityGroupEntry entityGroupId="5500" entityOrPackage="PosTerminal" applEnumId="ESIA_INCLUDE"/>
 
 <!-- PSS->POS Per Store Server to POS Terminal -->
     <EntityGroup entityGroupId="5501" entityGroupName="POS: Per Store Server to POS Terminal"/>
     <!-- these are used to update sync settings on the POS terminals from the central server -->
-    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.entity.group" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.entity.group" applEnumId="ESIA_INCLUDE"/>
     <!-- this is the general product information needed for pricing, promotions, basic product info, etc -->
-    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.product.product" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.product.price" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.product.promo" applEnumId="ESIA_INCLUDE"/>
-    <!-- org.apache.ofbiz.product.category is needed for certain promotions, probably won't be used much for category browsing in the POS -->
-    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.product.category" applEnumId="ESIA_INCLUDE"/>
-    <!-- org.apache.ofbiz.party.party may be needed for certain promotions -->
-    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.apache.ofbiz.specialpurpose.pos.PosTerminal" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.product.product" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.product.price" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.product.promo" applEnumId="ESIA_INCLUDE"/>
+    <!-- org.ofbiz.product.category is needed for certain promotions, probably won't be used much for category browsing in the POS -->
+    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.product.category" applEnumId="ESIA_INCLUDE"/>
+    <!-- org.ofbiz.party.party may be needed for certain promotions -->
+    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5501" entityOrPackage="org.ofbiz.specialpurpose.pos.PosTerminal" applEnumId="ESIA_INCLUDE"/>
 
 <!-- POS->PSS POS Terminal to Per Store Server -->
     <EntityGroup entityGroupId="5505" entityGroupName="POS: POS Terminal to Per Store Server"/>
-    <!-- org.apache.ofbiz.party.party may be needed for order related information, like party roles or contact info etc -->
-    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
+    <!-- org.ofbiz.party.party may be needed for order related information, like party roles or contact info etc -->
+    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
     <!-- all order and related information, including payment, etc info -->
-    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.order" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.accounting.invoice" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.accounting.payment" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.order" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.accounting.invoice" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.accounting.payment" applEnumId="ESIA_INCLUDE"/>
     <!-- NOTE: no inventory information will be on the POS terminal, so don't send any over -->
-    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.pos.PosTerminalLog" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.apache.ofbiz.pos.PosTerminalState" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.pos.PosTerminalLog" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.pos.PosTerminalState" applEnumId="ESIA_INCLUDE"/>
 
 <!-- PSS->MCS Per Store Server to Central Server -->
     <EntityGroup entityGroupId="5506" entityGroupName="POS: Per Store Server to Central Server"/>
-    <!-- org.apache.ofbiz.party.party may be needed for order related information, like party roles or contact info etc -->
-    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
+    <!-- org.ofbiz.party.party may be needed for order related information, like party roles or contact info etc -->
+    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
     <!-- all order and related information, including payment, etc info -->
-    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.order" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.accounting.invoice" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.accounting.payment" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.order" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.accounting.invoice" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.accounting.payment" applEnumId="ESIA_INCLUDE"/>
     <!-- include inventory and issuance info -->
-    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.shipment.issuance" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.product.inventory" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.pos.PosTerminalLog" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.apache.ofbiz.pos.PosTerminalState" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.shipment.issuance" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.product.inventory" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.pos.PosTerminalLog" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.pos.PosTerminalState" applEnumId="ESIA_INCLUDE"/>
 
 
 <!-- Some examples of EntitySync settings for pulling and pushing data around -->

Modified: ofbiz/branches/release16.11/specialpurpose/webpos/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/webpos/entitydef/entitymodel.xml?rev=1825195&r1=1825194&r2=1825195&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/webpos/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/webpos/entitydef/entitymodel.xml Sat Feb 24 08:05:46 2018
@@ -30,15 +30,15 @@ under the License.
   <!-- ========================================================= -->
   <!-- ======================== Data Model ===================== -->
   <!-- The modules in this file are as follows:                  -->
-  <!--  - org.apache.ofbiz.specialpurpose.pos -->
+  <!--  - org.ofbiz.specialpurpose.pos -->
   <!-- ========================================================= -->
 
 
   <!-- ========================================================= -->
-  <!-- org.apache.ofbiz.specialpurpose.pos -->
+  <!-- org.ofbiz.specialpurpose.pos -->
   <!-- ========================================================= -->
     <entity entity-name="PosTerminal"
-            package-name="org.apache.ofbiz.specialpurpose.pos"
+            package-name="org.ofbiz.specialpurpose.pos"
             title="Pos Terminal">
       <field name="posTerminalId" type="id-ne"></field>
       <field name="facilityId" type="id"></field>
@@ -47,7 +47,7 @@ under the License.
       <prim-key field="posTerminalId"/>
     </entity>
     <entity entity-name="PosTerminalLog"
-            package-name="org.apache.ofbiz.specialpurpose.pos"
+            package-name="org.ofbiz.specialpurpose.pos"
             title="Pos Terminal Log">
       <field name="posTerminalLogId" type="id-ne"></field>
       <field name="posTerminalId" type="id-ne"></field>
@@ -74,7 +74,7 @@ under the License.
       </relation>
     </entity>
     <entity entity-name="PosTerminalState"
-            package-name="org.apache.ofbiz.specialpurpose.pos"
+            package-name="org.ofbiz.specialpurpose.pos"
             title="Pos Terminal State">
       <field name="posTerminalId" type="id-ne"></field>
       <field name="openedDate" type="date-time"></field>
@@ -96,7 +96,7 @@ under the License.
       </relation>
     </entity>
     <entity entity-name="PosTerminalInternTx"
-            package-name="org.apache.ofbiz.specialpurpose.pos"
+            package-name="org.ofbiz.specialpurpose.pos"
             title="Pos Terminal Internal Transaction">
       <field name="posTerminalLogId" type="id-ne"></field>
       <field name="paidAmount" type="currency-amount"></field>