You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 18:30:53 UTC
svn commit: r730198 [1/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/script/org/ofbiz/accounting/payment/
applications/content/script/org/ofbiz/content/compdoc/
applications/content/script/or...
Author: jleroux
Date: Tue Dec 30 09:30:52 2008
New Revision: 730198
URL: http://svn.apache.org/viewvc?rev=730198&view=rev
Log:
<field field-name => <field field
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PromoEvents.xml
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=730198&r1=730197&r2=730198&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 Tue Dec 30 09:30:52 2008
@@ -64,10 +64,10 @@
<!-- first figure out if we need to reset the lastInvoiceNumber; is the lastInvoiceRestartDate after the fiscalYearStartMonth/Day for this year? -->
<calculate field="zeroLong" type="Long"><number value="0"/></calculate>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getYearStart" ret-field="curYearFiscalStartDate">
- <field field-name="nowTimestamp" type="java.sql.Timestamp"/>
- <field field-name="partyAcctgPreference.fiscalYearStartDay" type="java.lang.Number"/>
- <field field-name="partyAcctgPreference.fiscalYearStartMonth" type="java.lang.Number"/>
- <field field-name="zeroLong" type="java.lang.Number"/>
+ <field field="nowTimestamp" type="java.sql.Timestamp"/>
+ <field field="partyAcctgPreference.fiscalYearStartDay" type="java.lang.Number"/>
+ <field field="partyAcctgPreference.fiscalYearStartMonth" type="java.lang.Number"/>
+ <field field="zeroLong" type="java.lang.Number"/>
</call-class-method>
<if>
<condition>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml Tue Dec 30 09:30:52 2008
@@ -81,7 +81,7 @@
<find-by-and entity-name="CreditCard" map-name="lookupMap" list-name="creditCards"/>
<iterate entry="creditCard" list="creditCards">
<call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDateAfterToday" ret-field="isNotExpired">
- <field field-name="creditCard.expireDate"/>
+ <field field="creditCard.expireDate"/>
</call-class-method>
<if-compare field="isNotExpired" operator="equals" type="Boolean" value="true">
<set-service-fields service-name="updateCreditCard" map="creditCard" to-map="uccMap"/>
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=730198&r1=730197&r2=730198&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 Tue Dec 30 09:30:52 2008
@@ -251,10 +251,10 @@
</else>
</if-empty>
<call-class-method class-name="org.ofbiz.accounting.invoice.InvoiceWorker" method-name="getInvoiceTotalBd" ret-field="invoiceTotalAmount">
- <field field-name="invoice" type="org.ofbiz.entity.GenericValue"/>
+ <field field="invoice" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
<call-class-method class-name="org.ofbiz.accounting.invoice.InvoiceWorker" method-name="getInvoiceAppliedBd" ret-field="invoiceTotalAmountPaid">
- <field field-name="invoice" type="org.ofbiz.entity.GenericValue"/>
+ <field field="invoice" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
<get-related relation-name="InvoiceTerm" value-field="invoice" list="invoiceTerms"/>
<set field="remainingAppliedAmount" from-field="invoiceTotalAmountPaid" type="BigDecimal"/>
@@ -267,8 +267,8 @@
<set field="invoicePaymentInfo.invoiceTermId" from-field="invoiceTerm.invoiceTermId"/>
<set field="invoicePaymentInfo.termTypeId" from-field="invoiceTerm.termTypeId"/>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field="invoicePaymentInfo.dueDate">
- <field field-name="invoice.invoiceDate" type="Timestamp"/>
- <field field-name="invoiceTerm.termDays" type="Long"/>
+ <field field="invoice.invoiceDate" type="Timestamp"/>
+ <field field="invoiceTerm.termDays" type="Long"/>
</call-class-method>
<calculate field="invoiceTermAmount" type="BigDecimal">
<calcop field="invoiceTotalAmount" operator="multiply">
@@ -322,12 +322,12 @@
<if-not-empty field="invoiceTerm">
<set field="invoicePaymentInfo.termTypeId" from-field="invoiceTerm.termTypeId"/>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field="invoicePaymentInfo.dueDate">
- <field field-name="invoice.invoiceDate" type="Timestamp"/>
- <field field-name="invoiceTerm.termDays" type="Long"/>
+ <field field="invoice.invoiceDate" type="Timestamp"/>
+ <field field="invoiceTerm.termDays" type="Long"/>
</call-class-method>
<else>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field="invoicePaymentInfo.dueDate">
- <field field-name="invoice.invoiceDate" type="Timestamp"/>
+ <field field="invoice.invoiceDate" type="Timestamp"/>
</call-class-method>
</else>
</if-not-empty>
@@ -352,8 +352,8 @@
<simple-method method-name="getInvoicePaymentInfoListByDueDateOffset" short-description="Select a list with information on payment due dates and amounts for invoices.">
<now-timestamp field="nowTimestamp"/>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field="asOfDate">
- <field field-name="nowTimestamp" type="Timestamp"/>
- <field field-name="parameters.daysOffset" type="Long"/>
+ <field field="nowTimestamp" type="Timestamp"/>
+ <field field="parameters.daysOffset" type="Long"/>
</call-class-method>
<entity-condition entity-name="Invoice" list="invoices">
<condition-list combine="and">
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Tue Dec 30 09:30:52 2008
@@ -421,8 +421,8 @@
<number value="6"/>
</calculate>
<call-class-method method-name="padNumberWithLeadingZeros" class-name="org.ofbiz.content.compdoc.CompDocEvents" ret-field="paddedSeqId">
- <field field-name="incrementedSeq" type="Long"/>
- <field field-name="numericPadding" type="Integer"/>
+ <field field="incrementedSeq" type="Long"/>
+ <field field="numericPadding" type="Integer"/>
</call-class-method>
<log level="info" message="incrementedSeq(1): ${incrementedSeq}"/>
<log level="info" message="numericPadding(1): ${numericPadding}"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Dec 30 09:30:52 2008
@@ -985,15 +985,15 @@
<set field="dblTextDataLen" from-field="textDataLen" type="Double"/>
<set field="dblDescriptLen" from-field="descriptLen" type="Double"/>
<call-class-method method-name="min" class-name="java.lang.Math" ret-field="subStringLen">
- <field field-name="dblTextDataLen" type="double"/>
- <field field-name="dblDescriptLen" type="double"/>
+ <field field="dblTextDataLen" type="double"/>
+ <field field="dblDescriptLen" type="double"/>
</call-class-method>
<set field="intSubStringLen" from-field="subStringLen" type="Integer"/>
<log level="info" message="subStringLen:${subStringLen}"/>
<set field="zeroValue" value="0" type="Integer"/>
<call-object-method method-name="substring" obj-field-name="parameters.textData" ret-field="subDescript">
- <field field-name="zeroValue" type="int"/>
- <field field-name="intSubStringLen" type="int"/>
+ <field field="zeroValue" type="int"/>
+ <field field="intSubStringLen" type="int"/>
</call-object-method>
<log level="info" message="subDescript:${subDescript}"/>
<if-compare operator="equals" field="contentAssocTypeId" value="PUBLISH_LINK">
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml Tue Dec 30 09:30:52 2008
@@ -141,8 +141,8 @@
<log level="always" message="contentId: ${contentId}"/>
<log level="always" message="dataResourceId: ${dataResourceId}"/>
<call-class-method class-name="org.ofbiz.content.ContentManagementWorker" method-name="mruAdd">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
- <field field-name="subContent" type="org.ofbiz.entity.GenericEntity"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="subContent" type="org.ofbiz.entity.GenericEntity"/>
</call-class-method>
-->
</simple-method>
@@ -176,12 +176,12 @@
<log level="always" message="in createLayoutImage."/>
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker" method-name="uploadImageAndParameters" ret-field="formInput">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="imageData"/>
</call-class-method>
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker" method-name="returnByteBuffer" ret-field="byteWrap">
- <field field-name="formInput" type="java.util.Map"/>
+ <field field="formInput" type="java.util.Map"/>
</call-class-method>
<clear-field map-name="formInput" field="imageData"/>
@@ -237,8 +237,8 @@
<log level="always" message="contentId: ${contentId}"/>
<log level="always" message="dataResourceId: ${dataResourceId}"/>
<call-class-method class-name="org.ofbiz.content.ContentManagementWorker" method-name="mruAdd">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
- <field field-name="subContent" type="org.ofbiz.entity.GenericEntity"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="subContent" type="org.ofbiz.entity.GenericEntity"/>
</call-class-method>
-->
</simple-method>
@@ -295,8 +295,8 @@
<log level="always" message="contentId: ${contentId}"/>
<log level="always" message="dataResourceId: ${dataResourceId}"/>
<call-class-method class-name="org.ofbiz.content.ContentManagementWorker" method-name="mruAdd">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
- <field field-name="subContent" type="org.ofbiz.entity.GenericEntity"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="subContent" type="org.ofbiz.entity.GenericEntity"/>
</call-class-method>
-->
</simple-method>
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Tue Dec 30 09:30:52 2008
@@ -23,7 +23,7 @@
<simple-method method-name="createCustomer" short-description="Create Customer" login-required="false">
<call-class-method class-name="org.ofbiz.product.store.ProductStoreWorker" method-name="getProductStore" ret-field="productStore">
- <field field-name="request" type="javax.servlet.ServletRequest"/>
+ <field field="request" type="javax.servlet.ServletRequest"/>
</call-class-method>
<set from-field="productStore.allowPassword" field="allowPassword"/>
@@ -479,7 +479,7 @@
<field-to-session field-name="userLogin" session-name="userLogin" />
<if-not-empty field="cart">
<call-object-method obj-field-name="cart" method-name="setOrderPartyId">
- <field field-name="partyId"/>
+ <field field="partyId"/>
</call-object-method>
<call-bsh><![CDATA[
// clear out the login fields from the cart
@@ -490,8 +490,8 @@
}
]]></call-bsh>
<!-- call-object-method obj-field-name="cart" method-name="setUserLogin">
- <field field-name="userLogin" type="org.ofbiz.entity.GenericValue"/>
- <field field-name="dispatcher" map-name="request" type="org.ofbiz.service.LocalDispatcher"/>
+ <field field="userLogin" type="org.ofbiz.entity.GenericValue"/>
+ <field field="dispatcher" map-name="request" type="org.ofbiz.service.LocalDispatcher"/>
</call-object-method -->
</if-not-empty>
</if-not-empty>
@@ -784,10 +784,10 @@
<if-not-empty field="cart">
<call-object-method obj-field-name="cart" method-name="addContactMech">
<string value="SHIPPING_LOCATION"/>
- <field field-name="addressContext.contactMechId"/>
+ <field field="addressContext.contactMechId"/>
</call-object-method>
<call-object-method obj-field-name="cart" method-name="setShippingContactMechId">
- <field field-name="addressContext.contactMechId"/>
+ <field field="addressContext.contactMechId"/>
</call-object-method>
</if-not-empty>
</simple-method>
@@ -804,46 +804,46 @@
<if-not-empty field="cart">
<set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId" />
<call-object-method obj-field-name="cart" method-name="setShipmentMethodTypeId">
- <field field-name="shipmentMethodTypeId"/>
+ <field field="shipmentMethodTypeId"/>
</call-object-method>
<set field="carrierPartyId" from-field="parameters.carrierPartyId" />
<call-object-method obj-field-name="cart" method-name="setCarrierPartyId">
- <field field-name="carrierPartyId"/>
+ <field field="carrierPartyId"/>
</call-object-method>
<set field="maySplit" from-field="parameters.may_split" type="Boolean"/>
<if-not-empty field="maySplit">
<call-object-method obj-field-name="cart" method-name="setMaySplit">
- <field field-name="maySplit" type="Boolean"/>
+ <field field="maySplit" type="Boolean"/>
</call-object-method>
</if-not-empty>
<set field="shippingInstruction" from-field="parameters.shipping_instructions" type="String"/>
<if-not-empty field="shippingInstruction">
<call-object-method obj-field-name="cart" method-name="setShippingInstructions">
- <field field-name="shippingInstruction" type="String"/>
+ <field field="shippingInstruction" type="String"/>
</call-object-method>
</if-not-empty>
<set field="correspondingPoId" from-field="parameters.correspondingPoId"/>
<if-not-empty field="correspondingPoId">
<call-object-method obj-field-name="cart" method-name="setPoNumber">
- <field field-name="correspondingPoId" type="String"/>
+ <field field="correspondingPoId" type="String"/>
</call-object-method>
</if-not-empty>
<set field="isGift" from-field="parameters.is_gift" type="Boolean"/>
<if-not-empty field="isGift">
<call-object-method obj-field-name="cart" method-name="setIsGift">
- <field field-name="isGift" type="Boolean"/>
+ <field field="isGift" type="Boolean"/>
</call-object-method>
</if-not-empty>
<set field="giftMessage" from-field="parameters.gift_message" type="String"/>
<if-not-empty field="giftMessage">
<call-object-method obj-field-name="cart" method-name="setGiftMessage">
- <field field-name="giftMessage" type="String"/>
+ <field field="giftMessage" type="String"/>
</call-object-method>
</if-not-empty>
</if-not-empty>
@@ -930,19 +930,19 @@
<!-- Set partyId, in shoppingCart -->
<call-object-method obj-field-name="shoppingCart" method-name="setUserLogin">
- <field field-name="userLogin" type="org.ofbiz.entity.GenericValue"/>
- <field field-name="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
+ <field field="userLogin" type="org.ofbiz.entity.GenericValue"/>
+ <field field="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
</call-object-method>
<call-object-method obj-field-name="shoppingCart" method-name="addContactMech">
<string value="SHIPPING_LOCATION"/>
- <field field-name="parameters.shipToContactMechId"/>
+ <field field="parameters.shipToContactMechId"/>
</call-object-method>
<call-object-method obj-field-name="shoppingCart" method-name="setShippingContactMechId">
- <field field-name="parameters.shipToContactMechId"/>
+ <field field="parameters.shipToContactMechId"/>
</call-object-method>
<log level="info" message="updated shopping cart shipToContactMechId ${parameters.shipToContactMechId}"/>
<call-object-method obj-field-name="shoppingCart" method-name="setOrderPartyId">
- <field field-name="partyId"/>
+ <field field="partyId"/>
</call-object-method>
</simple-method>
@@ -1054,7 +1054,7 @@
</if-not-empty>
<iterate list="carrierShipmentMethodList" entry="carrierShipmentMethod">
<call-object-method obj-field-name="shippingEstWpr" method-name="getShippingEstimate" ret-field="shippingEst">
- <field field-name="carrierShipmentMethod" type="org.ofbiz.entity.GenericValue"/>
+ <field field="carrierShipmentMethod" type="org.ofbiz.entity.GenericValue"/>
</call-object-method>
<if-empty field="shippingEst">
<set field="shippingEst" value="-1" type="Integer"/>
@@ -1115,13 +1115,13 @@
<session-to-field field-name="shoppingCart"/>
</if-empty>
<call-object-method obj-field-name="shoppingCart" method-name="setShipmentMethodTypeId">
- <field field-name="shipmentMethodTypeId"/>
+ <field field="shipmentMethodTypeId"/>
</call-object-method>
<call-object-method obj-field-name="shoppingCart" method-name="setCarrierPartyId">
- <field field-name="carrierPartyId"/>
+ <field field="carrierPartyId"/>
</call-object-method>
<call-object-method obj-field-name="shoppingCart" method-name="setProductStoreShipMethId">
- <field field-name="productStoreShipMethId"/>
+ <field field="productStoreShipMethId"/>
</call-object-method>
<call-object-method obj-field-name="shoppingCart" method-name="getCurrency" ret-field="isoCode"/>
<set field="dispatcher" from-field="parameters.dispatcher" type="Object"/>
@@ -1326,7 +1326,7 @@
<simple-method method-name="updateCustomerProfile" short-description="Update a customer profile">
<call-class-method class-name="org.ofbiz.product.store.ProductStoreWorker" method-name="getProductStore" ret-field="productStore">
- <field field-name="request" type="javax.servlet.ServletRequest"/>
+ <field field="request" type="javax.servlet.ServletRequest"/>
</call-class-method>
<set-service-fields service-name="createUpdatePerson" map="parameters" to-map="createUpdatePersonCtx"/>
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Tue Dec 30 09:30:52 2008
@@ -526,7 +526,7 @@
<field-to-session field-name="userLogin" session-name="userLogin" />
<if-not-empty field="cart">
<call-object-method obj-field-name="cart" method-name="setOrderPartyId">
- <field field-name="partyId"/>
+ <field field="partyId"/>
</call-object-method>
<call-bsh><![CDATA[
// clear out the login fields from the cart
@@ -545,10 +545,10 @@
<if-not-empty field="cart">
<call-object-method obj-field-name="cart" method-name="addContactMech">
<string value="SHIPPING_LOCATION"/>
- <field field-name="parameters.shippingContactMechId"/>
+ <field field="parameters.shippingContactMechId"/>
</call-object-method>
<call-object-method obj-field-name="cart" method-name="setShippingContactMechId">
- <field field-name="parameters.shippingContactMechId"/>
+ <field field="parameters.shippingContactMechId"/>
</call-object-method>
</if-not-empty>
@@ -578,42 +578,42 @@
<if-not-empty field="cart">
<set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId" />
<call-object-method obj-field-name="cart" method-name="setShipmentMethodTypeId">
- <field field-name="shipmentMethodTypeId"/>
+ <field field="shipmentMethodTypeId"/>
</call-object-method>
<set field="carrierPartyId" from-field="parameters.carrierPartyId" />
<call-object-method obj-field-name="cart" method-name="setCarrierPartyId">
- <field field-name="carrierPartyId"/>
+ <field field="carrierPartyId"/>
</call-object-method>
<set field="maySplit" from-field="parameters.may_split" type="Boolean" default-value="false"/>
<call-object-method obj-field-name="cart" method-name="setMaySplit">
- <field field-name="maySplit" type="Boolean"/>
+ <field field="maySplit" type="Boolean"/>
</call-object-method>
<set field="shippingInstruction" from-field="parameters.shipping_instructions" type="String"/>
<if-not-empty field="shippingInstruction">
<call-object-method obj-field-name="cart" method-name="setShippingInstructions">
- <field field-name="shippingInstruction" type="String"/>
+ <field field="shippingInstruction" type="String"/>
</call-object-method>
</if-not-empty>
<set field="correspondingPoId" from-field="parameters.correspondingPoId" type="String"/>
<if-not-empty field="correspondingPoId">
<call-object-method obj-field-name="cart" method-name="setPoNumber">
- <field field-name="correspondingPoId" type="String"/>
+ <field field="correspondingPoId" type="String"/>
</call-object-method>
</if-not-empty>
<set field="isGift" from-field="parameters.is_gift" type="Boolean" default-value="false" />
<call-object-method obj-field-name="cart" method-name="setIsGift">
- <field field-name="isGift" type="Boolean"/>
+ <field field="isGift" type="Boolean"/>
</call-object-method>
<set field="giftMessage" from-field="parameters.gift_message" type="String"/>
<if-not-empty field="giftMessage">
<call-object-method obj-field-name="cart" method-name="setGiftMessage">
- <field field-name="giftMessage" type="String"/>
+ <field field="giftMessage" type="String"/>
</call-object-method>
</if-not-empty>
</if-not-empty>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 09:30:52 2008
@@ -629,7 +629,7 @@
<create-value value-field="newOrderItem"/>
<!-- and the orderItemSeqId is assigned to the shopping cart item-->
<call-object-method obj-field-name="item" method-name="setOrderItemSeqId">
- <field field-name="newOrderItem.orderItemSeqId" type="String"/>
+ <field field="newOrderItem.orderItemSeqId" type="String"/>
</call-object-method>
</if-empty>
</iterate>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Tue Dec 30 09:30:52 2008
@@ -309,16 +309,16 @@
</condition>
<then>
<call-class-method class-name="org.ofbiz.product.config.ProductConfigWorker" method-name="loadProductConfigWrapper" ret-field="configWrapper">
- <field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
- <field field-name="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
- <field field-name="parameters.configId" type="java.lang.String"/>
- <field field-name="parameters.productId" type="java.lang.String"/>
- <field field-name="" type="java.lang.String"/>
- <field field-name="" type="java.lang.String"/>
- <field field-name="" type="java.lang.String"/>
- <field field-name="" type="java.lang.String"/>
- <field field-name="locale" type="java.util.Locale"/>
- <field field-name="userLogin" type="org.ofbiz.entity.GenericValue"/>
+ <field field="delegator" type="org.ofbiz.entity.GenericDelegator"/>
+ <field field="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
+ <field field="parameters.configId" type="java.lang.String"/>
+ <field field="parameters.productId" type="java.lang.String"/>
+ <field field="" type="java.lang.String"/>
+ <field field="" type="java.lang.String"/>
+ <field field="" type="java.lang.String"/>
+ <field field="" type="java.lang.String"/>
+ <field field="locale" type="java.util.Locale"/>
+ <field field="userLogin" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
<call-object-method method-name="getTotalPrice" obj-field-name="configWrapper" ret-field="totalPrice"></call-object-method>
<set field="newEntity.quoteUnitPrice" from-field="totalPrice"/>
@@ -615,7 +615,7 @@
</call-service>
<!-- and the quoteItemSeqId is assigned to the shopping cart item (as orderItemSeqId) -->
<call-object-method obj-field-name="item" method-name="setOrderItemSeqId">
- <field field-name="quoteItemSeqId" type="String"/>
+ <field field="quoteItemSeqId" type="String"/>
</call-object-method>
<call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field="newOrderItemSeqId"/>
</if-empty>
@@ -632,7 +632,7 @@
</condition>
<then>
<call-object-method obj-field-name="cart" method-name="findCartItem" ret-field="item">
- <field field-name="quoteItem.quoteItemSeqId" type="String"/>
+ <field field="quoteItem.quoteItemSeqId" type="String"/>
</call-object-method>
<clear-field field="updateQuoteItemInMap"/>
<set from-field="quoteItem.quoteId" field="updateQuoteItemInMap.quoteId"/>
@@ -753,7 +753,7 @@
</call-service>
<!-- and the quoteItemSeqId is assigned to the shopping cart item (as orderItemSeqId) -->
<call-object-method obj-field-name="item" method-name="setOrderItemSeqId">
- <field field-name="quoteItemSeqId" type="String"/>
+ <field field="quoteItemSeqId" type="String"/>
</call-object-method>
</then>
</if>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml Tue Dec 30 09:30:52 2008
@@ -24,7 +24,7 @@
short-description="Create Customer Request Content" login-required="false">
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters" ret-field="formInput">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="dataResourceName"/>
</call-class-method>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 09:30:52 2008
@@ -896,7 +896,7 @@
<simple-method method-name="getCountryList" short-description="Returns a list of country" login-required="false">
<call-class-method method-name="getCountryList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList">
- <field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
+ <field field="delegator" type="org.ofbiz.entity.GenericDelegator"/>
</call-class-method>
<iterate list="geoList" entry="countryGeo">
<set field="countryName" value="${countryGeo.geoName}: ${countryGeo.geoId}"/>
@@ -908,8 +908,8 @@
<simple-method method-name="getAssociatedStateList" short-description="set the state options for selected country" login-required="false">
<set field="countryGeoId" from-field="parameters.countryGeoId"/>
<call-class-method method-name="getAssociatedStateList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList">
- <field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
- <field field-name="countryGeoId" type="String"/>
+ <field field="delegator" type="org.ofbiz.entity.GenericDelegator"/>
+ <field field="countryGeoId" type="String"/>
</call-class-method>
<iterate list="geoList" entry="stateGeo">
<set field="stateName" value="${stateGeo.geoName}: ${stateGeo.geoId}"/>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml Tue Dec 30 09:30:52 2008
@@ -79,14 +79,14 @@
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters"
ret-field="formInput">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="dataResourceName"/>
</call-class-method>
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="returnByteBuffer"
ret-field="byteWrap">
- <field field-name="formInput" type="java.util.Map"/>
+ <field field="formInput" type="java.util.Map"/>
</call-class-method>
<set-service-fields service-name="createPartyContent" map="formInput.formInput" to-map="partyContentMap"/>
@@ -105,7 +105,7 @@
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters"
ret-field="formInput">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="dataResourceName"/>
</call-class-method>
@@ -113,7 +113,7 @@
method-name="returnByteBuffer"
ret-field="byteWrap"
>
- <field field-name="formInput" type="java.util.Map"/>
+ <field field="formInput" type="java.util.Map"/>
</call-class-method >
<set-service-fields service-name="updatePartyContent" map="formInput.formInput" to-map="partyContentMap"/>
<set field="partyContentMap._uploadedFile_fileName" from-field="formInput.imageFileName"/>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml Tue Dec 30 09:30:52 2008
@@ -86,9 +86,9 @@
<set field="partyId" value="DemoCustomer"/>
<set field="contactMechTypeId" value="EMAIL_ADDRESS"/>
<call-class-method method-name="findPartyLatestContactMech" class-name="org.ofbiz.party.party.PartyWorker" ret-field="partyAndContactMech">
- <field field-name="partyId" type="java.lang.String"/>
- <field field-name="contactMechTypeId" type="java.lang.String"/>
- <field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
+ <field field="partyId" type="java.lang.String"/>
+ <field field="contactMechTypeId" type="java.lang.String"/>
+ <field field="delegator" type="org.ofbiz.entity.GenericDelegator"/>
</call-class-method>
<!-- first try with just updating without changing the email address -->
<set field="serviceCtx.partyId" from-field="partyId"/>
@@ -144,8 +144,8 @@
-->
<set field="partyId" value="DemoCustomer"/>
<call-class-method method-name="findPartyLatestTelecomNumber" class-name="org.ofbiz.party.party.PartyWorker" ret-field="telecomNumber">
- <field field-name="partyId" type="java.lang.String"/>
- <field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
+ <field field="partyId" type="java.lang.String"/>
+ <field field="delegator" type="org.ofbiz.entity.GenericDelegator"/>
</call-class-method>
<!-- first try with just updating without changing the telecom number -->
<set-service-fields service-name="updatePartyTelecomNumber" map="telecomNumber" to-map="serviceCtx"/>
@@ -213,8 +213,8 @@
-->
<set field="partyId" value="DemoCustomer"/>
<call-class-method method-name="findPartyLatestPostalAddress" class-name="org.ofbiz.party.party.PartyWorker" ret-field="postalAddress">
- <field field-name="partyId" type="java.lang.String"/>
- <field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
+ <field field="partyId" type="java.lang.String"/>
+ <field field="delegator" type="org.ofbiz.entity.GenericDelegator"/>
</call-class-method>
<!-- first try with just updating without changing the postal address -->
<set-service-fields service-name="updatePartyPostalAddress" map="postalAddress" to-map="serviceCtx"/>
@@ -348,8 +348,8 @@
<set field="partyId" value="DemoCustomer"/>
<set field="userLoginId" value="DemoCustomer"/>
<call-class-method method-name="findPartyLatestUserLogin" class-name="org.ofbiz.party.party.PartyWorker" ret-field="partyUserLogin">
- <field field-name="partyId" type="java.lang.String"/>
- <field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
+ <field field="partyId" type="java.lang.String"/>
+ <field field="delegator" type="org.ofbiz.entity.GenericDelegator"/>
</call-class-method>
<set-service-fields service-name="updatePassword" map="partyUserLogin" to-map="serviceCtx"/>
<!-- old details: userLoginId = DemoCustomer, password = ofbiz -->
@@ -372,8 +372,8 @@
<!-- get the encrypted password -->
<call-class-method method-name="getHashType" class-name="org.ofbiz.common.login.LoginServices" ret-field="hashType"/>
<call-class-method method-name="getDigestHash" class-name="org.ofbiz.base.crypto.HashCrypt" ret-field="newPasswordHash">
- <field field-name="serviceCtx.newPassword" type="java.lang.String"/>
- <field field-name="hashType" type="java.lang.String"/>
+ <field field="serviceCtx.newPassword" type="java.lang.String"/>
+ <field field="hashType" type="java.lang.String"/>
</call-class-method>
<assert>
<not><if-empty field="partyAndUserLogin"/></not>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Tue Dec 30 09:30:52 2008
@@ -152,7 +152,7 @@
<if-not-empty field="categories">
<iterate list="relCategories" entry="relCategory">
<call-object-method obj-field-name="categories" method-name="contains" ret-field="addInCategories" >
- <field field-name="relCategory" type="java.lang.Object"/>
+ <field field="relCategory" type="java.lang.Object"/>
</call-object-method>
<if-compare value="false" field="addInCategories" operator="equals" type="Boolean">
<field-to-list list-name="categories" field-name="relCategory"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 09:30:52 2008
@@ -587,8 +587,8 @@
-->
<!-- this is not normally needed...
- <log level="info"><string value="Getting inventory available to promise count; parameters are: "/><field field-name="parameters"/></log>
- <log level="info" message="foo foo: "><string value="Getting inventory available to promise count; productId is: "/><field field-name="productId" map-name="parameters"/></log>
+ <log level="info"><string value="Getting inventory available to promise count; parameters are: "/><field field="parameters"/></log>
+ <log level="info" message="foo foo: "><string value="Getting inventory available to promise count; productId is: "/><field field="productId" map-name="parameters"/></log>
-->
<set from-field="parameters.inventoryItemId" field="lookupFieldMap.inventoryItemId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Dec 30 09:30:52 2008
@@ -334,7 +334,7 @@
<simple-method method-name="forceIndexProductKeywords" short-description="induce all the keywords of a product">
<entity-one entity-name="Product" value-field="product"/>
<call-class-method class-name="org.ofbiz.product.product.KeywordIndex" method-name="forceIndexKeywords">
- <field field-name="product" type="org.ofbiz.entity.GenericValue"/>
+ <field field="product" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
</simple-method>
<simple-method method-name="deleteProductKeywords" short-description="delete all the keywords of a product">
@@ -362,7 +362,7 @@
</condition>
<then>
<call-class-method class-name="org.ofbiz.product.product.KeywordIndex" method-name="indexKeywords">
- <field field-name="productInstance" type="org.ofbiz.entity.GenericValue"/>
+ <field field="productInstance" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
</then>
</if>
@@ -416,7 +416,7 @@
<!-- do the same for the virtual product... -->
<entity-one entity-name="Product" value-field="product" use-cache="true"/>
<call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getVariantVirtualId" ret-field="virtualProductId">
- <field field-name="product" type="GenericValue"/>
+ <field field="product" type="GenericValue"/>
</call-class-method>
<if-not-empty field="virtualProductId">
<set from-field="virtualProductId" field="callSubMap.productId"/>
@@ -444,7 +444,7 @@
<!-- do the same for the virtual product... -->
<entity-one entity-name="Product" value-field="product" use-cache="true"/>
<call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getVariantVirtualId" ret-field="virtualProductId">
- <field field-name="product" type="GenericValue"/>
+ <field field="product" type="GenericValue"/>
</call-class-method>
<if-not-empty field="virtualProductId">
<set from-field="virtualProductId" field="callSubMap.productId"/>
@@ -577,8 +577,8 @@
<simple-method method-name="updateProductWithReviewRatingAvg" short-description="Update Product with new Review Rating Avg">
<!-- this method is meant to be called in-line and depends in a productId parameter -->
<call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getAverageProductRating" ret-field="averageCustomerRating">
- <field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
- <field field-name="productId" type="java.lang.String"/>
+ <field field="delegator" type="org.ofbiz.entity.GenericDelegator"/>
+ <field field="productId" type="java.lang.String"/>
</call-class-method>
<log level="info" message="Got new average customer rating ${averageCustomerRating}"/>
<if-compare field="averageCustomerRating" operator="equals" value="0" type="Double">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml Tue Dec 30 09:30:52 2008
@@ -34,8 +34,8 @@
</entity-one>
<set field="packSingleItemInMap.userLogin" from-field="userLogin"/>
<create-object class-name="org.ofbiz.shipment.packing.PackingSession" field-name="packingSession">
- <field field-name="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
- <field field-name="userLogin" type="org.ofbiz.entity.GenericValue"/>
+ <field field="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
+ <field field="userLogin" type="org.ofbiz.entity.GenericValue"/>
</create-object>
<set field="packSingleItemInMap.packingSession" from-field="packingSession"/>
<call-service service-name="packSingleItem" in-map-name="packSingleItemInMap">
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Tue Dec 30 09:30:52 2008
@@ -55,10 +55,10 @@
</else>
</if-empty>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getWeekStart" ret-field="parameters.fromDate">
- <field field-name="nowTimestamp" type="java.sql.Timestamp"/>
+ <field field="nowTimestamp" type="java.sql.Timestamp"/>
</call-class-method>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getWeekEnd" ret-field="parameters.thruDate">
- <field field-name="nowTimestamp" type="java.sql.Timestamp"/>
+ <field field="nowTimestamp" type="java.sql.Timestamp"/>
</call-class-method>
<!-- check if timesheet already exists -->
<entity-and entity-name="Timesheet" list="timesheets">
@@ -305,7 +305,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayStart" ret-field="newEntity.fromDate">
- <field field-name="nowTimestamp" type="java.sql.Timestamp"/>
+ <field field="nowTimestamp" type="java.sql.Timestamp"/>
</call-class-method>
</if-empty>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Tue Dec 30 09:30:52 2008
@@ -274,9 +274,9 @@
<if-not-empty field="parameters.statusId">
<now-timestamp field="newEntity.statusDateTime"/>
<call-class-method class-name="org.ofbiz.workeffort.workeffort.WorkEffortPartyAssignmentServices" method-name="updateWorkflowEngine">
- <field field-name="newEntity" type="org.ofbiz.entity.GenericValue"/>
- <field field-name="userLogin" type="org.ofbiz.entity.GenericValue"/>
- <field field-name="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
+ <field field="newEntity" type="org.ofbiz.entity.GenericValue"/>
+ <field field="userLogin" type="org.ofbiz.entity.GenericValue"/>
+ <field field="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
</call-class-method>
</if-not-empty>
<create-value value-field="newEntity"/>
@@ -297,9 +297,9 @@
<if-compare-field field="parameters.statusId" to-field="oldStatusId" operator="not-equals">
<now-timestamp field="workEffortPartyAssignment.statusDateTime"/>
<call-class-method class-name="org.ofbiz.workeffort.workeffort.WorkEffortPartyAssignmentServices" method-name="updateWorkflowEngine" >
- <field field-name="workEffortPartyAssignment" type="org.ofbiz.entity.GenericValue"/>
- <field field-name="userLogin" type="org.ofbiz.entity.GenericValue"/>
- <field field-name="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
+ <field field="workEffortPartyAssignment" type="org.ofbiz.entity.GenericValue"/>
+ <field field="userLogin" type="org.ofbiz.entity.GenericValue"/>
+ <field field="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
</call-class-method>
</if-compare-field>
<store-value value-field="workEffortPartyAssignment"/>
@@ -1038,7 +1038,7 @@
<check-errors />
<!-- index keywords -->
<call-class-method class-name="org.ofbiz.workeffort.workeffort.WorkEffortKeywordIndex" method-name="indexKeywords">
- <field field-name="workEffort" type="org.ofbiz.entity.GenericValue"/>
+ <field field="workEffort" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
</simple-method>
@@ -1085,7 +1085,7 @@
<set from-field="parameters.workEffortId" field="findWorkEffortMap.workEffortId"/>
<find-by-primary-key entity-name="WorkEffort" map="findWorkEffortMap" value-field="workEffortInstance"/>
<call-class-method class-name="org.ofbiz.workeffort.workeffort.WorkEffortKeywordIndex" method-name="indexKeywords">
- <field field-name="workEffortInstance" type="org.ofbiz.entity.GenericValue"/>
+ <field field="workEffortInstance" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
</simple-method>
Modified: ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Tue Dec 30 09:30:52 2008
@@ -26,7 +26,7 @@
<find-by-primary-key entity-name="Product" map="productIdMap" value-field="product"/>
<if-not-empty field="product.productId">
<log level="info" message="Found product ID ${parameters.productId}, "/>
- <!-- <log level="info"><string value="Product Details are: "/><field field-name="product"/></log> -->
+ <!-- <log level="info"><string value="Product Details are: "/><field field="product"/></log> -->
<return response-code="success"/> <!-- all done -->
</if-not-empty>
<if-empty field="product.productId">
Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Tue Dec 30 09:30:52 2008
@@ -189,7 +189,7 @@
<!-- Call layout to get field -->
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters" ret-field="formInput">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="uploadedFile"/>
</call-class-method>
<set field="parameters.imageFileName" from-field="formInput.imageFileName"/>
@@ -281,7 +281,7 @@
<!-- Call layout to get field -->
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters" ret-field="formInput">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="partyId"/>
</call-class-method>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 30 09:30:52 2008
@@ -317,8 +317,8 @@
<number value="-1"/>
</calculate>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="addDaysToTimestamp" ret-field="startDate">
- <field field-name="startDate"/>
- <field field-name="taskDays"/>
+ <field field="startDate"/>
+ <field field="taskDays"/>
</call-class-method>
<else>
<entity-one entity-name="WorkEffort" value-field="workEffort">
@@ -352,8 +352,8 @@
<now-timestamp field="upd.estimatedStartDate"/>
<now-timestamp field="currentDate"/>
<call-class-method class-name="org.ofbiz.project.Various" method-name="calculateCompletionDate" ret-field="upd.estimatedCompletionDate">
- <field field-name="task" type="org.ofbiz.entity.GenericValue"/>
- <field field-name="currentDate" type="java.sql.Timestamp"/>
+ <field field="task" type="org.ofbiz.entity.GenericValue"/>
+ <field field="currentDate" type="java.sql.Timestamp"/>
</call-class-method>
<set field="upd.workEffortId" from-field="task.workEffortId"/>
<call-service service-name="updateWorkEffort" in-map-name="upd"/>
@@ -361,7 +361,7 @@
<field-map field-name="workEffortId" from-field="task.workEffortId"/>
</entity-one>
<call-class-method class-name="org.ofbiz.project.Various" method-name="setDatesFollowingTasks">
- <field field-name="newTask" type="org.ofbiz.entity.GenericValue"/>
+ <field field="newTask" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
</if-empty>
</iterate>
@@ -422,8 +422,8 @@
<else>
<!-- translate the date into the daynumber -->
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getIntervalInDays" ret-field="dayNumber">
- <field field-name="timesheet.fromDate" type="java.sql.Timestamp"/>
- <field field-name="timeEntry.fromDate" type="java.sql.Timestamp"/>
+ <field field="timesheet.fromDate" type="java.sql.Timestamp"/>
+ <field field="timeEntry.fromDate" type="java.sql.Timestamp"/>
</call-class-method>
<!-- get the related field -->
<if-not-empty field="parameters.hoursDay${dayNumber}">
@@ -447,8 +447,8 @@
<if-compare field="parameters.hoursDay${dayNr}" value="-999999" operator="not-equals">
<set field="hours" from-field="parameters.hoursDay${dayNr}"/>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="addDaysToTimestamp" ret-field="fromDate">
- <field field-name="timesheet.fromDate" type="java.sql.Timestamp"/>
- <field field-name="dayNr" type="int"/>
+ <field field="timesheet.fromDate" type="java.sql.Timestamp"/>
+ <field field="dayNr" type="int"/>
</call-class-method>
<call-simple-method method-name="updateTimeEntry"/>
</if-compare>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Tue Dec 30 09:30:52 2008
@@ -105,7 +105,7 @@
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters"
ret-field="formInput">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="dataResourceName"/>
</call-class-method>
@@ -151,7 +151,7 @@
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters"
ret-field="formInput">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="dataResourceName"/>
</call-class-method>
<entity-one entity-name="Content" value-field="content">
Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml?rev=730198&r1=730197&r2=730198&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml Tue Dec 30 09:30:52 2008
@@ -22,8 +22,8 @@
<if-not-empty field="parameters.confirm">
<set field="posTerminalId" value="null"/>
<call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
- <field field-name="posTerminalId" type="String"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="posTerminalId" type="String"/>
</call-class-method>
<if-not-empty field="webPosSession">
<call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/>
@@ -38,11 +38,11 @@
<set field="minDecimal" value="0" type="Integer"/>
<set field="maxDecimal" value="3" type="Integer"/>
<call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble">
- <field field-name="startingDrawerAmount" type="String"/>
- <field field-name="allowNegative" type="boolean"/>
- <field field-name="allowPositive" type="boolean"/>
- <field field-name="minDecimal" type="int"/>
- <field field-name="maxDecimal" type="int"/>
+ <field field="startingDrawerAmount" type="String"/>
+ <field field="allowNegative" type="boolean"/>
+ <field field="allowPositive" type="boolean"/>
+ <field field="minDecimal" type="int"/>
+ <field field="maxDecimal" type="int"/>
</call-class-method>
<if-compare field="isDouble" operator="equals" value="true">
<make-value value-field="terminalState" entity-name="PosTerminalState"/>
@@ -81,8 +81,8 @@
<if-not-empty field="parameters.confirm">
<set field="posTerminalId" value="null"/>
<call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
- <field field-name="posTerminalId" type="String"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="posTerminalId" type="String"/>
</call-class-method>
<if-not-empty field="webPosSession">
<call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/>
@@ -97,11 +97,11 @@
<set field="minDecimal" value="0" type="Integer"/>
<set field="maxDecimal" value="3" type="Integer"/>
<call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble">
- <field field-name="amount" type="String"/>
- <field field-name="allowNegative" type="boolean"/>
- <field field-name="allowPositive" type="boolean"/>
- <field field-name="minDecimal" type="int"/>
- <field field-name="maxDecimal" type="int"/>
+ <field field="amount" type="String"/>
+ <field field="allowNegative" type="boolean"/>
+ <field field="allowPositive" type="boolean"/>
+ <field field="minDecimal" type="int"/>
+ <field field="maxDecimal" type="int"/>
</call-class-method>
<if-compare field="isDouble" operator="equals" value="false">
<add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalCashAmountNotValid"/></add-error>
@@ -109,11 +109,11 @@
</if-compare>
<set field="amount" from-field="parameters.endingDrawerCheckAmount" type="String"/>
<call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble">
- <field field-name="amount" type="String"/>
- <field field-name="allowNegative" type="boolean"/>
- <field field-name="allowPositive" type="boolean"/>
- <field field-name="minDecimal" type="int"/>
- <field field-name="maxDecimal" type="int"/>
+ <field field="amount" type="String"/>
+ <field field="allowNegative" type="boolean"/>
+ <field field="allowPositive" type="boolean"/>
+ <field field="minDecimal" type="int"/>
+ <field field="maxDecimal" type="int"/>
</call-class-method>
<if-compare field="isDouble" operator="equals" value="false">
<add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalCheckAmountNotValid"/></add-error>
@@ -121,11 +121,11 @@
</if-compare>
<set field="amount" from-field="parameters.endingDrawerCcAmount" type="String"/>
<call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble">
- <field field-name="amount" type="String"/>
- <field field-name="allowNegative" type="boolean"/>
- <field field-name="allowPositive" type="boolean"/>
- <field field-name="minDecimal" type="int"/>
- <field field-name="maxDecimal" type="int"/>
+ <field field="amount" type="String"/>
+ <field field="allowNegative" type="boolean"/>
+ <field field="allowPositive" type="boolean"/>
+ <field field="minDecimal" type="int"/>
+ <field field="maxDecimal" type="int"/>
</call-class-method>
<if-compare field="isDouble" operator="equals" value="false">
<add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalCcAmountNotValid"/></add-error>
@@ -133,11 +133,11 @@
</if-compare>
<set field="amount" from-field="parameters.endingDrawerGcAmount" type="String"/>
<call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble">
- <field field-name="amount" type="String"/>
- <field field-name="allowNegative" type="boolean"/>
- <field field-name="allowPositive" type="boolean"/>
- <field field-name="minDecimal" type="int"/>
- <field field-name="maxDecimal" type="int"/>
+ <field field="amount" type="String"/>
+ <field field="allowNegative" type="boolean"/>
+ <field field="allowPositive" type="boolean"/>
+ <field field="minDecimal" type="int"/>
+ <field field="maxDecimal" type="int"/>
</call-class-method>
<if-compare field="isDouble" operator="equals" value="false">
<add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalGcAmounNotValidt"/></add-error>
@@ -145,11 +145,11 @@
</if-compare>
<set field="amount" from-field="parameters.endingDrawerOtherAmount" type="String"/>
<call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble">
- <field field-name="amount" type="String"/>
- <field field-name="allowNegative" type="boolean"/>
- <field field-name="allowPositive" type="boolean"/>
- <field field-name="minDecimal" type="int"/>
- <field field-name="maxDecimal" type="int"/>
+ <field field="amount" type="String"/>
+ <field field="allowNegative" type="boolean"/>
+ <field field="allowPositive" type="boolean"/>
+ <field field="minDecimal" type="int"/>
+ <field field="maxDecimal" type="int"/>
</call-class-method>
<if-compare field="isDouble" operator="equals" value="false">
<add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerCloseTerminalOtherAmountNotValid"/></add-error>
@@ -188,8 +188,8 @@
<if-not-empty field="parameters.confirm">
<set field="posTerminalId" value="null"/>
<call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
- <field field-name="posTerminalId" type="String"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="posTerminalId" type="String"/>
</call-class-method>
<if-not-empty field="webPosSession">
<call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/>
@@ -200,7 +200,7 @@
<if-not-empty field="terminalState">
<set field="fieldName" value="openedDate" type="String"/>
<call-object-method obj-field-name="terminalState" method-name="getTimestamp" ret-field="openDate">
- <field field-name="fieldName" type="String"/>
+ <field field="fieldName" type="String"/>
</call-object-method>
<entity-one entity-name="OrderHeader" value-field="orderHeader">
<field-map field-name="orderId" from-field="parameters.orderId"/>
@@ -208,10 +208,10 @@
<if-not-empty field="orderHeader">
<set field="fieldName" value="orderDate" type="String"/>
<call-object-method obj-field-name="orderHeader" method-name="getTimestamp" ret-field="orderDate">
- <field field-name="fieldName" type="String"/>
+ <field field="fieldName" type="String"/>
</call-object-method>
<call-object-method obj-field-name="orderDate" method-name="after" ret-field="isAfter">
- <field field-name="openDate" type="Timestamp"/>
+ <field field="openDate" type="Timestamp"/>
</call-object-method>
<if-compare field="isAfter" operator="equals" value="true">
<call-object-method obj-field-name="webPosSession" method-name="getDispatcher" ret-field="dispatcher"/>
@@ -220,8 +220,8 @@
<call-object-method obj-field-name="webPosSession" method-name="getUserLogin" ret-field="returnOrder.userLogin"/>
<set field="serviceName" value="quickReturnOrder"/>
<call-object-method obj-field-name="dispatcher" method-name="runSync" ret-field="returnResp">
- <field field-name="serviceName" type="String"/>
- <field field-name="returnOrder" type="java.util.Map"/>
+ <field field="serviceName" type="String"/>
+ <field field="returnOrder" type="java.util.Map"/>
</call-object-method>
<check-errors/>
<log level="info" message="Void order ${returnResp}"/>
@@ -257,8 +257,8 @@
<simple-method method-name="shutdown" short-description="Shutdown" login-required="true">
<set field="posTerminalId" value="null"/>
<call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
- <field field-name="posTerminalId" type="String"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="posTerminalId" type="String"/>
</call-class-method>
<if-not-empty field="webPosSession">
<call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/>
@@ -281,8 +281,8 @@
<if-not-empty field="parameters.confirm">
<set field="posTerminalId" value="null"/>
<call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
- <field field-name="posTerminalId" type="String"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="posTerminalId" type="String"/>
</call-class-method>
<if-not-empty field="webPosSession">
<call-object-method obj-field-name="webPosSession" method-name="isManagerLoggedIn" ret-field="mgrLoggedIn"/>
@@ -298,11 +298,11 @@
<set field="minDecimal" value="0" type="Integer"/>
<set field="maxDecimal" value="3" type="Integer"/>
<call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble">
- <field field-name="amount" type="String"/>
- <field field-name="allowNegative" type="boolean"/>
- <field field-name="allowPositive" type="boolean"/>
- <field field-name="minDecimal" type="int"/>
- <field field-name="maxDecimal" type="int"/>
+ <field field="amount" type="String"/>
+ <field field="allowNegative" type="boolean"/>
+ <field field="allowPositive" type="boolean"/>
+ <field field="minDecimal" type="int"/>
+ <field field="maxDecimal" type="int"/>
</call-class-method>
<if-compare field="isDouble" operator="equals" value="true">
<make-value value-field="internTx" entity-name="PosTerminalInternTx"/>
@@ -313,7 +313,7 @@
<create-value value-field="internTx"/>
<set from-field="parameters.type" field="paidInOut"/>
<call-object-method obj-field-name="webPosTransaction" method-name="paidInOut">
- <field field-name="paidInOut" type="String"/>
+ <field field="paidInOut" type="String"/>
</call-object-method>
<else>
<add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerPaidOutAndIndAmountNotValid"/></add-error>
@@ -342,8 +342,8 @@
<if-not-empty field="parameters.confirm">
<set field="posTerminalId" value="null"/>
<call-class-method class-name="org.ofbiz.webpos.WebPosEvents" method-name="getWebPosSession" ret-field="webPosSession">
- <field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
- <field field-name="posTerminalId" type="String"/>
+ <field field="request" type="javax.servlet.http.HttpServletRequest"/>
+ <field field="posTerminalId" type="String"/>
</call-class-method>
<if-not-empty field="webPosSession">
<call-object-method obj-field-name="webPosSession" method-name="getCurrentTransaction" ret-field="webPosTransaction"/>
@@ -354,18 +354,18 @@
<set field="minDecimal" value="0" type="Integer"/>
<set field="maxDecimal" value="3" type="Integer"/>
<call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDouble" ret-field="isDouble">
- <field field-name="amount" type="String"/>
- <field field-name="allowNegative" type="boolean"/>
- <field field-name="allowPositive" type="boolean"/>
- <field field-name="minDecimal" type="int"/>
- <field field-name="maxDecimal" type="int"/>
+ <field field="amount" type="String"/>
+ <field field="allowNegative" type="boolean"/>
+ <field field="allowPositive" type="boolean"/>
+ <field field="minDecimal" type="int"/>
+ <field field="maxDecimal" type="int"/>
</call-class-method>
<if-compare field="isDouble" operator="equals" value="true">
<set from-field="parameters.sku" field="sku" type="String"/>
<set from-field="parameters.price" field="price" type="Double"/>
<call-object-method obj-field-name="webPosTransaction" method-name="modifyPrice">
- <field field-name="sku" type="String"/>
- <field field-name="price" type="double"/>
+ <field field="sku" type="String"/>
+ <field field="price" type="double"/>
</call-object-method>
<check-errors/>
<call-object-method obj-field-name="webPosTransaction" method-name="calcTax"/>