OFBiz - svn commit: r1242884 [2/2] - in /ofbiz/branches/20120209RemoveBsh: applications/accounting/script/org/ofbiz/accounting/fixedasset/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accounting/script/org/ofbiz/accounting/ledger/ ...

svn commit: r1242884 [2/2] - in /ofbiz/branches/20120209RemoveBsh: applications/accounting/script/org/ofbiz/accounting/fixedasset/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accounting/script/org/ofbiz/accounting/ledger/ ...

Posted by erwan on
URL: http://ofbiz.116.s1.nabble.com/svn-commit-r1242884-2-2-in-ofbiz-branches-20120209RemoveBsh-applications-accounting-script-org-ofbiz-tp4377193.html

Modified: ofbiz/branches/20120209RemoveBsh/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/workeffort/widget/WorkEffortForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/applications/workeffort/widget/WorkEffortForms.xml Fri Feb 10 18:51:03 2012
@@ -924,7 +924,7 @@ under the License.
</hyperlink>
</field>
<field name="noteInfo" title="${uiLabelMap.CommonNote}"><display/></field>
- <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field>
+ <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${groovy:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field>
<field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when=""N".equals(internalNote)">
<hyperlink target="updateWorkEffortNote" description="${uiLabelMap.OrderNotesPrivate}">
<parameter param-name="workEffortId"/>
@@ -1352,7 +1352,7 @@ under the License.

<form name="EditICalendar" default-map-name="workEffort" target="updateICalendar" type="single">
<actions>
- <set field="serverRootUrl" value="${bsh: org.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/>
+ <set field="serverRootUrl" value="${groovy: org.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/>
</actions>
<alt-target target="createICalendar" use-when="workEffort==null"/>
<field name="workEffortTypeId"><hidden value="PUBLISH_PROPS"></hidden></field>
@@ -1427,7 +1427,7 @@ under the License.
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="statusId" value="PRTYASGN_ASSIGNED"/>
</entity-and>
- <set field="serverRootUrl" value="${bsh: org.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/>
+ <set field="serverRootUrl" value="${groovy: org.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/>
</actions>
<field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}">
<hyperlink also-hidden="false" description="${workEffortId}" target="EditICalendar" target-type="plain">

Modified: ofbiz/branches/20120209RemoveBsh/framework/webtools/widget/tempExprForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/framework/webtools/widget/tempExprForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/framework/webtools/widget/tempExprForms.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/framework/webtools/widget/tempExprForms.xml Fri Feb 10 18:51:03 2012
@@ -24,7 +24,7 @@ under the License.

