svn commit: r730092 [2/3] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730092 [2/3] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 03:11:15 2008 @@ -160,8 +160,8 @@ <simple-method method-name="getProductFacilityAndQuantities" short-description="finds ProductFacility and QOH, ATP inventory for an inventoryItem"> <!-- Get the ProductFacility for the minimum stock level --> <entity-one entity-name="ProductFacility" value-name="productFacility"> - <field-map env-name="inventoryItem.productId" field-name="productId"/> - <field-map env-name="inventoryItem.facilityId" field-name="facilityId"/> + <field-map from-field="inventoryItem.productId" field-name="productId"/> + <field-map from-field="inventoryItem.facilityId" field-name="facilityId"/> </entity-one> <!-- Get the product's total quantityOnHand in the facility --> @@ -192,7 +192,7 @@ </condition> <then> <entity-one entity-name="ProductStore" value-name="productStore"> - <field-map env-name="order.productStoreId" field-name="productStoreId"/> + <field-map from-field="order.productStoreId" field-name="productStoreId"/> </entity-one> <set from-field="productStore.requirementMethodEnumId" field="requirementMethodId"/> </then> @@ -226,7 +226,7 @@ <if-not-empty field="parameters.itemIssuanceId"> <entity-one entity-name="ItemIssuance" auto-field-map="true" value-name="itemIssuance"/> <entity-one entity-name="InventoryItem" value-name="inventoryItem"> - <field-map env-name="itemIssuance.inventoryItemId" field-name="inventoryItemId"/> + <field-map from-field="itemIssuance.inventoryItemId" field-name="inventoryItemId"/> </entity-one> <else> <entity-one entity-name="InventoryItem" auto-field-map="true" value-name="inventoryItem"/> @@ -398,7 +398,7 @@ <check-errors/> <entity-and entity-name="ProductFacility" list-name="products"> - <field-map env-name="parameters.facilityId" field-name="facilityId"/> + <field-map from-field="parameters.facilityId" field-name="facilityId"/> </entity-and> <iterate list-name="products" entry-name="productFacility"> @@ -846,7 +846,7 @@ <set field="inputMap.maxAmount" from-field="parameters.maxAmount"/> <set field="inputMap.orderId" from-field="parameters.orderId"/> <entity-one entity-name="PaymentMethod" value-name="paymentMethod"> - <field-map field-name="paymentMethodId" env-name="parameters.paymentMethodId"/> + <field-map field-name="paymentMethodId" from-field="parameters.paymentMethodId"/> </entity-one> <set field="inputMap.paymentMethodTypeId" from-field="paymentMethod.paymentMethodTypeId"/> <!--In this method we calls createOrderPaymentPreference and returns orderPaymentPreferenceId field to authOrderPaymentPreference --> @@ -923,8 +923,8 @@ </call-service> </if-compare-field> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpShipList" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> - <field-map field-name="contactMechId" env-name="parameters.shipToContactMechId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> + <field-map field-name="contactMechId" from-field="parameters.shipToContactMechId"/> <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> </entity-and> <!-- If purpose is not exists then create --> @@ -933,7 +933,7 @@ <set field="serviceContext.partyId" from-field="userLogin.partyId"/> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> </entity-and> <if-not-empty field="pcmpList"> @@ -965,8 +965,8 @@ <set-nonpk-fields map-name="shipToAddressCtx" value-name="newValue"/> <if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object"> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true"> - <field-map field-name="contactMechId" env-name="shipToAddressCtx.shipToContactMechId"/> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="contactMechId" from-field="shipToAddressCtx.shipToContactMechId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> </entity-and> <first-from-list list-name="pcmpList" entry-name="pcmp"/> @@ -1014,8 +1014,8 @@ <else> <if-compare-field field="parameters.shipToContactMechId" operator="not-equals" to-field="parameters.billToContactMechId"> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true"> - <field-map field-name="contactMechId" env-name="parameters.billToContactMechId"/> - <field-map field-name="partyId" env-name="partyId"/> + <field-map field-name="contactMechId" from-field="parameters.billToContactMechId"/> + <field-map field-name="partyId" from-field="partyId"/> <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <first-from-list entry-name="pcmp" list-name="pcmpList"/> @@ -1067,8 +1067,8 @@ </if-compare-field> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpBillList" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> - <field-map field-name="contactMechId" env-name="parameters.billToContactMechId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> + <field-map field-name="contactMechId" from-field="parameters.billToContactMechId"/> <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <!-- If purpose is not exists then create --> @@ -1077,7 +1077,7 @@ <set field="serviceContext.partyId" from-field="userLogin.partyId"/> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <if-not-empty field="pcmpList"> @@ -1117,7 +1117,7 @@ <else> <!-- call update Credit Card --> <entity-and entity-name="PaymentMethod" list-name="paymentMethodList" filter-by-date="true"> - <field-map field-name="partyId" env-name="partyId"/> + <field-map field-name="partyId" from-field="partyId"/> <order-by field-name="-fromDate"/> </entity-and> <first-from-list list-name="paymentMethodList" entry-name="paymentMethod"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Tue Dec 30 03:11:15 2008 @@ -135,8 +135,8 @@ <if-compare-field field="quote.statusId" to-field="parameters.statusId" operator="not-equals"> <!-- check if the status change is a valid change --> <entity-and entity-name="StatusValidChange" list-name="validChange"> - <field-map field-name="statusId" env-name="quote.statusId"/> - <field-map field-name="statusIdTo" env-name="parameters.statusId"/> + <field-map field-name="statusId" from-field="quote.statusId"/> + <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-and> <if-empty field="validChange"> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Tue Dec 30 03:11:15 2008 @@ -136,7 +136,7 @@ <if-not-empty field="workEfforts"> <iterate entry="workEffort" list-name="workEfforts"> <entity-one entity-name="WorkEffort" value-name="lowInfo"> - <field-map field-name="workEffortId" env-name="workEffort.workEffortId"/> + <field-map field-name="workEffortId" from-field="workEffort.workEffortId"/> </entity-one> <call-simple-method method-name="getHours" xml-resource="component://projectmgr/script/org/ofbiz/project/ProjectServices.xml"/> <set field="actualHours" from-field="highInfo.actualHours"/> @@ -404,8 +404,8 @@ <field-to-result field-name="custRequest.statusId" result-name="oldStatusId"/> <if-compare-field field="custRequest.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-name="statusChange"> - <field-map field-name="statusId" env-name="custRequest.statusId"/> - <field-map field-name="statusIdTo" env-name="parameters.statusId"/> + <field-map field-name="statusId" from-field="custRequest.statusId"/> + <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-one> <if-empty field="statusChange"> <add-error><fail-message message="Status is not a valid change"/></add-error> @@ -454,7 +454,7 @@ <!-- copy attachements/content --> <entity-and entity-name="CommEventContentAssoc" list-name="custRequestContents"> - <field-map field-name="communicationEventId" env-name="parameters.communicationEventId"/> + <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/> </entity-and> <iterate entry="custRequestContent" list-name="custRequestContents"> <set field="reqContent.custRequestId" from-field="parameters.custRequestId"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Tue Dec 30 03:11:15 2008 @@ -212,13 +212,13 @@ <set from-field="parameters.autoUserLogin" field="calcPriceInBaseMap.autoUserLogin"/> <entity-and entity-name="ShoppingListItem" list-name="shoppingListItems" use-cache="true"> - <field-map field-name="shoppingListId" env-name="parameters.shoppingListId"/> + <field-map field-name="shoppingListId" from-field="parameters.shoppingListId"/> </entity-and> <set field="totalPrice" type="Double" value="0.0"/> <iterate entry="shoppingListItem" list-name="shoppingListItems"> <entity-one entity-name="Product" value-name="product" use-cache="true" auto-field-map="false"> - <field-map field-name="productId" env-name="shoppingListItem.productId"/> + <field-map field-name="productId" from-field="shoppingListItem.productId"/> </entity-one> <map-to-map map-name="calcPriceInBaseMap" to-map-name="calcPriceInMap"/> @@ -238,8 +238,8 @@ </iterate> <entity-and entity-name="ShoppingList" list-name="childshoppingLists" use-cache="true"> - <field-map field-name="parentShoppingListId" env-name="parameters.shoppingListId"/> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="parentShoppingListId" from-field="parameters.shoppingListId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> </entity-and> <iterate entry="childshoppingList" list-name="childshoppingLists"> <map-to-map map-name="calcPriceInBaseMap" to-map-name="calcChildPriceInMap"/> @@ -290,7 +290,7 @@ <if-empty field="orderHeader.productStoreId"><return/></if-empty> <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false"> - <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> + <field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/> </entity-one> <if-compare field="productStore.enableAutoSuggestionList" operator="not-equals" value="Y"><return/></if-compare> @@ -341,7 +341,7 @@ <call-service service-name="addDistinctShoppingListItem" in-map-name="shoppingListParameters" /> </iterate> <entity-one entity-name="Product" value-name="product" auto-field-map="false" > - <field-map field-name="productId" env-name="orderItem.productId" /> + <field-map field-name="productId" from-field="orderItem.productId" /> </entity-one> <if-compare field="product.isVariant" operator="equals" value="Y"> <entity-condition entity-name="ProductAssoc" list-name="virtualProductAssocList" filter-by-date="true"> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Tue Dec 30 03:11:15 2008 @@ -35,8 +35,8 @@ <simple-method method-name="createCommunicationEvent" short-description="Create a CommunicationEvent with or w/o permission check"> <if-not-empty field="parameters.parentCommEventId"> <entity-and list="roles" entity-name="CommunicationEventRole"> - <field-map field-name="communicationEventId" env-name="parameters.parentCommEventId"/> - <field-map field-name="partyId" env-name="parameters.partyIdFrom"/> + <field-map field-name="communicationEventId" from-field="parameters.parentCommEventId"/> + <field-map field-name="partyId" from-field="parameters.partyIdFrom"/> </entity-and> <if-not-empty field="roles"> <first-from-list list-name="roles" entry-name="role"/> @@ -67,7 +67,7 @@ <if-empty field="parameters.partyIdTo"> <if-not-empty field="parameters.contactMechIdTo"> <entity-and entity-name="PartyAndContactMech" list-name="partyContactMechs" filter-by-date="true"> - <field-map field-name="contactMechId" env-name="parameters.contactMechIdTo"/> + <field-map field-name="contactMechId" from-field="parameters.contactMechIdTo"/> <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/> </entity-and> <first-from-list entry-name="partyContactMech" list-name="partyContactMechs"/> @@ -143,8 +143,8 @@ <if-compare operator="not-equals" value="parameters.partIdFrom" field="event.partyIdFrom"> <!-- check if role exist then delete old role --> <entity-one entity-name="CommunicationEventRole" value-name="roleFrom"> - <field-map field-name="communicationEventId" env-name="event.communicationEventId" /> - <field-map field-name="partyId" env-name="parameters.partyIdFrom" /> + <field-map field-name="communicationEventId" from-field="event.communicationEventId" /> + <field-map field-name="partyId" from-field="parameters.partyIdFrom" /> <field-map field-name="roleTypeId" value="ORIGINATOR" /> </entity-one> <if-not-empty field="roleFrom"> @@ -162,7 +162,7 @@ <if-empty field="parameters.partyIdTo"> <if-not-empty field="parameters.contactMechIdTo"> <entity-and entity-name="PartyAndContactMech" list-name="partyContactMechs" filter-by-date="true"> - <field-map field-name="contactMechId" env-name="parameters.contactMechIdTo"/> + <field-map field-name="contactMechId" from-field="parameters.contactMechIdTo"/> <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/> </entity-and> <first-from-list entry-name="partyContactMech" list-name="partyContactMechs"/> @@ -175,8 +175,8 @@ field="event.partyIdTo"> <!-- check if role exist then delete old role --> <entity-one entity-name="CommunicationEventRole" value-name="roleTo"> - <field-map field-name="communicationEventId" env-name="event.communicationEventId" /> - <field-map field-name="partyId" env-name="event.partyIdTo" /> + <field-map field-name="communicationEventId" from-field="event.communicationEventId" /> + <field-map field-name="partyId" from-field="event.partyIdTo" /> <field-map field-name="roleTypeId" value="ADDRESSEE" /> </entity-one> <if-not-empty field="roleTo"> @@ -300,7 +300,7 @@ <remove-value value-name="eventRole"/> <if-compare field="parameters.deleteCommEventIfLast" operator="equals" value="Y"> <entity-and list="roles" entity-name="CommunicationEventRole"> - <field-map field-name="communicationEventId" env-name="eventRole.communicationEventId"/> + <field-map field-name="communicationEventId" from-field="eventRole.communicationEventId"/> </entity-and> <if-empty field="roles"> <set-service-fields service-name="deleteCommunicationEvent" map-name="parameters" to-map-name="inMapDel"/> @@ -434,8 +434,8 @@ <field-to-result field-name="communicationEvent.statusId" result-name="oldStatusId"/> <if-compare-field field="communicationEvent.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-name="statusChange"> - <field-map field-name="statusId" env-name="communicationEvent.statusId"/> - <field-map field-name="statusIdTo" env-name="parameters.statusId"/> + <field-map field-name="statusId" from-field="communicationEvent.statusId"/> + <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-one> <if-empty field="statusChange"> <add-error><fail-message message="Status is not a valid change"/></add-error> @@ -461,8 +461,8 @@ <field-to-result field-name="communicationEventRole.statusId" result-name="oldStatusId"/> <if-compare-field field="communicationEventRole.statusId" to-field="parameters.statusId" operator="not-equals"> <entity-one entity-name="StatusValidChange" value-name="statusChange"> - <field-map field-name="statusId" env-name="communicationEventRole.statusId"/> - <field-map field-name="statusIdTo" env-name="parameters.statusId"/> + <field-map field-name="statusId" from-field="communicationEventRole.statusId"/> + <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-one> <if-empty field="statusChange"> <add-error><fail-message message="Status is not a valid change"/></add-error> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Dec 30 03:11:15 2008 @@ -275,7 +275,7 @@ <set field="bodyParameters.verifyHash" from-field="emailAddressVerification.verifyHash"/> <first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/> <entity-and list="webSites" entity-name="WebSite"> - <field-map field-name="productStoreId" env-name="storeEmail.productStoreId"/> + <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/> </entity-and> <first-from-list entry-name="webSite" list-name="webSites"/> <if-not-empty field="storeEmail.bodyScreenLocation"> @@ -294,7 +294,7 @@ </simple-method> <simple-method method-name="verifyEmailAddress" short-description="Verify an Email Address through verifyHash and expireDate" login-required="false"> <entity-and entity-name="EmailAddressVerification" list-name="emailAddressVerifications"> - <field-map field-name="verifyHash" env-name="parameters.verifyHash"/> + <field-map field-name="verifyHash" from-field="parameters.verifyHash"/> </entity-and> <first-from-list list-name="emailAddressVerifications" entry-name="emailAddressVerification"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Dec 30 03:11:15 2008 @@ -29,11 +29,11 @@ <!-- check if the contact mech infostring is already existing if so, do not create a new one--> <entity-and list="partyAndContactMechs" entity-name="PartyAndContactMech" filter-by-date="true"> - <field-map field-name="partyId" env-name="parameters.partyId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> </entity-and> <iterate entry="partyAndContactMech" list-name="partyAndContactMechs"> <entity-one entity-name="ContactMechType" value-name="contactMechType"> - <field-map field-name="contactMechTypeId" env-name="partyAndContactMech.contactMechTypeId"/> + <field-map field-name="contactMechTypeId" from-field="partyAndContactMech.contactMechTypeId"/> </entity-one> <if> <condition> @@ -337,7 +337,7 @@ <set field="serviceContext.partyId" from-field="userLogin.partyId"/> <if-compare field="parameters.setShippingPurpose" operator="equals" value="Y"> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> </entity-and> <if-not-empty field="pcmpList"> @@ -356,7 +356,7 @@ </if-compare> <if-compare field="parameters.setBillingPurpose" operator="equals" value="Y"> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <if-not-empty field="pcmpList"> @@ -378,8 +378,8 @@ <simple-method method-name="updatePostalAddressAndPurposes" short-description="Update postal address, purposes and set them defaults" login-required="false"> <entity-one entity-name="PartyProfileDefault" value-name="partyProfileDefault"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> - <field-map field-name="productStoreId" env-name="parameters.productStoreId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> </entity-one> <if> <condition> @@ -432,8 +432,8 @@ <then> <if-compare field="parameters.setShippingPurpose" operator="equals" value="Y"> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpShipList" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> - <field-map field-name="contactMechId" env-name="parameters.contactMechId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> + <field-map field-name="contactMechId" from-field="parameters.contactMechId"/> <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> </entity-and> <!-- If purpose is not exists then create --> @@ -442,7 +442,7 @@ <set field="serviceContext.partyId" from-field="userLogin.partyId"/> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> </entity-and> <if-not-empty field="pcmpList"> @@ -464,8 +464,8 @@ </if-compare> <if-compare field="parameters.setBillingPurpose" operator="equals" value="Y"> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpBillList" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> - <field-map field-name="contactMechId" env-name="parameters.contactMechId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> + <field-map field-name="contactMechId" from-field="parameters.contactMechId"/> <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <!-- If purpose is not exists then create --> @@ -474,7 +474,7 @@ <set field="serviceContext.partyId" from-field="userLogin.partyId"/> <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <if-not-empty field="pcmpList"> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml Tue Dec 30 03:11:15 2008 @@ -28,7 +28,7 @@ <field-to-result field-name="newEntity.partyInvitationId" result-name="partyInvitationId"/> <if-not-empty field="parameters.partyId"> <entity-one entity-name="Person" value-name="person" auto-field-map="false"> - <field-map field-name="partyId" env-name="parameters.partyId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> </entity-one> <set field="parameters.toName" value="${person.firstName} ${person.middleName} ${person.lastName}"/> </if-not-empty> @@ -41,7 +41,7 @@ <entity-one entity-name="PartyInvitation" value-name="lookedUpValue"/> <if-not-empty field="parameters.partyId"> <entity-one entity-name="Person" value-name="person" auto-field-map="false"> - <field-map field-name="partyId" env-name="parameters.partyId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> </entity-one> <set field="parameters.toName" value="${person.firstName} ${person.middleName} ${person.lastName}"/> </if-not-empty> @@ -72,7 +72,7 @@ </simple-method> <simple-method method-name="acceptPartyInvitation" short-description="Accept Party Invitation"> <entity-and entity-name="PartyInvitationGroupAssoc" list-name="partyInvitationGroupAssocs"> - <field-map field-name="partyInvitationId" env-name="parameters.partyInvitationId"/> + <field-map field-name="partyInvitationId" from-field="parameters.partyInvitationId"/> </entity-and> <if-not-empty field="partyInvitationGroupAssocs"> <set field="createPartyRelationshipCtx.partyIdTo" from-field="parameters.partyId"/> @@ -83,7 +83,7 @@ </iterate> </if-not-empty> <entity-and entity-name="PartyInvitationRoleAssoc" list-name="partyInvitationRoleAssocs"> - <field-map field-name="partyInvitationId" env-name="parameters.partyInvitationId"/> + <field-map field-name="partyInvitationId" from-field="parameters.partyInvitationId"/> </entity-and> <if-not-empty field="partyInvitationRoleAssocs"> <set field="createPartyRoleCtx.partyId" from-field="parameters.partyId"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 03:11:15 2008 @@ -91,7 +91,7 @@ <simple-method method-name="getPartyNameForDate" short-description="Get Party Name For Date"> <entity-and entity-name="PartyNameHistory" list-name="partyNameHistoryList"> - <field-map field-name="partyId" env-name="parameters.partyId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> <order-by field-name="-changeDate"/> </entity-and> <entity-one entity-name="Person" value-name="person"/> @@ -767,10 +767,10 @@ <!-- check if not already exist --> <entity-and entity-name="PartyRelationship" list-name="partyRels" filter-by-date="true"> - <field-map field-name="partyIdFrom" env-name="parameters.partyIdFrom"/> - <field-map field-name="roleTypeIdFrom" env-name="parameters.roleTypeIdFrom"/> - <field-map field-name="partyIdTo" env-name="parameters.partyIdTo"/> - <field-map field-name="roleTypeIdTo" env-name="parameters.roleTypeIdTo"/> + <field-map field-name="partyIdFrom" from-field="parameters.partyIdFrom"/> + <field-map field-name="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/> + <field-map field-name="partyIdTo" from-field="parameters.partyIdTo"/> + <field-map field-name="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/> </entity-and> <if-empty field="partyRels"> @@ -823,7 +823,7 @@ </entity-condition> <first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/> <entity-and list="webSites" entity-name="WebSite"> - <field-map field-name="productStoreId" env-name="storeEmail.productStoreId"/> + <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/> </entity-and> <first-from-list entry-name="webSite" list-name="webSites"/> <if-not-empty field="storeEmail.bodyScreenLocation"> @@ -854,7 +854,7 @@ </entity-condition> <first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/> <entity-and list="webSites" entity-name="WebSite"> - <field-map field-name="productStoreId" env-name="storeEmail.productStoreId"/> + <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/> </entity-and> <first-from-list entry-name="webSite" list-name="webSites"/> <if-not-empty field="storeEmail.bodyScreenLocation"> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml Tue Dec 30 03:11:15 2008 @@ -119,7 +119,7 @@ </call-service> <log level="info" message="====== New contactMechId [${newContactMechId}] for email address is created for party [${partyId}] ======"/> <entity-one entity-name="ContactMech" value-name="contactMech"> - <field-map field-name="contactMechId" env-name="newContactMechId"/> + <field-map field-name="contactMechId" from-field="newContactMechId"/> </entity-one> <assert> <not><if-empty field="contactMech"/></not> @@ -184,7 +184,7 @@ </call-service> <log level="info" message="====== New contactMechId [${newContactMechId}] for TelecomNumber is created for party [${partyId}] ======"/> <entity-one entity-name="ContactMech" value-name="contactMech"> - <field-map field-name="contactMechId" env-name="newContactMechId"/> + <field-map field-name="contactMechId" from-field="newContactMechId"/> </entity-one> <assert> <not><if-empty field="contactMech"/></not> @@ -255,7 +255,7 @@ </call-service> <log level="info" message="====== New contactMechId [${newContactMechId}] for PostalAddress is created for party [${partyId}] ======"/> <entity-one entity-name="ContactMech" value-name="contactMech"> - <field-map field-name="contactMechId" env-name="newContactMechId"/> + <field-map field-name="contactMechId" from-field="newContactMechId"/> </entity-one> <assert> <not><if-empty field="contactMech"/></not> @@ -366,8 +366,8 @@ </call-service> <entity-one entity-name="PartyAndUserLogin" value-name="partyAndUserLogin"> - <field-map field-name="userLoginId" env-name="partyUserLogin.userLoginId"/> - <field-map field-name="partyId" env-name="partyId"/> + <field-map field-name="userLoginId" from-field="partyUserLogin.userLoginId"/> + <field-map field-name="partyId" from-field="partyId"/> </entity-one> <!-- get the encrypted password --> <call-class-method method-name="getHashType" class-name="org.ofbiz.common.login.LoginServices" ret-field-name="hashType"/> @@ -406,7 +406,7 @@ </call-service> <call-simple-method method-name="testUpdateCommEvent"/> <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"> - <field-map field-name="communicationEventId" env-name="commEventMap.communicationEventId"/> + <field-map field-name="communicationEventId" from-field="commEventMap.communicationEventId"/> </entity-one> <assert> <not><if-empty field="communicationEvent"/></not> @@ -445,7 +445,7 @@ </call-service> <call-simple-method method-name="testUpdateRequest"/> <entity-one entity-name="CustRequest" value-name="custRequest"> - <field-map field-name="custRequestId" env-name="requestMap.custRequestId"/> + <field-map field-name="custRequestId" from-field="requestMap.custRequestId"/> </entity-one> <assert> <not><if-empty field="custRequest"/></not> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml Tue Dec 30 03:11:15 2008 @@ -31,8 +31,8 @@ <set field="facilityParty.roleTypeId" from-field="oldFacilityRole.roleTypeId"/> <set field="facilityParty.fromDate" from-field="fromDate"/> <entity-one entity-name="PartyRole" value-name="partyRole" auto-field-map="false"> - <field-map field-name="partyId" env-name="facilityParty.partyId"/> - <field-map field-name="roleTypeId" env-name="facilityParty.roleTypeId"/> + <field-map field-name="partyId" from-field="facilityParty.partyId"/> + <field-map field-name="roleTypeId" from-field="facilityParty.roleTypeId"/> </entity-one> <if-empty field="partyRole"> <make-value entity-name="PartyRole" value-name="partyRole"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Dec 30 03:11:15 2008 @@ -62,7 +62,7 @@ <!-- if the user has the role limited position, add this category to the limit category/ies --> <if-has-permission permission="CATALOG_ROLE" action="_CREATE"> <entity-and entity-name="ProductCategoryRole" list-name="productCategoryRoles" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="roleTypeId" value="LTD_ADMIN"/> </entity-and> <iterate entry="productCategoryRole" list-name="productCategoryRoles"> @@ -361,7 +361,7 @@ <check-errors/> <entity-and entity-name="ProductCategoryMember" list-name="productCategoryMembers"> - <field-map field-name="productCategoryId" env-name="parameters.productCategoryId"/> + <field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/> </entity-and> <set field="validDate" from-field="parameters.validDate"/> @@ -414,7 +414,7 @@ <simple-method method-name="copyCategoryEntities" short-description="copies all entities of entityName with a productCategoryId to a new entity with a productCategoryIdTo, filtering them by a timestamp passed in to validDate if necessary"> <entity-and entity-name="${entityName}" list-name="categoryEntities"> - <field-map field-name="productCategoryId" env-name="productCategoryId"/> + <field-map field-name="productCategoryId" from-field="productCategoryId"/> </entity-and> <if-not-empty field="validDate"> @@ -444,7 +444,7 @@ </if-not-empty> <entity-and entity-name="ProductCategoryMember" list-name="productCategoryMembers"> - <field-map field-name="productCategoryId" env-name="parameters.productCategoryId"/> + <field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/> </entity-and> <iterate entry="productCategoryMember" list-name="productCategoryMembers"> @@ -466,7 +466,7 @@ </if-not-empty> <entity-and entity-name="ProductCategoryMember" list-name="productCategoryMembers"> - <field-map field-name="productCategoryId" env-name="parameters.productCategoryId"/> + <field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/> </entity-and> <iterate entry="productCategoryMember" list-name="productCategoryMembers"> @@ -561,7 +561,7 @@ <!-- look up the old product category and clone it --> <entity-one entity-name="ProductCategory" value-name="oldCategory"> - <field-map field-name="productCategoryId" env-name="parameters.oldProductCategoryId"/> + <field-map field-name="productCategoryId" from-field="parameters.oldProductCategoryId"/> </entity-one> <clone-value value-name="oldCategory" new-value-name="newCategory"/> @@ -610,7 +610,7 @@ </if-not-empty> <if-not-empty field="parameters.duplicateChildRollup"> <entity-and entity-name="ProductCategoryRollup" list-name="foundValues"> - <field-map field-name="parentProductCategoryId" env-name="parameters.oldProductCategoryId"/> + <field-map field-name="parentProductCategoryId" from-field="parameters.oldProductCategoryId"/> </entity-and> <iterate entry="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> @@ -723,8 +723,8 @@ </condition> <then> <entity-and entity-name="ProductCategoryRollupAndRole" list-name="roleCategories" filter-by-date="true"> - <field-map field-name="productCategoryId" env-name="productCategoryIdToCheck"/> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="productCategoryId" from-field="productCategoryIdToCheck"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="roleTypeId" value="LTD_ADMIN"/> </entity-and> <filter-list-by-date list-name="roleCategories" from-field-name="roleFromDate" thru-field-name="roleThruDate"/> @@ -805,7 +805,7 @@ <iterate entry="prodCatalogCategory" list-name="prodCatalogCategoryList"> <!-- Do not do a permission check unless the ProdCatalog requires it --> <entity-one entity-name="ProdCatalog" value-name="prodCatalog" auto-field-map="false"> - <field-map field-name="prodCatalogId" env-name="prodCatalogCategory.prodCatalogId"/> + <field-map field-name="prodCatalogId" from-field="prodCatalogCategory.prodCatalogId"/> </entity-one> <if> <condition> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Tue Dec 30 03:11:15 2008 @@ -116,8 +116,8 @@ <!-- find the ProductFeatures by type and id code --> <entity-and entity-name="ProductFeature" list-name="productFeatures"> - <field-map field-name="productFeatureTypeId" env-name="parameters.productFeatureTypeId"/> - <field-map field-name="idCode" env-name="parameters.idCode"/> + <field-map field-name="productFeatureTypeId" from-field="parameters.productFeatureTypeId"/> + <field-map field-name="idCode" from-field="parameters.idCode"/> </entity-and> <iterate entry="productFeature" list-name="productFeatures"> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml Tue Dec 30 03:11:15 2008 @@ -24,7 +24,7 @@ <entity-one entity-name="OrderHeader" value-name="orderHeader"/> <entity-one entity-name="ProductStore" value-name="productStore"> - <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> + <field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/> </entity-one> <if-not-empty field="orderHeader"> @@ -83,7 +83,7 @@ <!-- get the ProductStore to fund the reserveOrderEnumId --> <if-empty field="parameters.productStore"> <entity-one entity-name="ProductStore" value-name="productStore"> - <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> + <field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/> </entity-one> <else> <set field="productStore" from-field="parameters.productStore" /> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Tue Dec 30 03:11:15 2008 @@ -220,7 +220,7 @@ <result-to-field result-name="inventoryItemId" field-name="createInventoryItemOutMap.inventoryItemId"/> </call-service> <entity-one entity-name="InventoryItem" value-name="newNonSerInventoryItem"> - <field-map field-name="inventoryItemId" env-name="createInventoryItemOutMap.inventoryItemId"/> + <field-map field-name="inventoryItemId" from-field="createInventoryItemOutMap.inventoryItemId"/> </entity-one> <!-- also create a detail record with the quantities --> @@ -305,9 +305,9 @@ <call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/> <!-- Lets find the inventory to reserve --> <entity-and entity-name="InventoryItem" list-name="inventoryItems"> - <field-map field-name="productId" env-name="parameters.productId"/> + <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="inventoryItemTypeId" value="SERIALIZED_INV_ITEM"/> - <field-map field-name="serialNumber" env-name="parameters.serialNumber"/> + <field-map field-name="serialNumber" from-field="parameters.serialNumber"/> </entity-and> <clear-field field-name="inventoryItem"/> <first-from-list list-name="inventoryItems" entry-name="inventoryItem"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 03:11:15 2008 @@ -258,7 +258,7 @@ <!-- find the most recent InventoryItemStatus record and set the statusEndDatetime --> <entity-and entity-name="InventoryItemStatus" list-name="oldInventoryItemStatusList"> - <field-map field-name="inventoryItemId" env-name="parameters.inventoryItemId"/> + <field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/> <order-by field-name="-statusDatetime"/> </entity-and> <first-from-list entry-name="oldInventoryItemStatus" list-name="oldInventoryItemStatusList"/> @@ -1001,8 +1001,8 @@ <if-compare-field field="parameters.statusId" to-field="inventoryTransfer.statusId" operator="not-equals"> <!-- make sure a StatusValidChange record exists, if not return error --> <entity-one entity-name="StatusValidChange" value-name="checkStatusValidChange" auto-field-map="false"> - <field-map env-name="inventoryTransfer.statusId" field-name="statusId"/> - <field-map env-name="parameters.statusId" field-name="statusIdTo"/> + <field-map from-field="inventoryTransfer.statusId" field-name="statusId"/> + <field-map from-field="parameters.statusId" field-name="statusIdTo"/> </entity-one> <if-empty field="checkStatusValidChange"> <set value="ERROR: Changing the status from ${inventoryTransfer.statusId} to ${parameters.statusId} is not allowed." field="error_list[]"/> @@ -1266,7 +1266,7 @@ <find-by-and entity-name="OrderRole" list-name="orderRoles" map-name="orderRoleAndMap"/> <first-from-list list-name="orderRoles" entry-name="orderRole"/> <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false"> - <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> + <field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/> </entity-one> <if> <condition> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Tue Dec 30 03:11:15 2008 @@ -36,7 +36,7 @@ <entity-and entity-name="OrderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList"> <field-map field-name="locationTypeEnumId" value="FLT_BULK"/> <field-map field-name="orderItemStatusId" value="ITEM_APPROVED"/> - <field-map field-name="facilityId" env-name="parameters.facilityId"/> + <field-map field-name="facilityId" from-field="parameters.facilityId"/> </entity-and> <!-- @@ -73,14 +73,14 @@ <!-- get facilityLocationFrom --> <entity-one entity-name="FacilityLocation" value-name="moveInfo.facilityLocationFrom"> - <field-map field-name="facilityId" env-name="parameters.facilityId"/> - <field-map field-name="locationSeqId" env-name="locationSeqId"/> + <field-map field-name="facilityId" from-field="parameters.facilityId"/> + <field-map field-name="locationSeqId" from-field="locationSeqId"/> </entity-one> <!-- get facilityLocationTo: a little more tricky, find the first FLT_PICKLOC --> <entity-and entity-name="ProductFacilityLocationView" list-name="productFacilityLocationViewList"> - <field-map field-name="productId" env-name="productId"/> - <field-map field-name="facilityId" env-name="parameters.facilityId"/> + <field-map field-name="productId" from-field="productId"/> + <field-map field-name="facilityId" from-field="parameters.facilityId"/> <field-map field-name="locationTypeEnumId" value="FLT_PICKLOC"/> </entity-and> @@ -102,9 +102,9 @@ <!-- if moveInfo.totalQuantity is greater than the total quantity in the given location, show an error and do something (hopefully) intelligent --> <entity-and entity-name="InventoryItem" list-name="inventoryItemList"> - <field-map field-name="productId" env-name="productId"/> - <field-map field-name="facilityId" env-name="parameters.facilityId"/> - <field-map field-name="locationSeqId" env-name="locationSeqId"/> + <field-map field-name="productId" from-field="productId"/> + <field-map field-name="facilityId" from-field="parameters.facilityId"/> + <field-map field-name="locationSeqId" from-field="locationSeqId"/> </entity-and> <calculate field-name="totalQuantityOnHand" type="Double"><number value="0"/></calculate> @@ -217,7 +217,7 @@ <!-- start by finding all Xxx where locationTypeEnumId=FLT_PICKLOC and total of InventoryItems in the loc are less than minimumStock (ProductFacilityLocation, FacilityLocation, InventoryItem) --> <entity-and entity-name="ProductFacilityLocationQuantityTest" list-name="productFacilityLocationQuantityTestList"> <field-map field-name="locationTypeEnumId" value="FLT_PICKLOC"/> - <field-map field-name="facilityId" env-name="parameters.facilityId"/> + <field-map field-name="facilityId" from-field="parameters.facilityId"/> <order-by field-name="productId"/> </entity-and> @@ -258,8 +258,8 @@ <!-- create a moveInfo for each from location with a corresponding quantity --> <entity-and entity-name="InventoryItemAndLocation" list-name="inventoryItemAndLocationList"> - <field-map field-name="productId" env-name="productFacilityLocationQuantityTest.productId"/> - <field-map field-name="facilityId" env-name="productFacilityLocationQuantityTest.facilityId"/> + <field-map field-name="productId" from-field="productFacilityLocationQuantityTest.productId"/> + <field-map field-name="facilityId" from-field="productFacilityLocationQuantityTest.facilityId"/> <field-map field-name="locationTypeEnumId" value="FLT_BULK"/> </entity-and> @@ -370,9 +370,9 @@ <if-compare field="quantityLeftToProcess" operator="greater" value="0" type="Double"> <!-- find InventoryItems in the origin location with some availableToPromise to move --> <entity-and entity-name="InventoryItem" list-name="inventoryItemList"> - <field-map field-name="productId" env-name="parameters.productId"/> - <field-map field-name="facilityId" env-name="parameters.facilityId"/> - <field-map field-name="locationSeqId" env-name="parameters.locationSeqId"/> + <field-map field-name="productId" from-field="parameters.productId"/> + <field-map field-name="facilityId" from-field="parameters.facilityId"/> + <field-map field-name="locationSeqId" from-field="parameters.locationSeqId"/> <order-by field-name="datetimeReceived"/> </entity-and> @@ -431,10 +431,10 @@ </simple-method> <simple-method method-name="processOisgirMoveByStatusInline" short-description="Inline method to process OISGIR stock move for a specific OrderItem.statusId"> <entity-and entity-name="OrderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList"> - <field-map field-name="productId" env-name="parameters.productId"/> - <field-map field-name="facilityId" env-name="parameters.facilityId"/> - <field-map field-name="locationSeqId" env-name="parameters.locationSeqId"/> - <field-map field-name="orderItemStatusId" env-name="orderItemStatusId"/> + <field-map field-name="productId" from-field="parameters.productId"/> + <field-map field-name="facilityId" from-field="parameters.facilityId"/> + <field-map field-name="locationSeqId" from-field="parameters.locationSeqId"/> + <field-map field-name="orderItemStatusId" from-field="orderItemStatusId"/> <order-by field-name="reservedDatetime"/> </entity-and> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml Tue Dec 30 03:11:15 2008 @@ -96,7 +96,7 @@ <!-- update price --> <if-not-empty field="parameters.price"> <entity-and entity-name="ProductPrice" list-name="productPriceList"> - <field-map field-name="productId" env-name="parameters.productId"/> + <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="productPriceTypeId" value="DEFAULT_PRICE"/> <field-map field-name="productPricePurposeId" value="PURCHASE"/> <field-map field-name="productStoreGroupId" value="_NA_"/> @@ -112,8 +112,8 @@ <!-- make sure SupplierProduct exists for userLogin.partyId --> <entity-and entity-name="SupplierProduct" list-name="supplierProductList"> - <field-map field-name="productId" env-name="parameters.productId"/> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="productId" from-field="parameters.productId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> </entity-and> <if-empty field="supplierProductList"> @@ -141,8 +141,8 @@ <!-- make sure SupplierProduct exists for userLogin.partyId --> <entity-and entity-name="SupplierProduct" list-name="supplierProductList"> - <field-map field-name="productId" env-name="parameters.productId"/> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="productId" from-field="parameters.productId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> </entity-and> <if-empty field="supplierProductList"> <add-error><fail-message message="Cannot update this Product: you are not associated with it as a Supplier"/></add-error> @@ -150,8 +150,8 @@ <!-- make sure there is a ContentRole for userLogin.partyId and parameters.contentId and roleTypeId=OWNER --> <entity-and entity-name="ContentRole" list-name="contentRoleList"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> - <field-map field-name="contentId" env-name="parameters.contentId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> + <field-map field-name="contentId" from-field="parameters.contentId"/> <field-map field-name="roleTypeId" value="OWNER"/> </entity-and> <if-empty field="contentRoleList"> @@ -172,8 +172,8 @@ <!-- make sure SupplierProduct exists for userLogin.partyId --> <entity-and entity-name="SupplierProduct" list-name="supplierProductList"> - <field-map field-name="productId" env-name="parameters.productId"/> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="productId" from-field="parameters.productId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> </entity-and> <if-empty field="supplierProductList"> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Dec 30 03:11:15 2008 @@ -72,7 +72,7 @@ <!-- if the user has the role limited position, add this product to the limit category/ies --> <if-has-permission permission="CATALOG_ROLE" action="_CREATE"> <entity-and entity-name="ProductCategoryRole" list-name="productCategoryRoles" filter-by-date="true"> - <field-map field-name="partyId" env-name="userLogin.partyId"/> + <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="roleTypeId" value="LTD_ADMIN"/> </entity-and> @@ -145,7 +145,7 @@ <iterate entry="variantProductAssoc" list-name="variantProductAssocs"> <clear-field field-name="variantProduct"/> <entity-one entity-name="Product" value-name="variantProduct" auto-field-map="false"> - <field-map field-name="productId" env-name="variantProductAssoc.productIdTo"/> + <field-map field-name="productId" from-field="variantProductAssoc.productIdTo"/> </entity-one> <set from-field="parameters.productName" field="variantProduct.productName"/> @@ -166,7 +166,7 @@ <!-- look up the old product and clone it --> <entity-one entity-name="Product" value-name="oldProduct" auto-field-map="false"> - <field-map field-name="productId" env-name="parameters.oldProductId"/> + <field-map field-name="productId" from-field="parameters.oldProductId"/> </entity-one> <clone-value value-name="oldProduct" new-value-name="newProduct"/> @@ -242,7 +242,7 @@ <!-- small difference here, also do the reverse assocs... --> <entity-and entity-name="ProductAssoc" list-name="foundValues"> - <field-map field-name="productIdTo" env-name="parameters.oldProductId"/> + <field-map field-name="productIdTo" from-field="parameters.oldProductId"/> </entity-and> <iterate entry="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Tue Dec 30 03:11:15 2008 @@ -434,7 +434,7 @@ </if-compare> <else> <entity-and entity-name="ProductStoreFacility" list-name="productStoreFacilities" use-cache="true"> - <field-map env-name="productStore.productStoreId" field-name="productStoreId"/> + <field-map from-field="productStore.productStoreId" field-name="productStoreId"/> <order-by field-name="sequenceNum"/> </entity-and> <iterate list-name="productStoreFacilities" entry-name="productStoreFacility"> @@ -474,8 +474,8 @@ </if-compare> <else> <entity-and entity-name="ProductStoreFacility" list-name="productStoreFacilities" use-cache="true"> - <field-map env-name="productStore.productStoreId" field-name="productStoreId"/> - <field-map env-name="facilityId" field-name="facilityId"/> + <field-map from-field="productStore.productStoreId" field-name="productStoreId"/> + <field-map from-field="facilityId" field-name="facilityId"/> <order-by field-name="sequenceNum"/> </entity-and> <iterate list-name="productStoreFacilities" entry-name="productStoreFacility"> @@ -610,7 +610,7 @@ </if-compare-field> <else> <entity-and entity-name="ProductStoreFacility" list-name="productStoreFacilities" use-cache="true"> - <field-map env-name="productStore.productStoreId" field-name="productStoreId"/> + <field-map from-field="productStore.productStoreId" field-name="productStoreId"/> <order-by field-name="sequenceNum"/> </entity-and> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml Tue Dec 30 03:11:15 2008 @@ -34,8 +34,8 @@ <if-not-empty field="parameters.subscriptionResourceId"> <if-not-empty field="parameters.productId"> <entity-and entity-name="ProductSubscriptionResource" list-name="resourceList" filter-by-date="true"> - <field-map field-name="subscriptionResourceId" env-name="parameters.subscriptionResourceId"/> - <field-map field-name="productId" env-name="parameters.productId"/> + <field-map field-name="subscriptionResourceId" from-field="parameters.subscriptionResourceId"/> + <field-map field-name="productId" from-field="parameters.productId"/> <order-by field-name="-fromDate"/> </entity-and> <first-from-list entry-name="resource" list-name="resourceList"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml Tue Dec 30 03:11:15 2008 @@ -82,8 +82,8 @@ </simple-method> <simple-method method-name="getSupplierProductFeatures" short-description="Get all supplier information for a product feature" login-required="false"> <entity-and entity-name="SupplierProductFeature" list-name="supplierProductFeatures"> - <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="productFeatureId" env-name="parameters.productFeatureId"/> + <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="productFeatureId" from-field="parameters.productFeatureId"/> </entity-and> <field-to-result field-name="supplierProductFeatures"/> </simple-method> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Tue Dec 30 03:11:15 2008 @@ -487,7 +487,7 @@ <!-- reserve the order item --> <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false"> - <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> + <field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/> </entity-one> <if-compare value="Y" operator="equals" field="productStore.isImmediatelyFulfilled"> <log level="verbose" message="ProductStore with id ${productStore.productStoreId}, is immediatly fulfilled. Not reserving inventory"/> @@ -510,8 +510,8 @@ <set field="shipmentItemSeqId" from-field="parameters.shipmentItemSeqId"/> <entity-one entity-name="InventoryItem" value-name="inventoryItem"/> <entity-and entity-name="ReturnItemShipment" list-name="returnItemShipments"> - <field-map field-name="shipmentId" env-name="parameters.shipmentId"/> - <field-map field-name="shipmentItemSeqId" env-name="parameters.shipmentItemSeqId"/> + <field-map field-name="shipmentId" from-field="parameters.shipmentId"/> + <field-map field-name="shipmentItemSeqId" from-field="parameters.shipmentItemSeqId"/> </entity-and> <first-from-list list-name="returnItemShipments" entry-name="returnItemShipment"/> <calculate field-name="quantityNotIssued"> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Tue Dec 30 03:11:15 2008 @@ -88,7 +88,7 @@ <log level="info" message="Checking order #${orderHeader.orderId} to add to picklist"/> <!-- get all ship groups, and iterate over them for each order --> <entity-and entity-name="OrderItemShipGroup" list-name="orderItemShipGroupList"> - <field-map field-name="orderId" env-name="orderHeader.orderId"/> + <field-map field-name="orderId" from-field="orderHeader.orderId"/> <order-by field-name="shipGroupSeqId"/> </entity-and> @@ -114,12 +114,12 @@ <then> <!-- get only for current OrderItemShipGroup --> <entity-and entity-name="OrderItemShipGrpInvRes" list-name="orderItemShipGrpInvResList"> - <field-map field-name="orderId" env-name="orderItemShipGroup.orderId"/> - <field-map field-name="shipGroupSeqId" env-name="orderItemShipGroup.shipGroupSeqId"/> + <field-map field-name="orderId" from-field="orderItemShipGroup.orderId"/> + <field-map field-name="shipGroupSeqId" from-field="orderItemShipGroup.shipGroupSeqId"/> </entity-and> <entity-and entity-name="OrderItemAndShipGroupAssoc" list-name="orderItemAndShipGroupAssocList"> - <field-map field-name="orderId" env-name="orderItemShipGroup.orderId"/> - <field-map field-name="shipGroupSeqId" env-name="orderItemShipGroup.shipGroupSeqId"/> + <field-map field-name="orderId" from-field="orderItemShipGroup.orderId"/> + <field-map field-name="shipGroupSeqId" from-field="orderItemShipGroup.shipGroupSeqId"/> <order-by field-name="+orderItemSeqId"/> </entity-and> @@ -557,7 +557,7 @@ <!-- if we put nothing into this bin, delete the bin --> <if-compare field="itemsInBin" value="0" operator="equals"> <entity-one entity-name="PicklistBin" value-name="binToRemove"> - <field-map field-name="picklistBinId" env-name="picklistBinId"/> + <field-map field-name="picklistBinId" from-field="picklistBinId"/> </entity-one> <remove-value value-name="binToRemove"/> </if-compare> @@ -610,8 +610,8 @@ <if-compare-field field="parameters.statusId" to-field="lookedUpValue.statusId" operator="not-equals"> <!-- make sure a StatusValidChange record exists, if not return error --> <entity-one entity-name="StatusValidChange" value-name="checkStatusValidChange" auto-field-map="false"> - <field-map env-name="lookedUpValue.statusId" field-name="statusId"/> - <field-map env-name="parameters.statusId" field-name="statusIdTo"/> + <field-map from-field="lookedUpValue.statusId" field-name="statusId"/> + <field-map from-field="parameters.statusId" field-name="statusIdTo"/> </entity-one> <if-empty field="checkStatusValidChange"> <set value="ERROR: Changing the status from ${lookedUpValue.statusId} to ${parameters.statusId} is not allowed." field="error_list[]"/> @@ -720,8 +720,8 @@ <if-compare-field field="parameters.itemStatusId" to-field="lookedUpValue.itemStatusId" operator="not-equals"> <!-- make sure a StatusValidChange record exists, if not return error --> <entity-one entity-name="StatusValidChange" value-name="checkStatusValidChange" auto-field-map="false"> - <field-map env-name="lookedUpValue.itemStatusId" field-name="statusId"/> - <field-map env-name="parameters.itemStatusId" field-name="statusIdTo"/> + <field-map from-field="lookedUpValue.itemStatusId" field-name="statusId"/> + <field-map from-field="parameters.itemStatusId" field-name="statusIdTo"/> </entity-one> <if-empty field="checkStatusValidChange"> <set value="ERROR: Changing the status from ${lookedUpValue.itemStatusId} to ${parameters.itemStatusId} is not allowed." field="error_list[]"/> @@ -1247,7 +1247,7 @@ <!-- find all related picklist items --> <entity-and entity-name="PicklistItemAndBin" list-name="picklistItem"> - <field-map field-name="picklistId" env-name="picklist.picklistId"/> + <field-map field-name="picklistId" from-field="picklist.picklistId"/> </entity-and> <set field="allCompleteOrCancelled" type="Boolean" value="true"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730092&r1=730091&r2=730092&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Tue Dec 30 03:11:15 2008 @@ -42,8 +42,8 @@ <if-not-empty field="parameters.inventoryItemDetailSeqId"> <entity-one entity-name="InventoryItemDetail" value-name="invDet"> - <field-map field-name="inventoryItemDetailSeqId" env-name="parameters.inventoryItemDetailSeqId"/> - <field-map field-name="inventoryItemId" env-name="parameters.inventoryItemId"/> + <field-map field-name="inventoryItemDetailSeqId" from-field="parameters.inventoryItemDetailSeqId"/> + <field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/> </entity-one> <set field="invDet.receiptId" from-field="receiptId"/> <store-value value-name="invDet"/> @@ -192,7 +192,7 @@ <check-errors/> <entity-one entity-name="ReturnHeader" value-name="returnHeader"> - <field-map field-name="returnId" env-name="parameters.returnId"/> + <field-map field-name="returnId" from-field="parameters.returnId"/> </entity-one> <if-compare field="returnHeader.needsInventoryReceive" operator="equals" value="Y"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |