svn commit: r739732 [2/3] - in /ofbiz/trunk: applications/content/widget/ applications/content/widget/cm
Locked
svn commit: r739732 [2/3] - in /ofbiz/trunk: applications/content/widget/ applications/content/widget/cm
 
|
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Sun Feb 1 10:27:43 2009 @@ -29,7 +29,7 @@ <set field="labelTitleProperty" value="ProductProduct"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> @@ -109,7 +109,7 @@ <set field="labelTitleProperty" value="ProductPrices"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="ProductPrice" list-name="productPrices"> <field-map field-name="productId"/> <order-by field-name="productStoreGroupId"/> @@ -166,7 +166,7 @@ <set field="labelTitleProperty" value="ProductAgreements"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-condition entity-name="SupplierProduct" list-name="supplierProductAgreements"> <condition-list> <condition-expr field-name="productId" env-name="productId"/> @@ -243,7 +243,7 @@ <set field="labelTitleProperty" value="ProductCategoryMembers"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-condition entity-name="ProductCategoryMember" list-name="productCategoryMembers"> <condition-expr field-name="productId" env-name="productId"/> @@ -297,7 +297,7 @@ <set field="labelTitleProperty" value="ProductConfigs"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="ProductConfig" list-name="productConfigs"> <field-map field-name="productId"/> <order-by field-name="sequenceNum"/> @@ -348,7 +348,7 @@ <set field="labelTitleProperty" value="ProductAssetUsage"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-condition entity-name="FixedAssetProduct" list-name="fixedAssetProducts"> <condition-expr field-name="productId" env-name="productId"/> </entity-condition> @@ -401,7 +401,7 @@ <set field="labelTitleProperty" value="ProductAssetUsage"/> <set field="extraFunctionName" value="uiLabelMap.AccountingFixedAssetProductUpd"/> - <entity-one entity-name="FixedAssetProduct" value-name="fixedAssetProduct"/> + <entity-one entity-name="FixedAssetProduct" value-field="fixedAssetProduct"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> @@ -471,7 +471,7 @@ <set field="productAssocTypeId" value="MANUF_COMPONENT"/> <set field="workEffortGoodStdTypeId" value="ROU_PROD_TEMPLATE"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="ProductAssoc" list-name="components"> <field-map field-name="productId"/> <field-map field-name="productAssocTypeId"/> @@ -551,8 +551,8 @@ <!-- default currency in framework/common/config/general.properties --> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" /> - <entity-one entity-name="Product" value-name="product"/> - <entity-one entity-name="CostComponent" value-name="costComponent" auto-field-map="false"> + <entity-one entity-name="Product" value-field="product"/> + <entity-one entity-name="CostComponent" value-field="costComponent" auto-field-map="false"> <field-map field-name="costComponentId" env-name="productCostComponentId"/> </entity-one> <!--<entity-and entity-name="CostComponent" list-name="costs" filter-by-date="true">--> @@ -620,7 +620,7 @@ <set field="labelTitleProperty" value="ProductQuickAddVariants"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <script location="component://product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.groovy"/> </actions> @@ -656,7 +656,7 @@ <set field="labelTitleProperty" value="ProductQuickAdmin"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy"/> </actions> @@ -684,7 +684,7 @@ <set field="labelTitleProperty" value="ProductFacilities"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-condition entity-name="ProductFacility" list-name="productFacilities"> <condition-expr field-name="productId" env-name="productId"/> @@ -738,7 +738,7 @@ <set field="labelTitleProperty" value="ProductFacilityLocations"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-condition entity-name="ProductFacilityLocation" list-name="productFacilityLocations"> <condition-expr field-name="productId" env-name="productId"/> @@ -792,7 +792,7 @@ <set field="tabButtonItem" value="EditProductKeyword"/> <set field="labelTitleProperty" value="ProductKeywords"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <set field="orderByList[]" value="-relevancyWeight"/> <set field="orderByList[]" value="keyword"/> <get-related value-name="product" relation-name="ProductKeyword" list-name="productKeywords" order-by-list-name="orderByList"/> @@ -846,7 +846,7 @@ <set field="labelTitleProperty" value="ProductInventorySummary"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.groovy"/> </actions> <widgets> @@ -897,7 +897,7 @@ <set field="labelTitleProperty" value="ProductGoodIdentification"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-condition entity-name="GoodIdentification" list-name="goodIdentifications"> <condition-expr field-name="productId" env-name="productId"/> <order-by field-name="goodIdentificationTypeId"/> @@ -951,7 +951,7 @@ <set field="labelTitleProperty" value="ProductGlAccounts"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-condition entity-name="ProductGlAccount" list-name="productGlAccounts"> <condition-expr field-name="productId" env-name="productId"/> @@ -1021,7 +1021,7 @@ <set field="labelTitleProperty" value="ProductPaymentTypes"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-condition entity-name="ProductPaymentMethodType" list-name="productPaymentMethodTypes"> <condition-expr field-name="productId" env-name="productId"/> @@ -1075,7 +1075,7 @@ <set field="labelTitleProperty" value="ProductFeatures"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductFeatures.groovy"/> <entity-and entity-name="ProductFeatureIactn" list-name="featureInteractions"> <field-map field-name="productId" env-name="parameters.productId"/> @@ -1160,12 +1160,12 @@ <set field="minimumOrderQuantity" from-field="parameters.minimumOrderQuantity" type="BigDecimal"/> <set field="orderBy" from-field="parameters.orderBy" default-value="partyId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="SupplierProduct" list-name="productSuppliers"> <field-map field-name="productId"/> <order-by field-name="${orderBy}"/> </entity-and> - <entity-one entity-name="SupplierProduct" value-name="supplierProduct" auto-field-map="true"/> + <entity-one entity-name="SupplierProduct" value-field="supplierProduct" auto-field-map="true"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> @@ -1215,7 +1215,7 @@ <set field="labelTitleProperty" value="ProductContent"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy"/> </actions> <widgets> @@ -1292,8 +1292,8 @@ <set field="labelTitleProperty" value="ProductContent"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> - <entity-one entity-name="ProductContent" value-name="productContent"/> + <entity-one entity-name="Product" value-field="product"/> + <entity-one entity-name="ProductContent" value-field="productContent"/> <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy"/> </actions> <widgets> @@ -1354,7 +1354,7 @@ <set field="labelTitleProperty" value="ProductAttributes"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="ProductAttribute" list-name="productAttributes"> <field-map field-name="productId"/> <order-by field-name="attrType"/> @@ -1405,7 +1405,7 @@ <set field="labelTitleProperty" value="ProductAssociations"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.groovy"/> </actions> <widgets> @@ -1434,7 +1434,7 @@ <set field="labelTitleProperty" value="EditProductAssoc"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="ProductAssoc" list-name="productAssocs"> <field-map field-name="productId"/> <order-by field-name="productAssocTypeId"/> @@ -1463,7 +1463,7 @@ <set field="tabButtonItem" value="EditProductFeatures"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> @@ -1737,7 +1737,7 @@ <set field="labelTitleProperty" value="PartyParties"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <entity-condition entity-name="ProductRole" list-name="productRoles"> <condition-expr field-name="productId" env-name="productId"/> Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Sun Feb 1 10:27:43 2009 @@ -128,7 +128,7 @@ <set field="labelTitleProperty" value="ProductPromotion"/> <set field="productPromoId" from-field="parameters.productPromoId"/> - <entity-one entity-name="ProductPromo" value-name="productPromo" auto-field-map="true"/> + <entity-one entity-name="ProductPromo" value-field="productPromo" auto-field-map="true"/> </actions> <widgets> <decorator-screen name="CommonPromoDecorator"> @@ -161,7 +161,7 @@ <set field="labelTitleProperty" value="ProductRules"/> <set field="productPromoId" from-field="parameters.productPromoId"/> - <entity-one entity-name="ProductPromo" value-name="productPromo" auto-field-map="true"/> + <entity-one entity-name="ProductPromo" value-field="productPromo" auto-field-map="true"/> <!-- Data Related to the Promo --> <entity-condition entity-name="ProductPromoRule" list-name="productPromoRules"> @@ -231,7 +231,7 @@ <set field="labelTitleProperty" value="ProductStores"/> <set field="productPromoId" from-field="parameters.productPromoId"/> - <entity-one entity-name="ProductPromo" value-name="productPromo" auto-field-map="true"/> + <entity-one entity-name="ProductPromo" value-field="productPromo" auto-field-map="true"/> <entity-condition entity-name="ProductStorePromoAppl" list-name="productStorePromoAppls"> <condition-expr field-name="productPromoId" env-name="productPromoId"/> <order-by field-name="sequenceNum"/> @@ -262,7 +262,7 @@ <set field="labelTitleProperty" value="ProductPromotionCode"/> <set field="productPromoId" from-field="parameters.productPromoId"/> - <entity-one entity-name="ProductPromo" value-name="productPromo" auto-field-map="true"/> + <entity-one entity-name="ProductPromo" value-field="productPromo" auto-field-map="true"/> <set field="manualOnly" from-field="parameters.manualOnly" default-value="Y"/> <entity-condition entity-name="ProductPromoCode" list-name="productPromoCodes"> Modified: ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml Sun Feb 1 10:27:43 2009 @@ -36,7 +36,7 @@ <entity-condition entity-name="QuantityBreak" list-name="quantityBreaks"> <order-by field-name="quantityBreakId"/> </entity-condition> - <entity-one entity-name="QuantityBreak" value-name="quantityBreak" auto-field-map="true"/> + <entity-one entity-name="QuantityBreak" value-field="quantityBreak" auto-field-map="true"/> </actions> <widgets> <decorator-screen name="CommonShippingDecorator" location="${parameters.mainDecoratorLocation}"> @@ -89,7 +89,7 @@ <order-by field-name="sequenceNum"/> <order-by field-name="description"/> </entity-condition> - <entity-one entity-name="ShipmentMethodType" value-name="shipmentMethodType" auto-field-map="true"/> + <entity-one entity-name="ShipmentMethodType" value-field="shipmentMethodType" auto-field-map="true"/> </actions> <widgets> <decorator-screen name="CommonShippingDecorator" location="${parameters.mainDecoratorLocation}"> @@ -142,7 +142,7 @@ <entity-condition entity-name="CarrierShipmentMethod" list-name="carrierShipmentMethods"> <order-by field-name="sequenceNumber"/> </entity-condition> - <entity-one entity-name="CarrierShipmentMethod" value-name="carrierShipmentMethod" auto-field-map="true"/> + <entity-one entity-name="CarrierShipmentMethod" value-field="carrierShipmentMethod" auto-field-map="true"/> </actions> <widgets> <decorator-screen name="CommonShippingDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Sun Feb 1 10:27:43 2009 @@ -65,7 +65,7 @@ <set field="labelTitleProperty" value="ProductStore"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> <widgets> @@ -99,7 +99,7 @@ <set field="labelTitleProperty" value="ProductProductStoreRoles"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <script location="component://product/webapp/catalog/WEB-INF/actions/store/EditProductStoreRoles.groovy"/> </actions> @@ -123,7 +123,7 @@ <set field="labelTitleProperty" value="ProductPromotions"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <set field="userEntered" from-field="parameters.userEntered"/> <set field="activeOnly" from-field="parameters.activeOnly" default-value="true"/> @@ -193,7 +193,7 @@ <set field="labelTitleProperty" value="ProductCatalogs"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <entity-condition entity-name="ProductStoreCatalog" list-name="productStoreCatalogs"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> @@ -247,7 +247,7 @@ <set field="productStoreId" from-field="parameters.viewProductStoreId"/> <set field="productStoreId" from-field="parameters.productStoreId" default-value="${productStoreId}"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <entity-condition entity-name="WebSite" list-name="storeWebSites"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> @@ -277,12 +277,12 @@ <set field="labelTitleProperty" value="ProductProductStoreShipmentSettings"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <entity-condition entity-name="ProductStoreShipmentMethView" list-name="storeShipMethods"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> <order-by field-name="sequenceNumber"/> </entity-condition> - <entity-one entity-name="ProductStoreShipmentMeth" value-name="productStoreShipmentMeth" auto-field-map="true"/> + <entity-one entity-name="ProductStoreShipmentMeth" value-field="productStoreShipmentMeth" auto-field-map="true"/> <entity-condition entity-name="CarrierShipmentMethod" list-name="carrierShipmentMethods"> <order-by field-name="sequenceNumber"/> </entity-condition> @@ -356,14 +356,14 @@ <set field="labelTitleProperty" value="ProductProductStoreShipmentSettings"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <entity-condition entity-name="ShipmentCostEstimate" list-name="estimates"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> <order-by field-name="geoIdFrom"/> <order-by field-name="shipmentMethodTypeId"/> <order-by field-name="geoIdTo"/> </entity-condition> - <entity-one entity-name="ShipmentCostEstimate" value-name="estimate" auto-field-map="true"/> + <entity-one entity-name="ShipmentCostEstimate" value-field="estimate" auto-field-map="true"/> </actions> <widgets> <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> @@ -426,10 +426,10 @@ <set field="labelTitleProperty" value="ProductProductStorePaymentSettings"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <set field="paymentMethodTypeId" from-field="parameters.paymentMethodTypeId"/> <set field="paymentServiceTypeEnumId" from-field="parameters.paymentServiceTypeEnumId"/> - <entity-one entity-name="ProductStorePaymentSetting" value-name="productStorePaymentSetting" auto-field-map="true"/> + <entity-one entity-name="ProductStorePaymentSetting" value-field="productStorePaymentSetting" auto-field-map="true"/> </actions> <widgets> @@ -488,7 +488,7 @@ <set field="labelTitleProperty" value="ProductProductStoreEmailSettings"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <entity-condition entity-name="ProductStoreEmailSetting" list-name="productStoreEmailSettings"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> @@ -540,7 +540,7 @@ <set field="labelTitleProperty" value="ProductStoreSurveySettings"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <script location="component://product/webapp/catalog/WEB-INF/actions/store/EditProductStoreSurveys.groovy"/> </actions> @@ -564,7 +564,7 @@ <set field="labelTitleProperty" value="ProductStoreKeywordOverrides"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> <entity-condition entity-name="ProductStoreKeywordOvrd" list-name="productStorekeywordOvrdList"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> @@ -616,7 +616,7 @@ <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore"> + <entity-one entity-name="ProductStore" value-field="productStore"> <field-map field-name="productStoreId"/> </entity-one> </actions> @@ -655,9 +655,9 @@ <set field="labelTitleProperty" value="ProductStoreFinAccountSettings"/> <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/> + <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <entity-one entity-name="ProductStoreFinActSetting" value-name="finAccountSetting"/> + <entity-one entity-name="ProductStoreFinActSetting" value-field="finAccountSetting"/> <entity-condition entity-name="ProductStoreFinActSetting" list-name="productStoreFinActSettings"> <condition-expr field-name="productStoreId" env-name="productStoreId"/> </entity-condition> Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Sun Feb 1 10:27:43 2009 @@ -67,7 +67,7 @@ <actions> <set field="headerItem" value="Subscription"/> <set field="subscriptionId" from-field="parameters.subscriptionId"/> - <entity-one entity-name="Subscription" value-name="subscription"/> + <entity-one entity-name="Subscription" value-field="subscription"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -109,7 +109,7 @@ <set field="titleProperty" value="PageTitleEditSubscription"/> <set field="tabButtonItem" value="EditSubscription"/> <set field="subscriptionId" from-field="parameters.subscriptionId"/> - <entity-one entity-name="Subscription" value-name="subscription"/> + <entity-one entity-name="Subscription" value-field="subscription"/> </actions> <widgets> <section> @@ -189,7 +189,7 @@ <actions> <set field="headerItem" value="Subscription"/> <set field="subscriptionResourceId" from-field="parameters.subscriptionResourceId"/> - <entity-one entity-name="SubscriptionResource" value-name="subscriptionResource"/> + <entity-one entity-name="SubscriptionResource" value-field="subscriptionResource"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -234,7 +234,7 @@ <set field="titleProperty" value="PageTitleEditSubscriptionResource"/> <set field="tabButtonItem" value="EditSubscriptionResource"/> <set field="subscriptionResourceId" from-field="parameters.subscriptionResourceId"/> - <entity-one entity-name="SubscriptionResource" value-name="subscriptionResource"/> + <entity-one entity-name="SubscriptionResource" value-field="subscriptionResource"/> </actions> <widgets> <section> Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Sun Feb 1 10:27:43 2009 @@ -53,7 +53,7 @@ <actions> <set field="headerItem" value="facility"/> <set field="facilityId" from-field="parameters.facilityId"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -114,7 +114,7 @@ <section> <actions> <set field="inventoryItemLabelId" from-field="parameters.inventoryItemLabelId"/> - <entity-one entity-name="InventoryItemLabel" value-name="inventoryItemLabel"/> + <entity-one entity-name="InventoryItemLabel" value-field="inventoryItemLabel"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml Sun Feb 1 10:27:43 2009 @@ -57,7 +57,7 @@ <section> <actions> <set field="facilityGroupId" from-field="parameters.facilityGroupId"/> - <entity-one entity-name="FacilityGroup" value-name="facilityGroup"/> + <entity-one entity-name="FacilityGroup" value-field="facilityGroup"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -88,7 +88,7 @@ <set field="titleProperty" value="PageTitleEditFacilityGroup"/> <set field="headerItem" value="facilityGroup"/> <set field="tabButtonItem" value="EditFacilityGroup"/> - <entity-one entity-name="FacilityGroup" value-name="facilityGroup"/> + <entity-one entity-name="FacilityGroup" value-field="facilityGroup"/> </actions> <widgets> <decorator-screen name="CommonFacilityGroupDecorator"> @@ -121,7 +121,7 @@ <set field="titleProperty" value="PageTitleEditFacilityGroupMembers"/> <set field="headerItem" value="facilityGroup"/> <set field="tabButtonItem" value="EditFacilityGroupMembers"/> - <entity-one entity-name="FacilityGroup" value-name="facilityGroup"/> + <entity-one entity-name="FacilityGroup" value-field="facilityGroup"/> <set field="orderByList[]" value="sequenceNum"/> <get-related value-name="facilityGroup" relation-name="FacilityGroupMember" list-name="facilityGroupMembers" order-by-list-name="orderByList"/> </actions> @@ -147,7 +147,7 @@ <set field="titleProperty" value="PageTitleEditFacilityGroupRoles"/> <set field="headerItem" value="facilityGroup"/> <set field="tabButtonItem" value="EditFacilityGroupRoles"/> - <entity-one entity-name="FacilityGroup" value-name="facilityGroup"/> + <entity-one entity-name="FacilityGroup" value-field="facilityGroup"/> <get-related value-name="facilityGroup" relation-name="FacilityGroupRole" list-name="facilityRoles"/> </actions> <widgets> @@ -172,7 +172,7 @@ <set field="tabButtonItem" value="EditFacilityGroupRollup"/> <set field="parameters.facilityGroupId" from-field="parameters.showFacilityGroupId" default-value="${parameters.facilityGroupId}"/> - <entity-one entity-name="FacilityGroup" value-name="facilityGroup"/> + <entity-one entity-name="FacilityGroup" value-field="facilityGroup"/> <get-related relation-name="ParentFacilityGroupRollup" value-name="facilityGroup" list-name="parentGroupRollups"/> <get-related relation-name="CurrentFacilityGroupRollup" value-name="facilityGroup" list-name="currentGroupRollups"/> <set field="facilityGroupId" from-field="facilityGroup.facilityGroupId"/> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sun Feb 1 10:27:43 2009 @@ -193,7 +193,7 @@ <set field="titleProperty" value="PageTitleFindFacilityTransfers"/> <set field="tabButtonItem" value="FindFacilityTransfers"/> <set field="facilityId" from-field="parameters.facilityId"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <script location="component://product/webapp/facility/WEB-INF/actions/facility/FindFacilityTransfers.groovy"/> </actions> <widgets> @@ -253,7 +253,7 @@ <actions> <set field="tabButtonItem" value="FindFacilityLocation"/> <script location="component://product/webapp/facility/WEB-INF/actions/facility/FindFacilityLocation.groovy"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleFindFacilityLocation}"/> </actions> @@ -274,7 +274,7 @@ <actions> <set field="tabButtonItem" value="FindFacilityLocation"/> <script location="component://product/webapp/facility/WEB-INF/actions/facility/EditFacilityLocation.groovy"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleNewFacilityLocation}"/> </actions> @@ -304,7 +304,7 @@ <actions> <set field="tabButtonItem" value="EditFacilityInventoryItems"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleEditFacilityInventoryItems}"/> </actions> @@ -342,7 +342,7 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <entity-condition entity-name="InventoryItemLabelType" list-name="labelTypes"/> <script location="component://product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy"/> </actions> @@ -399,7 +399,7 @@ <set field="statusId" from-field="parameters.statusId"/> <!-- do not use the CountFacilityInventoryByProduct.groovy script unless the issues mentioned in it are correctly addressed --> <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleFindFacilityInventoryItems}"/> </actions> @@ -521,7 +521,7 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -625,7 +625,7 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> - <entity-one entity-name="Facility" value-name="facility" use-cache="true"/> + <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> <script location="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy"/> </actions> <widgets> @@ -657,7 +657,7 @@ <set field="headerItem" value="facility"/> <set field="tabButtonItem" value="ViewFacilityInventoryByProduct"/> <set field="facilityId" from-field="parameters.facilityId"/> - <entity-one entity-name="Facility" value-name="facility" use-cache="true"/> + <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> <script location="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleInventoryItemGrandTotals}"/> @@ -685,7 +685,7 @@ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10000"/> - <entity-one entity-name="Facility" value-name="facility" use-cache="true"/> + <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> <script location="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.groovy"/> </actions> <widgets> @@ -708,7 +708,7 @@ <set field="facilityId" from-field="parameters.facilityId"/> <set field="facilityGroupId" from-field="parameters.facilityGroupId"/> <set field="orderByList[]" value="sequenceNum"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <get-related value-name="facility" relation-name="FacilityGroupMember" list-name="facilityGroupMembers" order-by-list-name="orderByList"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleEditFacilityGroups}"/> @@ -740,7 +740,7 @@ <set field="partyId" from-field="parameters.partyId"/> <set field="roleTypeId" from-field="parameters.roleTypeId"/> <set field="orderByList[]" value="partyId"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <get-related value-name="facility" relation-name="FacilityParty" list-name="facilityParties" order-by-list-name="orderByList"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleEditFacilityParties}"/> @@ -770,7 +770,7 @@ <set field="tabButtonItem" value="ViewContactMechs"/> <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy"/> <set field="facilityId" from-field="parameters.facilityId"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleViewFacilityContactMechanism}"/> </actions> @@ -792,7 +792,7 @@ <set field="tabButtonItem" value="ViewContactMechs"/> <script location="component://product/webapp/facility/WEB-INF/actions/facility/EditContactMech.groovy"/> <set field="facilityId" from-field="parameters.facilityId"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleNewFacilityContactMech}"/> </actions> @@ -827,8 +827,8 @@ <set field="facilityId" from-field="parameters.facilityId"/> <set field="inventoryItemId" from-field="parameters.inventoryItemId"/> - <entity-one entity-name="Facility" value-name="facility" auto-field-map="true"/> - <entity-one entity-name="InventoryItem" value-name="inventoryItem" auto-field-map="true"/> + <entity-one entity-name="Facility" value-field="facility" auto-field-map="true"/> + <entity-one entity-name="InventoryItem" value-field="inventoryItem" auto-field-map="true"/> <entity-condition entity-name="OrderItemShipGrpInvRes" list-name="inventoryItemReservations"> <condition-list combine="and"> <condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItemId"/> @@ -849,7 +849,7 @@ <actions> <set field="parameters.facilityId" from-field="inventoryItem.facilityId"/> <set field="facilityId" from-field="inventoryItem.facilityId"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> </actions> <widgets/> </section> @@ -1043,7 +1043,7 @@ <set field="tabButtonItem" value="FindFacilityTransfers"/> <script location="component://product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy"/> <set field="facilityId" from-field="parameters.facilityId"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.PageTitleTransferInventoryItem}"/> </actions> @@ -1065,7 +1065,7 @@ <set field="tabButtonItem" value="ReceiveInventory"/> <script location="component://product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy"/> <set field="facilityId" from-field="parameters.facilityId"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.ProductReceiveInventory}"/> </actions> @@ -1295,8 +1295,8 @@ </entity-condition> <!-- get the default facility Uom --> - <entity-one entity-name="Facility" value-name="facility"/> - <entity-one entity-name="Uom" value-name="defaultWeightUom" use-cache="true" auto-field-map="false"> + <entity-one entity-name="Facility" value-field="facility"/> + <entity-one entity-name="Uom" value-field="defaultWeightUom" use-cache="true" auto-field-map="false"> <field-map env-name="facility.defaultWeightUomId" field-name="uomId"/> </entity-one> </actions> Modified: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml Sun Feb 1 10:27:43 2009 @@ -81,7 +81,7 @@ <set field="headerItem" value="inventoryItemLabel"/> <set field="tabButtonItem" value="FindInventoryItemLabels"/> <set field="subTabButtonItem" value="EditInventoryItemLabel"/> - <entity-one entity-name="InventoryItemLabel" value-name="inventoryItemLabel"/> + <entity-one entity-name="InventoryItemLabel" value-field="inventoryItemLabel"/> </actions> <widgets> <section> @@ -142,7 +142,7 @@ <set field="headerItem" value="inventoryItemLabel"/> <set field="tabButtonItem" value="FindInventoryItemLabels"/> <set field="subTabButtonItem" value="EditInventoryItemLabelAppls"/> - <entity-one entity-name="InventoryItemLabel" value-name="inventoryItemLabel"/> + <entity-one entity-name="InventoryItemLabel" value-field="inventoryItemLabel"/> <get-related value-name="inventoryItemLabel" relation-name="InventoryItemLabelAppl" list-name="inventoryItemLabelAppls"/> <get-related-one value-name="inventoryItemLabel" relation-name="InventoryItemLabelType" to-value-name="inventoryItemLabelType"/> </actions> Modified: ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml Sun Feb 1 10:27:43 2009 @@ -45,7 +45,7 @@ <set field="productId" from-field="parameters.productId"/> <script location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy"/> - <entity-one entity-name="Facility" value-name="facility" use-cache="true"/> + <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Sun Feb 1 10:27:43 2009 @@ -43,7 +43,7 @@ <section> <actions> <set field="shipmentId" from-field="parameters.shipmentId"/> - <entity-one entity-name="Shipment" value-name="shipment"/> + <entity-one entity-name="Shipment" value-field="shipment"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Sun Feb 1 10:27:43 2009 @@ -56,7 +56,7 @@ <actions> <set field="headerItem" value="workeffort"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -96,7 +96,7 @@ <actions> <set field="headerItem" value="timesheet"/> <set field="timesheetId" from-field="parameters.timesheetId"/> - <entity-one entity-name="Timesheet" value-name="timesheet"/> + <entity-one entity-name="Timesheet" value-field="timesheet"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/workeffort/widget/RequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/RequestScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/RequestScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/RequestScreens.xml Sun Feb 1 10:27:43 2009 @@ -30,7 +30,7 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/> <set field="custRequestId" from-field="parameters.custRequestId"/> - <entity-one entity-name="CustRequest" value-name="custRequest"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/request/RequestList.groovy"/> </actions> <widgets> Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml Sun Feb 1 10:27:43 2009 @@ -70,7 +70,7 @@ <iterate-section entry-name="currentTimeEntry" list-name="currentTimeEntryList"> <section> <actions> - <entity-one entity-name="RateType" value-name="currentRateType" auto-field-map="false"> + <entity-one entity-name="RateType" value-field="currentRateType" auto-field-map="false"> <field-map field-name="rateTypeId" env-name="currentTimeEntry.rateTypeId"/> </entity-one> </actions> @@ -202,7 +202,7 @@ <set field="labelTitleProperty" value="PageTitleEditTimesheet"/> <set field="timesheetId" from-field="parameters.timesheetId"/> - <entity-one entity-name="Timesheet" value-name="timesheet"/> + <entity-one entity-name="Timesheet" value-field="timesheet"/> </actions> <widgets> <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}"> @@ -301,7 +301,7 @@ <set field="labelTitleProperty" value="PageTitleEditTimesheetRoles"/> <set field="timesheetId" from-field="parameters.timesheetId"/> - <entity-one entity-name="Timesheet" value-name="timesheet"/> + <entity-one entity-name="Timesheet" value-field="timesheet"/> </actions> <widgets> <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}"> @@ -348,7 +348,7 @@ <set field="labelTitleProperty" value="PageTitleEditTimesheetEntries"/> <set field="timesheetId" from-field="parameters.timesheetId"/> - <entity-one entity-name="Timesheet" value-name="timesheet"/> + <entity-one entity-name="Timesheet" value-field="timesheet"/> </actions> <widgets> <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sun Feb 1 10:27:43 2009 @@ -1062,10 +1062,10 @@ </entity-and> </actions> <row-actions> - <entity-one entity-name="ContactMech" value-name="contactMech"/> + <entity-one entity-name="ContactMech" value-field="contactMech"/> <set field="contactMechTypeId" from-field="contactMech.contactMechTypeId"/> - <entity-one entity-name="PostalAddress" value-name="postalAddress"/> - <entity-one entity-name="TelecomNumber" value-name="telecomNumber"/> + <entity-one entity-name="PostalAddress" value-field="postalAddress"/> + <entity-one entity-name="TelecomNumber" value-field="telecomNumber"/> </row-actions> <field name="workEffortId"><hidden/></field> <field name="contactMechTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="ContactMechType"/></field> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml Sun Feb 1 10:27:43 2009 @@ -28,7 +28,7 @@ <set field="labelTitleProperty" value="PageTitleWorkEffortRelatedSummary"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> <get-related-one value-name="workEffort" relation-name="WorkEffortType" to-value-name="workEffortType"/> <get-related-one value-name="workEffort" relation-name="CurrentStatusItem" to-value-name="currentStatusItem"/> <get-related-one value-name="workEffort" relation-name="WorkEffortPurposeType" to-value-name="workEffortPurposeType"/> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Sun Feb 1 10:27:43 2009 @@ -107,7 +107,7 @@ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/> <set field="workEffortId" from-field="parameters.workEffortId"/> <set field="thisWorkEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> </actions> <widgets> <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> @@ -259,7 +259,7 @@ <section> <actions> <set field="workEffortId" from-field="workEffortIdFrom" default-value="${workEffort.workEffortId}"/> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${workEffort.workEffortId}"/> </actions> <widgets> @@ -335,8 +335,8 @@ <set field="workEffortId" from-field="parameters.workEffortIdTo" default-value="${parameters.workEffortId}"/> <set field="workEffortAssocTypeId" from-field="parameters.workEffortAssocTypeId"/> <set field="fromDate" from-field="parameters.fromDate"/> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> - <entity-one entity-name="WorkEffortAssoc" value-name="workEffortAssoc"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> + <entity-one entity-name="WorkEffortAssoc" value-field="workEffortAssoc"/> <set field="parameters.workEffortId" from-field="workEffortId"/> </actions> <widgets> @@ -369,7 +369,7 @@ <set field="tabButtonItem" value="WorkEffort"/> <set field="labelTitleProperty" value="PageTitleEditWorkEffortAssoc"/> <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/> - <entity-one entity-name="WorkEffortAssoc" value-name="workEffortAssoc"/> + <entity-one entity-name="WorkEffortAssoc" value-field="workEffortAssoc"/> <set field="donePage" value="ChildWorkEfforts?workEffortId=${workEffortIdFrom}&trail=${workEffortIdFrom}" /> </actions> <widgets> @@ -404,7 +404,7 @@ <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/> <set field="workEffortAssocTypeId" from-field="parameters.workEffortAssocTypeId"/> <set field="fromDate" from-field="parameters.fromDate"/> - <entity-one entity-name="WorkEffortAssoc" value-name="workEffortAssoc"/> + <entity-one entity-name="WorkEffortAssoc" value-field="workEffortAssoc"/> <set field="donePage" value="ChildWorkEfforts?workEffortId=${workEffortIdFrom}&trail=${workEffortIdFrom}" /> </actions> <widgets> @@ -438,7 +438,7 @@ <set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/> + <entity-one entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/> </actions> <widgets> <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> @@ -693,7 +693,7 @@ <set field="labelTitleProperty" value="PageTitleListWorkEffortNotes"/> <set field="workEffortId" from-field="parameters.workEffortId"/> <set field="noteId" from-field="parameters.noteId"/> - <entity-one entity-name="WorkEffortNoteAndData" value-name="workEffortNoteAndData"/> + <entity-one entity-name="WorkEffortNoteAndData" value-field="workEffortNoteAndData"/> </actions> <widgets> <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> @@ -895,7 +895,7 @@ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="workEffortId" from-field="parameters.workEffortId"/> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> <get-related-one value-name="workEffort" relation-name="WorkEffortType" to-value-name="workEffortType"/> <get-related-one value-name="workEffort" relation-name="CurrentStatusItem" to-value-name="currentStatusItem"/> <get-related-one value-name="workEffort" relation-name="WorkEffortPurposeType" to-value-name="workEffortPurposeType"/> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml Sun Feb 1 10:27:43 2009 @@ -23,7 +23,7 @@ <tree name="TreeWorkEffort" root-node-name="node-root" entity-name="WorkEffort" default-render-style="simple" default-wrap-style="treeWrapper"> <node name="node-root" entity-name="WorkEffort" render-style="expand-collapse"> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> <include-screen name="WorkEffortTreeLine" location="component://workeffort/widget/WorkEffortScreens.xml"/> <sub-node node-name="node-list"> <entity-condition entity-name="WorkEffortAssoc"> @@ -32,7 +32,7 @@ </sub-node> </node> <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdTo" render-style="expand-collapse"> - <entity-one entity-name="WorkEffort" value-name="workEffort"> + <entity-one entity-name="WorkEffort" value-field="workEffort"> <field-map field-name="workEffortId" env-name="workEffortAssoc.workEffortIdTo"/> </entity-one> <include-screen name="WorkEffortTreeLine" location="component://workeffort/widget/WorkEffortScreens.xml"/> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sun Feb 1 10:27:43 2009 @@ -138,7 +138,7 @@ <property-to-field resource="general" property="defaultOrganizationPartyId" field="defaultOrganizationPartyIdProperties"/> <set field="defaultOrganizationPartyId" value="${bsh:"DEFAULT".equals(userPreferences.get("ORGANIZATION_PARTY"))?defaultOrganizationPartyIdProperties:userPreferences.get("ORGANIZATION_PARTY")}" global="true"/> <property-to-field resource="general" property="currency.uom.id.default" field="defaultCurrencyUomId"/> - <entity-one entity-name="PartyAcctgPrefAndGroup" value-name="orgParty"> + <entity-one entity-name="PartyAcctgPrefAndGroup" value-field="orgParty"> <field-map field-name="partyId" env-name="defaultOrganizationPartyId"/> </entity-one> <set field="defaultOrganizationPartyCurrencyUomId" from-field="orgParty.baseCurrencyUomId" default-value="defaultCurrencyUomId" global="true"/> Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Sun Feb 1 10:27:43 2009 @@ -41,7 +41,7 @@ <section> <actions> <set field="headerItem" from-field="parameters.portalPageId"/> - <entity-one entity-name="PortalPage" value-name="portalPage"/> + <entity-one entity-name="PortalPage" value-field="portalPage"/> <set field="portalPages[]" from-field="portalPage"/> <set field="portalPageId" from-field="portalPage.portalPageId"/> <set field="parentPortalPageId" from-field="parameters.parentPortalPageId"/> @@ -102,7 +102,7 @@ <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap"/> <set field="originalPortalPageId" from-field="parameters.originalPortalPageId"/> - <entity-one entity-name="PortalPortlet" value-name="portalPortlet"/> + <entity-one entity-name="PortalPortlet" value-field="portalPortlet"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml (original) +++ ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml Sun Feb 1 10:27:43 2009 @@ -91,7 +91,7 @@ <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="exampleId" from-field="parameters.exampleId"/> - <entity-one entity-name="Example" value-name="example"/> + <entity-one entity-name="Example" value-field="example"/> </actions> <widgets> <include-form name="EditExampleBackgroundSubmit" location="component://example/widget/example/ExampleForms.xml"/> Modified: ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml (original) +++ ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml Sun Feb 1 10:27:43 2009 @@ -65,7 +65,7 @@ <set field="titleProperty" value="PageTitleEditExampleFeature"/> <set field="tabButtonItem" value="EditExampleFeature"/> <set field="exampleFeatureId" from-field="parameters.exampleFeatureId"/> - <entity-one entity-name="ExampleFeature" value-name="exampleFeature"/> + <entity-one entity-name="ExampleFeature" value-field="exampleFeature"/> </actions> <widgets> <decorator-screen name="CommonExampleFeatureDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml (original) +++ ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml Sun Feb 1 10:27:43 2009 @@ -37,7 +37,7 @@ <actions> <set field="headerItem" value="Example"/> <set field="exampleId" from-field="parameters.exampleId"/> - <entity-one entity-name="Example" value-name="example"/> + <entity-one entity-name="Example" value-field="example"/> </actions> <widgets> <decorator-screen name="main-decorator"> Modified: ofbiz/trunk/framework/exampleext/widget/example/ExampleScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/exampleext/widget/example/ExampleScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/framework/exampleext/widget/example/ExampleScreens.xml (original) +++ ofbiz/trunk/framework/exampleext/widget/example/ExampleScreens.xml Sun Feb 1 10:27:43 2009 @@ -28,7 +28,7 @@ <set field="tabButtonItem" value="EditExample"/> <set field="labelTitleProperty" value="ExampleExample"/> <set field="exampleId" from-field="parameters.exampleId"/> - <entity-one entity-name="Example" value-name="example"/> + <entity-one entity-name="Example" value-field="example"/> </actions> <widgets> <decorator-screen name="CommonExampleDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Sun Feb 1 10:27:43 2009 @@ -95,10 +95,10 @@ <script location="component://assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/EditMaint.groovy"/> <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> <set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/> - <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> - <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/> + <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> + <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/> <set field="workEffortId" from-field="fixedAssetMaint.scheduleWorkEffortId"/> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> <get-related-one value-name="workEffort" relation-name="WorkEffortType" to-value-name="workEffortType"/> <get-related-one value-name="workEffort" relation-name="CurrentStatusItem" to-value-name="currentStatusItem"/> <get-related-one value-name="workEffort" relation-name="WorkEffortPurposeType" to-value-name="workEffortPurposeType"/> @@ -218,8 +218,8 @@ <set field="workEffortId" from-field="parameters.workEffortId"/> <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> <set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/> - <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> - <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/> + <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> + <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/> </actions> <widgets> <decorator-screen name="CommonFixedAssetMaintDecorator"> @@ -243,8 +243,8 @@ <set field="workEffortId" from-field="parameters.workEffortId"/> <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> <set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/> - <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> - <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/> + <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> + <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/> </actions> <widgets> <decorator-screen name="CommonFixedAssetMaintDecorator"> @@ -266,8 +266,8 @@ <set field="tabButtonItemFixedAssetMaint" value="EditItemIssuances"/> <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> <set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/> - <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> - <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/> + <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> + <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/> <entity-condition list-name="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance"> <condition-expr field-name="quantity" operator="greater" value="0"/> </entity-condition> @@ -298,8 +298,8 @@ <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> <set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/> - <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> - <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/> + <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> + <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/> <entity-condition list-name="itemIssuanceList" entity-name="ProductInventoryItemAndItemIssuance"> <condition-expr field-name="quantity" operator="greater" value="0"/> </entity-condition> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Sun Feb 1 10:27:43 2009 @@ -51,7 +51,7 @@ <actions> <set field="headerItem" value="facility"/> <set field="facilityId" from-field="parameters.facilityId"/> - <entity-one entity-name="Facility" value-name="facility"/> + <entity-one entity-name="Facility" value-field="facility"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml Sun Feb 1 10:27:43 2009 @@ -54,10 +54,10 @@ <set field="labelTitleProperty" value="ProductMaintenance"/> <set field="tabButtonItem" value="EditProductMaints"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <set field="productName" from-field="product.productName"/> <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> - <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> + <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> </actions> <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Sun Feb 1 10:27:43 2009 @@ -24,7 +24,7 @@ <form name="EditWorkEffort" target="updateWorkEffort" title="" type="single" default-map-name="workEffort" header-row-style="header-row" default-table-style="basic-table"> <actions> - <entity-one entity-name="WorkEffortAssoc" value-name="workEffortAssoc"/> + <entity-one entity-name="WorkEffortAssoc" value-field="workEffortAssoc"/> <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/> </actions> <alt-target target="createWorkEffort" use-when="workEffort==null"/> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetScreens.xml Sun Feb 1 10:27:43 2009 @@ -27,7 +27,7 @@ <set field="titleProperty" value="PageTitleEditComputerHardware"/> <set field="tabButtonItem" value="EditComputerHardware"/> <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> - <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> + <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> </actions> <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> @@ -77,7 +77,7 @@ <set field="titleProperty" value="PageTitleEditComputerSoftware"/> <set field="headerItem" value="ComputerSoftware"/> <set field="fixedAssetId" from-field="parameters.fixedAssetId"/> - <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> + <entity-one entity-name="FixedAsset" value-field="fixedAsset"/> </actions> <widgets> <decorator-screen name="CommonComputerSoftwareDecorator" location="${parameters.fixedAssetDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=739732&r1=739731&r2=739732&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Sun Feb 1 10:27:43 2009 @@ -47,7 +47,7 @@ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> <set field="productName" from-field="product.productName"/> </actions> <widgets> @@ -253,7 +253,7 @@ <set field="labelTitleProperty" value="ProductProduct"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-name="product"/> + <entity-one entity-name="Product" value-field="product"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |