svn commit: r1679697 - in /ofbiz/trunk/applications/order/widget/ordermgr: FieldLookupForms.xml ReturnForms.xml

Author: jleroux
Date: Sat May 16 08:00:32 2015
New Revision: 1679697

URL: http://svn.apache.org/r1679697
Log:
A patch from Pierre Smits "Replacing bsh code with groovy Code in ORDER screens, forms and menus" https://issues.apache.org/jira/browse/OFBIZ-6340

jleroux: The quote part has been already handled at OFBIZ-6351


Modified:
    ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml

Modified: ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=1679697&r1=1679696&r2=1679697&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml Sat May 16 08:00:32 2015
@@ -422,7 +422,7 @@ under the License.
         </field>
         <field name="quoteId"><hidden/></field>
         <field name="quoteItemSeqId"><hidden/></field>
-        <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${bsh:isPromo==null}">
+        <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy:isPromo==null}">
             <hyperlink also-hidden="false" target-type="plain" description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')"/>
         </field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy: 'N'.equals(isPromo)}">

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml?rev=1679697&r1=1679696&r2=1679697&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml Sat May 16 08:00:32 2015
@@ -94,7 +94,7 @@ under the License.
         </field>
         <field name="paymentMethodId" use-when="creditCardList!=null&amp;&amp;creditCardList.size()&gt;0">
             <drop-down allow-empty="true">
-                <list-options list-name="creditCardList" list-entry-name="creditCardPm" key-name="creditCardPm.paymentMethodId" description="${bsh:org.ofbiz.party.contact.ContactHelper.formatCreditCard(creditCardPm.getRelatedOne(&quot;CreditCard&quot;, false))}"/>
+                <list-options list-name="creditCardList" list-entry-name="creditCardPm" key-name="creditCardPm.paymentMethodId" description="${groovy:org.ofbiz.party.contact.ContactHelper.formatCreditCard(creditCardPm.getRelatedOne(&quot;CreditCard&quot;, false))}"/>
             </drop-down>
         </field>
         <field name="newCreditCard" widget-style="buttontext" use-when="returnHeader!=null&amp;&amp;returnHeader.getString(&quot;fromPartyId&quot;)!=null">