You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2008/06/14 08:03:15 UTC
svn commit: r667748 [1/16] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounti...
Author: lektran
Date: Fri Jun 13 23:03:12 2008
New Revision: 667748
URL: http://svn.apache.org/viewvc?rev=667748&view=rev
Log:
Updated all simple methods to use the new attributes
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
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/invoice/SampleCommissionServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.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/accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxRateServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.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/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/test/TestServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml
ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/RateServices.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/framework/common/script/org/ofbiz/common/CdyneServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml
ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml
ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml
ofbiz/trunk/framework/example/script/org/ofbiz/example/feature/ExampleFeatureServices.xml
ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
ofbiz/trunk/specialpurpose/bi/script/org/ofbiz/bi/DimensionServices.xml
ofbiz/trunk/specialpurpose/bi/script/org/ofbiz/bi/FactServices.xml
ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml Fri Jun 13 23:03:12 2008
@@ -36,7 +36,7 @@
<set from-field="agreementId" field="newEntity.agreementId"/>
<field-to-result field-name="agreementId" result-name="agreementId"/>
- <if-empty field-name="fromDate" map-name="newEntity">
+ <if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="nowTimestamp"/>
<set from-field="nowTimestamp" field="newEntity.fromDate"/>
</if-empty>
@@ -81,7 +81,7 @@
<set from-field="agreementIdTo" field="createAgreementItemInMap.agreementId"/>
<call-service service-name="createAgreementItem" in-map-name="createAgreementItemInMap"/>
</iterate>
- <if-compare field-name="parameters.copyAgreementTerms" value="Y" operator="equals">
+ <if-compare field="parameters.copyAgreementTerms" value="Y" operator="equals">
<get-related value-name="agreement" relation-name="AgreementTerm" list-name="agreementTerms"/>
<iterate list-name="agreementTerms" entry-name="agreementTerm">
<clear-field field-name="createAgreementTermInMap"/>
@@ -90,7 +90,7 @@
<call-service service-name="createAgreementTerm" in-map-name="createAgreementTermInMap"/>
</iterate>
</if-compare>
- <if-compare field-name="parameters.copyAgreementProducts" value="Y" operator="equals">
+ <if-compare field="parameters.copyAgreementProducts" value="Y" operator="equals">
<get-related value-name="agreement" relation-name="AgreementProductAppl" list-name="agreementProductAppls"/>
<iterate list-name="agreementProductAppls" entry-name="agreementProductAppl">
<clear-field field-name="createAgreementProductApplInMap"/>
@@ -99,7 +99,7 @@
<call-service service-name="createAgreementProductAppl" in-map-name="createAgreementProductApplInMap"/>
</iterate>
</if-compare>
- <if-compare field-name="parameters.copyAgreementParties" value="Y" operator="equals">
+ <if-compare field="parameters.copyAgreementParties" value="Y" operator="equals">
<get-related value-name="agreement" relation-name="AgreementPartyApplic" list-name="agreementPartyApplic"/>
<iterate list-name="agreementPartyApplics" entry-name="agreementPartyApplic">
<clear-field field-name="createAgreementPartyApplicInMap"/>
@@ -119,7 +119,7 @@
<set from-field="parameters.agreementId" field="newEntity.agreementId"/>
<!-- create a non existing ID -->
- <if-empty field-name="parameters.agreementItemSeqId">
+ <if-empty field="parameters.agreementItemSeqId">
<make-next-seq-id value-name="newEntity" seq-field-name="agreementItemSeqId"/>
<set from-field="agreementItemSeqId" field="newEntity.agreementItemSeqId"/>
<else>
@@ -311,7 +311,7 @@
<!--AgreementWorkEffortAppl-->
<simple-method method-name="createAgreementWorkEffortAppl" short-description="Create a link between a WorkEffort and a Agreement Appl">
<entity-one entity-name="AgreementWorkEffortAppl" value-name="agreementWorkEffortAppl"/>
- <if-not-empty field-name="agreementWorkEffortAppl">
+ <if-not-empty field="agreementWorkEffortAppl">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingAgreementWorkEffortApplAlreadyExists"/></add-error>
<check-errors/>
<else>
@@ -327,4 +327,4 @@
<remove-value value-name="agreementWorkEffortAppl"/>
</simple-method>
-</simple-methods>
\ No newline at end of file
+</simple-methods>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml Fri Jun 13 23:03:12 2008
@@ -42,7 +42,7 @@
<make-value entity-name="WorkEffortCostCalc" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.fromDate">
+ <if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
</if-empty>
<create-value value-name="newEntity"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml Fri Jun 13 23:03:12 2008
@@ -35,7 +35,7 @@
<set field="organizationPartyId" from-field="finAccount.organizationPartyId"/>
<!-- Figure out which GlAccount to post to using finAccount.postToGlAccountId or if not specified then use FinAccountTypeGlAccount -->
- <if-not-empty field-name="finAccount.postToGlAccountId">
+ <if-not-empty field="finAccount.postToGlAccountId">
<set field="glAccountId" from-field="finAccount.postToGlAccountId"/>
<else>
@@ -43,7 +43,7 @@
<field-map field-name="organizationPartyId"/>
<field-map field-name="finAccountTypeId" env-name="finAccount.finAccountTypeId"/>
</entity-one>
- <if-not-empty field-name="finAccountTypeGlAccount">
+ <if-not-empty field="finAccountTypeGlAccount">
<set field="glAccountId" from-field="finAccountTypeGlAccount.glAccountId"/>
</if-not-empty>
</else>
@@ -77,7 +77,7 @@
if from account refill product purchase pull from special account where those funds wait;
if purchase on account, balance like bank acount received or something -->
<if>
- <condition><if-compare field-name="finAccountTrans.finAccountTransTypeId" operator="equals" value="DEPOSIT"/></condition>
+ <condition><if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="DEPOSIT"/></condition>
<then>
<!-- TODO: somehow check to see if the deposit was not from a product, or didn't get into the general CUSTOMER CREDITS 213000 account -->
@@ -93,7 +93,7 @@
<set field="createAcctgTransAndEntriesMap.acctgTransTypeId" value="RECEIPT"/>
</then>
<else-if>
- <condition><if-compare field-name="finAccountTrans.finAccountTransTypeId" operator="equals" value="WITHDRAWAL"/></condition>
+ <condition><if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="WITHDRAWAL"/></condition>
<then>
<!-- TODO: somehow determine if this is an order placed against the account or some other type of withdrawal -->
@@ -105,7 +105,7 @@
</then>
</else-if>
<else-if>
- <condition><if-compare field-name="finAccountTrans.finAccountTransTypeId" operator="equals" value="ADJUSTMENT"/></condition>
+ <condition><if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="ADJUSTMENT"/></condition>
<then>
<!-- TODO: what to do for an adjustment? for now nothing, will error out below -->
@@ -119,13 +119,13 @@
</if>
<!-- Make sure we have the glAccountId, glAccountIdOffset, organizationPartyId -->
- <if-empty field-name="mainAcctgTransEntry.glAccountId">
+ <if-empty field="mainAcctgTransEntry.glAccountId">
<add-error><fail-message message="Cannot post FinAccountTrans with ID [${parameters.finAccountTransId}] to GL, could not find Main glAccountId"/></add-error>
</if-empty>
- <if-empty field-name="offsetAcctgTransEntry.glAccountId">
+ <if-empty field="offsetAcctgTransEntry.glAccountId">
<add-error><fail-message message="Cannot post FinAccountTrans with ID [${parameters.finAccountTransId}] to GL, could not find Offset glAccountId"/></add-error>
</if-empty>
- <if-empty field-name="organizationPartyId">
+ <if-empty field="organizationPartyId">
<add-error><fail-message message="Cannot post FinAccountTrans with ID [${parameters.finAccountTransId}] to GL, could not find organizationPartyId"/></add-error>
</if-empty>
<check-errors/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Fri Jun 13 23:03:12 2008
@@ -31,7 +31,7 @@
<call-simple-method method-name="getArithmeticSettingsInline"/>
<!-- if no statusId set to default to FNACT_ACTIVE -->
- <if-empty field-name="parameters.statusId">
+ <if-empty field="parameters.statusId">
<set field="parameters.statusId" value="FNACT_ACTIVE"/>
</if-empty>
@@ -39,21 +39,21 @@
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.finAccountId">
+ <if-empty field="newEntity.finAccountId">
<sequenced-id-to-env sequence-name="FinAccount" env-name="finAccountId"/>
<to-string field-name="finAccountId"/>
<set from-field="finAccountId" field="newEntity.finAccountId"/>
</if-empty>
<!-- set the currency if none is already set -->
- <if-empty field-name="newEntity.currencyUomId">
+ <if-empty field="newEntity.currencyUomId">
<property-to-field resource="general" property="currency.uom.id.default" field-name="defaultCurrency"/>
<set field="newEntity.currencyUomId" from-field="defaultCurrency"/>
</if-empty>
<!-- set the refundable flag from the type; if not set -->
- <if-empty field-name="newEntity.isRefundable">
+ <if-empty field="newEntity.isRefundable">
<entity-one entity-name="FinAccountType" value-name="finAccountType">
<field-map field-name="finAccountTypeId" env-name="parameters.finAccountTypeId"/>
</entity-one>
@@ -61,9 +61,9 @@
<condition>
<and>
<not>
- <if-empty field-name="finAccountType.isRefundable"/>
+ <if-empty field="finAccountType.isRefundable"/>
</not>
- <if-compare field-name="finAccountType.isRefundable" value="Y" operator="equals"/>
+ <if-compare field="finAccountType.isRefundable" value="Y" operator="equals"/>
</and>
</condition>
<then>
@@ -95,19 +95,19 @@
<if>
<condition>
<and>
- <not><if-empty field-name="parameters.statusId"></if-empty></not>
- <if-compare-field operator="not-equals" field-name="lookedUpValue.statusId" to-field-name="parameters.statusId"></if-compare-field>
+ <not><if-empty field="parameters.statusId"></if-empty></not>
+ <if-compare-field operator="not-equals" field="lookedUpValue.statusId" to-field="parameters.statusId"></if-compare-field>
</and>
</condition>
<then>
<!-- if the record exists there should be a statusId, but just in case make it so it won't blow up -->
- <if-not-empty field-name="lookedUpValue.statusId">
+ <if-not-empty field="lookedUpValue.statusId">
<!-- if statusId change is not in the StatusValidChange list, complain... -->
<entity-one entity-name="StatusValidChange" value-name="statusValidChange" auto-field-map="false">
<field-map field-name="statusId" env-name="lookedUpValue.statusId"/>
<field-map field-name="statusIdTo" env-name="parameters.statusId"/>
</entity-one>
- <if-empty field-name="statusValidChange">
+ <if-empty field="statusValidChange">
<!-- no valid change record found? return an error... -->
<add-error><fail-property resource="CommonUiLabels" property="CommonErrorNoStatusValidChange"/></add-error>
<check-errors/>
@@ -146,7 +146,7 @@
<order-by field-name="-statusDate"/>
</entity-and>
<first-from-list entry-name="oldFinAccountStatus" list-name="oldFinAccountStatusList"/>
- <if-not-empty field-name="oldFinAccountStatus">
+ <if-not-empty field="oldFinAccountStatus">
<set field="oldFinAccountStatus.statusEndDate" from-field="nowTimestamp"/>
<store-value value-name="oldFinAccountStatus"/>
</if-not-empty>
@@ -167,10 +167,10 @@
<sequenced-id-to-env sequence-name="FinAccountTrans" env-name="newEntity.finAccountTransId"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
- <if-empty field-name="newEntity.transactionDate">
+ <if-empty field="newEntity.transactionDate">
<set from-field="nowTimestamp" field="newEntity.transactionDate"/>
</if-empty>
- <if-empty field-name="newEntity.entryDate">
+ <if-empty field="newEntity.entryDate">
<set from-field="nowTimestamp" field="newEntity.entryDate"/>
</if-empty>
@@ -181,7 +181,7 @@
<calculate field-name="newEntity.amount" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
<calcop operator="get" field-name="newEntity.amount"/>
</calculate>
- <if-compare-field field-name="newEntity.amount" operator="not-equals" to-field-name="originalAmount" type="BigDecimal">
+ <if-compare-field field="newEntity.amount" to-field="originalAmount" operator="not-equals" type="BigDecimal">
<log level="warning" message="In createFinAccountTrans had to round the amount from [${originalAmount}] to [${newEntity.amount}]"></log>
</if-compare-field>
@@ -195,7 +195,7 @@
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<set-nonpk-fields value-name="newEntity" map-name="parameters"/>
- <if-empty field-name="newEntity.fromDate">
+ <if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
</if-empty>
@@ -221,10 +221,10 @@
<sequenced-id-to-env sequence-name="FinAccountAuth" env-name="newEntity.finAccountAuthId"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
- <if-empty field-name="newEntity.authorizationDate">
+ <if-empty field="newEntity.authorizationDate">
<set from-field="nowTimestamp" field="newEntity.authorizationDate"/>
</if-empty>
- <if-empty field-name="newEntity.fromDate">
+ <if-empty field="newEntity.fromDate">
<set from-field="nowTimestamp" field="newEntity.fromDate"/>
</if-empty>
@@ -233,7 +233,7 @@
<calculate field-name="newEntity.amount" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
<calcop operator="get" field-name="newEntity.amount"/>
</calculate>
- <if-compare-field field-name="newEntity.amount" operator="not-equals" to-field-name="originalAmount" type="BigDecimal">
+ <if-compare-field field="newEntity.amount" to-field="originalAmount" operator="not-equals" type="BigDecimal">
<log level="warning" message="In createFinAccountAuth had to round the amount from [${originalAmount}] to [${newEntity.amount}]"></log>
</if-compare-field>
@@ -242,7 +242,7 @@
</simple-method>
<simple-method method-name="expireFinAccountAuth" short-description="Expire a Financial Account Authorization">
<entity-one entity-name="FinAccountAuth" value-name="finAccountAuth"/>
- <if-empty field-name="parameters.expireDateTime">
+ <if-empty field="parameters.expireDateTime">
<now-timestamp-to-env env-name="finAccountAuth.thruDate"/>
<else>
<set from-field="parameters.expireDatetime" field="finAccountAuth.thruDate"/>
@@ -253,7 +253,7 @@
<!-- Some methods to maintain FinAccount.actualBalance and FinAccount.availableBalance -->
<simple-method method-name="updateFinAccountBalancesFromTrans" short-description="">
- <if-not-empty field-name="parameters.finAccountId">
+ <if-not-empty field="parameters.finAccountId">
<set field="finAccountId" from-field="parameters.finAccountId"/>
<else>
<entity-one entity-name="FinAccountTrans" value-name="mainFinAccountTrans"/>
@@ -264,7 +264,7 @@
<call-simple-method method-name="inlineUpdateFinAccountActualAndAvailableBalance"/>
</simple-method>
<simple-method method-name="updateFinAccountBalancesFromAuth" short-description="">
- <if-not-empty field-name="parameters.finAccountId">
+ <if-not-empty field="parameters.finAccountId">
<set field="finAccountId" from-field="parameters.finAccountId"/>
<else>
<entity-one entity-name="FinAccountAuth" value-name="mainFinAccountAuth"/>
@@ -286,14 +286,14 @@
<set field="actualBalanceSum" value="0" type="BigDecimal"/>
<iterate entry-name="finAccountTrans" list-name="finAccountTransList">
<if>
- <condition><if-compare field-name="finAccountTrans.finAccountTransTypeId" operator="equals" value="DEPOSIT"/></condition>
+ <condition><if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="DEPOSIT"/></condition>
<then><set field="amountForCalc" from-field="finAccountTrans.amount"/></then>
<else-if>
- <condition><if-compare field-name="finAccountTrans.finAccountTransTypeId" operator="equals" value="WITHDRAWAL"/></condition>
+ <condition><if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="WITHDRAWAL"/></condition>
<then><calculate field-name="amountForCalc"><calcop operator="negative" field-name="finAccountTrans.amount"/></calculate></then>
</else-if>
<else-if>
- <condition><if-compare field-name="finAccountTrans.finAccountTransTypeId" operator="equals" value="ADJUSTMENT"/></condition>
+ <condition><if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="ADJUSTMENT"/></condition>
<then><set field="amountForCalc" from-field="finAccountTrans.amount"/></then>
</else-if>
</if>
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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008
@@ -32,12 +32,12 @@
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<!-- create a non existing ID if not supplied -->
- <if-empty field-name="parameters.fixedAssetId">
+ <if-empty field="parameters.fixedAssetId">
<sequenced-id-to-env sequence-name="FixedAsset" env-name="newEntity.fixedAssetId"/>
<else>
<!-- check the Duplicate ID> -->
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
- <if-not-empty field-name="fixedAsset">
+ <if-not-empty field="fixedAsset">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingFixedAssetIdAlreadyExists"/></add-error>
<log level="info" message="${AccountingUiLabels.AccountingFixedAssetIdAlreadyExists} "/>
</if-not-empty>
@@ -68,7 +68,7 @@
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.fromDate">
+ <if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
</if-empty>
@@ -120,7 +120,7 @@
<!-- Check, should not exist already -->
<entity-one entity-name="FixedAssetStdCost" value-name="fixedAssetStdCost"/>
- <if-not-empty field-name="fixedAssetStdCost">
+ <if-not-empty field="fixedAssetStdCost">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingFixedAssetStdCostAlreadyExists"/></add-error>
</if-not-empty>
<check-errors/>
@@ -168,7 +168,7 @@
<make-value value-name="newEntity" entity-name="FixedAssetRegistration"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.fromDate">
+ <if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
</if-empty>
<create-value value-name="newEntity"/>
@@ -190,7 +190,7 @@
<make-next-seq-id value-name="newEntity" seq-field-name="maintHistSeqId"/> <!-- this finds the next sub-sequence ID -->
<field-to-result field-name="newEntity.maintHistSeqId" result-name="maintHistSeqId"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <if-not-empty field-name="parameters.productMaintSeqId">
+ <if-not-empty field="parameters.productMaintSeqId">
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
<entity-one entity-name="ProductMaint" value-name="productMaint">
<field-map field-name="productId" env-name="fixedAsset.instanceOfProductId"/>
@@ -198,14 +198,14 @@
</entity-one>
<set field="newEntity.productMaintTypeId" from-field="productMaint.productMaintTypeId"/>
</if-not-empty >
- <if-not-empty field-name="productMaint.maintTemplateWorkEffortId">
+ <if-not-empty field="productMaint.maintTemplateWorkEffortId">
<set field="maintTemplateWorkEffortId" from-field="productMaint.maintTemplateWorkEffortId"/>
<else>
<!-- User can still pick a Template workEffort -->
<set field="maintTemplateWorkEffortId" from-field="parameters.maintTemplateWorkEffortId"/>
</else>
</if-not-empty>
- <if-not-empty field-name="maintTemplateWorkEffortId">
+ <if-not-empty field="maintTemplateWorkEffortId">
<set field="duplicateTemplateWorkEffortMap.oldWorkEffortId" from-field="maintTemplateWorkEffortId"/>
<sequenced-id-to-env sequence-name="WorkEffort" env-name="duplicateTemplateWorkEffortMap.workEffortId"/>
@@ -234,7 +234,7 @@
<simple-method method-name="updateFixedAssetMaint" short-description="Update an existing FixedAsset Maintenance">
<entity-one entity-name="FixedAssetMaint" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
- <if-not-empty field-name="parameters.productMaintSeqId">
+ <if-not-empty field="parameters.productMaintSeqId">
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
<entity-one entity-name="ProductMaint" value-name="productMaint">
<field-map field-name="productId" env-name="fixedAsset.instanceOfProductId"/>
@@ -270,20 +270,20 @@
<simple-method method-name="createFixedAssetMaintOrder" short-description="Create a FixedAsset Maintenance Order">
<!-- Check, should exist orderId and orderItemId -->
<entity-one entity-name="OrderHeader" value-name="lookedUpValue"/>
- <if-empty field-name="lookedUpValue">
+ <if-empty field="lookedUpValue">
<set field="orderId" from-field="parameters.orderId"/>
<add-error><fail-property resource="AccountingUiLabels" property="AccountingOrderWithIdNotFound"/></add-error>
</if-empty>
<check-errors/>
<!-- Check if user has not passed in orderItemSeqId then get list of OrderItems from database and default to first item -->
- <if-empty field-name="orderItemSeqId" map-name="parameters">
+ <if-empty field="parameters.orderItemSeqId">
<entity-and entity-name="OrderItem" list-name="orderItems">
<field-map field-name="orderId" env-name="parameters.orderId"/>
</entity-and>
- <if-not-empty field-name="orderItems">
+ <if-not-empty field="orderItems">
<set field="orderItem" from-field="orderItems[0]"/>
- <if-not-empty field-name="orderItem">
+ <if-not-empty field="orderItem">
<set field="parameters.orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
</if-not-empty>
</if-not-empty>
@@ -291,7 +291,7 @@
<else>
<!-- Check, should exist orderId and orderItemId -->
<entity-one entity-name="OrderItem" value-name="lookedUpValue"/>
- <if-empty field-name="lookedUpValue">
+ <if-empty field="lookedUpValue">
<set field="orderItemSeqId" from-field="parameters.orderItemSeqId"/>
<add-error><fail-property resource="AccountingUiLabels" property="AccountingOrderItemWithIdNotFound"/></add-error>
</if-empty>
@@ -314,7 +314,7 @@
<make-value entity-name="PartyFixedAssetAssignment" value-name="newEntity"/>
<set-pk-fields value-name="newEntity" map-name="parameters"/>
<set-nonpk-fields value-name="newEntity" map-name="parameters"/>
- <if-empty field-name="fromDate" map-name="newEntity">
+ <if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="nowTimestamp"/>
<set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>
@@ -339,7 +339,7 @@
<set field="purchaseCost" from-field="parameters.purchaseCost" type="Double"/>
<set field="salvageValue" from-field="parameters.salvageValue" type="Double"/>
<call-object-method obj-field-name="parameters.usageYears" method-name="intValue" ret-field-name="intUsageYears"/>
- <if-not-empty field-name="parameters.fixedAssetId">
+ <if-not-empty field="parameters.fixedAssetId">
<set field="depreciation" value="0.0" type="Double"/>
<!--FORMULA : depreciation = (purchaseCost - salvageValue) / (expectedEndOfLife - dateAcquired) -->
<calculate field-name="depreciation" decimal-scale="2" type="Double">
@@ -376,7 +376,7 @@
<set field="purchaseCost" from-field="parameters.purchaseCost" type="Double"/>
<set field="salvageValue" from-field="parameters.salvageValue" type="Double"/>
<call-object-method obj-field-name="parameters.usageYears" method-name="intValue" ret-field-name="intUsageYears"/>
- <if-not-empty field-name="parameters.fixedAssetId">
+ <if-not-empty field="parameters.fixedAssetId">
<loop count="${intUsageYears}">
<set field="depreciation" value="0.0" type="Double"/>
<!--FORMULA : depreciation = (NBV - salvageValue) * 2 / (expectedEndOfLife - dateAcquired) -->
@@ -418,7 +418,7 @@
<simple-method method-name="calculateFixedAssetDepreciation" short-description="Service to calculate the yearly depreciation from dateAcquired year to current financial year">
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
- <if-empty field-name="fixedAsset">
+ <if-empty field="fixedAsset">
<add-error><fail-property resource="ManufacturingUiLabels" property="ManufacturingFixedAssetNotExist"/></add-error>
<check-errors/>
</if-empty>
@@ -426,7 +426,7 @@
<set field="endIndex" value="4" type="Integer"/>
<!-- Extract asset end of life year from field expectedEndOfLife -->
- <if-not-empty field-name="fixedAsset.expectedEndOfLife">
+ <if-not-empty field="fixedAsset.expectedEndOfLife">
<set field="expectedEndOfLife" from-field="fixedAsset.expectedEndOfLife"/>
<to-string field-name="expectedEndOfLife"/>
<call-object-method method-name="substring" obj-field-name="expectedEndOfLife" ret-field-name="expEndOfLifeYear">
@@ -440,7 +440,7 @@
</if-not-empty>
<!-- Extract asset acquired year from field dateAcquired -->
- <if-not-empty field-name="fixedAsset.dateAcquired">
+ <if-not-empty field="fixedAsset.dateAcquired">
<set field="dateAcquired" from-field="fixedAsset.dateAcquired"/>
<to-string field-name="dateAcquired"/>
<call-object-method method-name="substring" obj-field-name="dateAcquired" ret-field-name="assetAcquiredYear">
@@ -454,7 +454,7 @@
</if-not-empty>
<!-- if any asset's salvage value is empty then set it by 0 -->
- <if-empty field-name="fixedAsset.salvageValue">
+ <if-empty field="fixedAsset.salvageValue">
<set field="salvageValue" value="0.0" type="Double"/>
<else>
<set field="salvageValue" from-field="fixedAsset.salvageValue"/>
@@ -480,7 +480,7 @@
<entity-and entity-name="FixedAssetDepMethod" list-name="fixedAssetDepMethods" filter-by-date="true">
<field-map field-name="fixedAssetId" env-name="parameters.fixedAssetId"/>
</entity-and>
- <if-not-empty field-name="fixedAssetDepMethods">
+ <if-not-empty field="fixedAssetDepMethods">
<first-from-list list-name="fixedAssetDepMethods" entry-name="fixedAssetDepMethod"/>
<get-related-one relation-name="CustomMethod" value-name="fixedAssetDepMethod" to-value-name="customMethod"/>
<log level="info" message="Depreciation service name for the FixedAsset ${parameters.fixedAssetId} is ${customMethod.customMethodName}"/>
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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008
@@ -30,12 +30,12 @@
<if>
<condition>
- <if-compare field-name="partyAcctgPreference.invoiceSequenceEnumId" operator="equals" value="INVSQ_ENF_SEQ"/>
+ <if-compare field="partyAcctgPreference.invoiceSequenceEnumId" operator="equals" value="INVSQ_ENF_SEQ"/>
</condition>
<then>
<log level="info" message="In createInvoice sequence enum INVSQ_ENF_SEQ"/>
<!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom -->
- <if-not-empty field-name="partyAcctgPreference.lastInvoiceNumber">
+ <if-not-empty field="partyAcctgPreference.lastInvoiceNumber">
<calculate field-name="partyAcctgPreference.lastInvoiceNumber" type="Long">
<calcop operator="add" field-name="partyAcctgPreference.lastInvoiceNumber"/>
<number value="1"/>
@@ -49,14 +49,14 @@
</then>
<else-if>
<condition>
- <if-compare field-name="partyAcctgPreference.invoiceSequenceEnumId" operator="equals" value="INVSQ_RESTARTYR"/>
+ <if-compare field="partyAcctgPreference.invoiceSequenceEnumId" operator="equals" value="INVSQ_RESTARTYR"/>
</condition>
<then>
<log level="info" message="In createInvoice sequence enum INVSQ_RESTARTYR"/>
<!-- this is sequential sequencing, we can't skip a number; except that it is restarted each fiscal year -->
<now-timestamp-to-env env-name="nowTimestamp"/>
- <if-empty field-name="partyAcctgPreference.lastInvoiceRestartDate">
+ <if-empty field="partyAcctgPreference.lastInvoiceRestartDate">
<!-- if no lastInvoiceRestartDate then it's easy, just start now with 1 -->
<calculate field-name="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate>
<set from-field="nowTimestamp" field="partyAcctgPreference.lastInvoiceRestartDate"/>
@@ -72,8 +72,8 @@
<if>
<condition>
<and>
- <if-compare-field field-name="partyAcctgPreference.lastInvoiceRestartDate" operator="less" to-field-name="curYearFiscalStartDate" type="Timestamp"/>
- <if-compare-field field-name="nowTimestamp" operator="greater-equals" to-field-name="curYearFiscalStartDate" type="Timestamp"/>
+ <if-compare-field field="partyAcctgPreference.lastInvoiceRestartDate" to-field="curYearFiscalStartDate" operator="less" type="Timestamp"/>
+ <if-compare-field field="nowTimestamp" to-field="curYearFiscalStartDate" operator="greater-equals" type="Timestamp"/>
</and>
</condition>
<then>
@@ -106,7 +106,7 @@
<log level="info" message="In createInvoice sequence enum INVSQ_STANDARD"/>
<!-- default to the default sequencing: INVSQ_STANDARD -->
<set from-field="parameters.invoiceId" field="invoiceIdTemp"/>
- <if-empty field-name="invoiceIdTemp">
+ <if-empty field="invoiceIdTemp">
<sequenced-id-to-env sequence-name="Invoice" env-name="invoiceIdTemp"/>
<else>
<!-- check the provided ID -->
@@ -131,7 +131,7 @@
<!-- call getNextInvoiceId service with the parameters.partyIdFrom when invoice Id is not suplied
else use it from the input -->
- <if-empty field-name="parameters.invoiceId">
+ <if-empty field="parameters.invoiceId">
<set field="getNextInvoiceIdMap.partyId" from-field="parameters.partyIdFrom"/>
<call-service service-name="getNextInvoiceId" in-map-name="getNextInvoiceIdMap">
<result-to-field result-name="invoiceId" field-name="newEntity.invoiceId"/>
@@ -142,10 +142,10 @@
</if-empty>
<field-to-result field-name="newEntity.invoiceId" result-name="invoiceId"/>
- <if-empty field-name="parameters.invoiceDate">
+ <if-empty field="parameters.invoiceDate">
<set from-field="nowTimestamp" field="newEntity.invoiceDate"/>
</if-empty>
- <if-empty field-name="parameters.currencyUomId">
+ <if-empty field="parameters.currencyUomId">
<set from-field="partyAcctgPreference.baseCurrencyUomId" field="newEntity.currencyUomId"/>
</if-empty>
@@ -169,7 +169,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<set field="invoice.invoiceDate" from-field="nowTimestamp"/>
<set field="invoice.statusId" value="INVOICE_IN_PROCESS"/>
- <if-not-empty field-name="parameters.invoiceTypeId">
+ <if-not-empty field="parameters.invoiceTypeId">
<set field="invoice.invoiceTypeId" from-field="parameters.invoiceTypeId"/>
</if-not-empty>
<set-service-fields service-name="createInvoice" map-name="invoice" to-map-name="newInvoice"/>
@@ -205,13 +205,13 @@
<find-by-primary-key entity-name="Invoice" map-name="lookupPKMap" value-name="lookedUpValue"/>
<!-- only try to update content if the status is in process.... -->
- <if-compare field-name="statusId" map-name="lookedUpValue" operator="equals" value="INVOICE_IN_PROCESS">
+ <if-compare field="lookedUpValue.statusId" operator="equals" value="INVOICE_IN_PROCESS">
<clone-value value-name="lookedUpValue" new-value-name="savedValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<!-- only save if something has changed, do not update status here -->
<set from-field="savedValue.statusId" field="lookedUpValue.statusId"/> <!-- get old status back -->
- <if-compare-field field-name="lookedUpValue" operator="not-equals" to-field-name="savedValue" type="Object">
+ <if-compare-field field="lookedUpValue" to-field="savedValue" operator="not-equals" type="Object">
<store-value value-name="lookedUpValue"/> <!-- update all non status and key fields -->
</if-compare-field>
<else>
@@ -222,7 +222,7 @@
</if-compare>
<!-- check if there is a status change if yes call invoice status update service -->
- <if-compare-field field-name="parameters.statusId" operator="not-equals" to-field-name="savedValue.statusId">
+ <if-compare-field field="parameters.statusId" to-field="savedValue.statusId" operator="not-equals">
<set from-field="parameters.invoiceId" field="inputMap.invoiceId"/>
<set from-field="parameters.statusId" field="inputMap.statusId"/>
<now-timestamp-to-env env-name="inputMap.statusDate"/>
@@ -246,14 +246,14 @@
<make-value value-name="newEntity" entity-name="InvoiceItem"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.invoiceItemSeqId">
+ <if-empty field="newEntity.invoiceItemSeqId">
<make-next-seq-id value-name="newEntity" seq-field-name="invoiceItemSeqId"/> <!-- this finds the next sub-sequence ID -->
<!--field-to-result field-name="newEntity.invoiceItemSeqId" result-name="invoiceItemSeqId"/-->
</if-empty>
<!-- if there is no amount and a productItem is supplied fill the amount(price) and description from the product record
TODO: there are return adjustments now that make this code very broken. The check for price was added as a quick fix. -->
- <if-empty field-name="parameters.amount">
- <if-not-empty field-name="parameters.productId">
+ <if-empty field="parameters.amount">
+ <if-not-empty field="parameters.productId">
<entity-one entity-name="Product" value-name="product"/>
<set from-field="product.description" field="newEntity.description"/>
<set from-field="product" field="calculateProductPriceMap.product"/>
@@ -262,7 +262,7 @@
</call-service>
</if-not-empty>
</if-empty>
- <if-empty field-name="newEntity.amount">
+ <if-empty field="newEntity.amount">
<add-error>
<fail-message message="The amount value is mandatory"/>
</add-error>
@@ -282,8 +282,8 @@
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<!-- check if the productNumber is updated, when yes retrieve product description and price -->
- <if-not-empty field-name="productId">
- <if-compare-field field-name="productId" map-name="savedValue" operator="not-equals" to-map-name="lookedUpValue">
+ <if-not-empty field="productId">
+ <if-compare-field to-field="lookedUpValue." field="savedValue.productId" operator="not-equals">
<entity-one entity-name="Product" value-name="product"/>
<set from-field="product.description" field="lookedUpValue.description"/>
@@ -293,12 +293,12 @@
</call-service>
</if-compare-field>
</if-not-empty>
- <if-empty field-name="newEntity.amount">
+ <if-empty field="newEntity.amount">
<add-error>
<fail-message message="The amount value is mandatory"/>
</add-error>
</if-empty>
- <if-compare-field field-name="lookedUpValue" operator="not-equals" to-field-name="savedValue" type="Object">
+ <if-compare-field field="lookedUpValue" to-field="savedValue" operator="not-equals" type="Object">
<store-value value-name="lookedUpValue"/>
</if-compare-field>
</simple-method>
@@ -309,7 +309,7 @@
<set field="paymentApplicationMap.invoiceId" from-field="parameters.invoiceId"/>
<set field="paymentApplicationMap.invoiceItemSeqId" from-field="parameters.invoiceItemSeqId"/>
- <if-not-empty field-name="parameters.invoiceItemSeqId">
+ <if-not-empty field="parameters.invoiceItemSeqId">
<!-- check if there are specific item paymentApplications when yes remove those -->
<remove-by-and entity-name="PaymentApplication" map-name="paymentApplicationMap"/>
<else><!-- update global application with a null sequence number -->
@@ -325,19 +325,19 @@
<entity-one entity-name="PaymentApplication" value-name="paymentApplication">
<field-map field-name="paymentApplicationId" value="${parameters.paymentApplicationId}"/>
</entity-one>
- <if-empty field-name="paymentApplication">
+ <if-empty field="paymentApplication">
<add-error>
<fail-message message="Cannot find payment application record [${parameters.paymentApplicationId}]"/>
</add-error>
<check-errors/>
</if-empty>
<!-- payment -->
- <if-not-empty field-name="paymentApplication.paymentId">
+ <if-not-empty field="paymentApplication.paymentId">
<entity-one entity-name="Payment" value-name="payment">
<field-map field-name="paymentId" value="${paymentApplication.paymentId}"/>
</entity-one>
- <if-not-empty field-name="payment">
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_CONFIRMED">
+ <if-not-empty field="payment">
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_CONFIRMED">
<add-error><fail-message message="PaymentID [${payment.paymentId}] has status 'confirmed', cannot remove application."/></add-error>
</if-compare>
<check-errors/>
@@ -346,17 +346,17 @@
</if-not-empty>
<property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplRemoved" field-name="successMessage"/>
<!-- check invoice -->
- <if-not-empty field-name="paymentApplication.invoiceId">
+ <if-not-empty field="paymentApplication.invoiceId">
<entity-one entity-name="Invoice" value-name="invoice">
<field-map field-name="invoiceId" value="${paymentApplication.invoiceId}"/>
</entity-one>
- <if-empty field-name="invoice">
+ <if-empty field="invoice">
<add-error><fail-message message="Invoice not found, invoice Id: ${paymentApplication.invoiceId}"/></add-error>
<log level="info" message="Invoice not found, invoice Id: ${invoiceId}"/>
<check-errors/>
</if-empty>
<!-- if the invoice is already PAID, then set it back to READY and clear out the paidDate -->
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_PAID">
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_PAID">
<set field="invoiceStatusMap.invoiceId" value="${paymentApplication.invoiceId}" />
<set field="invoiceStatusMap.statusId" value="INVOICE_READY"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
@@ -368,17 +368,17 @@
<property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToInvoice" field-name="toMessage"/>
</if-not-empty>
<!-- invoice item -->
- <if-not-empty field-name="paymentApplication.invoiceItemSeqId">
+ <if-not-empty field="paymentApplication.invoiceItemSeqId">
<field-to-result field-name="paymentApplication.invoiceItemSeqId" result-name="invoiceItemSeqId"/>
<property-to-field resource="AccountingUiLabels" property="AccountingApplicationToInvoiceItem" field-name="toMessage"/>
</if-not-empty>
<!-- toPayment -->
- <if-not-empty field-name="paymentApplication.toPaymentId">
+ <if-not-empty field="paymentApplication.toPaymentId">
<entity-one entity-name="Payment" value-name="toPayment">
<field-map field-name="paymentId" value="${paymentApplication.toPaymentId}"/>
</entity-one>
- <if-not-empty field-name="toPayment">
- <if-compare field-name="toPayment.statusId" operator="equals" value="PMNT_CONFIRMED">
+ <if-not-empty field="toPayment">
+ <if-compare field="toPayment.statusId" operator="equals" value="PMNT_CONFIRMED">
<add-error><fail-message message="Related payment [${toPayment.paymentId}] has status 'confirmed', cannot remove application."/></add-error>
</if-compare>
<check-errors/>
@@ -387,12 +387,12 @@
<field-to-result field-name="paymentApplication.toPaymentId" result-name="toPaymentId"/>
</if-not-empty>
<!-- billing account -->
- <if-not-empty field-name="paymentApplication.billingAccountId">
+ <if-not-empty field="paymentApplication.billingAccountId">
<field-to-result field-name="paymentApplication.billingAccountId" result-name="billingAccountId"/>
<property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToBillingAccount" field-name="toMessage"/>
</if-not-empty>
<!-- tax authority -->
- <if-not-empty field-name="paymentApplication.taxAuthGeoId">
+ <if-not-empty field="paymentApplication.taxAuthGeoId">
<field-to-result field-name="paymentApplication.taxAuthGeoId" result-name="taxAuthGeoId"/>
<property-to-field resource="AccountingUiLabels" property="AccountingPaymentApplToTaxAuth" field-name="toMessage"/>
</if-not-empty>
@@ -406,7 +406,7 @@
<make-value value-name="newEntity" entity-name="InvoiceRole"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.datetimePerformed"><now-timestamp-to-env env-name="newEntity.datetimePerformed"/></if-empty>
+ <if-empty field="newEntity.datetimePerformed"><now-timestamp-to-env env-name="newEntity.datetimePerformed"/></if-empty>
<create-value value-name="newEntity"/>
</simple-method>
@@ -419,26 +419,26 @@
<simple-method method-name="setInvoiceStatus" short-description="Set The Invoice Status">
<entity-one entity-name="Invoice" value-name="invoice"/>
<field-to-result field-name="invoice.statusId" result-name="oldStatusId"/>
- <if-compare-field field-name="invoice.statusId" operator="not-equals" to-field-name="parameters.statusId">
+ <if-compare-field field="invoice.statusId" to-field="parameters.statusId" operator="not-equals">
<entity-one entity-name="StatusValidChange" value-name="statusChange" auto-field-map="false">
<field-map field-name="statusId" env-name="invoice.statusId"/>
<field-map field-name="statusIdTo" env-name="parameters.statusId"/>
</entity-one>
- <if-empty field-name="statusChange">
+ <if-empty field="statusChange">
<add-error><fail-message message="Status is not a valid change"/></add-error>
<log level="error" message="Cannot change from ${invoice.statusId} to ${parameters.statusId}"/>
<check-errors/>
<else>
<!-- if new status is paid check if the complete invoice is applied. -->
- <if-compare field-name="parameters.statusId" operator="equals" value="INVOICE_PAID">
+ <if-compare field="parameters.statusId" operator="equals" value="INVOICE_PAID">
<set field="notApplied" type="Double" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}"/>
- <if-compare field-name="notApplied" operator="not-equals" value="0.00" type="Double">
+ <if-compare field="notApplied" operator="not-equals" value="0.00" type="Double">
<add-error><fail-message message="Cannot change status to 'paid', invoice ${invoice.invoiceId} has an unapplied balance of [${notApplied}]"/></add-error>
<check-errors/>
</if-compare>
<!-- if it's OK to mark invoice paid, use parameter for paidDate -->
- <if-empty field-name="parameters.paidDate">
+ <if-empty field="parameters.paidDate">
<now-timestamp-to-env env-name="nowTimestamp"/>
<set from-field="nowTimestamp" field="invoice.paidDate"/>
<else>
@@ -447,8 +447,8 @@
</if-empty>
</if-compare>
- <if-not-empty field-name="invoice.paidDate">
- <if-compare field-name="parameters.statusId" operator="equals" value="INVOICE_READY">
+ <if-not-empty field="invoice.paidDate">
+ <if-compare field="parameters.statusId" operator="equals" value="INVOICE_READY">
<clear-field field-name="invoice.paidDate" />
</if-compare>
</if-not-empty>
@@ -460,13 +460,13 @@
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.statusDate">
+ <if-empty field="newEntity.statusDate">
<now-timestamp-to-env env-name="newEntity.statusDate"/>
</if-empty>
<create-value value-name="newEntity"/>
<!-- if new status is cancelled remove existing payment applications. -->
- <if-compare field-name="parameters.statusId" operator="equals" value="INVOICE_CANCELLED">
+ <if-compare field="parameters.statusId" operator="equals" value="INVOICE_CANCELLED">
<set field="removePaymentApplicationMap.invoiceId" from-field="parameters.invoiceId"/>
<remove-by-and entity-name="PaymentApplication" map-name="removePaymentApplicationMap"/>
</if-compare>
@@ -489,10 +489,10 @@
<simple-method method-name="copyInvoiceToTemplate" short-description="copy a invoice to a InvoiceType starting with 'template'">
<set field="parameters.invoiceIdToCopyFrom" from-field="parameters.invoiceId"/>
- <if-compare field-name="parameters.invoiceTypeId" operator="equals" value="SALES_INVOICE">
+ <if-compare field="parameters.invoiceTypeId" operator="equals" value="SALES_INVOICE">
<set field="parameters.invoiceTypeId" value="SALES_INV_TEMPLATE"/>
</if-compare>
- <if-compare field-name="parameters.invoiceTypeId" operator="equals" value="PURCHASE_INVOICE">
+ <if-compare field="parameters.invoiceTypeId" operator="equals" value="PURCHASE_INVOICE">
<set field="parameters.invoiceTypeId" value="PUR_INV_TEMPLATE"/>
</if-compare>
<call-simple-method method-name="copyInvoice"/>
@@ -502,13 +502,13 @@
<simple-method method-name="InvoiceStatusInProgress" short-description="Check if the invoiceStatus is in progress">
<!-- find the current header record -->
<entity-one entity-name="Invoice" value-name="headerValue"/>
- <if-empty field-name="headerValue">
+ <if-empty field="headerValue">
<add-error><fail-message message="Invoice not found, invoice Id: ${invoiceId}"/></add-error>
<log level="info" message="Invoice not found, invoice Id: ${invoiceId}"/>
<check-errors/>
</if-empty>
<!-- check if the status is in progress... -->
- <if-compare field-name="headerValue.statusId" operator="not-equals" value="INVOICE_IN_PROCESS">
+ <if-compare field="headerValue.statusId" operator="not-equals" value="INVOICE_IN_PROCESS">
<add-error><fail-message message="Can only update Invoice, when status is in-process...is now: ${headerValue.statusId}"/></add-error>
<log level="info" message="Can only update Invoice, when status is in-process...is now: ${headerValue.statusId}"/>
</if-compare>
@@ -526,4 +526,4 @@
<set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
-</simple-methods>
\ No newline at end of file
+</simple-methods>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml Fri Jun 13 23:03:12 2008
@@ -34,7 +34,7 @@
<iterate entry-name="affiliatePartyRelationship" list-name="affiliatePartyRelationshipList">
<!-- calculate a commission for each commission partner, identified by affiliatePartyRelationship.partyIdTo -->
<if>
- <condition><if-compare field-name="affiliatePartyRelationship.roleTypeIdTo" operator="equals" value="AFFILIATE"/></condition>
+ <condition><if-compare field="affiliatePartyRelationship.roleTypeIdTo" operator="equals" value="AFFILIATE"/></condition>
<then>
<!-- calculate a simple commission with a base amount + a percentage of the payment -->
<calculate field-name="commissionAmount" type="Double">
@@ -52,7 +52,7 @@
</then>
<else-if>
<!-- NOTE: this is just an example of another type of commission partner associated with a customer, doesn't really exist -->
- <condition><if-compare field-name="affiliatePartyRelationship.roleTypeIdTo" operator="equals" value="TIERED_COMMISSION"/></condition>
+ <condition><if-compare field="affiliatePartyRelationship.roleTypeIdTo" operator="equals" value="TIERED_COMMISSION"/></condition>
<then></then>
</else-if>
</if>
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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008
@@ -37,7 +37,7 @@
</simple-method>
<simple-method method-name="updateAcctgTrans" short-description="Update an AcctgTrans">
<entity-one entity-name="AcctgTrans" value-name="lookedUpValue"/>
- <if-compare field-name="lookedUpValue.isPosted" operator="equals" value="Y">
+ <if-compare field="lookedUpValue.isPosted" operator="equals" value="Y">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
</if-compare>
@@ -49,7 +49,7 @@
</simple-method>
<simple-method method-name="deleteAcctgTrans" short-description="Delete an AcctgTrans">
<entity-one entity-name="AcctgTrans" value-name="lookedUpValue"/>
- <if-compare field-name="lookedUpValue.isPosted" operator="equals" value="Y">
+ <if-compare field="lookedUpValue.isPosted" operator="equals" value="Y">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
</if-compare>
@@ -68,7 +68,7 @@
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<entity-one entity-name="AcctgTrans" value-name="acctgTrans"/>
- <if-compare field-name="acctgTrans.isPosted" operator="equals" value="Y">
+ <if-compare field="acctgTrans.isPosted" operator="equals" value="Y">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
</if-compare>
@@ -80,18 +80,18 @@
<call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap">
<result-to-field result-name="partyAccountingPreference" field-name="partyAcctgPreference"/>
</call-service>
- <if-empty field-name="parameters.currencyUomId">
+ <if-empty field="parameters.currencyUomId">
<set from-field="partyAcctgPreference.baseCurrencyUomId" field="newEntity.currencyUomId"/>
</if-empty>
<!-- if the amount field is empty, then determine it from the origAmount and origCurrencyUomId fields:
if origCurrencyUomId is different from the base currency of the organization, then the amount value will be converted -->
- <if-empty field-name="newEntity.amount">
- <if-not-empty field-name="newEntity.origAmount">
- <if-empty field-name="newEntity.origCurrencyUomId">
+ <if-empty field="newEntity.amount">
+ <if-not-empty field="newEntity.origAmount">
+ <if-empty field="newEntity.origCurrencyUomId">
<set field="newEntity.origCurrencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
</if-empty>
- <if-compare-field field-name="newEntity.origCurrencyUomId" operator="not-equals" to-field-name="newEntity.currencyUomId">
+ <if-compare-field field="newEntity.origCurrencyUomId" to-field="newEntity.currencyUomId" operator="not-equals">
<clear-field field-name="convertUomInMap"/>
<set field="convertUomInMap.originalValue" from-field="newEntity.origAmount" type="Double"/>
<set field="convertUomInMap.uomId" from-field="newEntity.origCurrencyUomId"/>
@@ -107,7 +107,7 @@
</if-not-empty>
</if-empty>
- <if-empty field-name="newEntity.acctgTransEntryTypeId">
+ <if-empty field="newEntity.acctgTransEntryTypeId">
<set field="newEntity.acctgTransEntryTypeId" value="_NA_"/>
</if-empty>
@@ -120,7 +120,7 @@
</simple-method>
<simple-method method-name="updateAcctgTransEntry" short-description="Update Entry To AcctgTrans">
<entity-one entity-name="AcctgTrans" value-name="acctgTrans"/>
- <if-compare field-name="acctgTrans.isPosted" operator="equals" value="Y">
+ <if-compare field="acctgTrans.isPosted" operator="equals" value="Y">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
</if-compare>
@@ -133,7 +133,7 @@
</simple-method>
<simple-method method-name="deleteAcctgTransEntry" short-description="Remove Entry From AcctgTrans">
<entity-one entity-name="AcctgTrans" value-name="acctgTrans"/>
- <if-compare field-name="acctgTrans.isPosted" operator="equals" value="Y">
+ <if-compare field="acctgTrans.isPosted" operator="equals" value="Y">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
</if-compare>
@@ -159,7 +159,7 @@
<calculate field-name="debitTotal" type="BigDecimal"><number value="0"/></calculate>
<calculate field-name="creditTotal" type="BigDecimal"><number value="0"/></calculate>
<iterate entry-name="acctgTransEntry" list-name="acctgTransEntryList">
- <if-compare field-name="debitCreditFlag" map-name="acctgTransEntry" operator="equals" value="D">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<calculate field-name="debitTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
<calcop operator="add">
<calcop operator="get" field-name="debitTotal"/>
@@ -167,7 +167,7 @@
</calcop>
</calculate>
<else>
- <if-compare field-name="debitCreditFlag" map-name="acctgTransEntry" operator="equals" value="C">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<calculate field-name="creditTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
<calcop operator="add">
<calcop operator="get" field-name="creditTotal"/>
@@ -201,7 +201,7 @@
<simple-method method-name="postAcctgTrans" short-description="Post a AcctgTrans">
<!-- make sure the AcctgTrans has not already been posted -->
<entity-one entity-name="AcctgTrans" value-name="acctgTrans" auto-field-map="true"/>
- <if-compare field-name="acctgTrans.isPosted" operator="equals" value="Y">
+ <if-compare field="acctgTrans.isPosted" operator="equals" value="Y">
<add-error><fail-message message="AcctgTrans [${parameters.acctgTransId}] has already been posted. Not posting again"/></add-error>
</if-compare>
<check-errors/>
@@ -211,10 +211,10 @@
<call-service service-name="calculateAcctgTransTrialBalance" in-map-name="trialBalanceCallMap">
<results-to-map map-name="trialBalanceResultMap"/>
</call-service>
- <if-compare field-name="trialBalanceResultMap.debitCreditDifference" operator="greater-equals" value="0.01" type="Double">
+ <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="greater-equals" value="0.01" type="Double">
<add-error><fail-message message="Not posting GL Accounting Transaction with ID [${parameters.acctgTransId}] because the trial balance failed: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}"/></add-error>
</if-compare>
- <if-compare field-name="trialBalanceResultMap.debitCreditDifference" operator="less-equals" value="-0.01" type="Double">
+ <if-compare field="trialBalanceResultMap.debitCreditDifference" operator="less-equals" value="-0.01" type="Double">
<add-error><fail-message message="Not posting GL Accounting Transaction with ID [${parameters.acctgTransId}] because the trial balance failed: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}"/></add-error>
</if-compare>
@@ -224,10 +224,10 @@
</entity-condition>
<!-- check the scheduled posting date, but only if it's set -->
- <if-not-empty field-name="acctgTrans.scheduledPostingDate">
+ <if-not-empty field="acctgTrans.scheduledPostingDate">
<set field="scheduledPostingDate" from-field="acctgTrans.scheduledPostingDate"/>
<set field="beforeScheduled" value="${bsh: org.ofbiz.base.util.UtilDateTime.nowTimestamp().before(scheduledPostingDate)}"/>
- <if-compare field-name="beforeScheduled" operator="equals" value="true" type="Boolean">
+ <if-compare field="beforeScheduled" operator="equals" value="true" type="Boolean">
<add-error><fail-message message="Not posting GL Accounting Transaction with ID [${parameters.acctgTransId}] because it's not scheduled to be posted yet. The scheduled posting date is [${acctgTrans.scheduledPostingDate}]"/></add-error>
</if-compare>
</if-not-empty>
@@ -243,7 +243,7 @@
<!-- also check if the glAccountId, amount, currencyUomId fields are all set -->
<iterate entry-name="acctgTransEntry" list-name="acctgTransEntryList">
<!-- we want to do this for each organizationPartyId, so only do this if we haven't already found the list for the current org -->
- <if-empty field-name="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}">
+ <if-empty field="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}">
<clear-field field-name="findCustomTimePeriodCallMap"/>
<clear-field field-name="customTimePeriodList"/>
@@ -256,12 +256,12 @@
<result-to-field result-name="customTimePeriodList"/>
</call-service>
- <if-empty field-name="customTimePeriodList">
+ <if-empty field="customTimePeriodList">
<add-error><fail-message message="Could not find a CustomTimePeriod (fiscal period) for the Transaction Date [${acctgTrans.transactionDate}] (is for Organization Party with ID [${acctgTransEntry.organizationPartyId}])"/></add-error>
</if-empty>
<!-- now do the actual isClose check -->
<iterate entry-name="customTimePeriod" list-name="customTimePeriodList">
- <if-compare field-name="customTimePeriod.isClosed" operator="equals" value="Y">
+ <if-compare field="customTimePeriod.isClosed" operator="equals" value="Y">
<add-error><fail-message message="CustomTimePeriod (fiscal period) [${customTimePeriod.customTimePeriodId}] is CLOSED, cannot post to it (is for the Transaction Date [${acctgTrans.transactionDate}] and Organization Party with ID [${acctgTransEntry.organizationPartyId}])"/></add-error>
</if-compare>
</iterate>
@@ -269,14 +269,14 @@
<!-- save this customTimePeriodList for the current entry for later use -->
<set from-field="customTimePeriodList" field="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}"/>
</if-empty>
- <if-empty field-name="acctgTransEntry.glAccountId">
+ <if-empty field="acctgTransEntry.glAccountId">
<add-error><fail-message message="Gl account id is not set for [${acctgTransEntry.acctgTransEntrySeqId}] or mapping not found for account type ${acctgTransEntry.glAccountTypeId}"/></add-error>
</if-empty>
- <if-empty field-name="acctgTransEntry.amount">
+ <if-empty field="acctgTransEntry.amount">
<add-error><fail-message message="Amount not set for [${acctgTransEntry.acctgTransEntrySeqId}] or failed to convert the original amount ${acctgTransEntry.origAmount} with currency ${acctgTransEntry.origCurrencyUomId}"/></add-error>
</if-empty>
<!--
- <if-empty field-name="acctgTransEntry.currencyUomId">
+ <if-empty field="acctgTransEntry.currencyUomId">
<add-error><fail-message message="Currency is not set for [${acctgTransEntry.acctgTransEntrySeqId}]"/></add-error>
</if-empty>
-->
@@ -284,20 +284,20 @@
<!-- DONE with initial tests/checks, see if we are good to go or not... -->
- <if-compare field-name="parameters.verifyOnly" operator="equals" value="Y">
- <if-not-empty field-name="error_list">
+ <if-compare field="parameters.verifyOnly" operator="equals" value="Y">
+ <if-not-empty field="error_list">
<field-to-result field-name="error_list" result-name="successMessageList"/>
</if-not-empty>
<return/>
<else>
<!-- if there are errors and we have an error journal assign to the journal and return -->
- <if-not-empty field-name="error_list">
+ <if-not-empty field="error_list">
<iterate list-name="acctgTransEntryList" entry-name="acctgTransEntry">
<set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="acctgTransEntry.organizationPartyId"/>
<call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap">
<result-to-field result-name="partyAccountingPreference" field-name="partyAcctgPreference"/>
</call-service>
- <if-empty field-name="partyAcctgPreference.errorGlJournalId">
+ <if-empty field="partyAcctgPreference.errorGlJournalId">
<!-- if no error journal is set, then return the error messages -->
<check-errors/>
<else>
@@ -336,11 +336,11 @@
<get-related-one relation-name="ParentGlAccountClass" value-name="glAccountClass" to-value-name="parentGlAccountClass"/>
<!-- test if the account is a DEBIT account -->
<set field="isDebit" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount)}"/>
- <if-compare field-name="isDebit" operator="equals" value="true">
- <if-compare field-name="debitCreditFlag" map-name="acctgTransEntry" operator="equals" value="D">
+ <if-compare field="isDebit" operator="equals" value="true">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<set from-field="acctgTransEntry.amount" field="postingAmount"/>
<else>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<calculate field-name="postingAmount" type="BigDecimal">
<calcop field-name="acctgTransEntry.amount" operator="negative"/>
</calculate>
@@ -350,11 +350,11 @@
<else>
<!-- otherwise, test if the account is credit -->
<set field="isCredit" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.isCreditAccount(glAccount)}"/>
- <if-compare field-name="isCredit" operator="equals" value="true">
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
+ <if-compare field="isCredit" operator="equals" value="true">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<set from-field="acctgTransEntry.amount" field="postingAmount"/>
<else>
- <if-compare field-name="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<calculate field-name="postingAmount" type="BigDecimal">
<calcop field-name="acctgTransEntry.amount" operator="negative"/>
</calculate>
@@ -390,7 +390,7 @@
<field-map field-name="customTimePeriodId" env-name="customTimePeriod.customTimePeriodId"/>
</entity-one>
<!-- if no glAccountHistory create a new empty one -->
- <if-empty field-name="glAccountHistory">
+ <if-empty field="glAccountHistory">
<make-value value-name="glAccountHistory" entity-name="GlAccountHistory"/>
<set from-field="acctgTransEntry.glAccountId" field="glAccountHistory.glAccountId"/>
<set from-field="acctgTransEntry.organizationPartyId" field="glAccountHistory.organizationPartyId"/>
@@ -401,7 +401,7 @@
</if-empty>
<!-- update GlAccountHistory's debit and credit totals -->
- <if-compare field-name="debitCreditFlag" map-name="acctgTransEntry" operator="equals" value="D">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
<calculate field-name="postedDebits" map-name="glAccountHistory" type="BigDecimal">
<calcop operator="add">
<calcop operator="get" field-name="amount" map-name="acctgTransEntry"/>
@@ -409,7 +409,7 @@
</calcop>
</calculate>
<else>
- <if-compare field-name="debitCreditFlag" map-name="acctgTransEntry" operator="equals" value="C">
+ <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
<calculate field-name="postedCredits" map-name="glAccountHistory" type="BigDecimal">
<calcop operator="add">
<calcop operator="get" field-name="amount" map-name="acctgTransEntry"/>