svn commit: r1654274 - in /ofbiz/branches/release14.12: ./ applications/order/widget/ordermgr/FieldLookupForms.xml applications/order/widget/ordermgr/QuoteForms.xml

[jleroux]

Author: jleroux
Date: Fri Jan 23 17:25:41 2015
New Revision: 1654274

URL: http://svn.apache.org/r1654274
Log:
"Applied fix from trunk for revision: 1654273  " 
------------------------------------------------------------------------
r1654273 | jleroux | 2015-01-23 18:23:12 +0100 (ven. 23 janv. 2015) | 5 lignes

Fixes a bug, and get rid of some more bsh scriptlets

2015-01-23 18:19:10,216 |http-bio-8443-exec-6 |FlexibleStringExpander        
|W| Error evaluating scriptlet [${bsh:isPromo!=null&&isPromo.equals("Y")}]; 
error was: java.lang.IllegalArgumentException: Error ru
nning bsh script [isPromo!=null&&isPromo.equals("Y")]: 
javax.script.ScriptException: Sourced file: inline evaluation of: 
``isPromo!=null&&isPromo.equals("Y");'' : Attempt to resolve method: equals() 
on undefi
ned variable or class name: isPromo : at Line: 1 : in file: inline evaluation 
of: ``isPromo!=null&&isPromo.equals("Y");'' : isPromo .equals ( "Y" )
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release14.12/   (props changed)
    
ofbiz/branches/release14.12/applications/order/widget/ordermgr/FieldLookupForms.xml
    
ofbiz/branches/release14.12/applications/order/widget/ordermgr/QuoteForms.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 23 17:25:41 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653456,1654175
+/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653456,1654175,1654273

Modified: 
ofbiz/branches/release14.12/applications/order/widget/ordermgr/FieldLookupForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=1654274&r1=1654273&r2=1654274&view=diff
==============================================================================
--- 
ofbiz/branches/release14.12/applications/order/widget/ordermgr/FieldLookupForms.xml
 (original)
+++ 
ofbiz/branches/release14.12/applications/order/widget/ordermgr/FieldLookupForms.xml
 Fri Jan 23 17:25:41 2015
@@ -425,10 +425,10 @@ under the License.
         <field name="quoteItemSeqId" 
title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" 
use-when="${bsh: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="${bsh:isPromo!=null&amp;&amp;isPromo.equals(&quot;N&quot;)}">
+        <field name="quoteItemSeqId" 
title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" 
use-when="${groovy: 'N'.equals(isPromo)}">
             <hyperlink also-hidden="false" target-type="plain" 
description="${quoteItemSeqId}" 
target="javascript:set_value('${quoteItemSeqId}')"/>
         </field>
-        <field name="quoteItemSeqId" 
title="${uiLabelMap.OrderOrderQuoteItemSeqId}" 
use-when="${bsh:isPromo!=null&amp;&amp;isPromo.equals(&quot;Y&quot;)}"><display/></field>
+        <field name="quoteItemSeqId" 
title="${uiLabelMap.OrderOrderQuoteItemSeqId}" use-when="${groovy: 
'Y'.equals(isPromo)}"><display/></field>
         <field name="productId">
             <display-entity entity-name="Product" key-field-name="productId" 
description="${productId} - ${internalName}"/>
         </field>

Modified: 
ofbiz/branches/release14.12/applications/order/widget/ordermgr/QuoteForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/widget/ordermgr/QuoteForms.xml?rev=1654274&r1=1654273&r2=1654274&view=diff
==============================================================================
--- 
ofbiz/branches/release14.12/applications/order/widget/ordermgr/QuoteForms.xml 
(original)
+++ 
ofbiz/branches/release14.12/applications/order/widget/ordermgr/QuoteForms.xml 
Fri Jan 23 17:25:41 2015
@@ -195,13 +195,13 @@ under the License.
                 <parameter param-name="quoteItemSeqId"/>
             </hyperlink>
         </field>
-        <field name="quoteItemSeqId" 
title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" 
use-when="${bsh:isPromo!=null&amp;&amp;isPromo.equals(&quot;N&quot;)}">
+        <field name="quoteItemSeqId" 
title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" 
use-when="${groovy: 'N'.equals(isPromo)}">
             <hyperlink also-hidden="false" description="${quoteItemSeqId}" 
target="EditQuoteItem">
                 <parameter param-name="quoteId"/>
                 <parameter param-name="quoteItemSeqId"/>
             </hyperlink>
         </field>
-        <field name="quoteItemSeqId" 
title="${uiLabelMap.OrderOrderQuoteItemSeqId}" 
use-when="${bsh:isPromo!=null&amp;&amp;isPromo.equals(&quot;Y&quot;)}"><display/></field>
+        <field name="quoteItemSeqId" 
title="${uiLabelMap.OrderOrderQuoteItemSeqId}" use-when="${groovy: 
'Y'.equals(isPromo)}"><display/></field>
         <field name="productId" title="${uiLabelMap.ProductProductId}">
             <display-entity entity-name="Product" key-field-name="productId" 
description="${productId} - ${internalName}"/>
         </field>