svn commit: r1242884 [1/2] - in /ofbiz/branches/20120209Remove
Locked
svn commit: r1242884 [1/2] - in /ofbiz/branches/20120209Remove
 
|
Author: erwan
Date: Fri Feb 10 18:51:03 2012 New Revision: 1242884 URL: http://svn.apache.org/viewvc?rev=1242884&view=rev Log: replace bsh: to groovy: in all xml files Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/AccountingMenus.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/BillingAccountForms.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/GlForms.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/GlSetupForms.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/InvoiceForms.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/InvoiceScreens.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/PaymentForms.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/PaymentScreens.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ReportFinancialSummaryScreens.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ap/forms/InvoiceForms.xml ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ar/forms/InvoiceForms.xml ofbiz/branches/20120209RemoveBsh/applications/content/widget/content/ContentForms.xml ofbiz/branches/20120209RemoveBsh/applications/content/widget/forum/ForumForms.xml ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/PersonTrainingScreens.xml ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/forms/RecruitmentForms.xml ofbiz/branches/20120209RemoveBsh/applications/marketing/widget/sfa/forms/ContactForms.xml ofbiz/branches/20120209RemoveBsh/applications/marketing/widget/sfa/forms/LeadForms.xml ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/FieldLookupForms.xml ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/QuoteForms.xml ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/RequirementForms.xml ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/ReturnForms.xml ofbiz/branches/20120209RemoveBsh/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/branches/20120209RemoveBsh/applications/party/widget/partymgr/PartyForms.xml ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ConfigForms.xml ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/FacilityForms.xml ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ImageManagementForms.xml ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ProductForms.xml ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ProductStoreForms.xml ofbiz/branches/20120209RemoveBsh/applications/product/widget/facility/FacilityForms.xml ofbiz/branches/20120209RemoveBsh/applications/workeffort/widget/CalendarScreens.xml ofbiz/branches/20120209RemoveBsh/applications/workeffort/widget/WorkEffortForms.xml ofbiz/branches/20120209RemoveBsh/framework/webtools/widget/tempExprForms.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/ebay/widget/EbayForms.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/ebaystore/widget/EbayStoreForms.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/ProjectMenus.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/TaskScreens.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/TimeSheetScreens.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/MyWorkForms.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/MyWorkScreens.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TaskScreens.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TimeSheetForms.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/TimeSheetScreens.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/scrumForms.xml ofbiz/branches/20120209RemoveBsh/specialpurpose/scrum/widget/scrumMenus.xml Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Fri Feb 10 18:51:03 2012 @@ -366,7 +366,7 @@ under the License. </if-compare-field> </if-not-empty> </iterate> - <set field="nextIntervalQty" value="${bsh:maxIntervalQty.add(productMaintValue.getBigDecimal("intervalQuantity"));}" type="BigDecimal"/> + <set field="nextIntervalQty" value="${groovy:maxIntervalQty.add(productMaintValue.getBigDecimal("intervalQuantity"));}" type="BigDecimal"/> <if-not-empty field="meterValue.meterValue"> <if-compare-field field="nextIntervalQty" operator="less-equals" to-field="meterValue.meterValue" type="BigDecimal"> <set field="maintDue" value="false"/> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Fri Feb 10 18:51:03 2012 @@ -480,7 +480,7 @@ under the License. <else> <!-- if new status is paid check if the complete invoice is applied. --> <if-compare field="parameters.statusId" operator="equals" value="INVOICE_PAID"> - <set field="notApplied" type="BigDecimal" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}"/> + <set field="notApplied" type="BigDecimal" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}"/> <if-compare field="notApplied" operator="not-equals" value="0.00" type="BigDecimal"> <add-error> <fail-property resource="AccountingUiLabels" property="AccountingInvoiceCannotChangeStatusToPaid"/> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Fri Feb 10 18:51:03 2012 @@ -385,7 +385,7 @@ under the License. <get-related-one relation-name="GlAccountClass" value-field="glAccount" to-value-field="glAccountClass"/> <get-related-one relation-name="ParentGlAccountClass" value-field="glAccountClass" to-value-field="parentGlAccountClass"/> <!-- test if the account is a DEBIT account --> - <set field="isDebit" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount)}"/> + <set field="isDebit" value="${groovy:org.ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount)}"/> <if-compare field="isDebit" operator="equals" value="true"> <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D"> <set from-field="acctgTransEntry.amount" field="postingAmount"/> @@ -399,7 +399,7 @@ under the License. </if-compare> <else> <!-- otherwise, test if the account is credit --> - <set field="isCredit" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.isCreditAccount(glAccount)}"/> + <set field="isCredit" value="${groovy:org.ofbiz.accounting.util.UtilAccounting.isCreditAccount(glAccount)}"/> <if-compare field="isCredit" operator="equals" value="true"> <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C"> <set from-field="acctgTransEntry.amount" field="postingAmount"/> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Fri Feb 10 18:51:03 2012 @@ -309,7 +309,7 @@ under the License. <!-- check if the payment fully applied when set to confirmed--> <if-compare field="parameters.statusId" operator="equals" value="PMNT_CONFIRMED"> - <set field="notYetApplied" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)}"/> + <set field="notYetApplied" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)}"/> <if-compare field="notYetApplied" operator="greater" value="0.00" type="BigDecimal"> <add-error> <fail-property resource="AccountingUiLabels" property="AccountingPSNotConfirmedNotFullyApplied"/> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/AccountingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/AccountingMenus.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/AccountingMenus.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/AccountingMenus.xml Fri Feb 10 18:51:03 2012 @@ -400,7 +400,7 @@ under the License. <menu name="PaymentSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" menu-container-style="button-bar button-style-2"> <actions> - <set field="isDisbursement" value="${bsh:if(payment!=void)return org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}"/> + <set field="isDisbursement" value="${groovy:if(payment!=void)return org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}"/> </actions> <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}" widget-style="buttontext create" > <condition> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/BillingAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/BillingAccountForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/BillingAccountForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/BillingAccountForms.xml Fri Feb 10 18:51:03 2012 @@ -84,11 +84,11 @@ under the License. <field-map field-name="compareDate" from-field="invoiceDate"/> <field-map field-name="lastNameFirst" value="Y"/> </service> - <set field="paidInvoice" value="${bsh: org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId).compareTo(java.math.BigDecimal.ZERO)==0}" type="Boolean"/> - <set field="amountToApply" value="${bsh: + <set field="paidInvoice" value="${groovy: org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId).compareTo(java.math.BigDecimal.ZERO)==0}" type="Boolean"/> + <set field="amountToApply" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> - <set field="total" value="${bsh: + <set field="total" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/> </row-actions> @@ -104,22 +104,22 @@ under the License. <field name="description"><display/></field> <field name="partyIdFrom"><display description="${partyNameResultFrom.fullName} [${partyIdFrom}]"/></field> <field name="partyIdTo" parameter-name="partyId"><display description="${partyNameResultTo.fullName} [${partyId}]"/></field> - <field name="invoiceDate"><display description="${bsh:invoiceDate.toString().substring(0,10)}"/></field> + <field name="invoiceDate"><display description="${groovy:invoiceDate.toString().substring(0,10)}"/></field> <field name="total" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> <field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> - <field name="capture" use-when="${bsh:!paidInvoice}" widget-style="buttontext"> + <field name="capture" use-when="${groovy:!paidInvoice}" widget-style="buttontext"> <hyperlink target="capturePaymentsByInvoice" description="${uiLabelMap.AccountingCapture}"> <parameter param-name="invoiceId"/> <parameter param-name="billingAccountId"/> </hyperlink> </field> - <field name="capture" use-when="${bsh:paidInvoice}"><display/></field> + <field name="capture" use-when="${groovy:paidInvoice}"><display/></field> </form> <form name="EditBillingAccount" type="single" target="updateBillingAccount" title="" header-row-style="header-row" default-table-style="basic-table"> <actions> - <set field="availableBalance" value="${bsh:billingAccount != null ? org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount) : 0}" type="BigDecimal"/> + <set field="availableBalance" value="${groovy:billingAccount != null ? org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountBalance(billingAccount) : 0}" type="BigDecimal"/> </actions> <alt-target use-when="billingAccount==null" target="createBillingAccount"/> <auto-fields-service service-name="updateBillingAccount" map-name="billingAccount"/> @@ -152,7 +152,7 @@ under the License. </field> <!-- <field name="netBalance" title="${uiLabelMap.AccountingBillingNetBalance}" tooltip="${uiLabelMap.AccountingBillingNetBalanceMessage}"> - <display description="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountNetBalance(delegator, billingAccountId)}" type="currency" currency="${billingAccount.accountCurrencyUomId}"/> + <display description="${groovy:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountNetBalance(delegator, billingAccountId)}" type="currency" currency="${billingAccount.accountCurrencyUomId}"/> </field> --> <field name="availableBalance" title="${uiLabelMap.AccountingBillingAvailableBalance}" tooltip="${uiLabelMap.AccountingBillingAvailableBalanceMessage}"> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/GlForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/GlForms.xml Fri Feb 10 18:51:03 2012 @@ -275,7 +275,7 @@ under the License. </entity-condition> </actions> <row-actions> - <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("glAccountId");return new Boolean(!(prev!=null&&prev.equals(glAccountId)));}" type="Boolean"/> + <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("glAccountId");return new Boolean(!(prev!=null&&prev.equals(glAccountId)));}" type="Boolean"/> </row-actions> <field name="glAccountId" position="1" use-when="showPosition1"><display/></field> <field name="glAccountDescription" title="${uiLabelMap.CommonDescription}" position="1" use-when="showPosition1"> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/GlSetupForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/GlSetupForms.xml Fri Feb 10 18:51:03 2012 @@ -427,7 +427,7 @@ under the License. <entity-one entity-name="GlAccountClass" value-field="revenueGlAccountClass"> <field-map field-name="glAccountClassId" value="REVENUE"/> </entity-one> - <set field="revenueAccountClassIds" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(revenueGlAccountClass)}" type="List"/> + <set field="revenueAccountClassIds" value="${groovy:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(revenueGlAccountClass)}" type="List"/> </actions> <auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/> <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> @@ -481,7 +481,7 @@ under the License. <entity-one entity-name="GlAccountClass" value-field="expenseGlAccountClass"> <field-map field-name="glAccountClassId" value="EXPENSE"/> </entity-one> - <set field="expenseAccountClassIds" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(expenseGlAccountClass)}" type="List"/> + <set field="expenseAccountClassIds" value="${groovy:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(expenseGlAccountClass)}" type="List"/> </actions> <auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/> <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/InvoiceForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/InvoiceForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/InvoiceForms.xml Fri Feb 10 18:51:03 2012 @@ -69,9 +69,9 @@ under the License. <field-map field-name="compareDate" from-field="invoiceDate"/> <field-map field-name="lastNameFirst" value="Y"/> </service> - <set field="amountToApply" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId) + <set field="amountToApply" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId) .multiply(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/> - <set field="total" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId) + <set field="total" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId) .multiply(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/> <set field="currencyUomId" from-field="defaultOrganizationPartyCurrencyUomId"/> </row-actions> @@ -102,7 +102,7 @@ under the License. <form name="invoiceHeader" type="single" title="Invoice header information" default-map-name="invoice" header-row-style="header-row" default-table-style="basic-table"> <actions> - <set field="total" value="${bsh:return(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice));}"/> + <set field="total" value="${groovy:return(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice));}"/> <service service-name="getPartyNameForDate" result-map="partyNameResultFrom"> <field-map field-name="partyId" from-field="invoice.partyIdFrom"/> <field-map field-name="compareDate" from-field="invoice.invoiceDate"/> @@ -131,17 +131,17 @@ under the License. </field> <field position="1" name="roleTypeId"><display/></field> <field position="2" name="billingAccountId"><display/></field> - <field position="1" name="invoiceDate"><display description="${bsh:if(invoice.get("invoiceDate")!=null)return(invoice.getString("invoiceDate").substring(0,10));}"/></field> - <field position="2" name="dueDate"><display description="${bsh:if(invoice.get("dueDate")!=null)return(invoice.getString("dueDate").substring(0,10));}"/></field> + <field position="1" name="invoiceDate"><display description="${groovy:if(invoice.get("invoiceDate")!=null)return(invoice.getString("invoiceDate").substring(0,10));}"/></field> + <field position="2" name="dueDate"><display description="${groovy:if(invoice.get("dueDate")!=null)return(invoice.getString("dueDate").substring(0,10));}"/></field> <field position="1" name="total"><display description="${total}" type="currency" currency="${invoice.currencyUomId}"/></field> - <field position="2" name="paidDate"><display description="${bsh:if(invoice.get("paidDate")!=null)return(invoice.getString("paidDate").substring(0,10));}"/></field> + <field position="2" name="paidDate"><display description="${groovy:if(invoice.get("paidDate")!=null)return(invoice.getString("paidDate").substring(0,10));}"/></field> <field position="1" name="referenceNumber" title="${uiLabelMap.FormFieldTitle_referenceNum}"><display/></field> <field name="currencyUomId"><hidden/></field> </form> <form name="invoiceItems" list-name="invoiceItems" target="" title="" type="list" separate-columns="true" paginate-target="invoiceOverview" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> - <set field="total" value="${bsh: + <set field="total" value="${groovy: import java.math.BigDecimal; if(quantity==null) quantity = BigDecimal.ONE; if(amount==null) amount = BigDecimal.ZERO; @@ -349,7 +349,7 @@ under the License. <form name="EditInvoiceItems" type="multi" list-name="invoiceItems" default-entity-name="InvoiceItem" target="updateInvoiceItem?invoiceId=${invoiceId}&viewSize=${viewSize}&viewIndex=${viewIndex}" title="Edit Invoice Items" paginate-target="listInvoiceItems" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> - <set field="total" value="${bsh: + <set field="total" value="${groovy: import java.math.BigDecimal; if(quantity == null || quantity.compareTo(BigDecimal.ZERO) == 0) quantity = BigDecimal.ONE; return(quantity.multiply(amount));}"/> @@ -439,7 +439,7 @@ under the License. <form name="ListInvoiceStatus" list-name="invoiceStatus" target="" title="" type="list" paginate-target="ListInvoiceStatus" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="invoiceId"><hidden/></field> - <field name="statusDate"><display description="${bsh:statusDate.toString().substring(0,10)}"/></field> + <field name="statusDate"><display description="${groovy:statusDate.toString().substring(0,10)}"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field> </form> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/InvoiceScreens.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/InvoiceScreens.xml Fri Feb 10 18:51:03 2012 @@ -189,9 +189,9 @@ under the License. </entity-and> <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy"/> - <set field="invoiceAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/> - <set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/> - <set field="appliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}" type="BigDecimal"/> + <set field="invoiceAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/> + <set field="notAppliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/> + <set field="appliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}" type="BigDecimal"/> <entity-condition entity-name="AcctgTransAndEntries" list="AcctgTransAndEntries"> <condition-expr field-name="invoiceId" operator="equals" from-field="invoiceId"/> <order-by field-name="acctgTransId"/> @@ -343,9 +343,9 @@ under the License. <entity-one entity-name="Invoice" value-field="invoice"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy"/> - <set field="invoiceAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/> - <set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/> - <set field="appliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}" type="BigDecimal"/> + <set field="invoiceAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}" type="BigDecimal"/> + <set field="notAppliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/> + <set field="appliedAmount" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}" type="BigDecimal"/> </actions> <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/PaymentForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/PaymentForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/PaymentForms.xml Fri Feb 10 18:51:03 2012 @@ -60,7 +60,7 @@ under the License. </service> </actions> <row-actions> - <set field="amountToApply" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(delegator,paymentId);}"/> + <set field="amountToApply" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(delegator,paymentId);}"/> </row-actions> <field name="paymentId" widget-style="buttontext"> <hyperlink description="${paymentId}" target="paymentOverview"> @@ -443,7 +443,7 @@ under the License. </entity-condition> </actions> <row-actions> - <set field="amountApplied" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentAppliedAmount(delegator, paymentApplicationId);}"/> + <set field="amountApplied" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentAppliedAmount(delegator, paymentApplicationId);}"/> </row-actions> <auto-fields-entity entity-name="PaymentApplication" default-field-type="display"/> <field name="paymentApplicationId"><hidden/></field> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/PaymentScreens.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/PaymentScreens.xml Fri Feb 10 18:51:03 2012 @@ -168,11 +168,11 @@ under the License. <set field="tabButtonItem" value="editPaymentApplications"/> <set field="paymentId" from-field="parameters.paymentId"/> <entity-one entity-name="Payment" value-field="payment"/> - <set field="appliedAmount" type="String" value="${bsh: + <set field="appliedAmount" type="String" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment)));}"/> - <set field="notAppliedAmount" type="BigDecimal" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)}"/> - <set field="notAppliedAmountStr" type="String" value="${bsh: + <set field="notAppliedAmount" type="BigDecimal" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)}"/> + <set field="notAppliedAmountStr" type="String" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getCurrencyInstance(context.get("locale")).format(org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)));}"/> <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy"/> @@ -351,8 +351,8 @@ under the License. <entity-one entity-name="Payment" value-field="payment"/> <set field="finAccountTransId" from-field="payment.finAccountTransId"/> <entity-one entity-name="FinAccountTrans" value-field="finAccountTrans"/> - <set field="appliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment).toString()}"/> - <set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment).toString()}"/> + <set field="appliedAmount" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment).toString()}"/> + <set field="notAppliedAmount" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment).toString()}"/> <entity-condition entity-name="AcctgTransAndEntries" list="AcctgTransAndEntries"> <condition-expr field-name="paymentId" from-field="paymentId"/> <order-by field-name="acctgTransId"/> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ReportFinancialSummaryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ReportFinancialSummaryScreens.xml Fri Feb 10 18:51:03 2012 @@ -27,8 +27,8 @@ under the License. <set field="titleProperty" value="PageTitleFinancialSummaryReportOptions"/> <set field="headerItem" value="FinancialSummryReports"/> - <set field="month" from-field="parameters.month" default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/> - <set field="year" from-field="parameters.year" default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/> + <set field="month" from-field="parameters.month" default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/> + <set field="year" from-field="parameters.year" default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -60,8 +60,8 @@ under the License. <actions> <set field="headerItem" value="FinancialSummryReports"/> - <set field="month" from-field="parameters.month" type="Integer" default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/> - <set field="year" from-field="parameters.year" type="Integer" default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/> + <set field="month" from-field="parameters.month" type="Integer" default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/> + <set field="year" from-field="parameters.year" type="Integer" default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> <set field="currencyUomId" from-field="parameters.currencyUomId"/> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ap/forms/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ap/forms/InvoiceForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ap/forms/InvoiceForms.xml Fri Feb 10 18:51:03 2012 @@ -33,10 +33,10 @@ under the License. <field-map field-name="compareDate" from-field="invoiceDate"/> <field-map field-name="lastNameFirst" value="Y"/> </service> - <set field="amountToApply" value="${bsh: + <set field="amountToApply" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> - <set field="total" value="${bsh: + <set field="total" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/> </row-actions> Modified: ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ar/forms/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ar/forms/InvoiceForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/accounting/widget/ar/forms/InvoiceForms.xml Fri Feb 10 18:51:03 2012 @@ -34,10 +34,10 @@ under the License. <field-map field-name="compareDate" from-field="invoiceDate"/> <field-map field-name="lastNameFirst" value="Y"/> </service> - <set field="amountToApply" value="${bsh: + <set field="amountToApply" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/> - <set field="total" value="${bsh: + <set field="total" value="${groovy: import java.text.NumberFormat; return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/> </row-actions> Modified: ofbiz/branches/20120209RemoveBsh/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/content/widget/content/ContentForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/content/widget/content/ContentForms.xml Fri Feb 10 18:51:03 2012 @@ -330,7 +330,7 @@ under the License. </field> <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field> <field name="mapKey"><display/></field> - <field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field> + <field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc"> <parameter param-name="contentId"/> @@ -361,7 +361,7 @@ under the License. <field name="contentIdTo"><hidden/></field> <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field> <field name="mapKey"><display/></field> - <field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field> + <field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc"> <parameter param-name="contentId"/> Modified: ofbiz/branches/20120209RemoveBsh/applications/content/widget/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/content/widget/forum/ForumForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/content/widget/forum/ForumForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/content/widget/forum/ForumForms.xml Fri Feb 10 18:51:03 2012 @@ -65,7 +65,7 @@ under the License. <parameter param-name="deactivateExisting" value="yes"/> </hyperlink> </field> - <field name="fromDate" entry-name="caFromDate"><display description="${bsh:caFromDate.toString().substring(0,10)}"/></field> + <field name="fromDate" entry-name="caFromDate"><display description="${groovy:caFromDate.toString().substring(0,10)}"/></field> <field name="nbrOfMessages" entry-name="childBranchCount"><display/></field> </form> <form name="AddForum" type="single" target="createForum" @@ -150,8 +150,8 @@ under the License. <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field> <field name="messageTitle" entry-name="description" parameter-name="description"><display/></field> <field name="createdBy" entry-name="createdByUserLogin"><display/></field> - <field name="fromDate" entry-name="caFromDate"><display description="${bsh:caFromDate!=null?caFromDate.toString().substring(0,10):""}"/></field> - <field name="thruDate" entry-name="caThruDate"><display description="${bsh:caThruDate!=null?caThruDate.toString().substring(0,10):""}"/></field> + <field name="fromDate" entry-name="caFromDate"><display description="${groovy:caFromDate!=null?caFromDate.toString().substring(0,10):""}"/></field> + <field name="thruDate" entry-name="caThruDate"><display description="${groovy:caThruDate!=null?caThruDate.toString().substring(0,10):""}"/></field> <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"><hyperlink target="updateForumMessage"> <parameter param-name="forumGroupId"/> <parameter param-name="forumId"/> Modified: ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/PersonTrainingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/PersonTrainingScreens.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/PersonTrainingScreens.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/PersonTrainingScreens.xml Fri Feb 10 18:51:03 2012 @@ -36,7 +36,7 @@ <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy"/> </actions> <widgets> - <screenlet title="${uiLabelMap.WorkEffortDayView}: ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day"> + <screenlet title="${uiLabelMap.WorkEffortDayView}: ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day"> <include-menu name="Day" location="component://workeffort/widget/WorkEffortMenus.xml"/> <include-screen name="trainingCalendarDetail"/> <platform-specific> @@ -56,7 +56,7 @@ <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy"/> </actions> <widgets> - <screenlet title="${uiLabelMap.WorkEffortWeekView}: ${uiLabelMap.CommonWeek} ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w", timeZone, locale)}" navigation-menu-name="Week"> + <screenlet title="${uiLabelMap.WorkEffortWeekView}: ${uiLabelMap.CommonWeek} ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w", timeZone, locale)}" navigation-menu-name="Week"> <include-menu name="Week" location="component://workeffort/widget/WorkEffortMenus.xml"/> <include-screen name="trainingCalendarDetail"/> <platform-specific> @@ -73,7 +73,7 @@ <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy"/> </actions> <widgets> - <screenlet title="${uiLabelMap.WorkEffortMonthView}: ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month"> + <screenlet title="${uiLabelMap.WorkEffortMonthView}: ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month"> <include-menu name="Month" location="component://workeffort/widget/WorkEffortMenus.xml"/> <include-screen name="trainingCalendarDetail"/> <platform-specific> Modified: ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/forms/GlobalHRSettingForms.xml Fri Feb 10 18:51:03 2012 @@ -135,7 +135,7 @@ under the License. <form name="ListEmplPositionTypeRates" type="list" title="" target="deleteEmplPositionTypeRate" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <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"/> <entity-condition entity-name="EmplPositionTypeRateAndAmount" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId" operator="equals"/> Modified: ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/forms/RecruitmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/forms/RecruitmentForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/forms/RecruitmentForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/humanres/widget/forms/RecruitmentForms.xml Fri Feb 10 18:51:03 2012 @@ -445,7 +445,7 @@ under the License. <field name="internalOrganisation"><display/></field> <field name="reportingDate"><display/></field> <field name="location"> - <display description="${bsh: + <display description="${groovy: import org.ofbiz.entity.GenericValue; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.util.EntityUtil; Modified: ofbiz/branches/20120209RemoveBsh/applications/marketing/widget/sfa/forms/ContactForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/marketing/widget/sfa/forms/ContactForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/marketing/widget/sfa/forms/ContactForms.xml Fri Feb 10 18:51:03 2012 @@ -159,12 +159,12 @@ under the License. </actions> <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" position="1"> <drop-down allow-empty="false"> - <list-options list-name="partyList" key-name="contact.partyId" list-entry-name="contact" description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "partyId", false)} ${contact.partyId}"/> + <list-options list-name="partyList" key-name="contact.partyId" list-entry-name="contact" description="${groovy:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "partyId", false)} ${contact.partyId}"/> </drop-down> </field> <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" position="2"> <drop-down allow-empty="false"> - <list-options list-name="partyList" key-name="contact.partyId" list-entry-name="contact" description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "partyId", false)} ${contact.partyId}"/> + <list-options list-name="partyList" key-name="contact.partyId" list-entry-name="contact" description="${groovy:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "partyId", false)} ${contact.partyId}"/> </drop-down> </field> <field name="submitButton" position="3" title="${uiLabelMap.SfaMergeContacts}" widget-style="buttontext" tooltip-style="button-text"><submit button-type="text-link"/></field> Modified: ofbiz/branches/20120209RemoveBsh/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/marketing/widget/sfa/forms/LeadForms.xml Fri Feb 10 18:51:03 2012 @@ -85,7 +85,7 @@ under the License. </field> <field name="partyGroupId" title="${uiLabelMap.SfaAccountName}" tooltip="${uiLabelMap.SfaSelectExistingAccountOrLeaveBlankToCreateNew}" use-when="parameters.get("partyGroupId")=="""> <drop-down allow-empty="true" current-description=""> - <entity-options entity-name="PartyRole" description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "${partyId}", false)} : [${partyId}]" key-field-name="partyId"> + <entity-options entity-name="PartyRole" description="${groovy:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "${partyId}", false)} : [${partyId}]" key-field-name="partyId"> <entity-constraint name="roleTypeId" operator="equals" value="ACCOUNT"/> </entity-options> </drop-down> @@ -102,12 +102,12 @@ under the License. </actions> <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" position="1"> <drop-down allow-empty="false"> - <list-options list-name="partyList" key-name="lead.partyId" list-entry-name="lead" description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "partyId", false)} ${lead.partyId}"/> + <list-options list-name="partyList" key-name="lead.partyId" list-entry-name="lead" description="${groovy:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "partyId", false)} ${lead.partyId}"/> </drop-down> </field> <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" position="2"> <drop-down allow-empty="false"> - <list-options list-name="partyList" key-name="lead.partyId" list-entry-name="lead" description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "partyId", false)} ${lead.partyId}"/> + <list-options list-name="partyList" key-name="lead.partyId" list-entry-name="lead" description="${groovy:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "partyId", false)} ${lead.partyId}"/> </drop-down> </field> <field name="submitButton" position="3" title="${uiLabelMap.SfaMergeLeads}" widget-style="buttontext" tooltip-style="button-text"><submit button-type="text-link"/></field> Modified: ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/FieldLookupForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/FieldLookupForms.xml Fri Feb 10 18:51:03 2012 @@ -422,13 +422,13 @@ 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="${bsh:isPromo!=null&&isPromo.equals("N")}"> + <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy:isPromo!=null&&isPromo.equals("N")}"> <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&&isPromo.equals("Y")}"><display/></field> + <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" use-when="${groovy:isPromo!=null&&isPromo.equals("Y")}"><display/></field> <field name="productId"> <display-entity entity-name="Product" key-field-name="productId" description="${productId} - ${internalName}"/> </field> Modified: ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/QuoteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/QuoteForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/QuoteForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/QuoteForms.xml Fri Feb 10 18:51:03 2012 @@ -189,19 +189,19 @@ under the License. <auto-fields-entity entity-name="QuoteItem" default-field-type="display"/> <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" description="${quoteItemSeqId}" target="EditQuoteItem"> <parameter param-name="quoteId"/> <parameter param-name="quoteItemSeqId"/> </hyperlink> </field> - <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${bsh:isPromo!=null&&isPromo.equals("N")}"> + <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy:isPromo!=null&&isPromo.equals("N")}"> <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&&isPromo.equals("Y")}"><display/></field> + <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" use-when="${groovy:isPromo!=null&&isPromo.equals("Y")}"><display/></field> <field name="productId" title="${uiLabelMap.ProductProductId}"> <display-entity entity-name="Product" key-field-name="productId" description="${productId} - ${internalName}"/> </field> @@ -377,13 +377,13 @@ under the License. <field name="productFeatureId"><hidden/></field> <field name="createdDate"><hidden/></field> <field name="createdByUserLogin"><hidden/></field> - <field name="quoteAdjustmentId" title="${uiLabelMap.OrderOrderQuoteAdjustmentId}" widget-style="buttontext" use-when="${bsh:productPromoId==null}"> + <field name="quoteAdjustmentId" title="${uiLabelMap.OrderOrderQuoteAdjustmentId}" widget-style="buttontext" use-when="${groovy:productPromoId==null}"> <hyperlink also-hidden="false" description="${quoteAdjustmentId}" target="EditQuoteAdjustment"> <parameter param-name="quoteId"/> <parameter param-name="quoteAdjustmentId"/> </hyperlink> </field> - <field name="quoteAdjustmentId" title="${uiLabelMap.OrderOrderQuoteAdjustmentId}" use-when="${bsh:productPromoId!=null}"><display/></field> + <field name="quoteAdjustmentId" title="${uiLabelMap.OrderOrderQuoteAdjustmentId}" use-when="${groovy:productPromoId!=null}"><display/></field> <field name="quoteAdjustmentTypeId" title="${uiLabelMap.OrderOrderQuoteAdjustmentType}"> <display-entity entity-name="OrderAdjustmentType" key-field-name="orderAdjustmentTypeId"/> </field> Modified: ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/RequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/RequirementForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/RequirementForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/RequirementForms.xml Fri Feb 10 18:51:03 2012 @@ -64,8 +64,8 @@ under the License. </service> </actions> <row-actions> - <set field="lookupProductId" value="${bsh: (productId == null? "_NA_": productId);}" type="String"/> - <set field="lookupFacilityId" value="${bsh: (facilityIdId == null? "_NA_": facilityId);}" type="String"/> + <set field="lookupProductId" value="${groovy: (productId == null? "_NA_": productId);}" type="String"/> + <set field="lookupFacilityId" value="${groovy: (facilityIdId == null? "_NA_": facilityId);}" type="String"/> <service service-name="getInventoryAvailableByFacility" result-map="resultQoh"> <field-map field-name="productId" from-field="lookupProductId"/> <field-map field-name="facilityId" from-field="lookupFacilityId"/> Modified: ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/ReturnForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/ReturnForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/ReturnForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/order/widget/ordermgr/ReturnForms.xml Fri Feb 10 18:51:03 2012 @@ -94,7 +94,7 @@ under the License. </field> <field name="paymentMethodId" use-when="creditCardList!=null&&creditCardList.size()>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("CreditCard"))}"/> + <list-options list-name="creditCardList" list-entry-name="creditCardPm" key-name="creditCardPm.paymentMethodId" description="${groovy:org.ofbiz.party.contact.ContactHelper.formatCreditCard(creditCardPm.getRelatedOne("CreditCard"))}"/> </drop-down> </field> <field name="newCreditCard" widget-style="buttontext" use-when="returnHeader!=null&&returnHeader.getString("fromPartyId")!=null"> Modified: ofbiz/branches/20120209RemoveBsh/applications/party/widget/partymgr/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/party/widget/partymgr/CommunicationEventForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/party/widget/partymgr/CommunicationEventForms.xml Fri Feb 10 18:51:03 2012 @@ -124,7 +124,7 @@ under the License. </form> <form name="EditEmail" type="single" target="createCommunicationEvent" default-map-name="communicationEvent" id="EditEmail"> <actions> - <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"/> <entity-condition entity-name="PartyContactWithPurpose" list="emailAddresses"> <condition-list combine="and"> <condition-expr field-name="partyId" from-field="partyIdFrom"/> @@ -184,7 +184,7 @@ under the License. </form> <form name="EditInternalNote" type="single" target="createCommunicationEvent" default-map-name="communicationEvent"> <actions> - <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"/> <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/recentVisitor.groovy"/> </actions> <alt-target use-when="communicationEvent!=null" target="updateCommunicationEvent"/> @@ -505,7 +505,7 @@ under the License. </service> </actions> <row-actions> - <set field="toComplete" value="${bsh:"COM_ROLE_READ".equals(roleStatusId)?"PartyToComplete":"CommonEmptyHeader"}"/> + <set field="toComplete" value="${groovy:"COM_ROLE_READ".equals(roleStatusId)?"PartyToComplete":"CommonEmptyHeader"}"/> </row-actions> <field name="deleteCommEventIfLast"><hidden value="Y"/></field> <field name="delContentDataResource"><hidden value="Y"/></field> Modified: ofbiz/branches/20120209RemoveBsh/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/party/widget/partymgr/PartyForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/party/widget/partymgr/PartyForms.xml Fri Feb 10 18:51:03 2012 @@ -900,9 +900,9 @@ under the License. <set field="actualCurrencyUomId" from-field="actualCurrencyUomId" default-value="${defaultOrganizationPartyCurrencyUomId}"/> </actions> <row-actions> - <set field="total" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator, invoiceId, actualCurrency)}"/> - <set field="amountToApply" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId, actualCurrency)}"/> - <set field="amountApplied" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(delegator,invoiceId, org.ofbiz.base.util.UtilDateTime.nowTimestamp(), actualCurrency)}"/> + <set field="total" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator, invoiceId, actualCurrency)}"/> + <set field="amountToApply" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId, actualCurrency)}"/> + <set field="amountApplied" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(delegator,invoiceId, org.ofbiz.base.util.UtilDateTime.nowTimestamp(), actualCurrency)}"/> </row-actions> <field name="invoiceId"> <display-entity entity-name="Invoice" description=" " also-hidden="true"> Modified: ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ConfigForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ConfigForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ConfigForms.xml Fri Feb 10 18:51:03 2012 @@ -32,7 +32,7 @@ under the License. </service> </actions> <row-actions> - <set field="typeDescription" value="${bsh: return "SINGLE".equals(configItemTypeId) ? uiLabelMap.get("ProductSingleChoice") : uiLabelMap.get("ProductMultiChoice")}"/> + <set field="typeDescription" value="${groovy: return "SINGLE".equals(configItemTypeId) ? uiLabelMap.get("ProductSingleChoice") : uiLabelMap.get("ProductMultiChoice")}"/> </row-actions> <field name="configItemId" title="${uiLabelMap.ProductConfigItem}" widget-style="buttontext"> <hyperlink target="EditProductConfigItem" description="${configItemId}"> Modified: ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/FacilityForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/FacilityForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/FacilityForms.xml Fri Feb 10 18:51:03 2012 @@ -228,7 +228,7 @@ under the License. </service> </actions> <row-actions> - <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("inventoryItemId");return new Boolean(!(prev!=null&&prev.equals(inventoryItemId)));}" type="Boolean"/> + <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("inventoryItemId");return new Boolean(!(prev!=null&&prev.equals(inventoryItemId)));}" type="Boolean"/> </row-actions> <field name="inventoryItemId" widget-style="buttontext" position="1" use-when="showPosition1"> @@ -292,7 +292,7 @@ under the License. </service> </actions> <row-actions> - <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" position="1" use-when="showPosition1" widget-style="buttontext"> Modified: ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ImageManagementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ImageManagementForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ImageManagementForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ImageManagementForms.xml Fri Feb 10 18:51:03 2012 @@ -95,10 +95,10 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> - <field name="statusProductId" title="${uiLabelMap.ProductStatus}" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="statusProductId" title="${uiLabelMap.ProductStatus}" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <radio no-current-selected-key="${checkRadio}"> <option key="IM_APPROVED__${productId}" description="${uiLabelMap.FormFieldTitle_approve}"/> <option key="IM_REJECTED__${productId}" description="${uiLabelMap.FormFieldTitle_rejectButton}"/> @@ -150,7 +150,7 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> @@ -189,7 +189,7 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> <field name="_rowSubmit" position="2" title=" " widget-style="hidden"><check all-checked="true"/></field> @@ -244,7 +244,7 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> Modified: ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ProductForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ProductForms.xml Fri Feb 10 18:51:03 2012 @@ -1884,7 +1884,7 @@ under the License. <entity-one entity-name="Enumeration" value-field="locationType"> <field-map field-name="enumId" from-field="facilityLocation.locationTypeEnumId"/> </entity-one> - <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("facilityId");return new Boolean(!(prev!=null&&prev.equals(facilityId)));}" type="Boolean"/> + <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("facilityId");return new Boolean(!(prev!=null&&prev.equals(facilityId)));}" type="Boolean"/> </row-actions> <auto-fields-service service-name="updateProductFacilityLocation" default-position="2"/> <field name="productId" position="2"><hidden/></field> @@ -2041,7 +2041,7 @@ under the License. <display-entity entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/> </field> <field name="organizationPartyId" title="${uiLabelMap.ProductOrganization}"> - <display description="${bsh: org.ofbiz.party.party.PartyHelper.getPartyName(delegator, organizationPartyId, true);} [${organizationPartyId}]"/> + <display description="${groovy: org.ofbiz.party.party.PartyHelper.getPartyName(delegator, organizationPartyId, true);} [${organizationPartyId}]"/> </field> <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}"> <drop-down allow-empty="false"> Modified: ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ProductStoreForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ProductStoreForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/product/widget/catalog/ProductStoreForms.xml Fri Feb 10 18:51:03 2012 @@ -1074,24 +1074,24 @@ </field> <field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><display/></field> <field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll}"><display/></field> - <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:security.hasEntityPermission("CATALOG", "_UPDATE", session);}" widget-style="buttontext"> + <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${groovy:security.hasEntityPermission("CATALOG", "_UPDATE", session);}" widget-style="buttontext"> <hyperlink target="EditProductStorePaySetup" description="${uiLabelMap.CommonEdit}" also-hidden="false"> <parameter param-name="productStoreId"/> <parameter param-name="paymentMethodTypeId"/> <parameter param-name="paymentServiceTypeEnumId"/> </hyperlink> </field> - <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:!security.hasEntityPermission("CATALOG", "_UPDATE", session);}"> + <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${groovy:!security.hasEntityPermission("CATALOG", "_UPDATE", session);}"> <display/> </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:security.hasEntityPermission("CATALOG", "_DELETE", session);}" widget-style="buttontext"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${groovy:security.hasEntityPermission("CATALOG", "_DELETE", session);}" widget-style="buttontext"> <hyperlink target="storeRemovePaySetting" description="${uiLabelMap.CommonDelete}" also-hidden="false"> <parameter param-name="productStoreId"/> <parameter param-name="paymentMethodTypeId"/> <parameter param-name="paymentServiceTypeEnumId"/> </hyperlink> </field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:!security.hasEntityPermission("CATALOG", "_DELETE", session);}"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${groovy:!security.hasEntityPermission("CATALOG", "_DELETE", session);}"> <display/> </field> </form> Modified: ofbiz/branches/20120209RemoveBsh/applications/product/widget/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/product/widget/facility/FacilityForms.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/product/widget/facility/FacilityForms.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/product/widget/facility/FacilityForms.xml Fri Feb 10 18:51:03 2012 @@ -229,7 +229,7 @@ under the License. </service> </actions> <row-actions> - <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("inventoryItemId");return new Boolean(!(prev!=null&&prev.equals(inventoryItemId)));}" type="Boolean"/> + <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("inventoryItemId");return new Boolean(!(prev!=null&&prev.equals(inventoryItemId)));}" type="Boolean"/> </row-actions> <field name="inventoryItemId" widget-style="buttontext" position="1" use-when="showPosition1"> @@ -293,7 +293,7 @@ under the License. </service> </actions> <row-actions> - <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" position="1" use-when="showPosition1" widget-style="buttontext"> Modified: ofbiz/branches/20120209RemoveBsh/applications/workeffort/widget/CalendarScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120209RemoveBsh/applications/workeffort/widget/CalendarScreens.xml?rev=1242884&r1=1242883&r2=1242884&view=diff ============================================================================== --- ofbiz/branches/20120209RemoveBsh/applications/workeffort/widget/CalendarScreens.xml (original) +++ ofbiz/branches/20120209RemoveBsh/applications/workeffort/widget/CalendarScreens.xml Fri Feb 10 18:51:03 2012 @@ -50,7 +50,7 @@ under the License. <widgets> <include-screen name="eventDetail"/> <container style="bothclear"> - <screenlet title="${uiLabelMap.WorkEffortDayView}: ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day" padded="false"> + <screenlet title="${uiLabelMap.WorkEffortDayView}: ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day" padded="false"> <include-menu name="Day" location="component://workeffort/widget/WorkEffortMenus.xml"/> <platform-specific> <html><html-template location="component://workeffort/webapp/workeffort/calendar/day.ftl"/></html> @@ -72,7 +72,7 @@ under the License. <widgets> <include-screen name="eventDetail"/> <container style="bothclear"> - <screenlet title="${uiLabelMap.WorkEffortWeekView}: ${uiLabelMap.CommonWeek} ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w", timeZone, locale)}" navigation-menu-name="Week" padded="false"> + <screenlet title="${uiLabelMap.WorkEffortWeekView}: ${uiLabelMap.CommonWeek} ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w", timeZone, locale)}" navigation-menu-name="Week" padded="false"> <include-menu name="Week" location="component://workeffort/widget/WorkEffortMenus.xml"/> <platform-specific> <html><html-template location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html> @@ -91,7 +91,7 @@ under the License. <widgets> <include-screen name="eventDetail"/> <container style="bothclear"> - <screenlet title="${uiLabelMap.WorkEffortMonthView}: ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month" padded="false"> + <screenlet title="${uiLabelMap.WorkEffortMonthView}: ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month" padded="false"> <include-menu name="Month" location="component://workeffort/widget/WorkEffortMenus.xml"/> <platform-specific> <html><html-template location="component://workeffort/webapp/workeffort/calendar/month.ftl"/></html> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |