svn commit: r1726543 - in /ofbiz/branches/release15.12: ./ applications/marketing/widget/sfa/forms/OpportunityForms.xml

Author: jleroux
Date: Sun Jan 24 19:08:54 2016
New Revision: 1726543

URL: http://svn.apache.org/viewvc?rev=1726543&view=rev
Log:
"Applied fix from trunk for revision: 1723007 "
------------------------------------------------------------------------
r1723007 | hansbak | 2016-01-05 08:08:06 +0100 (mar. 05 janv. 2016) | 1 ligne

sales opportunity creation: required-field removed, disturbed the form submission, entityone no value field, error in the log
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/marketing/widget/sfa/forms/OpportunityForms.xml

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 24 19:08:54 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,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1726388
+/ofbiz/trunk:1722712,1723007,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1726388

Modified: ofbiz/branches/release15.12/applications/marketing/widget/sfa/forms/OpportunityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=1726543&r1=1726542&r2=1726543&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original)
+++ ofbiz/branches/release15.12/applications/marketing/widget/sfa/forms/OpportunityForms.xml Sun Jan 24 19:08:54 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&amp;&amp;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>