<form name="FindTemporalExpression" target="findTemporalExpression" type="single">
<actions>
- <set field="expressionTypeList" value="${bsh:org.ofbiz.service.calendar.ExpressionUiHelper.getExpressionTypeList(uiLabelMap);}" type="List"/>
+ <set field="expressionTypeList" value="${groovy:org.ofbiz.service.calendar.ExpressionUiHelper.getExpressionTypeList(uiLabelMap);}" type="List"/>
</actions>
<field name="tempExprId" title="${uiLabelMap.TemporalExpressionId}"><text-find/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/ebay/widget/EbayForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/ebay/widget/EbayForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/ebay/widget/EbayForms.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/ebay/widget/EbayForms.xml Fri Feb 10 18:51:03 2012
@@ -36,8 +36,8 @@ under the License.
<form name="ListOrdersFromEbay" type="multi" use-row-submit="true" list-name="orderList" target="ImportOrderFromEbay"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <set field="canImportOrder" value="${bsh: org.ofbiz.base.util.UtilValidate.isEmpty(orderId) && org.ofbiz.base.util.UtilValidate.isEmpty(errorMessage)}" type="Boolean"/>
- <set field="allowProductIdChange" value="${bsh: org.ofbiz.base.util.UtilValidate.isEmpty(orderId) && org.ofbiz.base.util.UtilValidate.isNotEmpty(errorMessage)}" type="Boolean"/>
+ <set field="canImportOrder" value="${groovy: org.ofbiz.base.util.UtilValidate.isEmpty(orderId) && org.ofbiz.base.util.UtilValidate.isEmpty(errorMessage)}" type="Boolean"/>
+ <set field="allowProductIdChange" value="${groovy: org.ofbiz.base.util.UtilValidate.isEmpty(orderId) && org.ofbiz.base.util.UtilValidate.isNotEmpty(errorMessage)}" type="Boolean"/>
</row-actions>
<field name="productStoreId"><hidden/></field>
<field name="externalId" title="${uiLabelMap.EbayImportEbayItem}"><display/></field>
@@ -105,9 +105,9 @@ under the License.
<form name="ListEbayOrders" type="multi" use-row-submit="true" list-name="orderList" target="importEbayOrders"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <set field="canImportOrder" value="${bsh: org.ofbiz.base.util.UtilValidate.isEmpty(orderId)}" type="Boolean"/>
- <set field="isEbayOrder" value="${bsh: org.ofbiz.base.util.UtilValidate.isNotEmpty(isEbayOrder)}" type="Boolean"/>
- <set field="isEbayTransaction" value="${bsh: org.ofbiz.base.util.UtilValidate.isNotEmpty(isEbayTransaction)}" type="Boolean"/>
+ <set field="canImportOrder" value="${groovy: org.ofbiz.base.util.UtilValidate.isEmpty(orderId)}" type="Boolean"/>
+ <set field="isEbayOrder" value="${groovy: org.ofbiz.base.util.UtilValidate.isNotEmpty(isEbayOrder)}" type="Boolean"/>
+ <set field="isEbayTransaction" value="${groovy: org.ofbiz.base.util.UtilValidate.isNotEmpty(isEbayTransaction)}" type="Boolean"/>
</row-actions>
<field name="productStoreId"><hidden/></field>
<field name="externalId" title="${uiLabelMap.EbayEbayOrderIdOrTransactionId}" use-when="${isEbayOrder}" tooltip="eBay Order"><display/></field>

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Fri Feb 10 18:51:03 2012
@@ -526,7 +526,7 @@ under the License.
<field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
<field-map field-name="roleTypeId" value="EBAY_ACCOUNT"/>
</entity-and>
- <set field="partyId" value="${bsh:
+ <set field="partyId" value="${groovy:
import org.ofbiz.entity.util.EntityUtil;
GenericValue partyStore = EntityUtil.getFirst(storeList);
if(partyStore!=null) partyId = partyStore.getString("partyId");
@@ -760,18 +760,18 @@ under the License.
<script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListParameters.groovy"/>
</row-actions>
<field name="productStoreId"><hidden value="${productStoreId}"/></field>
- <field name="_rowSubmit" position="1" title="${uiLabelMap.CommonSelect}" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><check/></field>
- <field name="orderId" position="1" title="Order ID" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}">
+ <field name="_rowSubmit" position="1" title="${uiLabelMap.CommonSelect}" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><check/></field>
+ <field name="orderId" position="1" title="Order ID" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}">
<hyperlink target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}" description="${orderId}" target-type="plain" target-window="_BLANK"/>
</field>
- <field name="externalId" title="External ID" position="1" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${externalId}"></display></field>
- <field name="ebayUserIdBuyer" title="Winning Bidder" position="1" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${ebayUserIdBuyer}"></display></field>
+ <field name="externalId" title="External ID" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${externalId}"></display></field>
+ <field name="ebayUserIdBuyer" title="Winning Bidder" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${ebayUserIdBuyer}"></display></field>
<field name="dummy4" title=" " position="1"><display></display></field>
<field name="dummy5" title=" " position="1"><display></display></field>
- <field name="createdDate" title="Invoice Date" position="1" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${createdDate}"></display></field>
- <field name="paymentMethodUsed" title="Payment Type" position="1" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${paymentMethodUsed}"></display></field>
+ <field name="createdDate" title="Invoice Date" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${createdDate}"></display></field>
+ <field name="paymentMethodUsed" title="Payment Type" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${paymentMethodUsed}"></display></field>
<field name="dummy7" title=" " position="1"><display></display></field>
- <field name="amountPaid" title="Order Total Price" position="1" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${amountPaid}"></display></field>
+ <field name="amountPaid" title="Order Total Price" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${amountPaid}"></display></field>

