svn commit: r1779625 - in /ofbiz: branches/release13.07/framework/entity/dtd/ branches/release14.12/framework/entity/dtd/ branches/release15.12/framework/entity/dtd/ branches/release16.11/framework/entity/dtd/ trunk/applications/accounting/entitydef/ t...

Author: jleroux
Date: Fri Jan 20 14:20:47 2017
New Revision: 1779625

URL: http://svn.apache.org/viewvc?rev=1779625&view=rev
Log:
Fixed: In entitymodel.xsd entity-alias for condition-expr must be required
(OFBIZ-9184)

Currently in the entitymodel.xsd the line

<xs:attribute name="entity-alias" type="xs:string"/>

is wrong, should be

<xs:attribute name="entity-alias" type="xs:string"  use="required"/>

Else in line

this.entityAlias = entityAlias;

in ModelViewEntity.ViewConditionExpr()

this.entityAlias

receives null.

All supported branches are concerned

Modified:
    ofbiz/branches/release13.07/framework/entity/dtd/entitymodel.xsd
    ofbiz/branches/release14.12/framework/entity/dtd/entitymodel.xsd
    ofbiz/branches/release15.12/framework/entity/dtd/entitymodel.xsd
    ofbiz/branches/release16.11/framework/entity/dtd/entitymodel.xsd
    ofbiz/trunk/applications/accounting/entitydef/entitymodel_reports.xml
    ofbiz/trunk/framework/entity/dtd/entitymodel.xsd

Modified: ofbiz/branches/release13.07/framework/entity/dtd/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/entity/dtd/entitymodel.xsd?rev=1779625&r1=1779624&r2=1779625&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/entity/dtd/entitymodel.xsd (original)
+++ ofbiz/branches/release13.07/framework/entity/dtd/entitymodel.xsd Fri Jan 20 14:20:47 2017
@@ -424,7 +424,7 @@ under the License.
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-expr">
-        <xs:attribute name="entity-alias" type="xs:string"/>
+        <xs:attribute name="entity-alias" type="xs:string"  use="required"/>
         <xs:attribute name="field-name" type="xs:string" use="required"/>
         <xs:attribute name="operator" default="equals">
             <xs:simpleType>

Modified: ofbiz/branches/release14.12/framework/entity/dtd/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/entity/dtd/entitymodel.xsd?rev=1779625&r1=1779624&r2=1779625&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/entity/dtd/entitymodel.xsd (original)
+++ ofbiz/branches/release14.12/framework/entity/dtd/entitymodel.xsd Fri Jan 20 14:20:47 2017
@@ -435,7 +435,7 @@ under the License.
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-expr">
-        <xs:attribute name="entity-alias" type="xs:string"/>
+        <xs:attribute name="entity-alias" type="xs:string"  use="required"/>
         <xs:attribute name="field-name" type="xs:string" use="required"/>
         <xs:attribute name="operator" default="equals">
             <xs:simpleType>

Modified: ofbiz/branches/release15.12/framework/entity/dtd/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/entity/dtd/entitymodel.xsd?rev=1779625&r1=1779624&r2=1779625&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/entity/dtd/entitymodel.xsd (original)
+++ ofbiz/branches/release15.12/framework/entity/dtd/entitymodel.xsd Fri Jan 20 14:20:47 2017
@@ -435,7 +435,7 @@ under the License.
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-expr">
-        <xs:attribute name="entity-alias" type="xs:string"/>
+        <xs:attribute name="entity-alias" type="xs:string"  use="required"/>
         <xs:attribute name="field-name" type="xs:string" use="required"/>
         <xs:attribute name="operator" default="equals">
             <xs:simpleType>

Modified: ofbiz/branches/release16.11/framework/entity/dtd/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/entity/dtd/entitymodel.xsd?rev=1779625&r1=1779624&r2=1779625&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/entity/dtd/entitymodel.xsd (original)
+++ ofbiz/branches/release16.11/framework/entity/dtd/entitymodel.xsd Fri Jan 20 14:20:47 2017
@@ -435,7 +435,7 @@ under the License.
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-expr">
-        <xs:attribute name="entity-alias" type="xs:string"/>
+        <xs:attribute name="entity-alias" type="xs:string"  use="required"/>
         <xs:attribute name="field-name" type="xs:string" use="required"/>
         <xs:attribute name="operator" default="equals">
             <xs:simpleType>

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel_reports.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel_reports.xml?rev=1779625&r1=1779624&r2=1779625&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel_reports.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel_reports.xml Fri Jan 20 14:20:47 2017
@@ -107,7 +107,7 @@ under the License.
         <view-link entity-alias="INV" rel-entity-alias="PFR" rel-optional="true">
             <key-map field-name="partyIdFrom" rel-field-name="partyId"/>
             <entity-condition>
-                <condition-expr entity-alias="PFR" field-name="partyIdentificationTypeId" value="INVOICE_EXPORT"/>
+                <condition-expr field-name="partyIdentificationTypeId" value="INVOICE_EXPORT"/>
             </entity-condition>
         </view-link>
         <view-link entity-alias="INV" rel-entity-alias="PTO" rel-optional="true">

Modified: ofbiz/trunk/framework/entity/dtd/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/dtd/entitymodel.xsd?rev=1779625&r1=1779624&r2=1779625&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/dtd/entitymodel.xsd (original)
+++ ofbiz/trunk/framework/entity/dtd/entitymodel.xsd Fri Jan 20 14:20:47 2017
@@ -435,7 +435,7 @@ under the License.
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-expr">
-        <xs:attribute name="entity-alias" type="xs:string"/>
+        <xs:attribute name="entity-alias" type="xs:string"  use="required"/>
         <xs:attribute name="field-name" type="xs:string" use="required"/>
         <xs:attribute name="operator" default="equals">
             <xs:simpleType>