svn commit: r1403370 - in /ofbiz/trunk/applications: party/entitydef/entitymodel.xml product/entitydef/entitymodel_shipment.xml

Author: jleroux
Date: Mon Oct 29 15:33:39 2012
New Revision: 1403370

URL: http://svn.apache.org/viewvc?rev=1403370&view=rev
Log:
Thanks to Roberto Benítez Monje's report: "Ofbiz uses a reserved word in a Party View definition" https://issues.apache.org/jira/browse/OFBIZ-5062

Inside the component Part, the view-entity 'PartyIdentificationAndParty' uses the reserved word of MAXDB "PI". Without change it the Party component doesn't work properly  

jleroux: I just changed form PI to PIN and PIM where relevant

Modified:
    ofbiz/trunk/applications/party/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml

Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=1403370&r1=1403369&r2=1403370&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Mon Oct 29 15:33:39 2012
@@ -1665,16 +1665,16 @@ under the License.
     <view-entity entity-name="PartyIdentificationAndParty"
                 package-name="org.ofbiz.party.party"
                 title="PartyIdentification and Party View Entity">
-      <member-entity entity-alias="PI" entity-name="PartyIdentification"/>
+      <member-entity entity-alias="PIN" entity-name="PartyIdentification"/>
       <member-entity entity-alias="PIT" entity-name="PartyIdentificationType"/>
       <member-entity entity-alias="PA" entity-name="Party"/>
-      <alias-all entity-alias="PI" />
+      <alias-all entity-alias="PIN" />
       <alias-all entity-alias="PA" />
       <alias name="partyIdentTypeDesc" field="description"  entity-alias="PIT"/>
-      <view-link entity-alias="PI" rel-entity-alias="PA">
+      <view-link entity-alias="PIN" rel-entity-alias="PA">
         <key-map field-name="partyId"/>
       </view-link>
-      <view-link entity-alias="PI" rel-entity-alias="PIT">
+      <view-link entity-alias="PIN" rel-entity-alias="PIT">
         <key-map field-name="partyIdentificationTypeId"/>
       </view-link>
     </view-entity>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?rev=1403370&r1=1403369&r2=1403370&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Mon Oct 29 15:33:39 2012
@@ -268,10 +268,10 @@ under the License.
                  package-name="org.ofbiz.shipment.picklist"
                  title="Picklist Item and Bin View Entity">
       <member-entity entity-alias="PB" entity-name="PicklistBin"/>
-      <member-entity entity-alias="PI" entity-name="PicklistItem"/>
+      <member-entity entity-alias="PIM" entity-name="PicklistItem"/>
       <alias-all entity-alias="PB"/>
-      <alias-all entity-alias="PI"/>
-      <view-link entity-alias="PB" rel-entity-alias="PI">
+      <alias-all entity-alias="PIM"/>
+      <view-link entity-alias="PB" rel-entity-alias="PIM">
         <key-map field-name="picklistBinId"/>
       </view-link>
     </view-entity>