You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2015/03/18 11:38:44 UTC
svn commit: r1667484 - in /ofbiz/branches/release14.12: ./
applications/order/entitydef/entitymodel.xml
specialpurpose/scrum/entitydef/entitymodel.xml
Author: deepak
Date: Wed Mar 18 10:38:44 2015
New Revision: 1667484
URL: http://svn.apache.org/r1667484
Log:
Applied fix from trunk r#1667483.
=========================================
Moved parentCustRequestId relationship for CustRequest entity from order/entitymodel.xml to scrum/entitymodel.xml, as parentCustRequestId defined in scrum component.
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/order/entitydef/entitymodel.xml
ofbiz/branches/release14.12/specialpurpose/scrum/entitydef/entitymodel.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 18 10:38:44 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483
Modified: ofbiz/branches/release14.12/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/entitydef/entitymodel.xml?rev=1667484&r1=1667483&r2=1667484&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release14.12/applications/order/entitydef/entitymodel.xml Wed Mar 18 10:38:44 2015
@@ -1780,9 +1780,6 @@ under the License.
<relation type="one" fk-name="CUST_REQ_CUOM" title="Currency" rel-entity-name="Uom">
<key-map field-name="currencyUomId" rel-field-name="uomId"/>
</relation>
- <relation type="one" fk-name="CUST_REQ_PARENT" title="Parent" rel-entity-name="CustRequest">
- <key-map field-name="parentCustRequestId" rel-field-name="custRequestId"/>
- </relation>
</entity>
<entity entity-name="CustRequestAttribute"
package-name="org.ofbiz.order.request"
Modified: ofbiz/branches/release14.12/specialpurpose/scrum/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/scrum/entitydef/entitymodel.xml?rev=1667484&r1=1667483&r2=1667484&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/scrum/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release14.12/specialpurpose/scrum/entitydef/entitymodel.xml Wed Mar 18 10:38:44 2015
@@ -85,6 +85,9 @@ under the License.
<field name="custSequenceNum" type="numeric"/>
<field name="parentCustRequestId" type="id-ne"/>
<field name="billed" type="indicator"/>
+ <relation type="one" fk-name="CUST_REQ_PARENT" title="Parent" rel-entity-name="CustRequest">
+ <key-map field-name="parentCustRequestId" rel-field-name="custRequestId"/>
+ </relation>
</extend-entity>
<view-entity entity-name="ScrumProjectSprintBacklogAndTask"