svn commit: r762215 [7/9] - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r762215 [7/9] - in /ofbiz/trunk: applications/accounting/webapp
 
|
Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Mon Apr 6 06:25:24 2009 @@ -164,7 +164,7 @@ <widgets> <screenlet title="${uiLabelMap.PageTitleEditConfigOptions}"> <link style="buttontext" text="${uiLabelMap.ProductCreateNewConfigOptions}" target="EditProductConfigOptions"> - <parameter param-name="configItemId" from-field="configItemId"/> + <parameter param-name="configItemId"/> </link> <include-form name="CreateConfigOption" location="component://product/webapp/catalog/config/ConfigForms.xml"/> </screenlet> @@ -197,8 +197,8 @@ <widgets> <screenlet title="${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigs}"> <link style="buttontext" text="${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}" target="EditProductConfigOptions"> - <parameter param-name="configItemId" from-field="configItemId"/> - <parameter param-name="configOptionId" from-field="configOptionId"/> + <parameter param-name="configItemId"/> + <parameter param-name="configOptionId"/> </link> <include-form name="CreateProductConfigProduct" location="component://product/webapp/catalog/config/ConfigForms.xml"/> </screenlet> @@ -206,8 +206,8 @@ <fail-widgets> <screenlet title="${uiLabelMap.CommonAddA} ${uiLabelMap.ProductConfigs}"> <link style="buttontext" text="${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}" target="EditProductConfigOptions"> - <parameter param-name="configItemId" from-field="configItemId"/> - <parameter param-name="configOptionId" from-field="configOptionId"/> + <parameter param-name="configItemId"/> + <parameter param-name="configOptionId"/> </link> <include-form name="CreateProductConfigProduct" location="component://product/webapp/catalog/config/ConfigForms.xml"/> </screenlet> Modified: ofbiz/trunk/applications/product/widget/catalog/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/Menus.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/Menus.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/Menus.xml Mon Apr 6 06:25:24 2009 @@ -60,12 +60,12 @@ <menu name="CategoryTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditCategory" title="${uiLabelMap.ProductCategory}"> <link target="EditCategory"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="productCategoryId"/> </link> </menu-item> <menu-item name="EditCategoryContent" title="${uiLabelMap.ProductCategoryContent}"> <link target="EditCategoryContent"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="productCategoryId"/> </link> </menu-item> <menu-item name="EditCategoryRollup" title="${uiLabelMap.ProductRollup}"> @@ -75,32 +75,32 @@ </menu-item> <menu-item name="EditCategoryProducts" title="${uiLabelMap.ProductProducts}"> <link target="EditCategoryProducts"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="productCategoryId"/> </link> </menu-item> <menu-item name="EditCategoryProdCatalogs" title="${uiLabelMap.ProductCatalogs}"> <link target="EditCategoryProdCatalogs"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="productCategoryId"/> </link> </menu-item> <menu-item name="EditCategoryFeatureCats" title="${uiLabelMap.ProductFeatureCats}"> <link target="EditCategoryFeatureCats"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="productCategoryId"/> </link> </menu-item> <menu-item name="EditCategoryParties" title="${uiLabelMap.PartyParties}"> <link target="EditCategoryParties"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="productCategoryId"/> </link> </menu-item> <menu-item name="EditCategoryAttributes" title="${uiLabelMap.ProductAttributes}"> <link target="EditCategoryAttributes"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="productCategoryId"/> </link> </menu-item> <menu-item name="EditProductCategoryLinks" title="${uiLabelMap.ProductCategoryLinks}"> <link target="EditProductCategoryLinks"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="productCategoryId"/> </link> </menu-item> </menu> @@ -108,22 +108,22 @@ <menu name="ProductStoreTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditProductStore" title="${uiLabelMap.ProductStore}"> <link target="EditProductStore"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStoreRoles" title="${uiLabelMap.PartyRoles}"> <link target="EditProductStoreRoles"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStorePromos" title="${uiLabelMap.ProductPromos}"> <link target="EditProductStorePromos"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStoreCatalogs" title="${uiLabelMap.ProductCatalogs}"> <link target="EditProductStoreCatalogs"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStoreWebSites" title="${uiLabelMap.ProductWebSites}"> @@ -134,58 +134,58 @@ <!-- The tax stuff is in the Tax Authority area of the accounting manager, need to re-do this screen to list current tax entries and link to the accmgr screens <menu-item name="EditProductStoreTaxSetup" title="${uiLabelMap.ProductSalesTax}"> <link target="EditProductStoreTaxSetup"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> --> <menu-item name="EditProductStoreShipSetup" title="${uiLabelMap.ProductShipping}"> <link target="EditProductStoreShipSetup"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStoreShipmentCostEstimates" title="${uiLabelMap.ProductViewEstimates}"> <link target="EditProductStoreShipmentCostEstimates"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStorePaySetup" title="${uiLabelMap.CommonPayments}"> <link target="EditProductStorePaySetup"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStoreFinAccountSettings" title="${uiLabelMap.CommonFinAccounts}"> <link target="EditProductStoreFinAccountSettings"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStoreEmails" title="${uiLabelMap.CommonEmails}"> <link target="EditProductStoreEmails"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStoreSurveys" title="${uiLabelMap.CommonSurveys}"> <link target="EditProductStoreSurveys"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStoreKeywordOvrd" title="${uiLabelMap.ProductOverride}"> <link target="editProductStoreKeywordOvrd"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="ViewProductStoreSegments" title="${uiLabelMap.ProductSegments}"> <link target="ViewProductStoreSegments"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStoreVendorPayments" title="${uiLabelMap.ProductVendorPayments}"> <link target="EditProductStoreVendorPayments"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> <menu-item name="EditProductStoreVendorShipments" title="${uiLabelMap.ProductVendorShipments}"> <link target="EditProductStoreVendorShipments"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> </menu-item> </menu> @@ -193,22 +193,22 @@ <menu name="CatalogTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="ProductCatalog" title="${uiLabelMap.ProductCatalog}"> <link target="EditProdCatalog"> - <parameter param-name="prodCatalogId" from-field="prodCatalogId"/> + <parameter param-name="prodCatalogId"/> </link> </menu-item> <menu-item name="ProductStores" title="${uiLabelMap.ProductStores}"> <link target="EditProdCatalogStores"> - <parameter param-name="prodCatalogId" from-field="prodCatalogId"/> + <parameter param-name="prodCatalogId"/> </link> </menu-item> <menu-item name="PartyParties" title="${uiLabelMap.PartyParties}"> <link target="EditProdCatalogParties"> - <parameter param-name="prodCatalogId" from-field="prodCatalogId"/> + <parameter param-name="prodCatalogId"/> </link> </menu-item> <menu-item name="ProductCategories" title="${uiLabelMap.ProductCategories}"> <link target="EditProdCatalogCategories"> - <parameter param-name="prodCatalogId" from-field="prodCatalogId"/> + <parameter param-name="prodCatalogId"/> </link> </menu-item> </menu> @@ -216,22 +216,22 @@ <menu name="PromoTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditProductPromo" title="${uiLabelMap.ProductPromotion}"> <link target="EditProductPromo"> - <parameter param-name="productPromoId" from-field="productPromoId"/> + <parameter param-name="productPromoId"/> </link> </menu-item> <menu-item name="EditProductPromoRules" title="${uiLabelMap.ProductRules}"> <link target="EditProductPromoRules"> - <parameter param-name="productPromoId" from-field="productPromoId"/> + <parameter param-name="productPromoId"/> </link> </menu-item> <menu-item name="EditProductPromoStores" title="${uiLabelMap.ProductStores}"> <link target="EditProductPromoStores"> - <parameter param-name="productPromoId" from-field="productPromoId"/> + <parameter param-name="productPromoId"/> </link> </menu-item> <menu-item name="FindProductPromoCode" title="${uiLabelMap.ProductPromotionCode}"> <link target="FindProductPromoCode"> - <parameter param-name="productPromoId" from-field="productPromoId"/> + <parameter param-name="productPromoId"/> </link> </menu-item> </menu> @@ -239,123 +239,123 @@ <menu name="ProductTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditProduct" title="${uiLabelMap.ProductProduct}"> <link target="EditProduct"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductPrices" title="${uiLabelMap.ProductPrices}"> <link target="EditProductPrices"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductContent" title="${uiLabelMap.ProductContent}"> <link target="EditProductContent"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductGeos" title="${uiLabelMap.CommonGeos}"> <link target="EditProductGeos"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductGoodIdentifications" title="${uiLabelMap.CommonIds}"> <link target="EditProductGoodIdentifications"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductCategories" title="${uiLabelMap.ProductCategories}"> <link target="EditProductCategories"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductKeyword" title="${uiLabelMap.ProductKeywords}"> <link target="EditProductKeyword"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductAssoc" title="${uiLabelMap.ProductAssociations}"> <link target="EditProductAssoc"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="ViewProductManufacturing" title="${uiLabelMap.ProductManufacturing}"> <link target="ViewProductManufacturing"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductCosts" title="${uiLabelMap.ProductCosts}"> <link target="EditProductCosts"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductAttributes" title="${uiLabelMap.ProductAttributes}"> <link target="EditProductAttributes"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductFeatures" title="${uiLabelMap.ProductFeatures}"> <link target="EditProductFeatures"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductFacilities" title="${uiLabelMap.ProductFacilities}"> <link target="EditProductFacilities"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductFacilityLocations" title="${uiLabelMap.ProductLocations}"> <link target="EditProductFacilityLocations"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductInventoryItems" title="${uiLabelMap.ProductInventory}"> <link target="EditProductInventoryItems"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> <parameter param-name="showAllFacilities" value="Y"/> </link> </menu-item> <menu-item name="EditSupplierProduct" title="${uiLabelMap.ProductSuppliers}"> <link target="EditProductSuppliers"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="ViewProductAgreements" title="${uiLabelMap.ProductAgreements}"> <link target="ViewProductAgreements"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductGlAccounts" title="${uiLabelMap.ProductAccounts}"> <link target="EditProductGlAccounts"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductPaymentMethodTypes" title="${uiLabelMap.ProductPaymentTypes}"> <link target="EditProductPaymentMethodTypes"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductMaints" title="${uiLabelMap.ProductMaintenance}"> <link target="EditProductMaints"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductMeters" title="${uiLabelMap.ProductMeters}"> <link target="EditProductMeters"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductSubscriptionResources" title="${uiLabelMap.ProductSubscriptionResources}"> <link target="EditProductSubscriptionResources"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductQuickAdmin" title="${uiLabelMap.ProductQuickAdmin}"> <link target="EditProductQuickAdmin"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditVendorProduct" title="${uiLabelMap.PartyVendor}"> <link target="EditVendorProduct"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="QuickAddVariants" title="${uiLabelMap.ProductVariants}"> @@ -363,7 +363,7 @@ <if-compare field="product.isVirtual" operator="equals" value="Y"/> </condition> <link target="QuickAddVariants"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductConfigs" title="${uiLabelMap.ProductConfigs}"> @@ -371,7 +371,7 @@ <if-compare field="product.productTypeId" operator="equals" value="AGGREGATED"/> </condition> <link target="EditProductConfigs"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductAssetUsage" title="${uiLabelMap.ProductAssetUsage}"> @@ -379,17 +379,17 @@ <if-compare field="product.productTypeId" operator="equals" value="ASSET_USAGE"/> </condition> <link target="EditProductAssetUsage"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductWorkEfforts" title="${uiLabelMap.WorkEffortWorkEffort}"> <link target="EditProductWorkEfforts"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> <menu-item name="EditProductParties" title="${uiLabelMap.PartyParties}"> <link target="EditProductParties"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </menu-item> </menu> @@ -397,22 +397,22 @@ <menu name="ConfigItemTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditProductConfigItem" title="${uiLabelMap.ProductConfigItem}"> <link target="EditProductConfigItem"> - <parameter param-name="configItemId" from-field="configItemId"/> + <parameter param-name="configItemId"/> </link> </menu-item> <menu-item name="EditProductConfigOptions" title="${uiLabelMap.ProductConfigOptions}"> <link target="EditProductConfigOptions"> - <parameter param-name="configItemId" from-field="configItemId"/> + <parameter param-name="configItemId"/> </link> </menu-item> <menu-item name="EditProductConfigItemContent" title="${uiLabelMap.ProductContent}"> <link target="EditProductConfigItemContent"> - <parameter param-name="configItemId" from-field="configItemId"/> + <parameter param-name="configItemId"/> </link> </menu-item> <menu-item name="ProductConfigItemArticle" title="${uiLabelMap.ProductProduct}"> <link target="ProductConfigItemArticle"> - <parameter param-name="configItemId" from-field="configItemId"/> + <parameter param-name="configItemId"/> </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Mon Apr 6 06:25:24 2009 @@ -379,7 +379,7 @@ <container style="screenlet-body"> <container> <link target="newFixedAssetProduct" text="${uiLabelMap.PageTitleCreateProductAssetUsage}" style="buttontext"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </container> <section> @@ -417,7 +417,7 @@ <container style="screenlet-body"> <container> <link target="newFixedAssetProduct" text="${uiLabelMap.AccountingFixedAssetNew}" style="buttontext"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </container> <section> @@ -806,10 +806,10 @@ <decorator-section name="body"> <container> <link target="forceIndexProductKeywords" text="${uiLabelMap.ProductReInduceKeywords}" style="buttontext"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> <link target="deleteProductKeywords" text="${uiLabelMap.ProductDeleteAllKeywords}" style="buttontext"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </container> <container style="screenlet"> @@ -1196,7 +1196,7 @@ <condition><not><if-empty field="supplierProduct"/></not></condition> <widgets> <link target="EditProductSuppliers" style="buttontext" text="${uiLabelMap.ProductNewProductSupplier}"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </link> </widgets> </section> Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Mon Apr 6 06:25:24 2009 @@ -282,7 +282,7 @@ <decorator-section name="body"> <container> <link target="EditProductPromoCode" text="${uiLabelMap.ProductNewPromotionCode}" style="buttontext"> - <parameter param-name="productPromoId" from-field="productPromoId"/> + <parameter param-name="productPromoId"/> </link> </container> <section> @@ -293,7 +293,7 @@ <container> <link target="FindProductPromoCode" text="${uiLabelMap.ProductPromotionManualImported}" style="buttontext"> <parameter param-name="manualOnly" value="N"/> - <parameter param-name="productPromoId" from-field="productPromoId"/> + <parameter param-name="productPromoId"/> </link> </container> </widgets> @@ -301,7 +301,7 @@ <container> <link target="FindProductPromoCode" text="${uiLabelMap.ProductPromotionManual}" style="buttontext"> <parameter param-name="manualOnly" value="Y"/> - <parameter param-name="productPromoId" from-field="productPromoId"/> + <parameter param-name="productPromoId"/> </link> </container> </fail-widgets> Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Mon Apr 6 06:25:24 2009 @@ -142,30 +142,30 @@ <container> <label style="h3">${uiLabelMap.CommonView}</label> <link target="EditProductStorePromos" text="${uiLabelMap.CommonAll}" style="buttontext"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> </link> <link target="EditProductStorePromos" text="${uiLabelMap.CommonUserEnteredOnly}" style="buttontext"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> <parameter param-name="userEntered" value="Y"/> </link> <link target="EditProductStorePromos" text="${uiLabelMap.ProductPromotionImported}" style="buttontext"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> <parameter param-name="userEntered" value="N"/> </link> </container> <container> <label style="h3">${uiLabelMap.CommonView} ${uiLabelMap.CommonActiveInactive}</label> <link target="EditProductStorePromos" text="${uiLabelMap.CommonAll}" style="buttontext"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> <parameter param-name="activeOnly" value="N"/> </link> <link target="EditProductStorePromos" text="${uiLabelMap.CommonUserEnteredOnly}" style="buttontext"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> <parameter param-name="activeOnly" value="N"/> <parameter param-name="userEntered" value="Y"/> </link> <link target="EditProductStorePromos" text="${uiLabelMap.ProductPromotionImported}" style="buttontext"> - <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreId"/> <parameter param-name="activeOnly" value="N"/> <parameter param-name="userEntered" value="N"/> </link> Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Mon Apr 6 06:25:24 2009 @@ -101,7 +101,7 @@ <field name="subscriptionResourceId"> <display-entity entity-name="SubscriptionResource" description="${description}"> <sub-hyperlink target="EditSubscriptionResource" description="${subscriptionResourceId}" link-style="buttontext"> - <parameter param-name="subscriptionResourceId" from-field="subscriptionResourceId"/> + <parameter param-name="subscriptionResourceId"/> </sub-hyperlink> </display-entity> </field> @@ -121,7 +121,7 @@ <field name="partyId"> <display-entity entity-name="PartyNameView" description="${groupName} ${firstName} ${lastName}"> <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext"> - <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="partyId"/> </sub-hyperlink> </display-entity> </field> @@ -129,20 +129,20 @@ <field name="orderId" widget-style="buttontext"> <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}"> - <parameter param-name="orderId" from-field="orderId"/> + <parameter param-name="orderId"/> </hyperlink> </field> <field name="productId"> <display-entity entity-name="Product" description="${productName}"> <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}" link-style="buttontext"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </sub-hyperlink> </display-entity> </field> <field name="productCategoryId"> <display-entity entity-name="ProductCategory" description="${categoryName}"> <sub-hyperlink target="/catalog/control/EditProductCategory" target-type="inter-app" description="${productCategoryId}" link-style="buttontext"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="productCategoryId"/> </sub-hyperlink> </display-entity> </field> @@ -171,7 +171,7 @@ <field name="subscriptionId" widget-style="buttontext"> <hyperlink description="${subscriptionId}" target="EditSubscription" also-hidden="false"> - <parameter param-name="subscriptionId" from-field="subscriptionId"/> + <parameter param-name="subscriptionId"/> </hyperlink> </field> </form> @@ -303,21 +303,21 @@ <field name="contentId"> <display-entity entity-name="Content" description="${contentName}"> <sub-hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" link-style="buttontext"> - <parameter param-name="contentId" from-field="contentId"/> + <parameter param-name="contentId"/> </sub-hyperlink> </display-entity> </field> <field name="webSiteId"> <display-entity entity-name="WebSite" description="${siteName}"> <sub-hyperlink target="/content/control/EditWebSite" target-type="inter-app" description="${webSiteId}" link-style="buttontext"> - <parameter param-name="webSiteId" from-field="webSiteId"/> + <parameter param-name="webSiteId"/> </sub-hyperlink> </display-entity> </field> <field name="subscriptionResourceId" widget-style="buttontext"> <hyperlink also-hidden="false" description="${subscriptionResourceId}" target="EditSubscriptionResource"> - <parameter param-name="subscriptionResourceId" from-field="subscriptionResourceId"/> + <parameter param-name="subscriptionResourceId"/> </hyperlink> </field> </form> @@ -377,9 +377,9 @@ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteProductSubscriptionResourceSr" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="subscriptionResourceId" from-field="subscriptionResourceId"/> - <parameter param-name="productId" from-field="productId"/> - <parameter param-name="fromDate" from-field="fromDate"/> + <parameter param-name="subscriptionResourceId"/> + <parameter param-name="productId"/> + <parameter param-name="fromDate"/> </hyperlink> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -434,7 +434,7 @@ <field name="subscriptionId"><hidden/></field> <field name="communicationEventId" widget-style="buttontext"> <hyperlink also-hidden="false" description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent" target-type="inter-app"> - <parameter param-name="communicationEventId" from-field="communicationEventId"/> + <parameter param-name="communicationEventId"/> </hyperlink> </field> <field name="partyIdFrom"> @@ -452,8 +452,8 @@ <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> <hyperlink target="removeSubscriptionCommEvent" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="subscriptionId" from-field="subscriptionId"/> - <parameter param-name="communicationEventId" from-field="communicationEventId"/> + <parameter param-name="subscriptionId"/> + <parameter param-name="communicationEventId"/> </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionMenus.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/SubscriptionMenus.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionMenus.xml Mon Apr 6 06:25:24 2009 @@ -24,18 +24,18 @@ menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="EditSubscription" title="${uiLabelMap.ProductSubscription}"> <link target="EditSubscription"> - <parameter param-name="subscriptionId" from-field="subscriptionId"/> + <parameter param-name="subscriptionId"/> </link> </menu-item> <menu-item name="EditSubscriptionAttributes" title="${uiLabelMap.ProductSubscriptionAttributes}"> <link target="EditSubscriptionAttributes"> - <parameter param-name="subscriptionId" from-field="subscriptionId"/> + <parameter param-name="subscriptionId"/> </link> </menu-item> <menu-item name="EditSubscriptionCommEvent" title="${uiLabelMap.ProductSubscriptionCommEvent}"> <link target="EditSubscriptionCommEvent"> - <parameter param-name="subscriptionId" from-field="subscriptionId"/> + <parameter param-name="subscriptionId"/> </link> </menu-item> </menu> @@ -43,12 +43,12 @@ menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="EditSubscriptionResource" title="${uiLabelMap.ProductSubscriptionResource}"> <link target="EditSubscriptionResource"> - <parameter param-name="subscriptionResourceId" from-field="subscriptionResourceId"/> + <parameter param-name="subscriptionResourceId"/> </link> </menu-item> <menu-item name="EditSubscriptionResourceProducts" title="${uiLabelMap.ProductProducts}"> <link target="EditSubscriptionResourceProducts"> - <parameter param-name="subscriptionResourceId" from-field="subscriptionResourceId"/> + <parameter param-name="subscriptionResourceId"/> </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Mon Apr 6 06:25:24 2009 @@ -209,7 +209,7 @@ <container style="button-bar"> <link target="EditSubscriptionResource" text="${uiLabelMap.ProductNewSubscriptionResource}" style="buttontext"/> <link target="FindSubscription" text="${uiLabelMap.ProductFindResourceSubscriptions}" style="buttontext"> - <parameter param-name="subscriptionResourceId" from-field="subscriptionResourceId"/> + <parameter param-name="subscriptionResourceId"/> </link> </container> </widgets> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml Mon Apr 6 06:25:24 2009 @@ -32,7 +32,7 @@ </node> <node name="node-body"> <link target="EditFacility" text="${facilityName} [${facilityId}]"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> <sub-node node-name="node-body"> <entity-and entity-name="Facility"> Modified: ofbiz/trunk/applications/product/widget/facility/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/Menus.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Mon Apr 6 06:25:24 2009 @@ -31,7 +31,7 @@ <not><if-empty field="facilityId"/></not> </condition> <link target="InventoryReports"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> </menu> @@ -40,97 +40,97 @@ default-menu-item-name="EditFacility"> <menu-item name="EditFacility" title="${uiLabelMap.ProductFacility}"> <link target="EditFacility"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="FacilityChildren" title="${uiLabelMap.CommonEntityChildren}"> <link target="FacilityChildren"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="ViewContactMechs" title="${uiLabelMap.PartyContactMechs}"> <link target="ViewContactMechs"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="EditFacilityGroups" title="${uiLabelMap.ProductGroups}"> <link target="EditFacilityGroups"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="FindFacilityLocation" title="${uiLabelMap.ProductLocations}"> <link target="FindFacilityLocation"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="EditFacilityParties" title="${uiLabelMap.PartyRoles}"> <link target="EditFacilityParties"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="ViewFacilityInventoryByProduct" title="${uiLabelMap.ProductInventory}"> <link target="ViewFacilityInventoryByProduct"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="EditFacilityInventoryItems" title="${uiLabelMap.ProductInventoryItems}"> <link target="EditFacilityInventoryItems"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="ViewFacilityInventoryItemsDetails" title="${uiLabelMap.ProductInventoryItemsDetails}"> <link target="ViewFacilityInventoryItemsDetails"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="ReceiveInventory" title="${uiLabelMap.ProductInventoryReceive}"> <link target="ReceiveInventory"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="PhysicalInventory" title="${uiLabelMap.ProductPhysicalInventory}"> <link target="FindFacilityPhysicalInventory"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="FindFacilityTransfers" title="${uiLabelMap.ProductInventoryXfers}"> <link target="FindFacilityTransfers"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="ReceiveReturn" title="${uiLabelMap.ProductReceiveReturn}"> <link target="ReceiveReturn"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="PicklistOptions" title="${uiLabelMap.ProductPicking}"> <link target="PicklistOptions"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="PickMoveStock" title="${uiLabelMap.ProductStockMoves}"> <link target="PickMoveStock"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="PicklistManage" title="${uiLabelMap.ProductPicklistManage}"> <link target="PicklistManage"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="VerifyPick" title="${uiLabelMap.ProductVerifyPick}"> <link target="VerifyPick"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="PackOrder" title="${uiLabelMap.ProductPacking}"> <link target="PackOrder"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="Scheduling" title="${uiLabelMap.ProductScheduling}"> <link target="Scheduling"> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="FindShipmentIn" title="${uiLabelMap.ProductIncomingShipments}"> @@ -159,12 +159,12 @@ default-menu-item-name="EditInventoryItemLabel" selected-menuitem-context-field-name="subTabButtonItem"> <menu-item name="EditInventoryItemLabel" title="${uiLabelMap.ProductInventoryItemLabel}"> <link target="EditInventoryItemLabel"> - <parameter param-name="inventoryItemLabelId" from-field="inventoryItemLabelId"/> + <parameter param-name="inventoryItemLabelId"/> </link> </menu-item> <menu-item name="EditInventoryItemLabelAppls" title="${uiLabelMap.ProductInventoryItemLabelAppl}"> <link target="EditInventoryItemLabelAppls"> - <parameter param-name="inventoryItemLabelId" from-field="inventoryItemLabelId"/> + <parameter param-name="inventoryItemLabelId"/> </link> </menu-item> </menu> @@ -172,20 +172,20 @@ default-menu-item-name="EditInventoryItem" selected-menuitem-context-field-name="subTabButtonItem"> <menu-item name="EditInventoryItem" title="${uiLabelMap.ProductInventoryItem}"> <link target="EditInventoryItem"> - <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="inventoryItemId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="ViewInventoryItemDetail" title="${uiLabelMap.ProductInventoryDetails}"> <link target="ViewInventoryItemDetail"> - <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="inventoryItemId"/> + <parameter param-name="facilityId"/> </link> </menu-item> <menu-item name="EditInventoryItemLabels" title="${uiLabelMap.ProductInventoryItemLabelAppl}"> <link target="EditInventoryItemLabels"> - <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> - <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="inventoryItemId"/> + <parameter param-name="facilityId"/> </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/request/RequestForms.xml Mon Apr 6 06:25:24 2009 @@ -24,7 +24,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="custRequestId" widget-style="buttontext"> <hyperlink description="${custRequestId}" target-type="inter-app" target="/ordermgr/control/ViewRequest"> - <parameter param-name="custRequestId" from-field="custRequestId"/> + <parameter param-name="custRequestId"/> </hyperlink> </field> <field name="custRequestName"><display/></field> Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml Mon Apr 6 06:25:24 2009 @@ -30,7 +30,7 @@ <auto-fields-entity entity-name="Timesheet"/> <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext"> <hyperlink description="${timesheetId}" target="EditTimesheet" also-hidden="false"> - <parameter param-name="timesheetId" from-field="timesheetId"/> + <parameter param-name="timesheetId"/> </hyperlink> </field> <field name="partyId"><hidden/></field> @@ -85,7 +85,7 @@ <auto-fields-entity entity-name="Timesheet"/> <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext"> <hyperlink description="${timesheetId}" target="EditTimesheet" also-hidden="false"> - <parameter param-name="timesheetId" from-field="timesheetId"/> + <parameter param-name="timesheetId"/> </hyperlink> </field> <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field> @@ -132,13 +132,13 @@ <field name="workEffortId"> <display-entity entity-name="WorkEffort" description="${workEffortName}"> <sub-hyperlink target="WorkEffortSummary" description="${workEffortId}" link-style="buttontext"> - <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="workEffortId"/> </sub-hyperlink> </display-entity> </field> <field name="invoiceId" widget-style="buttontext"> <hyperlink target="/accounting/control/invoiceOverview" target-type="inter-app" description="${invoiceId}"> - <parameter param-name="invoiceId" from-field="invoiceId"/> + <parameter param-name="invoiceId"/> </hyperlink> </field> </form> @@ -172,9 +172,9 @@ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteTimesheetRole" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="timesheetId" from-field="timesheetId"/> - <parameter param-name="partyId" from-field="partyId"/> - <parameter param-name="roleTypeId" from-field="roleTypeId"/> + <parameter param-name="timesheetId"/> + <parameter param-name="partyId"/> + <parameter param-name="roleTypeId"/> </hyperlink> </field> </form> @@ -222,7 +222,7 @@ <field name="workEffortId"> <lookup size="10" target-form-name="LookupWorkEffort"> <sub-hyperlink target="EditWorkEffort" link-style="buttontext" description="${uiLabelMap.WorkEffortWorkEffort}:${workEffortId}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="workEffortId"/> </sub-hyperlink> </lookup> </field> @@ -236,8 +236,8 @@ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteTimesheetEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="timesheetId" from-field="timesheetId"/> - <parameter param-name="timeEntryId" from-field="timeEntryId"/> + <parameter param-name="timesheetId"/> + <parameter param-name="timeEntryId"/> </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetMenus.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/TimesheetMenus.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/TimesheetMenus.xml Mon Apr 6 06:25:24 2009 @@ -23,17 +23,17 @@ default-menu-item-name="Timesheet"> <menu-item name="Timesheet" title="${uiLabelMap.WorkEffortTimesheet}"> <link target="EditTimesheet"> - <parameter param-name="timesheetId" from-field="timesheetId"/> + <parameter param-name="timesheetId"/> </link> </menu-item> <menu-item name="TimesheetRoles" title="${uiLabelMap.PartyParties}"> <link target="EditTimesheetRoles"> - <parameter param-name="timesheetId" from-field="timesheetId"/> + <parameter param-name="timesheetId"/> </link> </menu-item> <menu-item name="TimesheetEntries" title="${uiLabelMap.CommonEntries}"> <link target="EditTimesheetEntries"> - <parameter param-name="timesheetId" from-field="timesheetId"/> + <parameter param-name="timesheetId"/> </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml Mon Apr 6 06:25:24 2009 @@ -32,7 +32,7 @@ <field name="workEffortId"><hidden/></field> <field name="communicationEventId" widget-style="buttontext"> <hyperlink target="/partymgr/control/EditCommunicationEvent" target-type="inter-app" description="${communicationEventId}"> - <parameter param-name="communicationEventId" from-field="communicationEventId"/> + <parameter param-name="communicationEventId"/> </hyperlink> </field> <field name="statusId"><display-entity entity-name="StatusItem"/></field> @@ -41,8 +41,8 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteCommunicationEventWorkEff" also-hidden="false" description="${uiLabelMap.CommonDelete}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="communicationEventId" from-field="communicationEventId"/> + <parameter param-name="workEffortId"/> + <parameter param-name="communicationEventId"/> </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=762215&r1=762214&r2=762215&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Mon Apr 6 06:25:24 2009 @@ -406,7 +406,7 @@ </actions> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditWorkEffort"> - <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="workEffortId"/> </hyperlink> </field> <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field> @@ -421,7 +421,7 @@ <!-- These links have been commented because they are (partially or totally) broken <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="linktext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditWorkEffort"> - <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="workEffortId"/> <parameter param-name="DONE_PAGE" value="ListWorkEfforts?${queryStringEncoded"/> </hyperlink> </field> @@ -440,7 +440,7 @@ --> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffort"> - <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="workEffortId"/> </hyperlink> </field> </form> @@ -448,7 +448,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditWorkEffort"> - <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="workEffortId"/> </hyperlink> </field> <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field> @@ -460,7 +460,7 @@ </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffort"> - <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="workEffortId"/> </hyperlink> </field> </form> @@ -514,9 +514,9 @@ <field name="preferredContactMechId"><display/></field> <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditWorkEffortParty"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="partyId" from-field="partyId"/> - <parameter param-name="fromDate" from-field="fromDate"/> + <parameter param-name="workEffortId"/> + <parameter param-name="partyId"/> + <parameter param-name="fromDate"/> </hyperlink> </field> </form> @@ -525,7 +525,7 @@ <field name="partyId" title="${uiLabelMap.PartyParty}"> <display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName}"> <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext"> - <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="partyId"/> </sub-hyperlink> </display-entity> </field> @@ -644,7 +644,7 @@ </actions> <field name="communicationEventId"> <hyperlink description="${communicationEventId}" target="EditWorkEffortCommEvent" target-type="intra-app"> - <parameter param-name="communicationEventId" from-field="communicationEventId"/> + <parameter param-name="communicationEventId"/> <parameter param-name="DONE_PAGE" from-field="donePage"/> </hyperlink> </field> @@ -820,7 +820,7 @@ <field name="timesheetId"> <lookup size="10" target-form-name="LookupTimesheet"> <sub-hyperlink target="EditTimesheet" link-style="buttontext" description="${uiLabelMap.WorkEffortTimesheet}:${timesheetId}"> - <parameter param-name="timesheetId" from-field="timesheetId"/> + <parameter param-name="timesheetId"/> </sub-hyperlink> </lookup> </field> @@ -846,8 +846,8 @@ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteWorkEffortTimeEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="timeEntryId" from-field="timeEntryId"/> + <parameter param-name="workEffortId"/> + <parameter param-name="timeEntryId"/> </hyperlink> </field> </form> @@ -899,28 +899,28 @@ </actions> <field name="noteId"> <hyperlink target="EditWorkEffortNotes" also-hidden="false" description="${noteId}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="noteId" from-field="noteId"/> + <parameter param-name="workEffortId"/> + <parameter param-name="noteId"/> </hyperlink> </field> <field name="workEffortId" entity-name="WorkEffort" widget-style="buttontext"> <hyperlink target="EditWorkEffort" also-hidden="false" description="${workEffortId}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="workEffortId"/> </hyperlink> </field> <field name="noteInfo" title="${uiLabelMap.CommonNote}"><display/></field> <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field> <field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when="internalNote.equals("N")"> <hyperlink target="updateWorkEffortNote" description="${uiLabelMap.OrderNotesPrivate}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="noteId" from-field="noteId"/> + <parameter param-name="workEffortId"/> + <parameter param-name="noteId"/> <parameter param-name="internalNote" value="Y"/> </hyperlink> </field> <field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when="internalNote.equals("Y")"> <hyperlink target="updateWorkEffortNote" description="${uiLabelMap.OrderNotesPublic}"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="noteId" from-field="noteId"/> + <parameter param-name="workEffortId"/> + <parameter param-name="noteId"/> <parameter param-name="internalNote" value="N"/> </hyperlink> </field> @@ -974,7 +974,7 @@ <field name="contentId"> <display-entity entity-name="Content" key-field-name="contentId" description="${contentName}" also-hidden="true"> <sub-hyperlink target="/content/control/editContent" description="${contentId}" link-style="buttontext" target-type="inter-app"> - <parameter param-name="contentId" from-field="contentId"/> + <parameter param-name="contentId"/> </sub-hyperlink> </display-entity> </field> @@ -983,10 +983,10 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent"> - <parameter param-name="workEffortContentTypeId" from-field="workEffortContentTypeId"/> - <parameter param-name="fromDate" from-field="fromDate"/> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="contentId" from-field="contentId"/> + <parameter param-name="workEffortContentTypeId"/> + <parameter param-name="fromDate"/> + <parameter param-name="workEffortId"/> + <parameter param-name="contentId"/> </hyperlink> </field> </form> @@ -1029,7 +1029,7 @@ <field name="productId"> <display-entity entity-name="Product" key-field-name="productId" description="${productName}" also-hidden="true"> <sub-hyperlink target="/catalog/control/EditProduct" description="${productId}" link-style="buttontext" target-type="inter-app"> - <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productId"/> </sub-hyperlink> </display-entity> </field> @@ -1045,10 +1045,10 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffortGoodStandard"> - <parameter param-name="workEffortGoodStdTypeId" from-field="workEffortGoodStdTypeId"/> - <parameter param-name="productId" from-field="productId"/> - <parameter param-name="fromDate" from-field="fromDate"/> - <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="workEffortGoodStdTypeId"/> + <parameter param-name="productId"/> + <parameter param-name="fromDate"/> + <parameter param-name="workEffortId"/> </hyperlink> </field> </form> @@ -1085,7 +1085,7 @@ <field name="userLoginId" widget-style="buttontext"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}" also-hidden="true"> <sub-hyperlink target="/partymgr/control/viewprofile" description="${userLoginId}" link-style="buttontext" target-type="inter-app"> - <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="partyId"/> </sub-hyperlink> </display-entity> </field> @@ -1101,9 +1101,9 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortReview"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="userLoginId" from-field="userLoginId"/> - <parameter param-name="reviewDate" from-field="reviewDate"/> + <parameter param-name="workEffortId"/> + <parameter param-name="userLoginId"/> + <parameter param-name="reviewDate"/> </hyperlink> </field> </form> @@ -1128,8 +1128,8 @@ <field name="relevancyWeight" header-link="createWorkEffortKeywords?workEffortId=${workEffortId}" title="${uiLabelMap.ProductReInduceKeywords}" header-link-style="buttontext" ><display/></field> <field name="deleteLink" title="${uiLabelMap.ProductDeleteAllKeywords}" header-link="deleteWorkEffortKeywords?workEffortId=${workEffortId}" widget-style="buttontext" header-link-style="buttontext" > <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortKeyword"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="keyword" from-field="keyword"/> + <parameter param-name="workEffortId"/> + <parameter param-name="keyword"/> </hyperlink> </field> </form> @@ -1162,8 +1162,8 @@ <field name="contactMechId" use-when="telecomNumber == null && postalAddress == null" title="${uiLabelMap.CommonDescription}"><display description="${contactMech.infoString}"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContactMech"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="contactMechId" from-field="contactMechId"/> + <parameter param-name="workEffortId"/> + <parameter param-name="contactMechId"/> </hyperlink> </field> </form> @@ -1189,7 +1189,7 @@ <field name="agreementId"> <display-entity entity-name="Agreement" key-field-name="agreementId" also-hidden="true"> <sub-hyperlink target="/accounting/control/FindAgreement" description="${agreementId}" link-style="buttontext" target-type="inter-app"> - <parameter param-name="agreementId" from-field="agreementId"/> + <parameter param-name="agreementId"/> </sub-hyperlink> </display-entity> </field> @@ -1197,9 +1197,9 @@ <field name="workEffortId"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortAppl"> - <parameter param-name="agreementId" from-field="agreementId"/> - <parameter param-name="agreementItemSeqId" from-field="agreementItemSeqId"/> - <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="agreementId"/> + <parameter param-name="agreementItemSeqId"/> + <parameter param-name="workEffortId"/> </hyperlink> </field> </form> @@ -1216,7 +1216,7 @@ <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAsset}"> <display-entity entity-name="FixedAsset" description="${fixedAssetName}"> <sub-hyperlink target="/accounting/control/EditFixedAsset" target-type="inter-app" description="${fixedAssetId}" link-style="buttontext"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </sub-hyperlink> </display-entity> </field> @@ -1243,9 +1243,9 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortFixedAssetAssign"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> - <parameter param-name="fromDate" from-field="fromDate"/> + <parameter param-name="workEffortId"/> + <parameter param-name="fixedAssetId"/> + <parameter param-name="fromDate"/> </hyperlink> </field> </form> @@ -1255,7 +1255,7 @@ <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAsset}"> <display-entity entity-name="FixedAsset" description="${fixedAssetName}"> <sub-hyperlink target="/accounting/control/EditFixedAsset" target-type="inter-app" description="${fixedAssetId}" link-style="buttontext"> - <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="fixedAssetId"/> </sub-hyperlink> </display-entity> </field> @@ -1313,9 +1313,9 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortEventReminder"> - <parameter param-name="workEffortId" from-field="workEffortId"/> - <parameter param-name="contactMechId" from-field="contactMechId"/> - <parameter param-name="sequenceId" from-field="sequenceId"/> + <parameter param-name="workEffortId"/> + <parameter param-name="contactMechId"/> + <parameter param-name="sequenceId"/> </hyperlink> </field> </form> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |