Author: hansbak
Date: Tue Jan 5 07:08:06 2016
New Revision: 1723007
URL: http://svn.apache.org/viewvc?rev=1723007&view=rev
Log:
sales opportunity creation: required-field removed, disturbed the form
submission, entityone no value field, error in the log
Modified:
ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.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=1723007&r1=1723006&r2=1723007&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
(original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
Tue Jan 5 07:08:06 2016
@@ -65,7 +65,7 @@ under the License.
</actions>
<row-actions>
<set field="isDateAfterNow"
value="${groovy:org.ofbiz.base.util.UtilValidate.isDateAfterNow(estimatedCloseDate)}"
type="Boolean"/>
- <entity-one entity-name="SalesOpportunity"/>
+ <entity-one entity-name="SalesOpportunity"
value-field="salesOpportunity"/>
</row-actions>
<field name="salesOpportunityId"><hidden/></field>
<field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}">
@@ -93,8 +93,8 @@ under the License.
</field>
</form>
- <form name="EditSalesOpportunity" type="single"
target="updateSalesOpportunity" default-map-name="salesOpportunity"
- header-row-style="header-row" default-table-style="basic-table">
+ <form name="EditSalesOpportunity" type="single"
target="updateSalesOpportunity" default-map-name="salesOpportunity"
+ header-row-style="header-row" default-table-style="basic-table" >
<alt-target use-when="salesOpportunity==null"
target="createSalesOpportunity"/>
<field name="salesOpportunityId"
use-when="salesOpportunity!=null"><display/></field>
<field name="salesOpportunityId"
use-when="salesOpportunity==null&&salesOpportunityId==null"><text/></field>
@@ -119,8 +119,8 @@ under the License.
</drop-down>
</field>
<field name="nextStepDate" position="1"
title="${uiLabelMap.SfaNextStepDate}"><date-time/></field>
- <field name="estimatedCloseDate" position="2"
title="${uiLabelMap.SfaCloseDate}" required-field="true"><date-time/></field>
- <field name="opportunityStageId" position="1"
title="${uiLabelMap.SfaInitialStage}" required-field="true">
+ <field name="estimatedCloseDate" position="2"
title="${uiLabelMap.SfaCloseDate}"><date-time/></field>
+ <field name="opportunityStageId" position="1"
title="${uiLabelMap.SfaInitialStage}">
<drop-down>
<entity-options entity-name="SalesOpportunityStage">
<entity-order-by field-name="sequenceNum"/>
@@ -153,8 +153,8 @@ under the License.
</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}" required-field="true"><lookup
target-form-name="LookupPerson" default-value="${leadPartyId}"/></field>
- <field name="leadPartyId" use-when="communicationEvent!=null"
title="${uiLabelMap.SfaLead}" required-field="true"><lookup
target-form-name="LookupPerson"
default-value="${communicationEvent.partyIdFrom}"/></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="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>