<field name="dummy1" title=" " position="2"><display></display></field>
<field name="dummy2" title=" " position="2"><display></display></field>
@@ -785,9 +785,9 @@ under the License.
<field name="quantity" title="Quantity" position="2"><display description="${quantity}"></display></field>
<field name="amount" title="Amount price per item" position="2"><display description="${transactionPrice}"></display></field>

- <field name="paidTime" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${paidTime}"></hidden></field>
- <field name="shippedTime" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${shippedTime}"></hidden></field>
- <field name="emailBuyer" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${emailBuyer}"></hidden></field>
+ <field name="paidTime" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${paidTime}"></hidden></field>
+ <field name="shippedTime" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${shippedTime}"></hidden></field>
+ <field name="emailBuyer" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${emailBuyer}"></hidden></field>

<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/ebaystore/widget/EbayStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/ebaystore/widget/EbayStoreForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/ebaystore/widget/EbayStoreForms.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/ebaystore/widget/EbayStoreForms.xml Fri Feb 10 18:51:03 2012
@@ -17,7 +17,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.

-value="${bsh:billingAccount != null ? org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount) : 0}" type="BigDecimal"/>
+value="${groovy:billingAccount != null ? org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount) : 0}" type="BigDecimal"/>
-->

<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml Fri Feb 10 18:51:03 2012
@@ -120,7 +120,7 @@
<call-object-method method-name="render" obj-field="xscreens">
<field field="screenUri" type="String"/>
</call-object-method>
- <set field="content" value="${bsh:XMLWriter.toString()}"/>
+ <set field="content" value="${groovy:XMLWriter.toString()}"/>
</simple-method>

<simple-method method-name="setupContent" short-description="" login-required="false">
@@ -159,7 +159,7 @@
}
return org.ofbiz.base.util.UtilMisc.toMap("buffer", buffer);
]]></call-bsh>
- <set field="response" value="${bsh:buffer.toString()}"/>
+ <set field="response" value="${groovy:buffer.toString()}"/>
</simple-method>

