svn commit: r826786 - in /ofbiz/branches/release09.04: ./ applications/accounting/script
Locked
svn commit: r826786 - in /ofbiz/branches/release09.04: ./ applications/accounting/script
 
|
Author: jleroux
Date: Mon Oct 19 19:41:26 2009 New Revision: 826786 URL: http://svn.apache.org/viewvc?rev=826786&view=rev Log: "Applied fix from trunk for revision: 770308" ------------------------------------------------------------------------ r770308 | adrianc | 2009-04-30 18:12:21 +0200 (jeu. 30 avr. 2009) | 2 lignes Removed a bunch of nested expressions. ------------------------------------------------------------------------ Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml ofbiz/branches/release09.04/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml ofbiz/branches/release09.04/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml ofbiz/branches/release09.04/framework/common/script/org/ofbiz/common/CommonServices.xml Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 19 19:41:26 2009 @@ -1 +1 @@ -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253 +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253 Modified: ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=826786&r1=826785&r2=826786&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original) +++ ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Mon Oct 19 19:41:26 2009 @@ -243,7 +243,7 @@ <!-- also check if the glAccountId, amount, currencyUomId fields are all set --> <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}"> + <if-empty field="customTimePeriodListByOrganizationPartyIdMap[acctgTransEntry.organizationPartyId]"> <clear-field field="findCustomTimePeriodCallMap"/> <clear-field field="customTimePeriodList"/> @@ -267,7 +267,7 @@ </iterate> <!-- save this customTimePeriodList for the current entry for later use --> - <set from-field="customTimePeriodList" field="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}"/> + <set from-field="customTimePeriodList" field="customTimePeriodListByOrganizationPartyIdMap[acctgTransEntry.organizationPartyId]"/> </if-empty> <if-empty field="acctgTransEntry.glAccountId"> <add-error><fail-message message="Gl account id is not set for [${acctgTransEntry.acctgTransEntrySeqId}] or mapping not found for account type ${acctgTransEntry.glAccountTypeId}"/></add-error> @@ -382,7 +382,7 @@ <call-service service-name="updateGlAccountOrganization" in-map-name="updateGlAccountParams"/> <!-- assemble the glAccountHistoryList, we will update all of these --> - <set from-field="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}" field="customTimePeriodList"/> + <set from-field="customTimePeriodListByOrganizationPartyIdMap[acctgTransEntry.organizationPartyId]" field="customTimePeriodList"/> <iterate entry="customTimePeriod" list="customTimePeriodList"> <entity-one entity-name="GlAccountHistory" value-field="glAccountHistory"> <field-map field-name="glAccountId" from-field="acctgTransEntry.glAccountId"/> Modified: ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=826786&r1=826785&r2=826786&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/branches/release09.04/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Mon Oct 19 19:41:26 2009 @@ -954,18 +954,18 @@ <calcop field="totalNetIncome" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> <if-compare field="isExpenseAccount" operator="equals" value="true" type="Boolean"> - <if-empty field="glAccountTotalsExpenseMap.${glAccount.glAccountId}"> - <set field="glAccountTotalsExpenseMap.${glAccount.glAccountId}" value="0.0" type="BigDecimal"/> + <if-empty field="glAccountTotalsExpenseMap[glAccount.glAccountId]"> + <set field="glAccountTotalsExpenseMap[glAccount.glAccountId]" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsExpenseMap.${glAccount.glAccountId}"> - <calcop field="glAccountTotalsExpenseMap.${glAccount.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> + <calculate field="glAccountTotalsExpenseMap[glAccount.glAccountId]"> + <calcop field="glAccountTotalsExpenseMap[glAccount.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> <else> - <if-empty field="glAccountTotalsProfitMap.${glAccount.glAccountId}"> - <set field="glAccountTotalsProfitMap.${glAccount.glAccountId}" value="0.0" type="BigDecimal"/> + <if-empty field="glAccountTotalsProfitMap[glAccount.glAccountId]"> + <set field="glAccountTotalsProfitMap[glAccount.glAccountId]" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsProfitMap.${glAccount.glAccountId}"> - <calcop field="glAccountTotalsProfitMap.${glAccount.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> + <calculate field="glAccountTotalsProfitMap[glAccount.glAccountId]"> + <calcop field="glAccountTotalsProfitMap[glAccount.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </else> </if-compare> @@ -1029,7 +1029,7 @@ <order-by field-name="glAccountId"/> </entity-condition> <iterate list="glAccountAndHistories" entry="glAccountAndHistory"> - <set field="glAccountTotalsAssetMap.${glAccountAndHistory.glAccountId}" from-field="glAccountAndHistory.endingBalance"/> + <set field="glAccountTotalsAssetMap[glAccountAndHistory.glAccountId]" from-field="glAccountAndHistory.endingBalance"/> </iterate> <entity-condition entity-name="GlAccountAndHistory" list="glAccountAndHistories"> <condition-list combine="and"> @@ -1040,7 +1040,7 @@ <order-by field-name="glAccountId"/> </entity-condition> <iterate list="glAccountAndHistories" entry="glAccountAndHistory"> - <set field="glAccountTotalsLiabilityMap.${glAccountAndHistory.glAccountId}" from-field="glAccountAndHistory.endingBalance"/> + <set field="glAccountTotalsLiabilityMap[glAccountAndHistory.glAccountId]" from-field="glAccountAndHistory.endingBalance"/> </iterate> <entity-condition entity-name="GlAccountAndHistory" list="glAccountAndHistories"> <condition-list combine="and"> @@ -1051,7 +1051,7 @@ <order-by field-name="glAccountId"/> </entity-condition> <iterate list="glAccountAndHistories" entry="glAccountAndHistory"> - <set field="glAccountTotalsEquityMap.${glAccountAndHistory.glAccountId}" from-field="glAccountAndHistory.endingBalance"/> + <set field="glAccountTotalsEquityMap[glAccountAndHistory.glAccountId]" from-field="glAccountAndHistory.endingBalance"/> </iterate> </if-not-empty> @@ -1075,11 +1075,11 @@ <calcop field="amount" operator="negative"/> </calculate> </if-compare> - <if-empty field="glAccountTotalsAssetMap.${acctgTransAndEntry.glAccountId}"> - <set field="glAccountTotalsAssetMap.${acctgTransAndEntry.glAccountId}" value="0.0" type="BigDecimal"/> + <if-empty field="glAccountTotalsAssetMap[acctgTransAndEntry.glAccountId]"> + <set field="glAccountTotalsAssetMap[acctgTransAndEntry.glAccountId]" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsAssetMap.${acctgTransAndEntry.glAccountId}"> - <calcop field="glAccountTotalsAssetMap.${acctgTransAndEntry.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> + <calculate field="glAccountTotalsAssetMap[acctgTransAndEntry.glAccountId]"> + <calcop field="glAccountTotalsAssetMap[acctgTransAndEntry.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> <entity-condition entity-name="AcctgTransAndEntries" list="acctgTransAndEntries"> @@ -1102,11 +1102,11 @@ <calcop field="amount" operator="negative"/> </calculate> </if-compare> - <if-empty field="glAccountTotalsLiabilityMap.${acctgTransAndEntry.glAccountId}"> - <set field="glAccountTotalsLiabilityMap.${acctgTransAndEntry.glAccountId}" value="0.0" type="BigDecimal"/> + <if-empty field="glAccountTotalsLiabilityMap[acctgTransAndEntry.glAccountId]"> + <set field="glAccountTotalsLiabilityMap[acctgTransAndEntry.glAccountId]" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsLiabilityMap.${acctgTransAndEntry.glAccountId}"> - <calcop field="glAccountTotalsLiabilityMap.${acctgTransAndEntry.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> + <calculate field="glAccountTotalsLiabilityMap[acctgTransAndEntry.glAccountId]"> + <calcop field="glAccountTotalsLiabilityMap[acctgTransAndEntry.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> <entity-condition entity-name="AcctgTransAndEntries" list="acctgTransAndEntries"> @@ -1129,11 +1129,11 @@ <calcop field="amount" operator="negative"/> </calculate> </if-compare> - <if-empty field="glAccountTotalsEquityMap.${acctgTransAndEntry.glAccountId}"> - <set field="glAccountTotalsEquityMap.${acctgTransAndEntry.glAccountId}" value="0.0" type="BigDecimal"/> + <if-empty field="glAccountTotalsEquityMap[acctgTransAndEntry.glAccountId]"> + <set field="glAccountTotalsEquityMap[acctgTransAndEntry.glAccountId]" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsEquityMap.${acctgTransAndEntry.glAccountId}"> - <calcop field="glAccountTotalsEquityMap.${acctgTransAndEntry.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> + <calculate field="glAccountTotalsEquityMap[acctgTransAndEntry.glAccountId]"> + <calcop field="glAccountTotalsEquityMap[acctgTransAndEntry.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> @@ -1151,11 +1151,11 @@ <field-map field-name="glAccountTypeId" value="RETAINED_EARNINGS"/> </entity-one> <if-not-empty field="retainedEarningsAccount"> - <if-empty field="glAccountTotalsEquityMap.${retainedEarningsAccount.glAccountId}"> - <set field="glAccountTotalsEquityMap.${retainedEarningsAccount.glAccountId}" value="0.0" type="BigDecimal"/> + <if-empty field="glAccountTotalsEquityMap[retainedEarningsAccount.glAccountId]"> + <set field="glAccountTotalsEquityMap[retainedEarningsAccount.glAccountId]" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="glAccountTotalsEquityMap.${retainedEarningsAccount.glAccountId}"> - <calcop field="glAccountTotalsEquityMap.${retainedEarningsAccount.glAccountId}" operator="add"><calcop field="totalNetIncome" operator="get"/></calcop> + <calculate field="glAccountTotalsEquityMap[retainedEarningsAccount.glAccountId]"> + <calcop field="glAccountTotalsEquityMap[retainedEarningsAccount.glAccountId]" operator="add"><calcop field="totalNetIncome" operator="get"/></calcop> </calculate> </if-not-empty> @@ -1201,50 +1201,50 @@ </call-service> <iterate list="period2AssetBalancesList" entry="period2AssetBalance"> - <set field="assetBalancesMap.${period2AssetBalance.glAccountId}" from-field="period2AssetBalance.totalAmount"/> + <set field="assetBalancesMap[period2AssetBalance.glAccountId]" from-field="period2AssetBalance.totalAmount"/> </iterate> <iterate list="period1AssetBalancesList" entry="period1AssetBalance"> <set field="amount" from-field="period1AssetBalance.totalAmount"/> <calculate field="amount"> <calcop field="amount" operator="negative"/> </calculate> - <if-empty field="assetBalancesMap.${period1AssetBalance.glAccountId}"> - <set field="assetBalancesMap.${period1AssetBalance.glAccountId}" value="0.0" type="BigDecimal"/> + <if-empty field="assetBalancesMap[period1AssetBalance.glAccountId]"> + <set field="assetBalancesMap[period1AssetBalance.glAccountId]" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="assetBalancesMap.${period1AssetBalance.glAccountId}"> - <calcop field="assetBalancesMap.${period1AssetBalance.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> + <calculate field="assetBalancesMap[period1AssetBalance.glAccountId]"> + <calcop field="assetBalancesMap[period1AssetBalance.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> <iterate list="period2LiabilityBalancesList" entry="period2LiabilityBalance"> - <set field="liabilityBalancesMap.${period2LiabilityBalance.glAccountId}" from-field="period2LiabilityBalance.totalAmount"/> + <set field="liabilityBalancesMap[period2LiabilityBalance.glAccountId]" from-field="period2LiabilityBalance.totalAmount"/> </iterate> <iterate list="period1LiabilityBalancesList" entry="period1LiabilityBalance"> <set field="amount" from-field="period1LiabilityBalance.totalAmount"/> <calculate field="amount"> <calcop field="amount" operator="negative"/> </calculate> - <if-empty field="liabilityBalancesMap.${period1LiabilityBalance.glAccountId}"> - <set field="liabilityBalancesMap.${period1LiabilityBalance.glAccountId}" value="0.0" type="BigDecimal"/> + <if-empty field="liabilityBalancesMap[period1LiabilityBalance.glAccountId]"> + <set field="liabilityBalancesMap[period1LiabilityBalance.glAccountId]" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="liabilityBalancesMap.${period1LiabilityBalance.glAccountId}"> - <calcop field="liabilityBalancesMap.${period1LiabilityBalance.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> + <calculate field="liabilityBalancesMap[period1LiabilityBalance.glAccountId]"> + <calcop field="liabilityBalancesMap[period1LiabilityBalance.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> <iterate list="period2EquityBalancesList" entry="period2EquityBalance"> - <set field="equityBalancesMap.${period2EquityBalance.glAccountId}" from-field="period2EquityBalance.totalAmount"/> + <set field="equityBalancesMap[period2EquityBalance.glAccountId]" from-field="period2EquityBalance.totalAmount"/> </iterate> <iterate list="period1EquityBalancesList" entry="period1EquityBalance"> <set field="amount" from-field="period1EquityBalance.totalAmount"/> <calculate field="amount"> <calcop field="amount" operator="negative"/> </calculate> - <if-empty field="equityBalancesMap.${period1EquityBalance.glAccountId}"> - <set field="equityBalancesMap.${period1EquityBalance.glAccountId}" value="0.0" type="BigDecimal"/> + <if-empty field="equityBalancesMap[period1EquityBalance.glAccountId]"> + <set field="equityBalancesMap[period1EquityBalance.glAccountId]" value="0.0" type="BigDecimal"/> </if-empty> - <calculate field="equityBalancesMap.${period1EquityBalance.glAccountId}"> - <calcop field="equityBalancesMap.${period1EquityBalance.glAccountId}" operator="add"><calcop field="amount" operator="get"/></calcop> + <calculate field="equityBalancesMap[period1EquityBalance.glAccountId]"> + <calcop field="equityBalancesMap[period1EquityBalance.glAccountId]" operator="add"><calcop field="amount" operator="get"/></calcop> </calculate> </iterate> Modified: ofbiz/branches/release09.04/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?rev=826786&r1=826785&r2=826786&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original) +++ ofbiz/branches/release09.04/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Mon Oct 19 19:41:26 2009 @@ -94,7 +94,7 @@ <set value="SHIPMENT_CLERK" field="shipmentClerkFindMap.roleTypeId"/> <find-by-and entity-name="PartyRole" map="shipmentClerkFindMap" list="shipmentClerkRoles"/> <iterate entry="shipmentClerkRole" list="shipmentClerkRoles"> - <set field="sendToPartyIdMap.${shipmentClerkRole.partyId}" from-field="shipmentClerkRole.partyId"/> + <set field="sendToPartyIdMap[shipmentClerkRole.partyId]" from-field="shipmentClerkRole.partyId"/> </iterate> <!-- go through all send to parties and get email addresses --> Modified: ofbiz/branches/release09.04/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml?rev=826786&r1=826785&r2=826786&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original) +++ ofbiz/branches/release09.04/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Mon Oct 19 19:41:26 2009 @@ -92,11 +92,11 @@ <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-and> <iterate list="shipmentReceipts" entry="receipt"> - <if-empty field="totalsMap.${receipt.orderItemSeqId}"> - <set field="totalsMap.${receipt.orderItemSeqId}" value="0" type="BigDecimal"/> + <if-empty field="totalsMap[receipt.orderItemSeqId]"> + <set field="totalsMap[receipt.orderItemSeqId]" value="0" type="BigDecimal"/> </if-empty> - <calculate field="totalsMap.${receipt.orderItemSeqId}"> - <calcop field="totalsMap.${receipt.orderItemSeqId}" operator="add"> + <calculate field="totalsMap[receipt.orderItemSeqId]"> + <calcop field="totalsMap[receipt.orderItemSeqId]" operator="add"> <calcop field="receipt.quantityAccepted" operator="get"/> <calcop field="receipt.quantityRejected" operator="get"/> </calcop> @@ -105,7 +105,7 @@ <set from-field="receipt.orderItemSeqId" field="newLookupMap.orderItemSeqId"/> <find-by-primary-key entity-name="OrderItem" map="newLookupMap" value-field="orderItem"/> <if-compare field="orderItem.statusId" operator="not-equals" value="ITEM_COMPLETED"> - <if-compare-field field="orderItem.quantity" to-field="totalsMap.${receipt.orderItemSeqId}" operator="less-equals" type="BigDecimal"> + <if-compare-field field="orderItem.quantity" to-field="totalsMap[receipt.orderItemSeqId]" operator="less-equals" type="BigDecimal"> <!-- update the status for the item --> <set field="orderItem.statusId" value="ITEM_COMPLETED"/> <store-value value-field="orderItem"/> Modified: ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=826786&r1=826785&r2=826786&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original) +++ ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Mon Oct 19 19:41:26 2009 @@ -197,7 +197,7 @@ <result-to-field result-name="fileNotExists" field="fileStatusMap.fileNotExists"/> </call-service> <set field="categoryId" from-field="category.productCategoryId"/> - <set field="categoriesMap.${categoryId}" from-field="fileStatusMap"/> + <set field="categoriesMap[categoryId]" from-field="fileStatusMap"/> </iterate> <field-to-result field="categoriesMap" result-name="categoriesMap"/> </if-not-empty> Modified: ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/category/CategoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=826786&r1=826785&r2=826786&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original) +++ ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Mon Oct 19 19:41:26 2009 @@ -532,7 +532,7 @@ <log level="info" message="Applying feature [${productFeatureId}] of type [${productFeatureTypeId}] to product [${productId}]"/> <set field="createPfaMap.productId" from-field="productId"/> <set field="createPfaMap.productFeatureId" from-field="productFeatureId"/> - <if-compare field="parameters.productFeatureSelectableByType.${productFeatureTypeId}" operator="equals" value="Y"> + <if-compare field="parameters.productFeatureSelectableByType[productFeatureTypeId]" operator="equals" value="Y"> <set field="createPfaMap.productFeatureApplTypeId" value="SELECTABLE_FEATURE"/> <set field="hasSelectableFeatures" value="Y"/> <else> Modified: ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=826786&r1=826785&r2=826786&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original) +++ ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Mon Oct 19 19:41:26 2009 @@ -762,7 +762,7 @@ <!-- maintain a Set (in a Map) of orderIds that we have reallocated for, but only if they had some quantityNotReserved --> <if-not-empty field="oisgir.quantityNotAvailable"> <if-compare field="oisgir.quantityNotAvailable" operator="greater" value="0" type="BigDecimal"> - <set field="touchedOrderIdMap.${oisgir.orderId}" value="Y"/> + <set field="touchedOrderIdMap[oisgir.orderId]" value="Y"/> <log level="verbose" message="Adding ${oisgir.orderId} to touchedOrderIdMap"/> </if-compare> </if-not-empty> @@ -789,7 +789,7 @@ </call-service> <if-compare field="isBackOrder" operator="equals" value="false" type="Boolean"> - <set field="noLongerOnBackOrderIdMap.${touchedOrderId}" value="Y"/> + <set field="noLongerOnBackOrderIdMap[touchedOrderId]" value="Y"/> </if-compare> </iterate-map> <if-not-empty field="noLongerOnBackOrderIdMap"> @@ -872,7 +872,7 @@ <!-- maintain a Set (in a Map) of orderIds that we have reallocated for, but only if they had some quantityNotReserved --> <if-not-empty field="oisgir.quantityNotAvailable"> <if-compare field="oisgir.quantityNotAvailable" operator="greater" value="0" type="BigDecimal"> - <set field="touchedOrderIdMap.${oisgir.orderId}" value="Y"/> + <set field="touchedOrderIdMap[oisgir.orderId]" value="Y"/> <log level="verbose" message="Adding ${oisgir.orderId} to touchedOrderIdMap"/> </if-compare> </if-not-empty> @@ -905,7 +905,7 @@ </call-service> <if-compare field="isBackOrder" operator="equals" value="false" type="Boolean"> - <set field="noLongerOnBackOrderIdMap.${touchedOrderId}" value="Y"/> + <set field="noLongerOnBackOrderIdMap[touchedOrderId]" value="Y"/> </if-compare> </iterate-map> <if-not-empty field="noLongerOnBackOrderIdMap"> @@ -927,7 +927,7 @@ </condition-list> </entity-condition> <iterate list="oisgirais" entry="oisgir"> - <set field="orderItems.${oisgir.orderItemSeqId}" from-field="oisgir"/> + <set field="orderItems[oisgir.orderItemSeqId]" from-field="oisgir"/> </iterate> <now-timestamp field="nowTimestamp"/> <iterate-map key="orderItemSeqId" value="oisgir" map="orderItems"> Modified: ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=826786&r1=826785&r2=826786&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original) +++ ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Mon Oct 19 19:41:26 2009 @@ -54,7 +54,7 @@ --> <!-- start by making a Map where the locationSeqId is the key and the value is a List of orderItemShipGrpInvResAndItemLocation --> <iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList"> - <field-to-list field="orderItemShipGrpInvResAndItemLocation" list="oiirailByLocMap.${orderItemShipGrpInvResAndItemLocation.locationSeqId}"/> + <field-to-list field="orderItemShipGrpInvResAndItemLocation" list="oiirailByLocMap[orderItemShipGrpInvResAndItemLocation.locationSeqId]"/> </iterate> <!-- now get all info for each origin location --> @@ -147,34 +147,34 @@ ProductFacilityLocation, move the restock quantity from ProductFacilityLocation --> <if-compare-field field="targetTotalAvailableToPromise" to-field="moveInfo.targetProductFacilityLocation.minimumStock" operator="less" type="BigDecimal"> - <if-empty field="targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId}"> + <if-empty field="targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId]"> <!-- if targetTotalAvailableToPromise is less than productFacilityLocation.minimumStock, move over the moveInfo.targetProductFacilityLocation.moveQuantity --> - <!-- if trying to move more from the location than is there, find the difference and put it in targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId} --> + <!-- if trying to move more from the location than is there, find the difference and put it in targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId] --> <calculate field="moveInfo.totalQuantity"> <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="moveInfo.targetProductFacilityLocation.moveQuantity" operator="get"/></calcop> </calculate> <else> <!-- see if there is enough left for the full amount in - targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId}, + targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId], if not do whatever is available and put difference back in - targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId} + targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId] --> <calculate field="moveInfo.totalQuantity"> - <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId}" operator="get"/></calcop> + <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId]" operator="get"/></calcop> </calculate> </else> </if-empty> <if-compare-field field="totalQuantityOnHand" to-field="moveInfo.totalQuantity" operator="less" type="BigDecimal"> - <calculate field="targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId}"> + <calculate field="targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId]"> <calcop field="moveInfo.totalQuantity" operator="subtract"><calcop field="totalQuantityOnHand" operator="get"/></calcop> </calculate> <set from-field="totalQuantityOnHand" field="moveInfo.totalQuantity"/> </if-compare-field> <!-- add it to the stockMoveHandled Map to keep track of minimumStock based transfers already done so they are not duplicated below --> - <set value="Y" field="stockMoveHandled.${moveInfo.targetProductFacilityLocation.locationSeqId}"/> + <set value="Y" field="stockMoveHandled[moveInfo.targetProductFacilityLocation.locationSeqId]"/> </if-compare-field> </else> </if-compare-field> @@ -247,8 +247,8 @@ <if> <condition> <or> - <if-empty field="stockMoveHandled.${productFacilityLocationQuantityTest.locationSeqId}"/> - <if-compare field="stockMoveHandled.${productFacilityLocationQuantityTest.locationSeqId}" operator="not-equals" value="Y"/> + <if-empty field="stockMoveHandled[productFacilityLocationQuantityTest.locationSeqId]"/> + <if-compare field="stockMoveHandled[productFacilityLocationQuantityTest.locationSeqId]" operator="not-equals" value="Y"/> </or> </condition> <then> @@ -272,12 +272,12 @@ <!-- start by making a Map where the locationSeqId is the key and the value is a List of InventoryItemAndLocation --> <clear-field field="InventoryItemAndLocationByLocMap"/> <iterate entry="InventoryItemAndLocation" list="inventoryItemAndLocationList"> - <field-to-list field="InventoryItemAndLocation" list="InventoryItemAndLocationByLocMap.${InventoryItemAndLocation.locationSeqId}"/> + <field-to-list field="InventoryItemAndLocation" list="InventoryItemAndLocationByLocMap[InventoryItemAndLocation.locationSeqId]"/> </iterate> <clear-field field="locationSeqId"/> <clear-field field="perLocationInventoryItemAndLocList"/> <iterate-map key="locationSeqId" value="perLocationInventoryItemAndLocList" map="InventoryItemAndLocationByLocMap"> - <if-empty field="fromLocationTotalAvailableToPromise.${locationSeqId}"> + <if-empty field="fromLocationTotalAvailableToPromise[locationSeqId]"> <calculate field="totalQuantityOnHand"><number value="0"/></calculate> <calculate field="totalAvailableToPromise"><number value="0"/></calculate> <iterate entry="inventoryItem" list="perLocationInventoryItemAndLocList"> @@ -289,7 +289,7 @@ </calculate> </iterate> <else> - <set from-field="fromLocationTotalAvailableToPromise.${locationSeqId}" field="totalAvailableToPromise"/> + <set from-field="fromLocationTotalAvailableToPromise[locationSeqId]" field="totalAvailableToPromise"/> </else> </if-empty> @@ -319,10 +319,10 @@ <calcop field="targetLocationMoveQuantity" operator="subtract"><calcop field="totalAvailableToPromise" operator="get"/></calcop> </calculate> <set from-field="totalAvailableToPromise" field="moveInfo.totalQuantity"/> - <calculate field="fromLocationTotalAvailableToPromise.${locationSeqId}"><number value="0"/></calculate> + <calculate field="fromLocationTotalAvailableToPromise[locationSeqId]"><number value="0"/></calculate> <else> <set from-field="targetLocationMoveQuantity" field="moveInfo.totalQuantity"/> - <calculate field="fromLocationTotalAvailableToPromise.${locationSeqId}"> + <calculate field="fromLocationTotalAvailableToPromise[locationSeqId]"> <calcop field="totalAvailableToPromise" operator="subtract"><calcop field="targetLocationMoveQuantity" operator="get"/></calcop> </calculate> <calculate field="targetLocationMoveQuantity"><number value="0"/></calculate> @@ -443,7 +443,7 @@ <clear-field field="oiirailByInvItemMap"/> <log level="info" message="In processOisgirMoveByStatusInline orderItemShipGrpInvResAndItemLocationList=${orderItemShipGrpInvResAndItemLocationList}"/> <iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList"> - <field-to-list field="orderItemShipGrpInvResAndItemLocation" list="oiirailByInvItemMap.${orderItemShipGrpInvResAndItemLocation.inventoryItemId}"/> + <field-to-list field="orderItemShipGrpInvResAndItemLocation" list="oiirailByInvItemMap[orderItemShipGrpInvResAndItemLocation.inventoryItemId]"/> </iterate> <iterate-map key="inventoryItemId" value="orderItemShipGrpInvResAndItemLocationList" map="oiirailByInvItemMap"> Modified: ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=826786&r1=826785&r2=826786&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original) +++ ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Mon Oct 19 19:41:26 2009 @@ -453,27 +453,27 @@ <iterate entry="orderItemShipGrpInvRes" list="perItemResList"> <set from-field="orderItemShipGrpInvRes.inventoryItemId" field="inventoryItemId"/> <!-- update reserved quantity per inventoryItem, keep track of orderItems this came from --> - <set from-field="inventoryItems.${inventoryItemId}" field="inventoryItem"/> + <set from-field="inventoryItems[inventoryItemId]" field="inventoryItem"/> <if-empty field="inventoryItem"> <entity-one entity-name="InventoryItem" value-field="inventoryItem"></entity-one> - <set field="inventoryItems.${inventoryItemId}" from-field="inventoryItem"/> + <set field="inventoryItems[inventoryItemId]" from-field="inventoryItem"/> </if-empty> <if-compare-field field="inventoryItem.facilityId" to-field="parameters.facilityId" operator="equals"> <set field="perItemResListValid[]" from-field="orderItemShipGrpInvRes"/> - <set field="inventoryItemOrderItemList" from-field="inventoryItemOrderItems.${inventoryItemId}"/> + <set field="inventoryItemOrderItemList" from-field="inventoryItemOrderItems[inventoryItemId]"/> <set field="inventoryItemOrderItemList[]" from-field="orderItemAndShipGroupAssoc"/> - <set field="inventoryItemOrderItems.${orderItemShipGrpInvRes.inventoryItemId}" from-field="inventoryItemOrderItemList"/> + <set field="inventoryItemOrderItems[orderItemShipGrpInvRes.inventoryItemId]" from-field="inventoryItemOrderItemList"/> <clear-field field="inventoryItemOrderItemList"/> - <if-not-empty field="inventoryItemQuantities.${inventoryItemId}"> - <calculate field="inventoryItemQuantities.${inventoryItemId}"> - <calcop field="inventoryItemQuantities.${inventoryItemId}" operator="add"> + <if-not-empty field="inventoryItemQuantities[inventoryItemId]"> + <calculate field="inventoryItemQuantities[inventoryItemId]"> + <calcop field="inventoryItemQuantities[inventoryItemId]" operator="add"> <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/> </calcop> </calculate> <else> - <set from-field="orderItemShipGrpInvRes.quantity" field="inventoryItemQuantities.${inventoryItemId}"/> + <set from-field="orderItemShipGrpInvRes.quantity" field="inventoryItemQuantities[inventoryItemId]"/> </else> </if-not-empty> </if-compare-field> @@ -536,7 +536,7 @@ <!-- warn if insufficient QOH for reserved amount --> <iterate-map map="inventoryItemQuantities" key="inventoryItemId" value="quantityNeeded"> - <set from-field="inventoryItems.${inventoryItemId}" field="inventoryItem"/> + <set from-field="inventoryItems[inventoryItemId]" field="inventoryItem"/> <if> <condition> <and> @@ -949,7 +949,7 @@ <!-- Assemble the information per facility location for the pick sheet --> <iterate entry="picklistBinInfo" list="picklistInfo.picklistBinInfoList"> - <set from-field="picklistBinInfo.picklistBin" field="picklistBinByIdMap.${picklistBinInfo.picklistBin.picklistBinId}"/> + <set from-field="picklistBinInfo.picklistBin" field="picklistBinByIdMap[picklistBinInfo.picklistBin.picklistBinId]"/> <iterate entry="picklistItemInfo" list="picklistBinInfo.picklistItemInfoList"> <!-- @@ -964,12 +964,12 @@ --> <if-not-empty field="picklistItemInfo.inventoryItemAndLocation.locationSeqId"> <make-value value-field="facilityLocation" entity-name="FacilityLocation" map="picklistItemInfo.inventoryItemAndLocation"/> - <set from-field="facilityLocation" field="facilityLocationByLocationSeqIdMap.${facilityLocation.locationSeqId}"/> + <set from-field="facilityLocation" field="facilityLocationByLocationSeqIdMap[facilityLocation.locationSeqId]"/> <clear-field field="picklistItemInfoTempList"/> - <set field="picklistItemInfoTempList" from-field="picklistItemInfoListByLocationSeqIdMap.${facilityLocation.locationSeqId}"/> + <set field="picklistItemInfoTempList" from-field="picklistItemInfoListByLocationSeqIdMap[facilityLocation.locationSeqId]"/> <set field="picklistItemInfoTempList[]" from-field="picklistItemInfo"/> - <set field="picklistItemInfoListByLocationSeqIdMap.${facilityLocation.locationSeqId}" from-field="picklistItemInfoTempList"/> + <set field="picklistItemInfoListByLocationSeqIdMap[facilityLocation.locationSeqId]" from-field="picklistItemInfoTempList"/> <else> <!-- handle case where an InventoryItem is not associated with a location --> <if-not-empty field="picklistItemInfo.orderItem.productId"> @@ -978,7 +978,7 @@ <entity-one entity-name="Product" value-field="productValueTemp" use-cache="true"> <field-map field-name="productId"/> </entity-one> - <set field="productByProductIdMap.${productId}" from-field="productValueTemp"/> + <set field="productByProductIdMap[productId]" from-field="productValueTemp"/> <!-- <call-bsh><![CDATA[ @@ -987,9 +987,9 @@ --> <clear-field field="picklistItemInfoTempList"/> - <set field="picklistItemInfoTempList" from-field="picklistItemInfoListByProductIdMap.${productId}"/> + <set field="picklistItemInfoTempList" from-field="picklistItemInfoListByProductIdMap[productId]"/> <set field="picklistItemInfoTempList[]" from-field="picklistItemInfo"/> - <set field="picklistItemInfoListByProductIdMap.${productId}" from-field="picklistItemInfoTempList"/> + <set field="picklistItemInfoListByProductIdMap[productId]" from-field="picklistItemInfoTempList"/> <!-- <call-bsh><![CDATA[ @@ -1022,7 +1022,7 @@ <iterate entry="facilityLocation" list="facilityLocationList"> <clear-field field="facilityLocationInfo"/> <set from-field="facilityLocation" field="facilityLocationInfo.facilityLocation"/> - <set from-field="picklistItemInfoListByLocationSeqIdMap.${facilityLocation.locationSeqId}" field="facilityLocationInfo.picklistItemInfoList"/> + <set from-field="picklistItemInfoListByLocationSeqIdMap[facilityLocation.locationSeqId]" field="facilityLocationInfo.picklistItemInfoList"/> <!-- make the pickQuantity and quantityByPicklistBinIdMap --> <iterate entry="picklistItemInfo" list="facilityLocationInfo.picklistItemInfoList"> @@ -1032,8 +1032,8 @@ </calcop> </calculate> - <calculate field="facilityLocationInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}"> - <calcop field="facilityLocationInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" operator="add"> + <calculate field="facilityLocationInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]"> + <calcop field="facilityLocationInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]" operator="add"> <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/> </calcop> </calculate> @@ -1054,7 +1054,7 @@ <!-- create the picklistBinInfoList from the quantityByPicklistBinIdMap --> <iterate-map key="picklistBinId" value="quantity" map="facilityLocationInfo.quantityByPicklistBinIdMap"> <clear-field field="picklistBinInfo"/> - <set from-field="picklistBinByIdMap.${picklistBinId}" field="picklistBinInfo.picklistBin"/> + <set from-field="picklistBinByIdMap[picklistBinId]" field="picklistBinInfo.picklistBin"/> <set from-field="quantity" field="picklistBinInfo.quantity"/> <set from-field="picklistBinInfo" field="facilityLocationInfo.picklistBinInfoList[]"/> </iterate-map> @@ -1075,7 +1075,7 @@ <iterate entry="product" list="productList"> <clear-field field="productInfo"/> <set from-field="product" field="productInfo.product"/> - <set from-field="picklistItemInfoListByProductIdMap.${product.productId}" field="productInfo.picklistItemInfoList"/> + <set from-field="picklistItemInfoListByProductIdMap[product.productId]" field="productInfo.picklistItemInfoList"/> <!-- make the pickQuantity and quantityByPicklistBinIdMap --> <iterate entry="picklistItemInfo" list="productInfo.picklistItemInfoList"> @@ -1084,8 +1084,8 @@ <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/> </calculate> - <calculate field="productInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}"> - <calcop field="productInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" operator="add"> + <calculate field="productInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]"> + <calcop field="productInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]" operator="add"> <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/> </calcop> </calculate> @@ -1094,7 +1094,7 @@ <!-- create the picklistBinInfoList from the quantityByPicklistBinIdMap --> <iterate-map key="picklistBinId" value="quantity" map="productInfo.quantityByPicklistBinIdMap"> <clear-field field="picklistBinInfo"/> - <set from-field="picklistBinByIdMap.${picklistBinId}" field="picklistBinInfo.picklistBin"/> + <set from-field="picklistBinByIdMap[picklistBinId]" field="picklistBinInfo.picklistBin"/> <set from-field="quantity" field="picklistBinInfo.quantity"/> <set from-field="picklistBinInfo" field="productInfo.picklistBinInfoList[]"/> </iterate-map> @@ -1239,18 +1239,18 @@ <!-- go through all quantities and get inventoryItem and facilityLocation --> <iterate-map key="inventoryItemId" value="quantityNeeded" map="inventoryItemQuantities"> - <set from-field="inventoryItems.${inventoryItemId}" field="inventoryItem"/> + <set from-field="inventoryItems[inventoryItemId]" field="inventoryItem"/> <!-- create a list of locations, then sort it, will have to create a reverse Map to go from location to inventory item --> <clear-field field="facilityLocation"/> <get-related-one value-field="inventoryItem" relation-name="FacilityLocation" to-value-field="facilityLocation"/> <if-not-empty field="facilityLocation"> - <set from-field="facilityLocation" field="facilityLocationMap.${facilityLocation.locationSeqId}"/> + <set from-field="facilityLocation" field="facilityLocationMap[facilityLocation.locationSeqId]"/> <!-- support multiple invnetoryItemIds per facilityLocation.locationSeqId --> <clear-field field="inventoryItemIdList"/> - <set from-field="inventoryItemsByLocation.${facilityLocation.locationSeqId}" field="inventoryItemIdList"/> + <set from-field="inventoryItemsByLocation[facilityLocation.locationSeqId]" field="inventoryItemIdList"/> <set from-field="inventoryItemId" field="inventoryItemIdList[]"/> - <set from-field="inventoryItemIdList" field="inventoryItemsByLocation.${facilityLocation.locationSeqId}"/> + <set from-field="inventoryItemIdList" field="inventoryItemsByLocation[facilityLocation.locationSeqId]"/> <else> <set from-field="inventoryItemId" field="noLocationInventoryItemIds[]"/> </else> @@ -1277,13 +1277,13 @@ <set from-field="facilityLocation" field="facilityLocationInfo.facilityLocation"/> <!-- inventoryItemInfoList: facilityLocation, inventoryItem, orderItems, quantity, product, statusItems --> - <set from-field="inventoryItemsByLocation.${facilityLocation.locationSeqId}" field="inventoryItemIdList"/> + <set from-field="inventoryItemsByLocation[facilityLocation.locationSeqId]" field="inventoryItemIdList"/> <iterate entry="inventoryItemId" list="inventoryItemIdList"> <clear-field field="inventoryItemInfo"/> <set from-field="facilityLocation" field="inventoryItemInfo.facilityLocation"/> - <set from-field="inventoryItems.${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/> - <set from-field="inventoryItemOrderItems.${inventoryItemId}" field="inventoryItemInfo.orderItems"/> - <set from-field="inventoryItemQuantities.${inventoryItemId}" field="inventoryItemInfo.quantity"/> + <set from-field="inventoryItems[inventoryItemId]" field="inventoryItemInfo.inventoryItem"/> + <set from-field="inventoryItemOrderItems[inventoryItemId]" field="inventoryItemInfo.orderItems"/> + <set from-field="inventoryItemQuantities[inventoryItemId]" field="inventoryItemInfo.quantity"/> <get-related-one value-field="inventoryItemInfo.inventoryItem" relation-name="Product" to-value-field="inventoryItemInfo.product"/> <get-related-one value-field="inventoryItemInfo.inventoryItem" relation-name="StatusItem" to-value-field="inventoryItemInfo.statusItem"/> @@ -1319,8 +1319,8 @@ <!-- add all noLocationInventoryItemIds to inventoryItemInfoList with all entries except facilityLocation --> <iterate entry="inventoryItemId" list="noLocationInventoryItemIds"> <set from-field="inventoryItems${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/> - <set from-field="inventoryItemOrderItems.${inventoryItemId}" field="inventoryItemInfo.orderItems"/> - <set from-field="inventoryItemQuantities.${inventoryItemId}" field="inventoryItemInfo.quantity"/> + <set from-field="inventoryItemOrderItems[inventoryItemId]" field="inventoryItemInfo.orderItems"/> + <set from-field="inventoryItemQuantities[inventoryItemId]" field="inventoryItemInfo.quantity"/> <get-related-one value-field="inventoryItemInfo.inventoryItem" relation-name="Product" to-value-field="inventoryItemInfo.product"/> <get-related-one value-field="inventoryItemInfo.inventoryItem" relation-name="StatusItem" to-value-field="inventoryItemInfo.statusItem"/> Modified: ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=826786&r1=826785&r2=826786&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/branches/release09.04/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Mon Oct 19 19:41:26 2009 @@ -706,7 +706,7 @@ </entity-and> <iterate entry="supplierAgentOrderRole" list="supplierAgentOrderRoles"> - <set from-field="supplierAgentOrderRole.partyId" field="sendToPartyIdMap.${supplierAgentOrderRole.partyId}"/> + <set from-field="supplierAgentOrderRole.partyId" field="sendToPartyIdMap[supplierAgentOrderRole.partyId]"/> </iterate> <!-- go through all send to parties and get email addresses --> @@ -1435,7 +1435,7 @@ <!-- group orderItems (actually OrderItemAndShipGroupAssocs) by shipGroupSeqId in a Map with List values This Map is actually used only for sales orders' shipments right now. --> <iterate list="orderItemAndShipGroupAssocList" entry="orderItemAndShipGroupAssoc"> - <field-to-list field="orderItemAndShipGroupAssoc" list="orderItemListByShGrpMap.${orderItemAndShipGroupAssoc.shipGroupSeqId}"/> + <field-to-list field="orderItemAndShipGroupAssoc" list="orderItemListByShGrpMap[orderItemAndShipGroupAssoc.shipGroupSeqId]"/> </iterate> </simple-method> @@ -1450,7 +1450,7 @@ <field-map field-name="statusId" value="ITEM_APPROVED"/> </entity-and> - <set from-field="orderItemListByShGrpMap.${orderItemShipGroup.shipGroupSeqId}" field="perShipGroupItemList"/> + <set from-field="orderItemListByShGrpMap[orderItemShipGroup.shipGroupSeqId]" field="perShipGroupItemList"/> <!-- make sure we have something to ship --> <if-empty field="perShipGroupItemList"> Modified: ofbiz/branches/release09.04/framework/common/script/org/ofbiz/common/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=826786&r1=826785&r2=826786&view=diff ============================================================================== --- ofbiz/branches/release09.04/framework/common/script/org/ofbiz/common/CommonServices.xml (original) +++ ofbiz/branches/release09.04/framework/common/script/org/ofbiz/common/CommonServices.xml Mon Oct 19 19:41:26 2009 @@ -218,7 +218,7 @@ <property-to-field field="warningMsg" property="CommonVisualThemeInvalidRecord" resource="CommonUiLabels"/> <log level="warning" message="${warningMsg}"/> <else> - <set field="themeResources.${resourceTypeEnumId}[]" from-field="resourceValue"/> + <set field="themeResources[resourceTypeEnumId][]" from-field="resourceValue"/> </else> </if-empty> </iterate> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |