Jacques,
As you know, we in AntWebsystems are using a 'near' trunk version which
we test for a month and then deploy in production. We do this for the
last 4 years without major problems. We also support the continuous
testing and deployment with the Kanban methodology with 'rolling'
releases. So for us, we cannot use the official ofbiz releases.
So my question, is it mandatory when we fix problems in the trunk that
we have to backport even if we do not use the releases?
The changes I did, were simple fixes, do we need a Jira for that too?
Regards,
Hans
On 06/01/16 16:00, Jacques Le Roux wrote:
Hi Hans,
With this commit and r1723007 will you not create a Jira and backport
fixes in released branches?
Jacques
Le 06/01/2016 08:53, [email protected] a écrit :
Author: hansbak
Date: Wed Jan 6 07:53:26 2016
New Revision: 1723248
URL: http://svn.apache.org/viewvc?rev=1723248&view=rev
Log:
various fixes to the salesopportunity list and create functions
Modified:
ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
ofbiz/trunk/applications/order/servicedef/secas.xml
Modified:
ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=1723248&r1=1723247&r2=1723248&view=diff
==============================================================================
---
ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
(original)
+++
ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
Wed Jan 6 07:53:26 2016
@@ -64,7 +64,6 @@ under the License.
</service>
</actions>
<row-actions>
- <set field="isDateAfterNow"
value="${groovy:org.ofbiz.base.util.UtilValidate.isDateAfterNow(estimatedCloseDate)}"
type="Boolean"/>
<entity-one entity-name="SalesOpportunity"
value-field="salesOpportunity"/>
</row-actions>
<field name="salesOpportunityId"><hidden/></field>
@@ -85,7 +84,7 @@ under the License.
<field name="estimatedAmount"
title="${uiLabelMap.SfaEstimatedAmount}"><display/></field>
<field name="nextStepDate" position="1"
title="${uiLabelMap.SfaNextStepDate}"
sort-field="true"><display/></field>
<field name="estimatedCloseDate"
title="${uiLabelMap.SfaCloseDate}"><display/></field>
- <field name="editButton" title="${uiLabelMap.CommonClose}"
use-when="${groovy: estimatedCloseDate == null || isDateAfterNow ==
true || opportunityStageId != "SOSTG_CLOSED"}"
widget-style="buttontext">
+ <field name="editButton" title="${uiLabelMap.CommonClose}"
use-when="estimatedCloseDate == void || estimatedCloseDate == null ||
org.ofbiz.base.util.UtilValidate.isDateAfterNow(estimatedCloseDate)
|| opportunityStageId != "SOSTG_CLOSED""
widget-style="buttontext">
<hyperlink target="closeSalesOpportunity"
description="${uiLabelMap.CommonClose}">
<parameter param-name="salesOpportunityId"/>
<parameter param-name="opportunityStageId"
value="SOSTG_CLOSED"/>
@@ -151,10 +150,10 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="accountPartyId"
use-when="communicationEvent==null"
title="${uiLabelMap.SfaInitialAccount}" ><lookup
target-form-name="LookupPartyGroup"
default-value="${accountPartyId}"/></field>
- <field name="accountPartyId"
use-when="communicationEvent!=null"
title="${uiLabelMap.SfaInitialAccount}" ><lookup
target-form-name="LookupPartyGroup"
default-value="${accountPartyId}"/></field>
- <field name="leadPartyId"
use-when="communicationEvent==null"
title="${uiLabelMap.SfaLead}"><lookup target-form-name="LookupPerson"
default-value="${leadPartyId}"/></field>
- <field name="leadPartyId"
use-when="communicationEvent!=null"
title="${uiLabelMap.SfaLead}"><lookup target-form-name="LookupPerson"
default-value="${communicationEvent.partyIdFrom}"/></field>
+ <field name="accountPartyId"
use-when="communicationEvent==null"
title="${uiLabelMap.SfaInitialAccount}" ><lookup
target-form-name="LookupAccount"
default-value="${accountPartyId}"/></field>
+ <field name="accountPartyId"
use-when="communicationEvent!=null"
title="${uiLabelMap.SfaInitialAccount}" ><lookup
target-form-name="LookupAccount"
default-value="${accountPartyId}"/></field>
+ <field name="leadPartyId"
use-when="communicationEvent==null"
title="${uiLabelMap.SfaLead}"><lookup target-form-name="LookupLead"
default-value="${leadPartyId}"/></field>
+ <field name="leadPartyId"
use-when="communicationEvent!=null"
title="${uiLabelMap.SfaLead}"><lookup target-form-name="LookupLead"
default-value="${communicationEvent.partyIdFrom}"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"
use-when="salesOpportunity==null"><submit button-type="button"/></field>
<field name="submitButton"
title="${uiLabelMap.CommonUpdate}"
use-when="salesOpportunity!=null"><submit button-type="button"/></field>
</form>
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml?rev=1723248&r1=1723247&r2=1723248&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
(original)
+++
ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
Wed Jan 6 07:53:26 2016
@@ -143,13 +143,11 @@ This file contains basic services for Sa
</if-not-empty>
<!-- Check party role for create Account Role -->
<if-not-empty field="parameters.accountPartyId">
- <set field="roleMap.roleTypeId" value="ACCOUNT"/>
- <set field="roleMap.partyId"
from-field="parameters.accountPartyId"/>
- <call-service service-name="ensurePartyRole"
in-map-name="roleMap"/>
- </if-not-empty>
<set field="salesOpportunityRole.roleTypeId"
value="ACCOUNT"/>
- <set field="salesOpportunityRole.salesOpportunityId"
from-field="parameters.salesOpportunityId"/>
<set field="salesOpportunityRole.partyId"
from-field="parameters.accountPartyId"/>
+ <call-service service-name="ensurePartyRole"
in-map-name="salesOpportunityRole"/>
+ </if-not-empty>
+ <set field="salesOpportunityRole.salesOpportunityId"
from-field="parameters.salesOpportunityId"/>
<call-service service-name="createSalesOpportunityRole"
in-map-name="salesOpportunityRole"/>
</if-compare-field>
</simple-method>
@@ -164,12 +162,10 @@ This file contains basic services for Sa
<remove-value value-field="lookedUpValue"/>
</if-not-empty>
<!-- Check party role for create Lead Role -->
- <if-not-empty field="parameters.leadPartyId">
- <call-service service-name="ensurePartyRole"
in-map-name="roleMap"/>
- </if-not-empty>
<set field="salesOpportunityRole.roleTypeId"
value="LEAD"/>
- <set field="salesOpportunityRole.salesOpportunityId"
from-field="parameters.salesOpportunityId"/>
<set field="salesOpportunityRole.partyId"
from-field="parameters.leadPartyId"/>
+ <call-service service-name="ensurePartyRole"
in-map-name="salesOpportunityRole"/>
+ <set field="salesOpportunityRole.salesOpportunityId"
from-field="parameters.salesOpportunityId"/>
<call-service service-name="createSalesOpportunityRole"
in-map-name="salesOpportunityRole"/>
</if-compare-field>
</simple-method>
Modified: ofbiz/trunk/applications/order/servicedef/secas.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/secas.xml?rev=1723248&r1=1723247&r2=1723248&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/secas.xml Wed Jan 6
07:53:26 2016
@@ -421,7 +421,6 @@ under the License.
<action service="createSalesOpportunityAccountRole"
mode="sync"/>
</eca>
<eca service="createSalesOpportunity" event="commit">
- <condition field-name="leadPartyId" operator="is-not-empty"/>
<action service="createSalesOpportunityLeadRole" mode="sync"/>
</eca>
<eca service="updateSalesOpportunity" event="commit">
--
Regards,
Hans Bakker
CEO, http://antwebsystems.com
