Author: jleroux
Date: Mon Apr 16 06:30:07 2012
New Revision: 1326504
URL: http://svn.apache.org/viewvc?rev=1326504&view=rev
Log:
"Applied fix from trunk for revision: 1326503"
------------------------------------------------------------------------
r1326503 | jleroux | 2012-04-16 08:27:45 +0200 (lun., 16 avr. 2012) | 5 lines
Fixes a bug reported by Dimitrios Moustos on dev ML
The relationship between lead owner and lead company is not expired when
converting the lead.
The reason is that as the partyRelationship which is to be expired is looked up
the party group information is taken from partyGroupPartyId, which does not
exist.
The correct variable to use is partyGroupId.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1326503
Modified:
ofbiz/branches/release11.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=1326504&r1=1326503&r2=1326504&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
(original)
+++
ofbiz/branches/release11.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
Mon Apr 16 06:30:07 2012
@@ -165,7 +165,7 @@
<!-- Expire relation between lead company and its owner -->
<entity-and entity-name="PartyRelationship" list="partyRelationships"
filter-by-date="true">
<field-map field-name="partyIdFrom"
from-field="userLogin.partyId"/>
- <field-map field-name="partyIdTo" from-field="partyGroupPartyId"/>
+ <field-map field-name="partyIdTo" from-field="partyGroupId"/>
<field-map field-name="roleTypeIdTo" value="ACCOUNT_LEAD"/>
<field-map field-name="roleTypeIdFrom" value="OWNER"/>
<order-by field-name="-fromDate"/>
