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/21 14:16:36 UTC
svn commit: r1668264 - in /ofbiz/branches/release14.12: ./
applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml
Author: deepak
Date: Sat Mar 21 13:16:36 2015
New Revision: 1668264
URL: http://svn.apache.org/r1668264
Log:
Applied fix from from trunk r#1668263
============================================================
Applied patch from jira issue OFBIZ-6201 - Error in Create New Account process of SFA
Thanks Arun Patidar for reporting the issue and providing the patch.
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 21 13:16:36 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,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258
+/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,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263
Modified: ofbiz/branches/release14.12/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml?rev=1668264&r1=1668263&r2=1668264&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml (original)
+++ ofbiz/branches/release14.12/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml Sat Mar 21 13:16:36 2015
@@ -25,7 +25,13 @@
<field-to-result field="partyId"/>
<set field="createPartyRoleCtx.partyId" from-field="userLogin.partyId"/>
<set field="createPartyRoleCtx.roleTypeId" value="OWNER"/>
- <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/>
+ <entity-one entity-name="PartyRole" value-field="partyRole">
+ <field-map field-name="partyId" from-field="createPartyRoleCtx.partyId"/>
+ <field-map field-name="roleTypeId" from-field="createPartyRoleCtx.roleTypeId"/>
+ </entity-one>
+ <if-empty field="partyRole">
+ <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/>
+ </if-empty>
<set field="partyRelationshipCtx.partyIdFrom" from-field="userLogin.partyId"/>
<set field="partyRelationshipCtx.partyIdTo" from-field="partyId"/>
<set field="partyRelationshipCtx.roleTypeIdFrom" value="OWNER"/>