<simple-method method-name="getReDirectFromXmlDoc" short-description="" login-required="false">

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/ProjectMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/ProjectMenus.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/ProjectMenus.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/ProjectMenus.xml Fri Feb 10 18:51:03 2012
@@ -55,14 +55,14 @@
<menu name="ProjectTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<actions>
<set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
- <set field="hasUpdatePermission" value="${bsh:
+ <set field="hasUpdatePermission" value="${groovy:
result = dispatcher.runSync("projectMgrPermission",
org.ofbiz.base.util.UtilMisc.toMap("userLogin", parameters.get("userLogin"),
"resourceDescription", "Project",
"mainAction", "UPDATE",
"projectId", projectId));
return result.get("hasPermission"); }" type="Boolean"/>
- <set field="hasViewPermission" value="${bsh:
+ <set field="hasViewPermission" value="${groovy:
result = dispatcher.runSync("projectMgrPermission",
org.ofbiz.base.util.UtilMisc.toMap("userLogin", parameters.get("userLogin"),
"resourceDescription", "Project",
@@ -221,7 +221,7 @@
<menu name="ProjectButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<actions>
<set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
- <set field="hasUpdatePermission" value="${bsh:
+ <set field="hasUpdatePermission" value="${groovy:
result = dispatcher.runSync("projectMgrPermission",
org.ofbiz.base.util.UtilMisc.toMap("userLogin", parameters.get("userLogin"),
"resourceDescription", "Project",

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/ProjectScreens.xml Fri Feb 10 18:51:03 2012
@@ -58,7 +58,7 @@ under the License.
</condition>
<actions>
<set field="parameters.partyId" from-field="parameters.userLogin.partyId"/>
- <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/>
+ <set field="nowDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/>
<set field="filterByDate" from-field="nowDate"/>
</actions>
<widgets/>

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/TaskScreens.xml Fri Feb 10 18:51:03 2012
@@ -273,7 +273,7 @@ under the License.
<set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
<entity-one entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/>
- <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/>
+ <set field="nowDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/>
<service service-name="getProjectIdAndNameFromTask" result-map="result">
<field-map field-name="taskId" from-field="parameters.workEffortId"/>
</service>

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Fri Feb 10 18:51:03 2012
@@ -57,7 +57,7 @@ under the License.
<widgets>
<decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.PageTitleTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}">
+ <screenlet title="${uiLabelMap.PageTitleTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${groovy:timesheet.get("thruDate").toString().substring(0,10)}">
<section>
<condition>
<if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
@@ -212,13 +212,13 @@ under the License.
<if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
</condition>
<widgets>
- <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"
+ <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${groovy:timesheet.get("thruDate").toString().substring(0,10)}"
navigation-form-name="WeekTimesheet">
<include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
- <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"
+ <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${groovy:timesheet.get("thruDate").toString().substring(0,10)}"
navigation-menu-name="TimesheetBar">
<include-menu name="TimesheetBar" location="component://projectmgr/widget/ProjectMenus.xml"/>
<include-form name="EditWeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Fri Feb 10 18:51:03 2012
@@ -124,7 +124,7 @@
</entity-condition>
</actions>
<row-actions>
- <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("workEffortId");return !(prev!=null&&prev.equals(workEffortId));}" type="Boolean"/>
+ <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("workEffortId");return !(prev!=null&&prev.equals(workEffortId));}" type="Boolean"/>
</row-actions>
<field name="workEffortId"><hidden/></field>
<field name="phaseName" position="1" use-when="showPosition1"><display description="${phaseName}[${phaseId}]"/></field>
@@ -194,7 +194,7 @@
<field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display type="date"/></field>
<field name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
<field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
- <field name="actualNonBilledTotalHours" title="${uiLabelMap.ProjectMgrNonBilledActualHours}"><display description="${bsh:isBillable&&actualNonBilledTotalHours!=void?actualNonBilledTotalHours:""}"/></field>
+ <field name="actualNonBilledTotalHours" title="${uiLabelMap.ProjectMgrNonBilledActualHours}"><display description="${groovy:isBillable&&actualNonBilledTotalHours!=void?actualNonBilledTotalHours:""}"/></field>
<field name="createdStamp" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field>
</form>
<form name="EditSubProjects" list-name="projects" type="list" target="RemoveSubProject"
@@ -525,8 +525,8 @@
<row-actions>
<entity-one entity-name="PartyAcctgPreference" value-field="orgParty"/>
<entity-one entity-name="Party" value-field="clientParty"/>
- <set field="currencyUomId" value="${bsh:orgParty!=null&&orgParty.getString("baseCurrencyUomId")!=null?orgParty.getString("baseCurrencyUomId"):""}"/>
- <set field="currencyUomId" value="${bsh:clientParty!=null&&clientParty.getString("preferredCurrencyUomId")!=null?clientParty.getString("preferredCurrencyUomId"):currencyUomId}"/>
+ <set field="currencyUomId" value="${groovy:orgParty!=null&&orgParty.getString("baseCurrencyUomId")!=null?orgParty.getString("baseCurrencyUomId"):""}"/>
+ <set field="currencyUomId" value="${groovy:clientParty!=null&&clientParty.getString("preferredCurrencyUomId")!=null?clientParty.getString("preferredCurrencyUomId"):currencyUomId}"/>
</row-actions>
<field name="projectId"><hidden/></field>
<field name="partyName" title="${uiLabelMap.CommonName}">

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/TaskForms.xml Fri Feb 10 18:51:03 2012
@@ -521,7 +521,7 @@
</actions>
<field name="noteId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
- <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field>
+ <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${groovy:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${groovy: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field>

<field name="internalNote" widget-style="buttontext" title="${uiLabelMap.ProjectMgrPrivateOrPublic}" use-when="internalNote.equals("N")">
<hyperlink target="updateTaskNote" description="${uiLabelMap.OrderNotesPrivate}">

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Fri Feb 10 18:51:03 2012
@@ -42,7 +42,7 @@
<entity-order-by field-name="sequenceNum"/>
<entity-order-by field-name="workEffortName"/>
</entity-options>
- <sub-hyperlink target="taskView" description="${bsh:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}">
+ <sub-hyperlink target="taskView" description="${groovy:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}">
<parameter param-name="workEffortId"/>
<parameter param-name="my"/>
</sub-hyperlink>
@@ -130,8 +130,8 @@
<set field="complete" value="${uiLabelMap.ProjectMgrToComplete}"/>
</actions>
<row-actions>
- <set field="actualHours" value="${bsh:org.ofbiz.project.Various.calculateActualHours(delegator, timesheetId)}"/>
- <set field="completeLink" value="${bsh:"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/>
+ <set field="actualHours" value="${groovy:org.ofbiz.project.Various.calculateActualHours(delegator, timesheetId)}"/>
+ <set field="completeLink" value="${groovy:"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/>
</row-actions>
<field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${timesheetId}" target="Timesheet">

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/MyWorkForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/MyWorkForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/MyWorkForms.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/MyWorkForms.xml Fri Feb 10 18:51:03 2012
@@ -132,7 +132,7 @@
<drop-down allow-empty="true" current-description="${result.projectId} ${product.productId} - ${result.projectName}${product.internalName} - ${result.sprintName} - ${groovy:result.backlogName.toString().substring(0,Math.min(result.backlogName.toString().length(),30))}[${result.backlogId}] - ${groovy:result.taskName.toString().substring(0,Math.min(result.taskName.toString().length(),30))}[${result.taskId}]">
<list-options key-name="taskId" list-name="taskListDropdown" description="${projectId}${productId} - ${projectName} ${productName} - ${sprintName} - ${groovy: if (description) description.substring(0,Math.min(description.length(),30))} [${custRequestId}] - ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/>
<entity-options description="${description}" entity-name="EmplLeaveType" key-field-name="leaveTypeId"/>
- <sub-hyperlink target="taskView" description="${bsh:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}" target-window="_blank">
+ <sub-hyperlink target="taskView" description="${groovy:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}" target-window="_blank">
<parameter param-name="taskId" from-field="workEffortId"/>
</sub-hyperlink>
</drop-down>

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/MyWorkScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/MyWorkScreens.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/MyWorkScreens.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/MyWorkScreens.xml Fri Feb 10 18:51:03 2012
@@ -120,13 +120,13 @@ under the License.
<if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
</condition>
<widgets>
- <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"
+ <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${groovy:timesheet.get("thruDate").toString().substring(0,10)}"
navigation-form-name="WeekTimesheet">
<include-form name="WeekTimesheet" location="component://scrum/widget/MyWorkForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
- <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"
+ <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${groovy:timesheet.get("thruDate").toString().substring(0,10)}"
navigation-menu-name="TimesheetBar">
<include-menu name="TimesheetBar" location="component://scrum/widget/scrumMenus.xml"/>
<include-form name="EditWeekTimesheet" location="component://scrum/widget/MyWorkForms.xml"/>

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TaskScreens.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TaskScreens.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TaskScreens.xml Fri Feb 10 18:51:03 2012
@@ -223,7 +223,7 @@ under the License.
<set field="tabButtonItem" value="Members"/>
<set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
<set field="workEffortId" from-field="parameters.taskId"/>
- <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/>
+ <set field="nowDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/>
</actions>
<widgets>
<decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TimeSheetForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TimeSheetForms.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TimeSheetForms.xml Fri Feb 10 18:51:03 2012
@@ -61,7 +61,7 @@
<set field="inProcess" value="Set To In-progress"/>
</actions>
<row-actions>
- <set field="completeLink" value="${bsh:"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/>
+ <set field="completeLink" value="${groovy:"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/>
</row-actions>
<field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${timesheetId}" target="ViewTimeSheet">
@@ -145,7 +145,7 @@
<drop-down allow-empty="true" current-description="${result.projectId} ${product.productId} - ${result.projectName}${product.internalName} - ${result.sprintName} - ${groovy:result.backlogName.toString().substring(0,Math.min(result.backlogName.toString().length(),30))}[${result.backlogId}] - ${groovy:result.taskName.toString().substring(0,Math.min(result.taskName.toString().length(),30))}[${result.taskId}]">
<list-options key-name="taskId" list-name="taskListDropdown" description="${projectId}${productId} - ${projectName} ${productName} - ${sprintName} - ${groovy: if (description) description.substring(0,Math.min(description.length(),30))} [${custRequestId}] - ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/>
<entity-options description="${description}" entity-name="EmplLeaveType" key-field-name="leaveTypeId"/>
- <sub-hyperlink target="taskView" description="${bsh:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}" target-window="_blank">
+ <sub-hyperlink target="taskView" description="${groovy:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}" target-window="_blank">
<parameter param-name="taskId" from-field="workEffortId"/>
</sub-hyperlink>
</drop-down>

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TimeSheetScreens.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TimeSheetScreens.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TimeSheetScreens.xml Fri Feb 10 18:51:03 2012
@@ -62,8 +62,8 @@ under the License.
<decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonWeek}: ${weekNumber}
- ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo}
- ${bsh:timesheet.get("thruDate").toString().substring(0,10)} ${uiLabelMap.PartyParty} : ${partyNameViewMap.lastName} ${partyNameViewMap.firstName} ${partyNameViewMap.middleName} [${timesheet.partyId}]">
+ ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo}
+ ${groovy:timesheet.get("thruDate").toString().substring(0,10)} ${uiLabelMap.PartyParty} : ${partyNameViewMap.lastName} ${partyNameViewMap.firstName} ${partyNameViewMap.middleName} [${timesheet.partyId}]">
<section>
<condition>
<if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/scrumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/scrumForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/scrumForms.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/scrumForms.xml Fri Feb 10 18:51:03 2012
@@ -115,7 +115,7 @@ under the License.
</service>
<set field="planHours" from-field="taskPlanHourOutMap.planHours"/>

