Author: adrianc
Date: Thu Apr 4 22:01:07 2013
New Revision: 1464779
URL: http://svn.apache.org/r1464779
Log:
Converted Mini-language bsh: scripts to groovy: scripts.
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
ofbiz/trunk/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=1464779&r1=1464778&r2=1464779&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
Thu Apr 4 22:01:07 2013
@@ -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/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=1464779&r1=1464778&r2=1464779&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
Thu Apr 4 22:01:07 2013
@@ -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/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=1464779&r1=1464778&r2=1464779&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
Thu Apr 4 22:01:07 2013
@@ -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/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1464779&r1=1464778&r2=1464779&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
Thu Apr 4 22:01:07 2013
@@ -311,7 +311,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/trunk/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml?rev=1464779&r1=1464778&r2=1464779&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml
(original)
+++
ofbiz/trunk/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml
Thu Apr 4 22:01:07 2013
@@ -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>
<!-- Step 3 -->
<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>
<!-- Step 5 -->
<simple-method method-name="getReDirectFromXmlDoc" short-description=""
login-required="false">
