svn commit: r730098 [1/9] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730098 [1/9] - in /ofbiz/trunk: applications/accounting/script
 
|
Author: jleroux
Date: Tue Dec 30 03:28:24 2008 New Revision: 730098 URL: http://svn.apache.org/viewvc?rev=730098&view=rev Log: <make-value(.*)value-name => <make-value$1value-field r730090 was naive fix also <iterate list-name and entry-name to <iterate list and entry Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml 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/BillingServices.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/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/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/jobshopmgt/ProductionRunServices.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/tracking/TrackingCodeServices.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/UpgradeServices.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/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/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/PartyServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.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/CategoryContentServices.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/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/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/ProductContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.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/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/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/TimesheetServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.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/LookupServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.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/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.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/WebPosServices.xml ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml?rev=730098&r1=730097&r2=730098&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml Tue Dec 30 03:28:24 2008 @@ -35,7 +35,7 @@ <!-- Does not check if the Party is actually a company because real people have to pay taxes too --> <!-- TODO: maybe check to make sure that all fields are not null --> - <make-value value-name="newEntity" entity-name="PartyAcctgPreference"/> + <make-value value-field="newEntity" entity-name="PartyAcctgPreference"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -43,7 +43,7 @@ <simple-method method-name="getPartyAccountingPreferences" short-description="Get the accounting preference settings for a party (organization)"> - <make-value entity-name="PartyAcctgPreference" value-name="aggregatedPartyAcctgPref" /> + <make-value entity-name="PartyAcctgPreference" value-field="aggregatedPartyAcctgPref" /> <set field="currentOrganizationPartyId" from-field="parameters.organizationPartyId"/> <set field="containsEmptyFields" type="Boolean" value="true"/> <while> @@ -121,7 +121,7 @@ </entity-condition> <!-- expire all of them --> - <iterate list-name="uomConversions" entry-name="uomConversion"> + <iterate list="uomConversions" entry="uomConversion"> <set from-field="nowTimestamp" field="uomConversion.thruDate"/> </iterate> <store-list list-name="uomConversions"/> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -28,7 +28,7 @@ <!-- create a new Agreement --> <simple-method method-name="createAgreement" short-description="Create an Agreement"> <!-- create new entity and create all the fields --> - <make-value value-name="newEntity" entity-name="Agreement"/> + <make-value value-field="newEntity" entity-name="Agreement"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <!-- create a non existing ID --> @@ -75,7 +75,7 @@ </call-service> <get-related value-name="agreement" relation-name="AgreementItem" list-name="agreementItems"/> - <iterate list-name="agreementItems" entry-name="agreementItem"> + <iterate list="agreementItems" entry="agreementItem"> <clear-field field-name="createAgreementItemInMap"/> <set-service-fields service-name="createAgreementItem" to-map-name="createAgreementItemInMap" map-name="agreementItem"/> <set from-field="agreementIdTo" field="createAgreementItemInMap.agreementId"/> @@ -83,7 +83,7 @@ </iterate> <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"> + <iterate list="agreementTerms" entry="agreementTerm"> <clear-field field-name="createAgreementTermInMap"/> <set-service-fields service-name="createAgreementTerm" to-map-name="createAgreementTermInMap" map-name="agreementTerm"/> <set from-field="agreementIdTo" field="createAgreementTermInMap.agreementId"/> @@ -92,7 +92,7 @@ </if-compare> <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"> + <iterate list="agreementProductAppls" entry="agreementProductAppl"> <clear-field field-name="createAgreementProductApplInMap"/> <set-service-fields service-name="createAgreementProductAppl" to-map-name="createAgreementProductApplInMap" map-name="agreementProductAppl"/> <set from-field="agreementIdTo" field="createAgreementProductApplInMap.agreementId"/> @@ -101,7 +101,7 @@ </if-compare> <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"> + <iterate list="agreementPartyApplics" entry="agreementPartyApplic"> <clear-field field-name="createAgreementPartyApplicInMap"/> <set-service-fields service-name="createAgreementPartyApplic" to-map-name="createAgreementPartyApplicInMap" map-name="agreementPartyApplic"/> <set from-field="agreementIdTo" field="createAgreementPartyApplicInMap.agreementId"/> @@ -114,7 +114,7 @@ <!-- create a new AgreementItem --> <simple-method method-name="createAgreementItem" short-description="Create an AgreementItem"> <!-- create new entity and create all the fields --> - <make-value value-name="newEntity" entity-name="AgreementItem"/> + <make-value value-field="newEntity" entity-name="AgreementItem"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set from-field="parameters.agreementId" field="newEntity.agreementId"/> @@ -153,7 +153,7 @@ <!-- create a new AgreementTerm --> <simple-method method-name="createAgreementTerm" short-description="Create an AgreementTerm"> <!-- create new entity and create all the fields --> - <make-value value-name="newEntity" entity-name="AgreementTerm"/> + <make-value value-field="newEntity" entity-name="AgreementTerm"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <!-- create a non existing ID --> @@ -187,7 +187,7 @@ <!-- create a new AgreementPromoAppl --> <simple-method method-name="createAgreementPromoAppl" short-description="Create an AgreementPromoAppl"> - <make-value value-name="newEntity" entity-name="AgreementPromoAppl"/> + <make-value value-field="newEntity" entity-name="AgreementPromoAppl"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -213,7 +213,7 @@ <!-- create a new AgreementProductAppl --> <simple-method method-name="createAgreementProductAppl" short-description="Create an AgreementProductAppl"> - <make-value value-name="newEntity" entity-name="AgreementProductAppl"/> + <make-value value-field="newEntity" entity-name="AgreementProductAppl"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -239,7 +239,7 @@ <!-- create a new AgreementPartyApplic --> <simple-method method-name="createAgreementPartyApplic" short-description="Create an AgreementPartyApplic"> - <make-value value-name="newEntity" entity-name="AgreementPartyApplic"/> + <make-value value-field="newEntity" entity-name="AgreementPartyApplic"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -265,7 +265,7 @@ <!-- create a new AgreementGeographicalApplic --> <simple-method method-name="createAgreementGeographicalApplic" short-description="Create an AgreementGeographicalApplic"> - <make-value value-name="newEntity" entity-name="AgreementGeographicalApplic"/> + <make-value value-field="newEntity" entity-name="AgreementGeographicalApplic"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -291,7 +291,7 @@ <!-- Agreement Role --> <simple-method method-name="createAgreementRole" short-description="Create an Agreement Role"> - <make-value entity-name="AgreementRole" value-name="newEntity"/> + <make-value entity-name="AgreementRole" value-field="newEntity"/> <set-pk-fields value-name="newEntity" map-name="parameters"/> <set-nonpk-fields value-name="newEntity" map-name="parameters"/> <create-value value-name="newEntity"/> @@ -315,7 +315,7 @@ <add-error><fail-property resource="AccountingUiLabels" property="AccountingAgreementWorkEffortApplAlreadyExists"/></add-error> <check-errors/> <else> - <make-value value-name="newEntity" entity-name="AgreementWorkEffortAppl"/> + <make-value value-field="newEntity" entity-name="AgreementWorkEffortAppl"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </else> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="createCostComponentCalc" short-description="Create a CostComponentCalc entry"> - <make-value entity-name="CostComponentCalc" value-name="newEntity"/> + <make-value entity-name="CostComponentCalc" value-field="newEntity"/> <sequenced-id-to-env sequence-name="CostComponentCalc" env-name="costComponentCalcId"/> <set from-field="costComponentCalcId" field="newEntity.costComponentCalcId"/> <field-to-result field-name="costComponentCalcId" result-name="costComponentCalcId"/> @@ -39,7 +39,7 @@ <remove-value value-name="costComponentCalc"/> </simple-method> <simple-method method-name="createWorkEffortCostCalc" short-description="Create a WorkEffortCostCalc entry"> - <make-value entity-name="WorkEffortCostCalc" value-name="newEntity"/> + <make-value entity-name="WorkEffortCostCalc" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -56,7 +56,7 @@ <set field="createAcctgTransAndEntriesMap.partyId" from-field="finAccount.ownerPartyId"/> <!-- set initial values for Main AcctgTransEntry --> - <make-value value-name="mainAcctgTransEntry" entity-name="AcctgTransEntry"/> + <make-value value-field="mainAcctgTransEntry" entity-name="AcctgTransEntry"/> <set field="mainAcctgTransEntry.glAccountId" from-field="glAccountId"/> <set field="mainAcctgTransEntry.organizationPartyId" from-field="finAccount.organizationPartyId"/> <set field="mainAcctgTransEntry.partyId" from-field="finAccount.ownerPartyId"/> @@ -65,7 +65,7 @@ <set field="mainAcctgTransEntry.acctgTransEntrySeqId" value="01"/> <!-- set initial values for Offset AcctgTransEntry --> - <make-value value-name="offsetAcctgTransEntry" entity-name="AcctgTransEntry"/> + <make-value value-field="offsetAcctgTransEntry" entity-name="AcctgTransEntry"/> <set field="offsetAcctgTransEntry.organizationPartyId" from-field="finAccount.organizationPartyId"/> <set field="offsetAcctgTransEntry.partyId" from-field="finAccount.ownerPartyId"/> <set field="offsetAcctgTransEntry.amount" from-field="finAccountTrans.amount"/> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -35,7 +35,7 @@ <set field="parameters.statusId" value="FNACT_ACTIVE"/> </if-empty> - <make-value value-name="newEntity" entity-name="FinAccount"/> + <make-value value-field="newEntity" entity-name="FinAccount"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> @@ -151,7 +151,7 @@ <store-value value-name="oldFinAccountStatus"/> </if-not-empty> - <make-value entity-name="FinAccountStatus" value-name="newEntity"/> + <make-value entity-name="FinAccountStatus" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set field="newEntity.statusDate" from-field="nowTimestamp"/> @@ -162,7 +162,7 @@ <simple-method method-name="createFinAccountTrans" short-description="Create a Financial Account Transaction"> <call-simple-method method-name="getArithmeticSettingsInline"/> - <make-value value-name="newEntity" entity-name="FinAccountTrans"/> + <make-value value-field="newEntity" entity-name="FinAccountTrans"/> <set-nonpk-fields value-name="newEntity" map-name="parameters"/> <sequenced-id-to-env sequence-name="FinAccountTrans" env-name="newEntity.finAccountTransId"/> @@ -191,7 +191,7 @@ <!-- FinAccountRole Services --> <simple-method method-name="createFinAccountRole" short-description="Create a Financial Account Role"> - <make-value value-name="newEntity" entity-name="FinAccountRole"/> + <make-value value-field="newEntity" entity-name="FinAccountRole"/> <set-pk-fields value-name="newEntity" map-name="parameters"/> <set-nonpk-fields value-name="newEntity" map-name="parameters"/> @@ -215,7 +215,7 @@ <simple-method method-name="createFinAccountAuth" short-description="Create a Financial Account Authorization"> <call-simple-method method-name="getArithmeticSettingsInline"/> - <make-value value-name="newEntity" entity-name="FinAccountAuth"/> + <make-value value-field="newEntity" entity-name="FinAccountAuth"/> <set-nonpk-fields value-name="newEntity" map-name="parameters"/> <sequenced-id-to-env sequence-name="FinAccountAuth" env-name="newEntity.finAccountAuthId"/> @@ -284,7 +284,7 @@ <condition-expr field-name="finAccountId" env-name="finAccountId"/> </entity-condition> <set field="actualBalanceSum" value="0" type="BigDecimal"/> - <iterate entry="finAccountTrans" list-name="finAccountTransList"> + <iterate entry="finAccountTrans" list="finAccountTransList"> <if> <condition><if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="DEPOSIT"/></condition> <then><set field="amountForCalc" from-field="finAccountTrans.amount"/></then> @@ -309,7 +309,7 @@ <entity-condition entity-name="FinAccountAuth" list-name="finAccountAuthList" filter-by-date="true"> <condition-expr field-name="finAccountId" env-name="finAccountId"/> </entity-condition> - <iterate entry="finAccountAuth" list-name="finAccountAuthList"> + <iterate entry="finAccountAuth" list="finAccountAuthList"> <calculate field-name="availableBalanceSum" type="BigDecimal" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add" field-name="availableBalanceSum"> <calcop operator="negative" field-name="finAccountAuth.amount"/> @@ -327,7 +327,7 @@ <!-- FinAccountTypeGlAccount methods --> <simple-method method-name="createFinAccountTypeGlAccount" short-description="Create an FinAccountTypeGlAccount"> - <make-value value-name="newEntity" entity-name="FinAccountTypeGlAccount"/> + <make-value value-field="newEntity" entity-name="FinAccountTypeGlAccount"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -346,7 +346,7 @@ <!-- VarianceReasonGlAccount methods --> <simple-method method-name="createVarianceReasonGlAccount" short-description="Create a Variance Reason Gl Account"> - <make-value entity-name="VarianceReasonGlAccount" value-name="newEntity" /> + <make-value entity-name="VarianceReasonGlAccount" value-field="newEntity" /> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -28,7 +28,7 @@ <!-- create a new Fixed Asset header record --> <simple-method method-name="createFixedAsset" short-description="Create an FixedAsset"> <!-- create new entity and create all the fields --> - <make-value value-name="newEntity" entity-name="FixedAsset"/> + <make-value value-field="newEntity" entity-name="FixedAsset"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <!-- create a non existing ID if not supplied --> @@ -64,7 +64,7 @@ <!-- add a product to a fixed Asset --> <simple-method method-name="addFixedAssetProduct" short-description="Add Product to FixedAsset"> - <make-value value-name="newEntity" entity-name="FixedAssetProduct"/> + <make-value value-field="newEntity" entity-name="FixedAssetProduct"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> @@ -101,7 +101,7 @@ <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> - <make-value value-name="excDayPKMap" entity-name="TechDataCalendarExcDay"/> + <make-value value-field="excDayPKMap" entity-name="TechDataCalendarExcDay"/> <set-pk-fields field-name= "calendarId" map-name="fixedAsset" value-name="excDayPKMap"/> <set-pk-fields fieldName= "exceptionDateStartTime" map-name="parameters" value-name="excDayPKMap"/> <find-by entity-name="TechDataCalendarExcDay" map-name="excDayPKMap" value-name="lookedUpValue"/> @@ -125,7 +125,7 @@ </if-not-empty> <check-errors/> - <make-value value-name="newEntity" entity-name="FixedAssetStdCost"/> + <make-value value-field="newEntity" entity-name="FixedAssetStdCost"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> @@ -148,7 +148,7 @@ <!-- Fixed Asset Identification "FIXED_ASSET_IDENT"--> <simple-method method-name="createFixedAssetIdent" short-description="Create an FixedAssetIdent"> - <make-value value-name="newEntity" entity-name="FixedAssetIdent"/> + <make-value value-field="newEntity" entity-name="FixedAssetIdent"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -165,7 +165,7 @@ <!-- FixedAsset Registration Create/Update/Delete"--> <simple-method method-name="createFixedAssetRegistration" short-description="Create FixedAsset Registration"> - <make-value value-name="newEntity" entity-name="FixedAssetRegistration"/> + <make-value value-field="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="newEntity.fromDate"> @@ -185,7 +185,7 @@ <!-- create/update/delete FixedAssetMaint --> <simple-method method-name="createFixedAssetMaint" short-description="create a FixedAssetMaint"> - <make-value entity-name="FixedAssetMaint" value-name="newEntity"/> + <make-value entity-name="FixedAssetMaint" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <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"/> @@ -288,7 +288,7 @@ <entity-condition list-name="wepas" entity-name="WorkEffortPartyAssignment" filter-by-date="true"> <condition-expr field-name="workEffortId" env-name="workEffortId" operator="equals"/> </entity-condition> - <iterate list-name="wepas" entry-name="wepa"> + <iterate list="wepas" entry="wepa"> <set field="wepa.thruDate" from-field="nowTimestamp"/> <store-value value-name="wepa"/> <check-errors/> @@ -305,7 +305,7 @@ <!-- create/update/delete FixedAssetMeter --> <simple-method method-name="createFixedAssetMeter" short-description="Create a Fixed Asset Meter Reading"> - <make-value entity-name="FixedAssetMeter" value-name="newEntity"/> + <make-value entity-name="FixedAssetMeter" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -337,7 +337,7 @@ <field-map field-name="productId" from-field="fixedAssetValue.instanceOfProductId"/> <field-map field-name="intervalMeterTypeId" from-field="meterValue.productMeterTypeId"/> </entity-and> - <iterate list-name="productMaintList" entry-name="productMaintValue"> + <iterate list="productMaintList" entry="productMaintValue"> <set field="repeatCount" from-field="productMaintValue.repeatCount" default-value="0" type="Long"/> <entity-condition list-name="maintList" entity-name="FixedAssetMaint"> <condition-list combine="and"> @@ -352,7 +352,7 @@ <set field="listSize" value="${util:size(maintList)}" type="Long"/> </if-not-empty> <set field="maxIntervalQty" value="0" type="Double"/> - <iterate list-name="maintList" entry-name="maintValue"> + <iterate list="maintList" entry="maintValue"> <if-compare-field field="maintValue.intervalQuantity" operator="greater" to-field="maxIntervalQty" type="BigDecimal"> <set field="maxIntervalQty" from-field="maintValue.intervalQuantity" type="Double"/> </if-compare-field> @@ -387,14 +387,14 @@ <condition-expr field-name="actualEndOfLife" operator="equals" env-name="null"/> </condition-list> </entity-condition> - <iterate list-name="fixedAssets" entry-name="fixedAsset"> + <iterate list="fixedAssets" entry="fixedAsset"> <entity-condition list-name="productMaints" entity-name="ProductMaint"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="fixedAsset.instanceOfProductId"/> <condition-expr field-name="intervalUomId" operator="like" value="TF_%"/> </condition-list> </entity-condition> - <iterate list-name="productMaints" entry-name="productMaint"> + <iterate list="productMaints" entry="productMaint"> <set field="repeatCount" from-field="productMaint.repeatCount" default-value="0" type="Long"/> <entity-condition list-name="maintList" entity-name="FixedAssetMaintWorkEffort"> <condition-list combine="and"> @@ -426,7 +426,7 @@ </if-not-empty> <set field="lastSvcLong" value="0" type="Long"/> <set field="lastSvcDate" from-field="lastSvcLong" type="Timestamp"/> - <iterate list-name="maintList" entry-name="maintValue"> + <iterate list="maintList" entry="maintValue"> <set field="lastSvcDate" from-field="maintValue.actualCompletionDate" set-if-null="true"/> </iterate> <if-not-empty field="lastSvcDate"> @@ -455,8 +455,8 @@ </simple-method> <simple-method method-name="migrateFixedAssetMaintMeter" short-description="Copy FixedAssetMaintMeter To FixedAssetMeter"> <entity-condition list-name="maintMeterList" entity-name="FixedAssetMaintMeter"/> - <iterate list-name="maintMeterList" entry-name="maintMeter"> - <make-value value-name="newEntity" entity-name="FixedAssetMeter"/> + <iterate list="maintMeterList" entry="maintMeter"> + <make-value value-field="newEntity" entity-name="FixedAssetMeter"/> <set-pk-fields map-name="maintMeter" value-name="newEntity"/> <set-nonpk-fields map-name="maintMeter" value-name="newEntity"/> <set field="newEntity.readingDate" from-field="maintMeter.createdStamp"/> @@ -505,7 +505,7 @@ </if-empty> <check-errors/> - <make-value entity-name="FixedAssetMaintOrder" value-name="newEntity"/> + <make-value entity-name="FixedAssetMaintOrder" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -517,7 +517,7 @@ <!-- ==============Party Fixed Asset Assignment============= --> <simple-method method-name="createPartyFixedAssetAssignment" short-description="Associate Party to Fixed Asset"> - <make-value entity-name="PartyFixedAssetAssignment" value-name="newEntity"/> + <make-value entity-name="PartyFixedAssetAssignment" value-field="newEntity"/> <set-pk-fields value-name="newEntity" map-name="parameters"/> <set-nonpk-fields value-name="newEntity" map-name="parameters"/> <if-empty field="newEntity.fromDate"> @@ -554,7 +554,7 @@ <field-map field-name="fixedAssetId" from-field="fixedAssetId"/> <field-map field-name="parentTypeId" value="FAM_ASSIGNEE"/> </entity-and> - <iterate list-name="assignedParties" entry-name="assignedParty"> + <iterate list="assignedParties" entry="assignedParty"> <set field="assignPartyCtx.partyId" from-field="assignedParty.partyId"/> <set field="assignPartyCtx.roleTypeId" from-field="assignedParty.roleTypeId"/> <set field="assignPartyCtx.workEffortId" from-field="workEffortId"/> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -122,7 +122,7 @@ <simple-method method-name="createInvoice" short-description="Create a new Invoice"> <now-timestamp-to-env env-name="nowTimestamp"/> - <make-value value-name="newEntity" entity-name="Invoice"/> + <make-value value-field="newEntity" entity-name="Invoice"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <!-- call getNextInvoiceId service with the parameters.partyIdFrom when invoice Id is not suplied @@ -155,7 +155,7 @@ <create-value value-name="newEntity"/> <!-- create new status entry, and set lastStatusUpdate date --> - <make-value value-name="newInvoiceStatus" entity-name="InvoiceStatus"/> + <make-value value-field="newInvoiceStatus" entity-name="InvoiceStatus"/> <set from-field="newEntity.invoiceId" field="newInvoiceStatus.invoiceId"/> <set from-field="newEntity.statusId" field="newInvoiceStatus.statusId"/> <set from-field="nowTimestamp" field="newInvoiceStatus.statusDate"/> @@ -182,7 +182,7 @@ </call-service> <field-to-result field-name="invoiceId" result-name="invoiceId"/> <field-to-request field-name="invoiceId" request-name="invoiceId"/> - <iterate entry="invoiceItem" list-name="invoiceItems"> + <iterate entry="invoiceItem" list="invoiceItems"> <set-service-fields service-name="createInvoiceItem" map-name="invoiceItem" to-map-name="createInvoiceItem"/> <set field="createInvoiceItem.invoiceId" from-field="invoiceId"/> <call-service service-name="createInvoiceItem" in-map-name="createInvoiceItem"/> @@ -191,7 +191,7 @@ <simple-method method-name="getInvoice" short-description="Retrieve an invoice and the items"> <!-- find the invoice record --> - <make-value value-name="lookupPKMap" entity-name="Invoice"/> + <make-value value-field="lookupPKMap" entity-name="Invoice"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="Invoice" map-name="lookupPKMap" value-name="invoiceValue"/> <field-to-result field-name="invoiceValue" result-name="invoice"/> @@ -203,7 +203,7 @@ <simple-method method-name="updateInvoice" short-description="Update the header of an existing Invoice"> <call-simple-method method-name="InvoiceStatusInProgress"/> <!-- find the current record --> - <make-value value-name="lookupPKMap" entity-name="Invoice"/> + <make-value value-field="lookupPKMap" entity-name="Invoice"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="Invoice" map-name="lookupPKMap" value-name="lookedUpValue"/> @@ -248,7 +248,7 @@ <simple-method method-name="createInvoiceItem" short-description="Create a new Invoice Item"> <set field="invoiceId" from-field="parameters.invoiceId"/> <call-simple-method method-name="InvoiceStatusInProgress"/> - <make-value value-name="newEntity" entity-name="InvoiceItem"/> + <make-value value-field="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="newEntity.invoiceItemSeqId"> @@ -282,7 +282,7 @@ <simple-method method-name="updateInvoiceItem" short-description="Update an existing Invoice Item"> <call-simple-method method-name="InvoiceStatusInProgress"/> - <make-value value-name="lookupPKMap" entity-name="InvoiceItem"/> + <make-value value-field="lookupPKMap" entity-name="InvoiceItem"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="InvoiceItem" map-name="lookupPKMap" value-name="lookedUpValue"/> @@ -420,7 +420,7 @@ <simple-method method-name="createInvoiceRole" short-description="Create a Invoice Role"> <call-simple-method method-name="InvoiceStatusInProgress"/> - <make-value value-name="newEntity" entity-name="InvoiceRole"/> + <make-value value-field="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="newEntity.datetimePerformed"><now-timestamp-to-env env-name="newEntity.datetimePerformed"/></if-empty> @@ -473,7 +473,7 @@ <set from-field="parameters.statusId" field="invoice.statusId"/> <store-value value-name="invoice"/> - <make-value value-name="newEntity" entity-name="InvoiceStatus"/> + <make-value value-field="newEntity" entity-name="InvoiceStatus"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> @@ -489,7 +489,7 @@ <entity-and entity-name="TimeEntry" list-name="entries"> <field-map field-name="invoiceId" from-field="parameters.invoiceId"/> </entity-and> - <iterate entry="entry" list-name="entries"> + <iterate entry="entry" list="entries"> <clear-field field-name="entry.invoiceId"/> <clear-field field-name="entry.invoiceItemSeqId"/> <store-value value-name="entry"/> @@ -503,7 +503,7 @@ <simple-method method-name="createInvoiceTerm" short-description="Create a Invoice Term"> <call-simple-method method-name="InvoiceStatusInProgress"/> - <make-value value-name="newEntity" entity-name="InvoiceTerm"/> + <make-value value-field="newEntity" entity-name="InvoiceTerm"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <sequenced-id-to-env sequence-name="InvoiceTerm" env-name="newEntity.invoiceTermId"/> @@ -540,7 +540,7 @@ <check-errors/> </simple-method> <simple-method method-name="createInvoiceContactMech" short-description="Create a ContactMech for an invoice"> - <make-value value-name="invoiceContactMech" entity-name="InvoiceContactMech"/> + <make-value value-field="invoiceContactMech" entity-name="InvoiceContactMech"/> <set-pk-fields map-name="parameters" value-name="invoiceContactMech"/> <create-value value-name="invoiceContactMech"/> <field-to-result field-name="contactMechId" map-name="invoiceContactMech"/> @@ -556,7 +556,7 @@ <entity-and entity-name="Invoice" list-name="invoices"> <field-map field-name="recurrenceInfoId" from-field="parameters.recurrenceInfoId"/> </entity-and> - <iterate list-name="invoices" entry-name="invoice"> + <iterate list="invoices" entry="invoice"> <set-service-fields service-name="copyInvoice" map-name="invoice" to-map-name="copyInvoiceCtx"/> <set field="copyInvoiceCtx.invoiceIdToCopyFrom" from-field="invoice.invoiceId"/> <call-service service-name="copyInvoice" in-map-name="copyInvoiceCtx"> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -31,7 +31,7 @@ <field-map field-name="partyRelationshipTypeId" value="SALES_AFFILIATE"/><!-- this constraint could be optional if not being set in company data --> </entity-and> - <iterate entry="affiliatePartyRelationship" list-name="affiliatePartyRelationshipList"> + <iterate entry="affiliatePartyRelationship" list="affiliatePartyRelationshipList"> <!-- calculate a commission for each commission partner, identified by affiliatePartyRelationship.partyIdTo --> <if> <condition><if-compare field="affiliatePartyRelationship.roleTypeIdTo" operator="equals" value="AFFILIATE"/></condition> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <!-- ========= AcctgTrans methods ========= --> <simple-method method-name="createAcctgTrans" short-description="Create an AcctgTrans"> - <make-value entity-name="AcctgTrans" value-name="newEntity"/> + <make-value entity-name="AcctgTrans" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set field="newEntity.isPosted" value="N"/> @@ -64,7 +64,7 @@ <!-- ========= AcctgTransEntry methods ========= --> <simple-method method-name="createAcctgTransEntry" short-description="Add Entry To AcctgTrans"> - <make-value entity-name="AcctgTransEntry" value-name="newEntity"/> + <make-value entity-name="AcctgTransEntry" value-field="newEntity"/> <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"/> @@ -158,7 +158,7 @@ </entity-condition> <calculate field-name="debitTotal" type="BigDecimal"><number value="0"/></calculate> <calculate field-name="creditTotal" type="BigDecimal"><number value="0"/></calculate> - <iterate entry="acctgTransEntry" list-name="acctgTransEntryList"> + <iterate entry="acctgTransEntry" list="acctgTransEntryList"> <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D"> <calculate field-name="debitTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add"> @@ -241,7 +241,7 @@ <!-- get current period(s) and check if closed --> <!-- also check if the glAccountId, amount, currencyUomId fields are all set --> - <iterate entry="acctgTransEntry" list-name="acctgTransEntryList"> + <iterate entry="acctgTransEntry" list="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="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}"> <clear-field field-name="findCustomTimePeriodCallMap"/> @@ -260,7 +260,7 @@ <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="customTimePeriod" list-name="customTimePeriodList"> + <iterate entry="customTimePeriod" list="customTimePeriodList"> <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> @@ -292,7 +292,7 @@ <else> <!-- if there are errors and we have an error journal assign to the journal and return --> <if-not-empty field="error_list"> - <iterate list-name="acctgTransEntryList" entry-name="acctgTransEntry"> + <iterate list="acctgTransEntryList" entry="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"/> @@ -312,7 +312,7 @@ </iterate> </if-not-empty> <!-- TODO: for each entry: lookup GlAccount, update posted balance --> - <iterate entry="acctgTransEntry" list-name="acctgTransEntryList"> + <iterate entry="acctgTransEntry" list="acctgTransEntryList"> <!-- Get all data to operate on: GlAccount, GlAccountOrganization, GlAccountHistory --> <clear-field field-name="glAccount"/> <clear-field field-name="glAccountOrganization"/> @@ -383,7 +383,7 @@ <!-- assemble the glAccountHistoryList, we will update all of these --> <set from-field="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}" field="customTimePeriodList"/> - <iterate entry="customTimePeriod" list-name="customTimePeriodList"> + <iterate entry="customTimePeriod" list="customTimePeriodList"> <entity-one entity-name="GlAccountHistory" value-name="glAccountHistory"> <field-map field-name="glAccountId" from-field="acctgTransEntry.glAccountId"/> <field-map field-name="organizationPartyId" from-field="acctgTransEntry.organizationPartyId"/> @@ -391,7 +391,7 @@ </entity-one> <!-- if no glAccountHistory create a new empty one --> <if-empty field="glAccountHistory"> - <make-value value-name="glAccountHistory" entity-name="GlAccountHistory"/> + <make-value value-field="glAccountHistory" entity-name="GlAccountHistory"/> <set from-field="acctgTransEntry.glAccountId" field="glAccountHistory.glAccountId"/> <set from-field="acctgTransEntry.organizationPartyId" field="glAccountHistory.organizationPartyId"/> <set from-field="customTimePeriod.customTimePeriodId" field="glAccountHistory.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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -30,7 +30,7 @@ <if-compare field="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE"> <set field="andConditions.invoiceItemTypeId" value="INV_FPROD_ITEM"/> <get-related relation-name="InvoiceItem" value-name="invoice" list-name="invoiceItems" map-name="andConditions"/> - <iterate list-name="invoiceItems" entry-name="invoiceItem"> + <iterate list="invoiceItems" entry="invoiceItem"> <clear-field field-name="inMap"/> <set field="inMap.invoice" from-field="invoice"/> <set field="inMap.invoiceItem" from-field="invoiceItem"/> @@ -62,7 +62,7 @@ </entity-one> <!-- key handling --> <if-empty field="fact"> - <make-value entity-name="SalesInvoiceItemFact" value-name="fact"/> + <make-value entity-name="SalesInvoiceItemFact" value-field="fact"/> <set field="fact.invoiceId" from-field="invoice.invoiceId"/> <set field="fact.invoiceItemSeqId" from-field="invoiceItem.invoiceItemSeqId"/> <!-- conversion of the invoice date --> @@ -132,7 +132,7 @@ <clear-field field-name="andConditions"/> <set field="andConditions.invoiceItemTypeId" value="ITM_SALES_TAX"/> <get-related relation-name="ChildrenInvoiceItem" value-name="invoiceItem" list-name="taxes" map-name="andConditions"/> - <iterate list-name="taxes" entry-name="tax"> + <iterate list="taxes" entry="tax"> <calculate field-name="fact.extTaxAmount" type="BigDecimal"> <calcop field-name="fact.extTaxAmount" operator="add"> <calcop field-name="tax.amount" operator="get"/> @@ -143,7 +143,7 @@ <clear-field field-name="andConditions"/> <set field="andConditions.invoiceItemTypeId" value="ITM_PROMOTION_ADJ"/> <get-related relation-name="ChildrenInvoiceItem" value-name="invoiceItem" list-name="discounts" map-name="andConditions"/> - <iterate list-name="discounts" entry-name="discount"> + <iterate list="discounts" entry="discount"> <calculate field-name="fact.extDiscountAmount" type="BigDecimal"> <calcop field-name="fact.extDiscountAmount" operator="add"> <calcop field-name="discount.amount" operator="negative"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml?rev=730098&r1=730097&r2=730098&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml Tue Dec 30 03:28:24 2008 @@ -21,7 +21,7 @@ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="createBillingAccount" short-description="Create Billing Account"> - <make-value value-name="newEntity" entity-name="BillingAccount"/> + <make-value value-field="newEntity" entity-name="BillingAccount"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <sequenced-id-to-env sequence-name="BillingAccount" env-name="billingAccountId"/> @@ -37,14 +37,14 @@ <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateBillingAccount" short-description="Update Billing Account"> - <make-value value-name="lookupPKMap" entity-name="BillingAccount"/> + <make-value value-field="lookupPKMap" entity-name="BillingAccount"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccount" map-name="lookupPKMap" value-name="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="createBillingAccountRole" short-description="Create Billing Account Role"> - <make-value value-name="newEntity" entity-name="BillingAccountRole"/> + <make-value value-field="newEntity" entity-name="BillingAccountRole"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -54,20 +54,20 @@ <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateBillingAccountRole" short-description="Update Billing Account Role"> - <make-value value-name="lookupPKMap" entity-name="BillingAccountRole"/> + <make-value value-field="lookupPKMap" entity-name="BillingAccountRole"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccountRole" map-name="lookupPKMap" value-name="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeBillingAccountRole" short-description="Remove Billing Account Role"> - <make-value value-name="lookupPKMap" entity-name="BillingAccountRole"/> + <make-value value-field="lookupPKMap" entity-name="BillingAccountRole"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccountRole" map-name="lookupPKMap" value-name="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="createBillingAccountTerm" short-description="Create Billing Account Term"> - <make-value value-name="newEntity" entity-name="BillingAccountTerm"/> + <make-value value-field="newEntity" entity-name="BillingAccountTerm"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <sequenced-id-to-env sequence-name="BillingAccountTerm" env-name="billingAccountTermId"/> @@ -78,14 +78,14 @@ <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateBillingAccountTerm" short-description="Update Billing Account Term"> - <make-value value-name="lookupPKMap" entity-name="BillingAccountTerm"/> + <make-value value-field="lookupPKMap" entity-name="BillingAccountTerm"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccountTerm" map-name="lookupPKMap" value-name="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeBillingAccountTerm" short-description="Remove Billing Account Term"> - <make-value entity-name="BillingAccountTerm" value-name="lookupPKMap"/> + <make-value entity-name="BillingAccountTerm" value-field="lookupPKMap"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccountTerm" map-name="lookupPKMap" value-name="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -27,7 +27,7 @@ <field-to-field field-name="currency" map-name="parameters" to-map-name="captureParams" /> <string-to-field string="PAYMENT_AUTHORIZED" field-name="paymentStatusId" map-name="orderLookup" /> <find-by-and entity-name="OrderHeaderAndPaymentPref" map-name="orderLookup" list-name="orderHeaderAndPaymentPrefs" /> - <iterate entry="orderHeaderAndPaymentPref" list-name="orderHeaderAndPaymentPrefs" > + <iterate entry="orderHeaderAndPaymentPref" list="orderHeaderAndPaymentPrefs" > <field-to-field map-name="orderHeaderAndPaymentPref" field-name="orderId" to-map-name="captureParams" /> <call-service service-name="capturePayment" in-map-name="captureParams" error-code="ignore-error"> <result-to-field map-name="captureResult" result-name="responseMessage" /> @@ -53,7 +53,7 @@ --> <simple-method method-name="setPaymentMethodAddress" short-description="Set the initial payment method address"> - <make-value value-name="lookupPKMap" entity-name="PaymentMethod"/> + <make-value value-field="lookupPKMap" entity-name="PaymentMethod"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="PaymentMethod" map-name="lookupPKMap" value-name="lookedUpValue"/> <if-compare field="lookedUpValue.paymentMethodTypeId" operator="equals" value="CREDIT_CARD"> @@ -79,7 +79,7 @@ <set field="lookupMap.contactMechId" from-field="parameters.oldContactMechId"/> <find-by-and entity-name="CreditCard" map-name="lookupMap" list-name="creditCards"/> - <iterate entry="creditCard" list-name="creditCards"> + <iterate entry="creditCard" list="creditCards"> <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDateAfterToday" ret-field-name="isNotExpired"> <field field-name="creditCard.expireDate"/> </call-class-method> @@ -93,7 +93,7 @@ </iterate> <find-by-and entity-name="EftAccount" map-name="lookupMap" list-name="eftAccounts"/> - <iterate entry="eftAccount" list-name="eftAccounts"> + <iterate entry="eftAccount" list="eftAccounts"> <set-service-fields service-name="updateEftAccount" map-name="eftAccount" to-map-name="ueaMap"/> <set field="ueaMap.contactMechId" from-field="parameters.contactMechId"/> <set field="ueaMap.partyId" from-field="parameters.partyId"/> @@ -103,7 +103,7 @@ </simple-method> <!--CreateCreditCardTypeGlAccount methods --> <simple-method method-name="createCreditCardTypeGlAccount" short-description="Create a Credit Card Gl Account"> - <make-value entity-name="CreditCardTypeGlAccount" value-name="newEntity"/> + <make-value entity-name="CreditCardTypeGlAccount" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -35,7 +35,7 @@ </if> <check-errors/> - <make-value entity-name="Payment" value-name="payment"/> + <make-value entity-name="Payment" value-field="payment"/> <if-empty field="parameters.paymentId"> <sequenced-id-to-env sequence-name="Payment" env-name="payment.paymentId"/> <else> @@ -64,7 +64,7 @@ <create-value value-name="payment"/> </simple-method> <simple-method method-name="updatePayment" short-description="Update a Payment"> - <make-value entity-name="Payment" value-name="lookupPayment"/> + <make-value entity-name="Payment" value-field="lookupPayment"/> <set-pk-fields value-name="lookupPayment" map-name="parameters"/> <find-by-primary-key entity-name="Payment" map-name="lookupPayment" value-name="payment"/> @@ -84,8 +84,8 @@ <if-compare field="payment.statusId" value="PMNT_NOT_PAID" operator="not-equals"> <!-- check if only status change --> - <make-value value-name="newPayment" entity-name="Payment"/> - <make-value value-name="oldPayment" entity-name="Payment"/> + <make-value value-field="newPayment" entity-name="Payment"/> + <make-value value-field="oldPayment" entity-name="Payment"/> <set-nonpk-fields value-name="newPayment" map-name="payment"/> <set-nonpk-fields value-name="oldPayment" map-name="payment"/> <set-nonpk-fields value-name="newPayment" map-name="parameters"/> @@ -137,7 +137,7 @@ </if-empty> </if-empty> - <make-value entity-name="PaymentApplication" value-name="paymentAppl"/> + <make-value entity-name="PaymentApplication" value-field="paymentAppl"/> <set-nonpk-fields map-name="parameters" value-name="paymentAppl"/> <!-- get the invoice and do some further validation against it --> @@ -197,7 +197,7 @@ <if-compare field="parameters.statusId" operator="equals" value="PMNT_CANCELLED"> <!-- if new status is cancelled delete existing payment applications. --> <get-related value-name="payment" relation-name="PaymentApplication" list-name="paymentApplications"/> - <iterate list-name="paymentApplications" entry-name="paymentApplication"> + <iterate list="paymentApplications" entry="paymentApplication"> <set field="removePaymentApplicationMap.paymentApplicationId" from-field="paymentApplication.paymentApplicationId"/> <call-service service-name="removePaymentApplication" in-map-name="removePaymentApplicationMap"/> </iterate> @@ -259,7 +259,7 @@ <get-related relation-name="InvoiceTerm" value-name="invoice" list-name="invoiceTerms"/> <set field="remainingAppliedAmount" from-field="invoiceTotalAmountPaid" type="BigDecimal"/> <set field="computedTotalAmount" value="0.0" type="BigDecimal"/> - <iterate list-name="invoiceTerms" entry-name="invoiceTerm"> + <iterate list="invoiceTerms" entry="invoiceTerm"> <get-related-one relation-name="TermType" value-name="invoiceTerm" to-value-name="termType" use-cache="true"/> <if-compare field="termType.parentTypeId" operator="equals" value="FIN_PAYMENT_TERM"> <clear-field field-name="invoicePaymentInfo"/> @@ -365,13 +365,13 @@ </condition-list> <order-by field-name="invoiceDate"/> </entity-condition> - <iterate list-name="invoices" entry-name="invoice"> + <iterate list="invoices" entry="invoice"> <clear-field field-name="getInvoicePaymentInfoListInMap"/> <set field="getInvoicePaymentInfoListInMap.invoice" from-field="invoice"/> <call-service service-name="getInvoicePaymentInfoList" in-map-name="getInvoicePaymentInfoListInMap"> <result-to-field field-name="invoicePaymentInfoList" result-name="invoicePaymentInfoList"/> </call-service> - <iterate list-name="invoicePaymentInfoList" entry-name="invoicePaymentInfo"> + <iterate list="invoicePaymentInfoList" entry="invoicePaymentInfo"> <if> <condition> <and> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -62,7 +62,7 @@ </if-compare-field> </if-not-empty> - <make-value entity-name="RateAmount" value-name="newEntity"/> + <make-value entity-name="RateAmount" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <now-timestamp-to-env env-name="newEntity.fromDate"/> @@ -307,7 +307,7 @@ <store-value value-name="partyRate"/> </if-not-empty> - <make-value value-name="newEntity" entity-name="PartyRate"/> + <make-value value-field="newEntity" entity-name="PartyRate"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> @@ -353,12 +353,12 @@ <!-- migrate service --> <simple-method method-name="migrateRateFactor" short-description="migrate the several entities which were change in the rate refactor activity"> <entity-condition entity-name="OldEmplPositionTypeRate" list-name="posRates"/> - <iterate entry="posRate" list-name="posRates"> - <make-value value-name="emplPositionTypeRate" entity-name="EmplPositionTypeRate"/> + <iterate entry="posRate" list="posRates"> + <make-value value-field="emplPositionTypeRate" entity-name="EmplPositionTypeRate"/> <set-pk-fields value-name="posRate" map-name="emplPositionTypeRate"/> <set-nonpk-fields value-name="posRate" map-name="emplPositionTypeRate"/> <create-value value-name="emplPositionTypeRate"/> - <make-value value-name="rateAmount" entity-name="RateAmount"/> + <make-value value-field="rateAmount" entity-name="RateAmount"/> <set-pk-fields value-name="posRate" map-name="rateAmount"/> <set-nonpk-fields value-name="posRate" map-name="rateAmount"/> <set field="rateAmount.workeffortId" value="_NA_"/> @@ -367,12 +367,12 @@ <create-value value-name="rateAmount"/> </iterate> <entity-condition entity-name="OldPartyRate" list-name="partyRates"/> - <iterate entry="oldPartyRate" list-name="oldPartyRates"> - <make-value value-name="partyRate" entity-name="PartyRate"/> + <iterate entry="oldPartyRate" list="oldPartyRates"> + <make-value value-field="partyRate" entity-name="PartyRate"/> <set-pk-fields value-name="oldPartyRate" map-name="partyRate"/> <set-nonpk-fields value-name="oldPartyRate" map-name="partyRate"/> <create-value value-name="partyRate"/> - <make-value value-name="rateAmount" entity-name="RateAmount"/> + <make-value value-field="rateAmount" entity-name="RateAmount"/> <set-pk-fields value-name="oldPartyRate" map-name="rateAmount"/> <set-nonpk-fields value-name="oldPartyRate" map-name="rateAmount"/> <set field="rateAmount.workeffortId" value="_NA_"/> 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=730098&r1=730097&r2=730098&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 03:28:24 2008 @@ -27,7 +27,7 @@ <check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TaxAuthority" value-name="newEntity"/> + <make-value entity-name="TaxAuthority" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -56,7 +56,7 @@ <check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TaxAuthorityAssoc" value-name="newEntity"/> + <make-value entity-name="TaxAuthorityAssoc" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> @@ -86,7 +86,7 @@ <check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TaxAuthorityCategory" value-name="newEntity"/> + <make-value entity-name="TaxAuthorityCategory" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -127,7 +127,7 @@ <check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TaxAuthorityGlAccount" value-name="newEntity"/> + <make-value entity-name="TaxAuthorityGlAccount" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -156,7 +156,7 @@ <check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission> <check-errors/> - <make-value entity-name="TaxAuthorityRateProduct" value-name="newEntity"/> + <make-value entity-name="TaxAuthorityRateProduct" value-field="newEntity"/> <sequenced-id-to-env sequence-name="TaxAuthorityRateProduct" env-name="newEntity.taxAuthorityRateSeqId"/> <field-to-result field-name="newEntity.taxAuthorityRateSeqId" result-name="taxAuthorityRateSeqId"/> @@ -192,7 +192,7 @@ <!-- done checking preliminary constraints, see if there are any errors --> <check-errors/> - <make-value entity-name="PartyTaxAuthInfo" value-name="newEntity"/> + <make-value entity-name="PartyTaxAuthInfo" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=730098&r1=730097&r2=730098&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Tue Dec 30 03:28:24 2008 @@ -179,8 +179,8 @@ <set field="mapIn.targetOperationList[]" value="CONTENT_VIEW"/> <set field="mapIn.targetOperationList[]" value="CONTENT_UPDATE"/> <set field="blogList[]"/> - <iterate entry="view" list-name="unfilteredList"> - <make-value entity-name="Content" value-name="content"/> + <iterate entry="view" list="unfilteredList"> + <make-value entity-name="Content" value-field="content"/> <set-nonpk-fields value-name="content" map-name="view"/> <set-pk-fields value-name="content" map-name="view"/> <set field="mapIn.currentContent" from-field="content"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |