svn commit: r1740443 - in /ofbiz/branches/release15.12: ./ specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

[Deepak Dixit-5]

Author: deepak
Date: Fri Apr 22 05:47:38 2016
New Revision: 1740443

URL: http://svn.apache.org/viewvc?rev=1740443&view=rev
Log:
Applied fix from trunk for revision: 1740442
===

(OFBIZ-6989) Applied patch from jira issue.
============================================================
Editing project in Project Manager duplicates resources
============================================================
Thanks Montalbano Florian for reporting issue and providing the patch.

Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 22 05:47:38 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442

Modified: ofbiz/branches/release15.12/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=1740443&r1=1740442&r2=1740443&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Fri Apr 22 05:47:38 2016
@@ -126,7 +126,7 @@
                             input map: updProjectRole.newPartyId, updProjectRole.roleTypeId">
         <entity-and entity-name="WorkEffortPartyAssignment" list="workEffortPartyAssignments" filter-by-date="true">
             <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
-            <field-map field-name="roleTypeId" value="updProjectRole.roleTypeId"/>
+            <field-map field-name="roleTypeId" from-field="updProjectRole.roleTypeId"/>
         </entity-and>
         <!-- end current record if required -->
         <if-not-empty field="workEffortPartyAssignments">