svn commit: r1726551 - in /ofbiz/branches/release14.12: ./ applications/marketing/widget/sfa/forms/OpportunityForms.xml applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml applications/order/servicedef/secas.xml

Author: jleroux
Date: Sun Jan 24 19:14:51 2016
New Revision: 1726551

URL: http://svn.apache.org/viewvc?rev=1726551&view=rev
Log:
"Applied fix from trunk for revision: 1723248 "
------------------------------------------------------------------------
r1723248 | hansbak | 2016-01-06 08:53:26 +0100 (mer. 06 janv. 2016) | 1 ligne

various fixes to the salesopportunity list and create functions
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/marketing/widget/sfa/forms/OpportunityForms.xml
    ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
    ofbiz/branches/release14.12/applications/order/servicedef/secas.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 24 19:14:51 2016
@@ -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,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065
 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954,1724957,1724978,1725217,1725257,1725561
+/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,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065
 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954,1724957,1724978,1725217,1725257,1725561

Modified: ofbiz/branches/release14.12/applications/marketing/widget/sfa/forms/OpportunityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=1726551&r1=1726550&r2=1726551&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original)
+++ ofbiz/branches/release14.12/applications/marketing/widget/sfa/forms/OpportunityForms.xml Sun Jan 24 19:14:51 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 != &quot;SOSTG_CLOSED&quot;}" widget-style="buttontext">
+        <field name="editButton" title="${uiLabelMap.CommonClose}" use-when="estimatedCloseDate == void || estimatedCloseDate == null || org.ofbiz.base.util.UtilValidate.isDateAfterNow(estimatedCloseDate) || opportunityStageId != &quot;SOSTG_CLOSED&quot;" 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/branches/release14.12/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml?rev=1726551&r1=1726550&r2=1726551&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml (original)
+++ ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml Sun Jan 24 19:14:51 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/branches/release14.12/applications/order/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/servicedef/secas.xml?rev=1726551&r1=1726550&r2=1726551&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/servicedef/secas.xml (original)
+++ ofbiz/branches/release14.12/applications/order/servicedef/secas.xml Sun Jan 24 19:14:51 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">