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 13:07:17 UTC
svn commit: r730111 [1/6] - 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/accountin...
Author: jleroux
Date: Tue Dec 30 04:07:14 2008
New Revision: 730111
URL: http://svn.apache.org/viewvc?rev=730111&view=rev
Log:
<entity-one(.*)value-name => <entity-one$1value-field
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/olap/FactServices.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/rate/RateServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.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/data/DataServices.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/website/WebSiteServices.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.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/sfa/opportunity/OpportunityServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.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/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/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/test/PartyTestServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.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/olap/ProductDimensionServices.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/ProductServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.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/product/supplier/SupplierProductServices.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/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.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/EnumerationServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml
ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml
ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.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
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.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=730111&r1=730110&r2=730111&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 Tue Dec 30 04:07:14 2008
@@ -48,7 +48,7 @@
<!-- update an existing Agreement -->
<simple-method method-name="updateAgreement" short-description="Update an existing Agreement">
- <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
+ <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="agreement"/>
<store-value value-name="agreement"/>
@@ -57,7 +57,7 @@
<!-- cancel an existing Agreement -->
<simple-method method-name="cancelAgreement" short-description="Cancel an existing Agreement">
- <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
+ <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
<check-errors/>
<now-timestamp-to-env env-name="nowTimestamp"/>
<set from-field="nowTimestamp" field="agreement.thruDate"/>
@@ -67,7 +67,7 @@
<!-- copy an existing Agreement -->
<simple-method method-name="copyAgreement" short-description="Copy an existing Agreement">
- <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
+ <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
<check-errors/>
<set-service-fields service-name="createAgreement" to-map-name="createAgreementInMap" map-name="agreement"/>
<call-service service-name="createAgreement" in-map-name="createAgreementInMap">
@@ -136,7 +136,7 @@
<!-- update an existing AgreementItem -->
<simple-method method-name="updateAgreementItem" short-description="Update an existing AgreementItem">
- <entity-one entity-name="AgreementItem" value-name="agreementItem" auto-field-map="true"/>
+ <entity-one entity-name="AgreementItem" value-field="agreementItem" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="agreementItem"/>
<store-value value-name="agreementItem"/>
@@ -145,7 +145,7 @@
<!-- remove an AgreementItem -->
<simple-method method-name="removeAgreementItem" short-description="Remove an AgreementItem">
- <entity-one entity-name="AgreementItem" value-name="agreementItem" auto-field-map="true"/>
+ <entity-one entity-name="AgreementItem" value-field="agreementItem" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="agreementItem"/>
</simple-method>
@@ -170,7 +170,7 @@
<!-- update an existing AgreementTerm -->
<simple-method method-name="updateAgreementTerm" short-description="Update an existing AgreementTerm">
- <entity-one entity-name="AgreementTerm" value-name="agreementTerm" auto-field-map="true"/>
+ <entity-one entity-name="AgreementTerm" value-field="agreementTerm" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="agreementTerm"/>
<store-value value-name="agreementTerm"/>
@@ -179,7 +179,7 @@
<!-- delete an existing AgreementTerm -->
<simple-method method-name="deleteAgreementTerm" short-description="Delete an existing AgreementTerm">
- <entity-one entity-name="AgreementTerm" value-name="agreementTerm" auto-field-map="true"/>
+ <entity-one entity-name="AgreementTerm" value-field="agreementTerm" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="agreementTerm"/>
<check-errors/>
@@ -196,7 +196,7 @@
<!-- update an existing AgreementPromoAppl -->
<simple-method method-name="updateAgreementPromoAppl" short-description="Update an existing AgreementPromoAppl">
- <entity-one entity-name="AgreementPromoAppl" value-name="agreementPromoAppl" auto-field-map="true"/>
+ <entity-one entity-name="AgreementPromoAppl" value-field="agreementPromoAppl" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="agreementPromoAppl"/>
<store-value value-name="agreementPromoAppl"/>
@@ -205,7 +205,7 @@
<!-- remove an existing AgreementPromoAppl -->
<simple-method method-name="removeAgreementPromoAppl" short-description="Remove an existing AgreementPromoAppl">
- <entity-one entity-name="AgreementPromoAppl" value-name="agreementPromoAppl" auto-field-map="true"/>
+ <entity-one entity-name="AgreementPromoAppl" value-field="agreementPromoAppl" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="agreementPromoAppl"/>
<check-errors/>
@@ -222,7 +222,7 @@
<!-- update an existing AgreementProductAppl -->
<simple-method method-name="updateAgreementProductAppl" short-description="Update an existing AgreementProductAppl">
- <entity-one entity-name="AgreementProductAppl" value-name="agreementProductAppl" auto-field-map="true"/>
+ <entity-one entity-name="AgreementProductAppl" value-field="agreementProductAppl" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="agreementProductAppl"/>
<store-value value-name="agreementProductAppl"/>
@@ -231,7 +231,7 @@
<!-- remove an existing AgreementProductAppl -->
<simple-method method-name="removeAgreementProductAppl" short-description="Remove an existing AgreementProductAppl">
- <entity-one entity-name="AgreementProductAppl" value-name="agreementProductAppl" auto-field-map="true"/>
+ <entity-one entity-name="AgreementProductAppl" value-field="agreementProductAppl" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="agreementProductAppl"/>
<check-errors/>
@@ -248,7 +248,7 @@
<!-- update an existing AgreementPartyApplic -->
<simple-method method-name="updateAgreementPartyApplic" short-description="Update an existing AgreementPartyApplic">
- <entity-one entity-name="AgreementPartyApplic" value-name="agreementPartyApplic" auto-field-map="true"/>
+ <entity-one entity-name="AgreementPartyApplic" value-field="agreementPartyApplic" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="agreementPartyApplic"/>
<store-value value-name="agreementPartyApplic"/>
@@ -257,7 +257,7 @@
<!-- remove an existing AgreementPartyApplic -->
<simple-method method-name="removeAgreementPartyApplic" short-description="Remove an existing AgreementPartyApplic">
- <entity-one entity-name="AgreementPartyApplic" value-name="agreementPartyApplic" auto-field-map="true"/>
+ <entity-one entity-name="AgreementPartyApplic" value-field="agreementPartyApplic" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="agreementPartyApplic"/>
<check-errors/>
@@ -274,7 +274,7 @@
<!-- update an existing AgreementGeographicalApplic -->
<simple-method method-name="updateAgreementGeographicalApplic" short-description="Update an existing AgreementGeographicalApplic">
- <entity-one entity-name="AgreementGeographicalApplic" value-name="agreementGeographicalApplic" auto-field-map="true"/>
+ <entity-one entity-name="AgreementGeographicalApplic" value-field="agreementGeographicalApplic" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="agreementGeographicalApplic"/>
<store-value value-name="agreementGeographicalApplic"/>
@@ -283,7 +283,7 @@
<!-- remove an existing AgreementGeographicalApplic -->
<simple-method method-name="removeAgreementGeographicalApplic" short-description="Remove an existing AgreementGeographicalApplic">
- <entity-one entity-name="AgreementGeographicalApplic" value-name="agreementGeographicalApplic" auto-field-map="true"/>
+ <entity-one entity-name="AgreementGeographicalApplic" value-field="agreementGeographicalApplic" auto-field-map="true"/>
<check-errors/>
<remove-value value-name="agreementGeographicalApplic"/>
<check-errors/>
@@ -298,19 +298,19 @@
</simple-method>
<simple-method method-name="updateAgreementRole" short-description="Update an Agreement Role">
- <entity-one entity-name="AgreementRole" value-name="lookedUpValue"/>
+ <entity-one entity-name="AgreementRole" value-field="lookedUpValue"/>
<set-pk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteAgreementRole" short-description="Delete an Agreement Role">
- <entity-one entity-name="AgreementRole" value-name="agreementRole"/>
+ <entity-one entity-name="AgreementRole" value-field="agreementRole"/>
<remove-value value-name="agreementRole"/>
</simple-method>
<!--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"/>
+ <entity-one entity-name="AgreementWorkEffortAppl" value-field="agreementWorkEffortAppl"/>
<if-not-empty field="agreementWorkEffortAppl">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingAgreementWorkEffortApplAlreadyExists"/></add-error>
<check-errors/>
@@ -323,7 +323,7 @@
</simple-method>
<simple-method method-name="deleteAgreementWorkEffortAppl" short-description="Remove a link between a WorkEffort and a Agreement Appl">
- <entity-one entity-name="AgreementWorkEffortAppl" value-name="agreementWorkEffortAppl"/>
+ <entity-one entity-name="AgreementWorkEffortAppl" value-field="agreementWorkEffortAppl"/>
<remove-value value-name="agreementWorkEffortAppl"/>
</simple-method>
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=730111&r1=730110&r2=730111&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 Tue Dec 30 04:07:14 2008
@@ -30,12 +30,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateCostComponentCalc" short-description="Update a CostComponentCalc entry">
- <entity-one entity-name="CostComponentCalc" value-name="costComponentCalc"/>
+ <entity-one entity-name="CostComponentCalc" value-field="costComponentCalc"/>
<set-nonpk-fields map="parameters" value-field="costComponentCalc"/>
<store-value value-name="costComponentCalc"/>
</simple-method>
<simple-method method-name="removeCostComponentCalc" short-description="Remove a CostComponentCalc entry">
- <entity-one entity-name="CostComponentCalc" value-name="costComponentCalc"/>
+ <entity-one entity-name="CostComponentCalc" value-field="costComponentCalc"/>
<remove-value value-name="costComponentCalc"/>
</simple-method>
<simple-method method-name="createWorkEffortCostCalc" short-description="Create a WorkEffortCostCalc entry">
@@ -48,7 +48,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="removeWorkEffortCostCalc" short-description="Remove a WorkEffortCostCalc entry">
- <entity-one entity-name="WorkEffortCostCalc" value-name="workEffortCostCalc"/>
+ <entity-one entity-name="WorkEffortCostCalc" value-field="workEffortCostCalc"/>
<remove-value value-name="workEffortCostCalc"/>
</simple-method>
</simple-methods>
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=730111&r1=730110&r2=730111&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 Tue Dec 30 04:07:14 2008
@@ -28,9 +28,9 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
- <entity-one entity-name="FinAccountTrans" value-name="finAccountTrans"/>
+ <entity-one entity-name="FinAccountTrans" value-field="finAccountTrans"/>
<set field="finAccountId" from-field="finAccountTrans.finAccountId"/>
- <entity-one entity-name="FinAccount" value-name="finAccount"/>
+ <entity-one entity-name="FinAccount" value-field="finAccount"/>
<set field="organizationPartyId" from-field="finAccount.organizationPartyId"/>
@@ -39,7 +39,7 @@
<set field="glAccountId" from-field="finAccount.postToGlAccountId"/>
<else>
- <entity-one entity-name="FinAccountTypeGlAccount" value-name="finAccountTypeGlAccount" auto-field-map="false">
+ <entity-one entity-name="FinAccountTypeGlAccount" value-field="finAccountTypeGlAccount" auto-field-map="false">
<field-map field-name="organizationPartyId"/>
<field-map field-name="finAccountTypeId" from-field="finAccount.finAccountTypeId"/>
</entity-one>
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=730111&r1=730110&r2=730111&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 Tue Dec 30 04:07:14 2008
@@ -54,7 +54,7 @@
<!-- set the refundable flag from the type; if not set -->
<if-empty field="newEntity.isRefundable">
- <entity-one entity-name="FinAccountType" value-name="finAccountType">
+ <entity-one entity-name="FinAccountType" value-field="finAccountType">
<field-map field-name="finAccountTypeId" from-field="parameters.finAccountTypeId"/>
</entity-one>
<if>
@@ -86,7 +86,7 @@
<simple-method method-name="updateFinAccount" short-description="Update a Financial Account">
<call-simple-method method-name="getArithmeticSettingsInline"/>
- <entity-one entity-name="FinAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="FinAccount" value-field="lookedUpValue"/>
<field-to-result field-name="lookedUpValue.replenishPaymentId" result-name="oldReplenishPaymentId"/>
<field-to-result field-name="lookedUpValue.replenishLevel" result-name="oldReplenishLevel"/>
@@ -103,7 +103,7 @@
<!-- 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="lookedUpValue.statusId">
<!-- if statusId change is not in the StatusValidChange list, complain... -->
- <entity-one entity-name="StatusValidChange" value-name="statusValidChange" auto-field-map="false">
+ <entity-one entity-name="StatusValidChange" value-field="statusValidChange" auto-field-map="false">
<field-map field-name="statusId" from-field="lookedUpValue.statusId"/>
<field-map field-name="statusIdTo" from-field="parameters.statusId"/>
</entity-one>
@@ -133,7 +133,7 @@
<field-to-result field-name="lookedUpValue.finAccountId" result-name="finAccountId"/>
</simple-method>
<simple-method method-name="deleteFinAccount" short-description="Delete a Financial Account">
- <entity-one value-name="finAccount" entity-name="FinAccount"/>
+ <entity-one value-field="finAccount" entity-name="FinAccount"/>
<remove-value value-name="finAccount"/>
</simple-method>
@@ -202,12 +202,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateFinAccountRole" short-description="Update a Financial Account Role">
- <entity-one entity-name="FinAccountRole" value-name="lookedUpValue"/>
+ <entity-one entity-name="FinAccountRole" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteFinAccountRole" short-description="Delete a Financial Account Role">
- <entity-one entity-name="FinAccountRole" value-name="lookedUpValue"/>
+ <entity-one entity-name="FinAccountRole" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -241,7 +241,7 @@
<field-to-result field-name="newEntity.finAccountAuthId" result-name="finAccountAuthId"/>
</simple-method>
<simple-method method-name="expireFinAccountAuth" short-description="Expire a Financial Account Authorization">
- <entity-one entity-name="FinAccountAuth" value-name="finAccountAuth"/>
+ <entity-one entity-name="FinAccountAuth" value-field="finAccountAuth"/>
<if-empty field="parameters.expireDateTime">
<now-timestamp-to-env env-name="finAccountAuth.thruDate"/>
<else>
@@ -256,7 +256,7 @@
<if-not-empty field="parameters.finAccountId">
<set field="finAccountId" from-field="parameters.finAccountId"/>
<else>
- <entity-one entity-name="FinAccountTrans" value-name="mainFinAccountTrans"/>
+ <entity-one entity-name="FinAccountTrans" value-field="mainFinAccountTrans"/>
<set field="finAccountId" from-field="mainFinAccountTrans.finAccountId"/>
</else>
</if-not-empty>
@@ -267,7 +267,7 @@
<if-not-empty field="parameters.finAccountId">
<set field="finAccountId" from-field="parameters.finAccountId"/>
<else>
- <entity-one entity-name="FinAccountAuth" value-name="mainFinAccountAuth"/>
+ <entity-one entity-name="FinAccountAuth" value-field="mainFinAccountAuth"/>
<set field="finAccountId" from-field="mainFinAccountAuth.finAccountId"/>
</else>
</if-not-empty>
@@ -318,7 +318,7 @@
</iterate>
<!-- Okay, now just store the results -->
- <entity-one entity-name="FinAccount" value-name="finAccount"/>
+ <entity-one entity-name="FinAccount" value-field="finAccount"/>
<log level="info" message="In updateFinAccountBalancesFromTrans/Auth updating FinAccount with ID [${finAccountId}] with actualBalance: ${finAccount.actualBalance} -> ${actualBalanceSum}, and availableBalance: ${finAccount.availableBalance} -> ${availableBalanceSum}"/>
<set field="finAccount.actualBalance" from-field="actualBalanceSum" type="Double"/>
<set field="finAccount.availableBalance" from-field="availableBalanceSum" type="Double"/>
@@ -334,13 +334,13 @@
</simple-method>
<simple-method method-name="updateFinAccountTypeGlAccount" short-description="Update an FinAccountTypeGlAccount">
- <entity-one entity-name="FinAccountTypeGlAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="FinAccountTypeGlAccount" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteFinAccountTypeGlAccount" short-description="Delete an FinAccountTypeGlAccount">
- <entity-one entity-name="FinAccountTypeGlAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="FinAccountTypeGlAccount" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -353,13 +353,13 @@
</simple-method>
<simple-method method-name="updateVarianceReasonGlAccount" short-description="Update an Variance Reason Gl Account">
- <entity-one entity-name="VarianceReasonGlAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="VarianceReasonGlAccount" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteVarianceReasonGlAccount" short-description="Delete an Variance Reason Gl Account">
- <entity-one entity-name="VarianceReasonGlAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="VarianceReasonGlAccount" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
</simple-methods>
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=730111&r1=730110&r2=730111&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 Tue Dec 30 04:07:14 2008
@@ -36,7 +36,7 @@
<sequenced-id-to-env sequence-name="FixedAsset" env-name="newEntity.fixedAssetId"/>
<else>
<!-- check the Duplicate ID> -->
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
<if-not-empty field="fixedAsset">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingFixedAssetIdAlreadyExists"/></add-error>
<log level="info" message="${AccountingUiLabels.AccountingFixedAssetIdAlreadyExists} "/>
@@ -53,7 +53,7 @@
<!-- update an existing Fixed Asset header Record -->
<simple-method method-name="updateFixedAsset" short-description="Update an existing FixedAsset">
- <entity-one entity-name="FixedAsset" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAsset" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -77,14 +77,14 @@
<!-- update the product to fixed Asset link -->
<simple-method method-name="updateFixedAssetProduct" short-description="Update Products of a FixedAsset">
- <entity-one entity-name="FixedAssetProduct" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAssetProduct" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<!-- remove the productlink from the Fixed Asset -->
<simple-method method-name="removeFixedAssetProduct" short-description="Remove Product From FixedAsset">
- <entity-one entity-name="FixedAssetProduct" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAssetProduct" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -99,7 +99,7 @@
</check-permission>
<check-errors/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
<make-value value-field="excDayPKMap" entity-name="TechDataCalendarExcDay"/>
<set-pk-fields field-name= "calendarId" map="fixedAsset" value-field="excDayPKMap"/>
@@ -119,7 +119,7 @@
<!-- create new entity and create all the fields -->
<!-- Check, should not exist already -->
- <entity-one entity-name="FixedAssetStdCost" value-name="fixedAssetStdCost"/>
+ <entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
<if-not-empty field="fixedAssetStdCost">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingFixedAssetStdCostAlreadyExists"/></add-error>
</if-not-empty>
@@ -135,13 +135,13 @@
</simple-method>
<!-- update an existing FixedAssetStdCost -->
<simple-method method-name="updateFixedAssetStdCost" short-description="Update an existing FixedAssetStdCost">
- <entity-one entity-name="FixedAssetStdCost" value-name="fixedAssetStdCost"/>
+ <entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
<set-nonpk-fields map="parameters" value-field="fixedAssetStdCost"/>
<store-value value-name="fixedAssetStdCost"/>
</simple-method>
<!-- cancel an existing Agreement -->
<simple-method method-name="cancelFixedAssetStdCost" short-description="Cancel an existing FixedAssetStdCost">
- <entity-one entity-name="FixedAssetStdCost" value-name="fixedAssetStdCost"/>
+ <entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
<now-timestamp-to-env env-name="fixedAssetStdCost.thruDate"/>
<store-value value-name="fixedAssetStdCost"/>
</simple-method>
@@ -154,12 +154,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateFixedAssetIdent" short-description="Update an existing FixedAssetIdent">
- <entity-one entity-name="FixedAssetIdent" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAssetIdent" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeFixedAssetIdent" short-description="Remove Fixed Assets Idents FixedAssetIdent">
- <entity-one entity-name="FixedAssetIdent" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAssetIdent" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -174,12 +174,12 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateFixedAssetRegistration" short-description="Update an existing FixedAsset Registration">
- <entity-one entity-name="FixedAssetRegistration" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAssetRegistration" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteFixedAssetRegistration" short-description="Delete FixedAsset Registration">
- <entity-one entity-name="FixedAssetRegistration" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAssetRegistration" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -191,8 +191,8 @@
<field-to-result field-name="newEntity.maintHistSeqId" result-name="maintHistSeqId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-not-empty field="parameters.productMaintSeqId">
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
- <entity-one entity-name="ProductMaint" value-name="productMaint">
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
+ <entity-one entity-name="ProductMaint" value-field="productMaint">
<field-map field-name="productId" from-field="fixedAsset.instanceOfProductId"/>
<field-map field-name="productMaintSeqId" from-field="parameters.productMaintSeqId"/>
</entity-one>
@@ -219,7 +219,7 @@
<else>
<!-- Create the WorkEffort -->
<!-- Maintenance WorkEffort entity -->
- <entity-one value-name="fixedAsset" entity-name="FixedAsset"/>
+ <entity-one value-field="fixedAsset" entity-name="FixedAsset"/>
<property-to-field field-name="workEffortName" resource="AccountingUiLabels" property="AccountingFixedAssetMaintWorkEffortName"/>
<set from-field="workEffortName" field="maintWorkEffortMap.workEffortName"/>
<set value="TASK" field="maintWorkEffortMap.workEffortTypeId"/>
@@ -243,13 +243,13 @@
<call-simple-method method-name="autoAssignFixedAssetPartiesToMaintenance"/>
</simple-method>
<simple-method method-name="updateFixedAssetMaint" short-description="Update an existing FixedAsset Maintenance">
- <entity-one entity-name="FixedAssetMaint" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAssetMaint" value-field="lookedUpValue"/>
<set field="oldStatusId" from-field="lookedUpValue.statusId"/>
<field-to-result field-name="oldStatusId"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<if-not-empty field="parameters.productMaintSeqId">
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
- <entity-one entity-name="ProductMaint" value-name="productMaint">
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
+ <entity-one entity-name="ProductMaint" value-field="productMaint">
<field-map field-name="productId" from-field="fixedAsset.instanceOfProductId"/>
<field-map field-name="productMaintSeqId" from-field="parameters.productMaintSeqId"/>
</entity-one>
@@ -266,7 +266,7 @@
</condition>
<then>
<set field="workEffortId" from-field="lookedUpValue.scheduleWorkEffortId"/>
- <entity-one value-name="workEffort" entity-name="WorkEffort"/>
+ <entity-one value-field="workEffort" entity-name="WorkEffort"/>
<if>
<condition>
<and>
@@ -299,7 +299,7 @@
</if>
</simple-method>
<simple-method method-name="deleteFixedAssetMaint" short-description="Delete FixedAsset Maintenance">
- <entity-one entity-name="FixedAssetMaint" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAssetMaint" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -314,7 +314,7 @@
<call-simple-method method-name="createMaintsFromMeterReading"/>
</simple-method>
<simple-method method-name="updateFixedAssetMeter" short-description="Update a Fixed Asset Meter Reading">
- <entity-one entity-name="FixedAssetMeter" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAssetMeter" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
<check-errors/>
@@ -322,14 +322,14 @@
<call-simple-method method-name="createMaintsFromMeterReading"/>
</simple-method>
<simple-method method-name="deleteFixedAssetMeter" short-description="Delete a Fixed Asset Meter Reading">
- <entity-one entity-name="FixedAssetMeter" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAssetMeter" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createMaintsFromMeterReading" short-description="Create Fixed Asset Maintenances From A Meter Reading">
<if-not-empty field="meterValue.maintHistSeqId">
<return/>
</if-not-empty>
- <entity-one entity-name="FixedAsset" value-name="fixedAssetValue"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAssetValue"/>
<if-empty field="fixedAssetValue.instanceOfProductId">
<return/>
</if-empty>
@@ -460,7 +460,7 @@
<set-pk-fields map="maintMeter" value-field="newEntity"/>
<set-nonpk-fields map="maintMeter" value-field="newEntity"/>
<set field="newEntity.readingDate" from-field="maintMeter.createdStamp"/>
- <entity-one entity-name="FixedAssetMeter" value-name="lookedUpValue" auto-field-map="false">
+ <entity-one entity-name="FixedAssetMeter" value-field="lookedUpValue" auto-field-map="false">
<field-map field-name="fixedAssetId" from-field="newEntity.fixedAssetId"/>
<field-map field-name="productMeterTypeId" from-field="newEntity.productMeterTypeId"/>
<field-map field-name="readingDate" from-field="newEntity.readingDate"/>
@@ -475,7 +475,7 @@
<!-- create/update/delete FixedAssetMaintOrder -->
<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"/>
+ <entity-one entity-name="OrderHeader" value-field="lookedUpValue"/>
<if-empty field="lookedUpValue">
<set field="orderId" from-field="parameters.orderId"/>
<add-error><fail-property resource="AccountingUiLabels" property="AccountingOrderWithIdNotFound"/></add-error>
@@ -496,7 +496,7 @@
<else>
<!-- Check, should exist orderId and orderItemId -->
- <entity-one entity-name="OrderItem" value-name="lookedUpValue"/>
+ <entity-one entity-name="OrderItem" value-field="lookedUpValue"/>
<if-empty field="lookedUpValue">
<set field="orderItemSeqId" from-field="parameters.orderItemSeqId"/>
<add-error><fail-property resource="AccountingUiLabels" property="AccountingOrderItemWithIdNotFound"/></add-error>
@@ -511,7 +511,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="deleteFixedAssetMaintOrder" short-description="Delete FixedAsset Maintenance Order">
- <entity-one entity-name="FixedAssetMaintOrder" value-name="lookedUpValue"/>
+ <entity-one entity-name="FixedAssetMaintOrder" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -528,13 +528,13 @@
</simple-method>
<simple-method method-name="updatePartyFixedAssetAssignment" short-description="Update Party to Fixed Asset">
- <entity-one entity-name="PartyFixedAssetAssignment" value-name="newEntity"/>
+ <entity-one entity-name="PartyFixedAssetAssignment" value-field="newEntity"/>
<set-nonpk-fields value-field="newEntity" map="parameters"/>
<store-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="deletePartyFixedAssetAssignment" short-description="Delete Party to Fixed Asset">
- <entity-one entity-name="PartyFixedAssetAssignment" value-name="newEntity"/>
+ <entity-one entity-name="PartyFixedAssetAssignment" value-field="newEntity"/>
<remove-value value-name="newEntity"/>
</simple-method>
@@ -546,7 +546,7 @@
<if-empty field="fixedAssetId">
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
</if-empty>
- <entity-one entity-name="FixedAssetMaint" value-name="maintValue"/>
+ <entity-one entity-name="FixedAssetMaint" value-field="maintValue"/>
<if-empty field="workEffortId">
<set field="workEffortId" from-field="maintValue.scheduleWorkEffortId"/>
</if-empty>
@@ -649,7 +649,7 @@
</simple-method>
<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"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
<if-empty field="fixedAsset">
<add-error><fail-property resource="ManufacturingUiLabels" property="ManufacturingFixedAssetNotExist"/></add-error>
<check-errors/>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -23,7 +23,7 @@
<simple-method method-name="getNextInvoiceId" short-description="Get Next invoiceId">
<!-- try to find PartyAcctgPreference for parameters.partyId, see if we need any special invoice number sequencing -->
- <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false">
+ <entity-one entity-name="PartyAcctgPreference" value-field="partyAcctgPreference" auto-field-map="false">
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-one>
<log level="info" message="In getNextInvoiceId partyId is [${parameters.partyId}], partyAcctgPreference: ${partyAcctgPreference}"/>
@@ -143,7 +143,7 @@
</if-empty>
<if-empty field="parameters.currencyUomId">
<!-- if provided set the default currency to the receiving party -->
- <entity-one entity-name="Party" value-name="party"/>
+ <entity-one entity-name="Party" value-field="party"/>
<if-not-empty field="party.preferredCurrencyUomId">
<set field="newEntity.currencyUomId" from-field="party.preferredCurrencyUomId"/>
<else>
@@ -259,7 +259,7 @@
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="parameters.amount">
<if-not-empty field="parameters.productId">
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<set from-field="product.description" field="newEntity.description"/>
<set from-field="product" field="calculateProductPriceMap.product"/>
<call-service service-name="calculateProductPrice" in-map-name="calculateProductPriceMap">
@@ -294,7 +294,7 @@
<!-- check if the productNumber is updated, when yes retrieve product description and price -->
<if-not-empty field="productId">
<if-compare-field to-field="lookedUpValue.productId" field="savedValue.productId" operator="not-equals">
- <entity-one entity-name="Product" value-name="product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<set from-field="product.description" field="lookedUpValue.description"/>
<set from-field="product" field="calculateProductPriceMap.product"/>
@@ -327,12 +327,12 @@
</else>
</if-not-empty>
- <entity-one entity-name="InvoiceItem" value-name="lookedUpValue"/>
+ <entity-one entity-name="InvoiceItem" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="removePaymentApplication" short-description="Remove an existing payment application">
- <entity-one entity-name="PaymentApplication" value-name="paymentApplication">
+ <entity-one entity-name="PaymentApplication" value-field="paymentApplication">
<field-map field-name="paymentApplicationId" value="${parameters.paymentApplicationId}"/>
</entity-one>
<if-empty field="paymentApplication">
@@ -344,7 +344,7 @@
<!-- payment -->
<set field="currencyUomId" value=""/><!-- currency of the paymentApplication -->
<if-not-empty field="paymentApplication.paymentId">
- <entity-one entity-name="Payment" value-name="payment">
+ <entity-one entity-name="Payment" value-field="payment">
<field-map field-name="paymentId" value="${paymentApplication.paymentId}"/>
</entity-one>
<if-not-empty field="payment">
@@ -358,7 +358,7 @@
</if-not-empty>
<!-- check invoice -->
<if-not-empty field="paymentApplication.invoiceId">
- <entity-one entity-name="Invoice" value-name="invoice">
+ <entity-one entity-name="Invoice" value-field="invoice">
<field-map field-name="invoiceId" value="${paymentApplication.invoiceId}"/>
</entity-one>
<if-empty field="invoice">
@@ -386,7 +386,7 @@
</if-not-empty>
<!-- toPayment -->
<if-not-empty field="paymentApplication.toPaymentId">
- <entity-one entity-name="Payment" value-name="toPayment">
+ <entity-one entity-name="Payment" value-field="toPayment">
<field-map field-name="paymentId" value="${paymentApplication.toPaymentId}"/>
</entity-one>
<if-not-empty field="toPayment">
@@ -402,7 +402,7 @@
<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"/>
- <entity-one entity-name="BillingAccount" value-name="billingAccount">
+ <entity-one entity-name="BillingAccount" value-field="billingAccount">
<field-map field-name="billingAccountId" from-field="paymentApplication.billingAccountId"/>
</entity-one>
<set field="currencyUomId" from-field="billingAccount.accountCurrencyUomId"/>
@@ -429,15 +429,15 @@
<simple-method method-name="removeInvoiceRole" short-description="Remove existing Invoice Role">
<call-simple-method method-name="InvoiceStatusInProgress"/>
- <entity-one entity-name="InvoiceRole" value-name="lookedUpValue"/>
+ <entity-one entity-name="InvoiceRole" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="setInvoiceStatus" short-description="Set The Invoice Status">
- <entity-one entity-name="Invoice" value-name="invoice"/>
+ <entity-one entity-name="Invoice" value-field="invoice"/>
<field-to-result field-name="invoice.statusId" result-name="oldStatusId"/>
<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">
+ <entity-one entity-name="StatusValidChange" value-field="statusChange" auto-field-map="false">
<field-map field-name="statusId" from-field="invoice.statusId"/>
<field-map field-name="statusIdTo" from-field="parameters.statusId"/>
</entity-one>
@@ -526,7 +526,7 @@
<!-- ===============subroutine services =================-->
<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"/>
+ <entity-one entity-name="Invoice" value-field="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}"/>
@@ -547,7 +547,7 @@
</simple-method>
<simple-method method-name="updateInvoiceItemType" short-description="Updates a InvoiceItemType Record">
- <entity-one entity-name="InvoiceItemType" value-name="lookedUpValue"/>
+ <entity-one entity-name="InvoiceItemType" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
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=730111&r1=730110&r2=730111&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 Tue Dec 30 04:07:14 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="sampleCalculateAffiliateCommission" short-description="Sample Calculate Affiliate Commission">
- <entity-one entity-name="Payment" value-name="payment"/>
+ <entity-one entity-name="Payment" value-field="payment"/>
<!-- find affiliate or commission partner for payment.partyIdFrom; will be relationship from CUSTOMER to AFFILIATE, type SALES_AFFILIATE -->
<entity-and entity-name="PartyRelationship" list-name="affiliatePartyRelationshipList" filter-by-date="true">
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=730111&r1=730110&r2=730111&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 Tue Dec 30 04:07:14 2008
@@ -36,7 +36,7 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateAcctgTrans" short-description="Update an AcctgTrans">
- <entity-one entity-name="AcctgTrans" value-name="lookedUpValue"/>
+ <entity-one entity-name="AcctgTrans" value-field="lookedUpValue"/>
<if-compare field="lookedUpValue.isPosted" operator="equals" value="Y">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
@@ -48,7 +48,7 @@
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteAcctgTrans" short-description="Delete an AcctgTrans">
- <entity-one entity-name="AcctgTrans" value-name="lookedUpValue"/>
+ <entity-one entity-name="AcctgTrans" value-field="lookedUpValue"/>
<if-compare field="lookedUpValue.isPosted" operator="equals" value="Y">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
@@ -57,7 +57,7 @@
</simple-method>
<simple-method method-name="updateAcctgTransLastModified" short-description="Update AcctgTrans LastModified Info">
<!-- this is just a little method that is meant to be called as an inline call-simple-method target with the context already setup -->
- <entity-one entity-name="AcctgTrans" value-name="lookedUpACTX"/>
+ <entity-one entity-name="AcctgTrans" value-field="lookedUpACTX"/>
<set from-field="userLogin.userLoginId" field="lookedUpACTX.lastModifiedByUserLogin"/>
<store-value value-name="lookedUpACTX"/>
</simple-method>
@@ -67,7 +67,7 @@
<make-value entity-name="AcctgTransEntry" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <entity-one entity-name="AcctgTrans" value-name="acctgTrans"/>
+ <entity-one entity-name="AcctgTrans" value-field="acctgTrans"/>
<if-compare field="acctgTrans.isPosted" operator="equals" value="Y">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
@@ -119,12 +119,12 @@
<!-- call-simple-method method-name="updateAcctgTransLastModified"/ -->
</simple-method>
<simple-method method-name="updateAcctgTransEntry" short-description="Update Entry To AcctgTrans">
- <entity-one entity-name="AcctgTrans" value-name="acctgTrans"/>
+ <entity-one entity-name="AcctgTrans" value-field="acctgTrans"/>
<if-compare field="acctgTrans.isPosted" operator="equals" value="Y">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
</if-compare>
- <entity-one entity-name="AcctgTransEntry" value-name="lookedUpValue"/>
+ <entity-one entity-name="AcctgTransEntry" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-name="lookedUpValue"/>
@@ -132,12 +132,12 @@
<call-simple-method method-name="updateAcctgTransLastModified"/>
</simple-method>
<simple-method method-name="deleteAcctgTransEntry" short-description="Remove Entry From AcctgTrans">
- <entity-one entity-name="AcctgTrans" value-name="acctgTrans"/>
+ <entity-one entity-name="AcctgTrans" value-field="acctgTrans"/>
<if-compare field="acctgTrans.isPosted" operator="equals" value="Y">
<add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error>
<check-errors/>
</if-compare>
- <entity-one entity-name="AcctgTransEntry" value-name="lookedUpValue"/>
+ <entity-one entity-name="AcctgTransEntry" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
<!-- when changing entries, also update the last modified info for the AcctgTrans -->
@@ -200,7 +200,7 @@
</simple-method>
<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"/>
+ <entity-one entity-name="AcctgTrans" value-field="acctgTrans" auto-field-map="true"/>
<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>
@@ -318,10 +318,10 @@
<clear-field field="glAccountOrganization"/>
<clear-field field="glAccountHistoryList"/>
- <entity-one entity-name="GlAccount" value-name="glAccount">
+ <entity-one entity-name="GlAccount" value-field="glAccount">
<field-map field-name="glAccountId" from-field="acctgTransEntry.glAccountId"/>
</entity-one>
- <entity-one entity-name="GlAccountOrganization" value-name="glAccountOrganization">
+ <entity-one entity-name="GlAccountOrganization" value-field="glAccountOrganization">
<field-map field-name="glAccountId" from-field="acctgTransEntry.glAccountId"/>
<field-map field-name="organizationPartyId" from-field="acctgTransEntry.organizationPartyId"/>
</entity-one>
@@ -384,7 +384,7 @@
<!-- assemble the glAccountHistoryList, we will update all of these -->
<set from-field="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}" field="customTimePeriodList"/>
<iterate entry="customTimePeriod" list="customTimePeriodList">
- <entity-one entity-name="GlAccountHistory" value-name="glAccountHistory">
+ <entity-one entity-name="GlAccountHistory" value-field="glAccountHistory">
<field-map field-name="glAccountId" from-field="acctgTransEntry.glAccountId"/>
<field-map field-name="organizationPartyId" from-field="acctgTransEntry.organizationPartyId"/>
<field-map field-name="customTimePeriodId" from-field="customTimePeriod.customTimePeriodId"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml Tue Dec 30 04:07:14 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="loadSalesInvoiceFact" short-description="">
- <entity-one entity-name="Invoice" value-name="invoice"/>
+ <entity-one entity-name="Invoice" value-field="invoice"/>
<if-empty field="invoice">
<add-error><fail-message message="Invoice with id [${parameters.invoiceId}] doesn't exist."/></add-error>
</if-empty>
@@ -42,10 +42,10 @@
<set field="invoice" from-field="parameters.invoice"/>
<set field="invoiceItem" from-field="parameters.invoiceItem"/>
<if-empty field="invoice">
- <entity-one entity-name="Invoice" value-name="invoice"/>
+ <entity-one entity-name="Invoice" value-field="invoice"/>
</if-empty>
<if-empty field="invoiceItem">
- <entity-one entity-name="InvoiceItem" value-name="invoiceItem"/>
+ <entity-one entity-name="InvoiceItem" value-field="invoiceItem"/>
</if-empty>
<if-empty field="invoice">
<add-error><fail-message message="Invoice with id [${parameters.invoiceId}] doesn't exist."/></add-error>
@@ -56,7 +56,7 @@
<check-errors/>
<if-compare field="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE">
- <entity-one entity-name="SalesInvoiceItemFact" value-name="fact" auto-field-map="false">
+ <entity-one entity-name="SalesInvoiceItemFact" value-field="fact" auto-field-map="false">
<field-map field-name="invoiceId" from-field="invoiceItem.invoiceId"/>
<field-map field-name="invoiceItemSeqId" from-field="invoiceItem.invoiceItemSeqId"/>
</entity-one>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -110,19 +110,19 @@
</simple-method>
<simple-method method-name="updateCreditCardTypeGlAccount" short-description="Update a Credit Card Gl Account">
- <entity-one entity-name="CreditCardTypeGlAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="CreditCardTypeGlAccount" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteCreditCardTypeGlAccount" short-description="Delete a Credit Card Gl Account">
- <entity-one entity-name="CreditCardTypeGlAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="CreditCardTypeGlAccount" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
<!-- Updates a Payment Method Type default glAccountId -->
<simple-method method-name="updatePaymentMethodType" short-description="Updates a Payment Method Type default glAccountId">
- <entity-one entity-name="PaymentMethodType" value-name="lookedUpValue"/>
+ <entity-one entity-name="PaymentMethodType" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
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=730111&r1=730110&r2=730111&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 04:07:14 2008
@@ -45,7 +45,7 @@
<field-to-result field-name="payment.paymentId" result-name="paymentId"/>
<if-not-empty field="parameters.paymentMethodId">
- <entity-one entity-name="PaymentMethod" value-name="paymentMethod">
+ <entity-one entity-name="PaymentMethod" value-field="paymentMethod">
<field-map field-name="paymentMethodId" from-field="parameters.paymentMethodId"/>
</entity-one>
<log level="info" message="Replacing passed payment method type [${parameters.paymentMethodTypeId}] with payment method type [${paymentMethod.paymentMethodTypeId}] for payment method [${parameters.paymentMethodId}]"/>
@@ -107,7 +107,7 @@
<now-timestamp-to-env env-name="payment.effectiveDate"/>
</if-empty>
<if-not-empty field="payment.paymentMethodId">
- <entity-one entity-name="PaymentMethod" value-name="paymentMethod">
+ <entity-one entity-name="PaymentMethod" value-field="paymentMethod">
<field-map field-name="paymentMethodId" from-field="payment.paymentMethodId"/>
</entity-one>
<if-compare-field field="payment.paymentMethodTypeId" to-field="paymentMethod.paymentMethodTypeId" operator="not-equals">
@@ -142,7 +142,7 @@
<!-- get the invoice and do some further validation against it -->
<if-not-empty field="parameters.invoiceId">
- <entity-one entity-name="Invoice" value-name="invoice"/>
+ <entity-one entity-name="Invoice" value-field="invoice"/>
<!-- get the amount that has not been applied yet for the invoice (outstanding amount) -->
<set field="notApplied" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice).doubleValue()}" type="Double"/>
@@ -170,11 +170,11 @@
<fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
</check-permission>
- <entity-one entity-name="Payment" value-name="payment"/>
+ <entity-one entity-name="Payment" value-field="payment"/>
<field-to-result field-name="payment.paymentId" result-name="oldStatusId"/>
<if-compare-field field="payment.statusId" to-field="parameters.statusId" operator="not-equals">
- <entity-one entity-name="StatusValidChange" value-name="statusChange" auto-field-map="false">
+ <entity-one entity-name="StatusValidChange" value-field="statusChange" auto-field-map="false">
<field-map field-name="statusId" from-field="payment.statusId"/>
<field-map field-name="statusIdTo" from-field="parameters.statusId"/>
</entity-one>
@@ -245,7 +245,7 @@
<simple-method method-name="getInvoicePaymentInfoList" short-description="Create a list with information on payment due dates and amounts for the invoice">
<if-empty field="parameters.invoice">
- <entity-one entity-name="Invoice" value-name="invoice"/>
+ <entity-one entity-name="Invoice" value-field="invoice"/>
<else>
<set field="invoice" from-field="parameters.invoice"/>
</else>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml Tue Dec 30 04:07:14 2008
@@ -92,7 +92,7 @@
<set field="parameters.workEffortId" value="_NA_"/>
</if-empty>
- <entity-one entity-name="RateAmount" value-name="rateAmount"/>
+ <entity-one entity-name="RateAmount" value-field="rateAmount"/>
<if-not-empty field="rateAmount">
<now-timestamp-to-env env-name="rateAmount.thruDate"/>
@@ -199,7 +199,7 @@
</if-empty>
<if-empty field="amounts">
- <entity-one entity-name="RateType" value-name="rateType"/>
+ <entity-one entity-name="RateType" value-field="rateType"/>
<log level="error" message="A valid rate amount could not be found for rateType: ${rateType.description}"/>
</if-empty>
<if-compare field="level" value="workEffort" operator="equals">
@@ -211,13 +211,13 @@
<field-map field-name="rateCurrencyUomId" from-field="parameters.rateCurrencyUomId"/>
</entity-and>
<if-empty field="amounts">
- <entity-one entity-name="Uom" value-name="currencyUomId">
+ <entity-one entity-name="Uom" value-field="currencyUomId">
<field-map field-name="uomId" from-field="parameters.rateCurrencyUomId"/>
</entity-one>
- <entity-one entity-name="PeriodType" value-name="periodType"/>
- <entity-one entity-name="RateType" value-name="rateType"/>
- <entity-one entity-name="WorkEffort" value-name="workEffort"/>
- <entity-one entity-name="PartyNameView" value-name="partyNameView"/>
+ <entity-one entity-name="PeriodType" value-field="periodType"/>
+ <entity-one entity-name="RateType" value-field="rateType"/>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
+ <entity-one entity-name="PartyNameView" value-field="partyNameView"/>
<log level="error" message="A valid rate entry could be found for rateType: ${rateType.description}, workEffort: ${workEffort.workEffortName}, party: ${partyNameView.lastName} ${partyNameView.middleName} ${partyNameView.firstName}${partyNameView.groupName} However.....not for the period: ${period.description} and currency: ${currencyUomId.description}"/>
</if-empty>
</if-compare>
@@ -230,12 +230,12 @@
<field-map field-name="rateCurrencyUomId" from-field="parameters.rateCurrencyUomId"/>
</entity-and>
<if-empty field="amounts">
- <entity-one entity-name="Uom" value-name="currencyUomId">
+ <entity-one entity-name="Uom" value-field="currencyUomId">
<field-map field-name="uomId" from-field="parameters.rateCurrencyUomId"/>
</entity-one>
- <entity-one entity-name="PeriodType" value-name="periodType"/>
- <entity-one entity-name="RateType" value-name="rateType"/>
- <entity-one entity-name="PartyNameView" value-name="partyNameView"/>
+ <entity-one entity-name="PeriodType" value-field="periodType"/>
+ <entity-one entity-name="RateType" value-field="rateType"/>
+ <entity-one entity-name="PartyNameView" value-field="partyNameView"/>
<log level="error" message="A valid rate entry could be found for rateType: ${rateType.description}, party: ${partyNameView.lastName} ${partyNameView.middleName} ${partyNameView.firstName}${partyNameView.groupName} However..... NOT for the period: ${period.description} and currency: ${currencyUomId.description}"/>
</if-empty>
</if-compare>
@@ -248,12 +248,12 @@
<field-map field-name="rateCurrencyUomId" from-field="parameters.rateCurrencyUomId"/>
</entity-and>
<if-empty field="amounts">
- <entity-one entity-name="Uom" value-name="currencyUomId">
+ <entity-one entity-name="Uom" value-field="currencyUomId">
<field-map field-name="uomId" from-field="parameters.rateCurrencyUomId"/>
</entity-one>
- <entity-one entity-name="PeriodType" value-name="periodType"/>
- <entity-one entity-name="RateType" value-name="rateType"/>
- <entity-one entity-name="EmplPositionType" value-name="emplPositionType"/>
+ <entity-one entity-name="PeriodType" value-field="periodType"/>
+ <entity-one entity-name="RateType" value-field="rateType"/>
+ <entity-one entity-name="EmplPositionType" value-field="emplPositionType"/>
<log level="error" message="A valid rate entry could be found for rateType: ${rateType.description}, emplPositionType: ${emplPositionType.description}.... However.....NOT for the period: ${period.description} and currency: ${currencyUomId.description}"/>
<check-errors/>
</if-empty>
@@ -266,12 +266,12 @@
<field-map field-name="rateCurrencyUomId" from-field="parameters.rateCurrencyUomId"/>
</entity-and>
<if-empty field="amounts">
- <entity-one entity-name="Uom" value-name="currencyUomId">
+ <entity-one entity-name="Uom" value-field="currencyUomId">
<field-map field-name="uomId" from-field="parameters.rateCurrencyUomId"/>
</entity-one>
- <entity-one entity-name="PeriodType" value-name="periodType"/>
- <entity-one entity-name="RateType" value-name="rateType"/>
- <entity-one entity-name="PartyNameView" value-name="partyNameView"/>
+ <entity-one entity-name="PeriodType" value-field="periodType"/>
+ <entity-one entity-name="RateType" value-field="rateType"/>
+ <entity-one entity-name="PartyNameView" value-field="partyNameView"/>
<log level="error" message="A valid rate entry could be found for rateType: ${rateType.description}, However.....NOT for the period: ${period.description} and currency: ${currencyUomId.description}"/>
<check-errors/>
</if-empty>
@@ -341,7 +341,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="PartyRate" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyRate" value-field="lookedUpValue"/>
<now-timestamp-to-env env-name="lookedUpValue.thruDate"/>
<store-value value-name="lookedUpValue"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml?rev=730111&r1=730110&r2=730111&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml Tue Dec 30 04:07:14 2008
@@ -37,7 +37,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="TaxAuthority" value-name="lookedUpValue"/>
+ <entity-one entity-name="TaxAuthority" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -46,7 +46,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="TaxAuthority" value-name="lookedUpValue"/>
+ <entity-one entity-name="TaxAuthority" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -67,7 +67,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="TaxAuthorityAssoc" value-name="lookedUpValue"/>
+ <entity-one entity-name="TaxAuthorityAssoc" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -76,7 +76,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="TaxAuthorityAssoc" value-name="lookedUpValue"/>
+ <entity-one entity-name="TaxAuthorityAssoc" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -96,7 +96,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="TaxAuthorityCategory" value-name="lookedUpValue"/>
+ <entity-one entity-name="TaxAuthorityCategory" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -110,7 +110,7 @@
<set field="taxAuthorityRateProductMap.productCategoryId" from-field="parameters.productCategoryId"/>
<find-by-and entity-name="TaxAuthorityRateProduct" map-name="taxAuthorityRateProductMap" list-name="taxAuthorityRateProductList"/>
<if-empty field="taxAuthorityRateProductList">
- <entity-one entity-name="TaxAuthorityCategory" value-name="lookedUpValue"/>
+ <entity-one entity-name="TaxAuthorityCategory" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
<else>
<add-error>
@@ -137,7 +137,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="TaxAuthorityGlAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="TaxAuthorityGlAccount" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -146,7 +146,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="TaxAuthorityGlAccount" value-name="lookedUpValue"/>
+ <entity-one entity-name="TaxAuthorityGlAccount" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -168,7 +168,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="TaxAuthorityRateProduct" value-name="lookedUpValue"/>
+ <entity-one entity-name="TaxAuthorityRateProduct" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -177,7 +177,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="TaxAuthorityRateProduct" value-name="lookedUpValue"/>
+ <entity-one entity-name="TaxAuthorityRateProduct" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
@@ -208,14 +208,14 @@
<!-- done checking preliminary constraints, see if there are any errors -->
<check-errors/>
- <entity-one entity-name="PartyTaxAuthInfo" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyTaxAuthInfo" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="validatePartyTaxIdInline" short-description="validatePartyTaxIdInline">
<!-- validate the partyTaxId based on TaxAuthority.taxIdFormatPattern if not empty -->
<!-- If the party validated is in the UE, we could to a better job using the SOAP service from http://ec.europa.eu/taxation_customs/vies/faqvies.do#item16 -->
- <entity-one entity-name="TaxAuthority" value-name="taxAuthority"/>
+ <entity-one entity-name="TaxAuthority" value-field="taxAuthority"/>
<if>
<condition>
<and>
@@ -235,7 +235,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><accept-userlogin-party/><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
- <entity-one entity-name="PartyTaxAuthInfo" value-name="lookedUpValue"/>
+ <entity-one entity-name="PartyTaxAuthInfo" value-field="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>