- <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("custRequestId");return new Boolean(!(prev!=null&&prev.equals(custRequestId)));}" type="Boolean"/>
+ <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("custRequestId");return new Boolean(!(prev!=null&&prev.equals(custRequestId)));}" type="Boolean"/>

<entity-and entity-name="WorkEffortPartyAssignView" list="sprintMember">
<field-map field-name="workEffortId" from-field="sprintId"/>
@@ -926,7 +926,7 @@ under the License.
<set field="description" from-field="custRequest.description"/>
<set field="custRequestCategoryGroupId" from-field="parentCustRequestId"/>
<set field="estimatedHours" value="${groovy:custEstimatedMilliSeconds!=null?custEstimatedMilliSeconds/3600000:0;}"/>
- <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("parentCustRequestId");return new Boolean(!(prev!=null&&prev.equals(parentCustRequestId)));}" type="Boolean"/>
+ <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("parentCustRequestId");return new Boolean(!(prev!=null&&prev.equals(parentCustRequestId)));}" type="Boolean"/>
</row-actions>
<field name="postWorkHours"><hidden value="1"/></field>
<field name="priority"><hidden/></field>
@@ -1802,7 +1802,7 @@ under the License.
<form name="hoursNotYetBilled" type="multi" list-name="hoursNotYetBilledTasks" use-row-submit="false" paginate-target="ProductBilling" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
target="updateNotBilledBacklog?productId=${productId}&fromDate=${fromDate}&thruDate=${thruDate}&includeMeeting=${includeMeeting}&VIEW_SIZE_1=${parameters.VIEW_SIZE_1}&VIEW_INDEX_1=${parameters.VIEW_INDEX_1}">
<row-actions>
- <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("custRequestId");return !(prev!=null&&prev.equals(custRequestId));}" type="Boolean"/>
+ <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("custRequestId");return !(prev!=null&&prev.equals(custRequestId));}" type="Boolean"/>
<entity-one entity-name="WorkEffort" value-field="project">
<field-map field-name="workEffortId" from-field="projectId"/>
</entity-one>
@@ -2013,7 +2013,7 @@ under the License.
<set field="description" from-field="custRequest.description"/>
<set field="custRequestCategoryGroupId" from-field="parentCustRequestId"/>
<set field="estimatedHours" value="${groovy:custEstimatedMilliSeconds!=null?custEstimatedMilliSeconds/3600000:0;}"/>
- <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("parentCustRequestId");return new Boolean(!(prev!=null&&prev.equals(parentCustRequestId)));}" type="Boolean"/>
+ <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("parentCustRequestId");return new Boolean(!(prev!=null&&prev.equals(parentCustRequestId)));}" type="Boolean"/>
</row-actions>
<field name="custSequenceNum" position="2" title="${uiLabelMap.ScrumSeq}"><display/></field>
<field name="custRequestId" position="2" title="${uiLabelMap.ScrumProductBacklogItem}">
@@ -2046,7 +2046,7 @@ under the License.
<entity-one entity-name="CustRequest" value-field="custRequest"/>
<set field="description" from-field="custRequest.description"/>
<set field="estimatedHours" value="${groovy:custEstimatedMilliSeconds!=null?custEstimatedMilliSeconds/3600000:0;}"/>
- <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}" type="Boolean"/>
+ <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}" type="Boolean"/>
</row-actions>
<field name="productId" title="${uiLabelMap.PageTitleProduct}" position="1" use-when="showPosition1">
<display-entity entity-name="Product" description="${internalName} " key-field-name="productId">
@@ -3003,7 +3003,7 @@ under the License.
</service>
<set field="planHours" from-field="taskPlanHourOutMap.planHours"/>

- <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("custRequestId");return new Boolean(!(prev!=null&&prev.equals(custRequestId)));}" type="Boolean"/>
+ <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("custRequestId");return new Boolean(!(prev!=null&&prev.equals(custRequestId)));}" type="Boolean"/>

<entity-and entity-name="WorkEffortPartyAssignView" list="assignedTos">
<field-map field-name="workEffortId" from-field="workEffortId"/>
@@ -3156,7 +3156,7 @@ under the License.
<set field="description" from-field="custRequest.description"/>
<set field="custRequestCategoryGroupId" from-field="parentCustRequestId"/>
<set field="estimatedHours" value="${groovy:custEstimatedMilliSeconds!=null?custEstimatedMilliSeconds/3600000:0;}"/>
- <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("parentCustRequestId");return new Boolean(!(prev!=null&&prev.equals(parentCustRequestId)));}" type="Boolean"/>
+ <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("parentCustRequestId");return new Boolean(!(prev!=null&&prev.equals(parentCustRequestId)));}" type="Boolean"/>
</row-actions>
<!--<field name="custRequestCategoryGroupId" position="1" use-when="${groovy:showPosition1}" title="${uiLabelMap.ScrumCategory}">
<display-entity entity-name="CustRequest" key-field-name="custRequestId" description="${custRequestName}"/>

Modified: ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/scrumMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/scrumMenus.xml?rev=1242884&r1=1242883&r2=1242884&view=diff
==============================================================================
--- ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/scrumMenus.xml (original)
+++ ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/scrumMenus.xml Fri Feb 10 18:51:03 2012
@@ -253,7 +253,7 @@ under the License.
<menu name="ProductTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<actions>
<set field="productId" from-field="parameters.productId"/>
- <set field="hasUpdatePermission" value="${bsh:
+ <set field="hasUpdatePermission" value="${groovy:
result = dispatcher.runSync("scrumPermissionCheck",
org.ofbiz.base.util.UtilMisc.toMap("userLogin", parameters.get("userLogin"),
"resourceDescription", "PRODUCT",
@@ -633,7 +633,7 @@ under the License.
menu-container-style="button-bar button-style-2">
<actions>
<set field="productId" from-field="parameters.productId"/>
- <set field="hasViewPermission" value="${bsh:
+ <set field="hasViewPermission" value="${groovy:
result = dispatcher.runSync("scrumPermissionCheck",
org.ofbiz.base.util.UtilMisc.toMap("userLogin", parameters.get("userLogin"),
"resourceDescription", "PRODUCT",