svn commit: r759666 [5/6] - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r759666 [5/6] - in /ofbiz/trunk: applications/accounting/webapp
 
|
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Sun Mar 29 11:00:00 2009 @@ -18,10 +18,10 @@ under the License. --> -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <!-- UNUSED FORM - <form name="EditProductSimpleTest" type="single" target="updateProduct" title="" + <form name="EditProductSimpleTest" type="single" target="updateProduct" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="updateProduct" map-name="product"/> </form> @@ -50,7 +50,7 @@ <field position="2" name="isVariant" title="${uiLabelMap.ProductVariantProduct}"> <drop-down><option key="N" description="${uiLabelMap.CommonN}"/><option key="Y" description="${uiLabelMap.CommonY}"/></drop-down> </field> - <field position="3" name="virtualVariantMethodEnum" title="${uiLabelMap.ProductVirtualVariantMethod}"> + <field position="3" name="virtualVariantMethodEnum" title="${uiLabelMap.ProductVirtualVariantMethod}"> <drop-down allow-empty="true"> <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}"> <entity-constraint name="enumTypeId" value="PROD_VVMETHOD"/> @@ -66,7 +66,7 @@ </entity-options> </drop-down> </field> - + <field position="1" name="internalName" title="${uiLabelMap.ProductInternalName}"><text size="30" maxlength="255"/></field> <field position="2" name="brandName" title="${uiLabelMap.ProductBrandName}" ><text size="30" maxlength="60"/></field> <field name="manufacturerPartyId" title="${uiLabelMap.ProductOemPartyId}" ><text size="20" maxlength="20"/></field> @@ -79,7 +79,7 @@ <field name="salesDiscWhenNotAvail" title="${uiLabelMap.ProductSalesDiscontinuationNotAvailable}"> <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> - <field position="1" name="requirementMethodEnumId" title="${uiLabelMap.ProductRequirementMethodEnumId}"> + <field position="1" name="requirementMethodEnumId" title="${uiLabelMap.ProductRequirementMethodEnumId}"> <drop-down allow-empty="true"> <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}"> <entity-constraint name="enumTypeId" value="PROD_REQ_METHOD"/> @@ -192,7 +192,7 @@ <field position="4" name="autoCreateKeywords" title="${uiLabelMap.ProductAutoCreateKeywords}"> <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> - + <field name="contentInfoText" title="${uiLabelMap.ProductContentInfoText}" widget-style="tooltip"> <display description="${uiLabelMap.ProductNoteForContentOptions}" also-hidden="false"/> </field> @@ -232,7 +232,7 @@ <sort-field name="virtualVariantMethodEnum"/> </field-group> <field-group title="${uiLabelMap.ProductPrimaryCategory}" collapsible="true" initially-collapsed="true"> - <sort-field name="primaryProductCategoryId"/> + <sort-field name="primaryProductCategoryId"/> </field-group> <field-group title="${uiLabelMap.CommonDates}" collapsible="true" initially-collapsed="true"> <sort-field name="introductionDate"/> @@ -240,10 +240,10 @@ <sort-field name="supportDiscontinuationDate"/> </field-group> <field-group title="${uiLabelMap.CommonInventory}" collapsible="true" initially-collapsed="true"> - <sort-field name="salesDiscWhenNotAvail"/> + <sort-field name="salesDiscWhenNotAvail"/> <sort-field name="requirementMethodEnumId"/> <sort-field name="requireInventory"/> - <sort-field name="inventoryMessage"/> + <sort-field name="inventoryMessage"/> </field-group> <field-group title="${uiLabelMap.CommonRate}" collapsible="true" initially-collapsed="true"> <sort-field name="ratingTypeEnum"/> @@ -260,7 +260,7 @@ <sort-field name="productWidth"/> <sort-field name="widthUomId"/> <sort-field name="shippingWidth"/> - <sort-field name="productDepth"/> + <sort-field name="productDepth"/> <sort-field name="depthUomId"/> <sort-field name="shippingDepth"/> <sort-field name="weight"/> @@ -268,7 +268,7 @@ <sort-field name="quantityIncluded"/> <sort-field name="quantityUomId"/> <sort-field name="quantityIncluded"/> - <sort-field name="quantityUomId"/> + <sort-field name="quantityUomId"/> </field-group> <field-group title="${uiLabelMap.CommonShipping}" collapsible="true" initially-collapsed="true"> <sort-field name="piecesIncluded"/> @@ -284,10 +284,10 @@ </field-group> </sort-order> </form> - + <form name="EditProductDup" type="single" target="DuplicateProduct" title="" default-map-name="product" header-row-style="header-row" default-table-style="basic-table"> - + <field name="oldProductId"><hidden value="${productId}"/></field> <field name="productId" title="${uiLabelMap.ProductDuplicateRemoveSelectedWithNewId}" map-name="dupProduct"><text size="20" maxlength="20"/></field> <field name="newInternalName" title="${uiLabelMap.ProductInternalName}"><text size="30" maxlength="255"/></field> @@ -318,11 +318,11 @@ <field name="removeInventoryItems" position="4" title="${uiLabelMap.ProductInventoryItems}"><check all-checked="false"/></field> <field name="submitButton" title="${uiLabelMap.CommonDuplicate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <form name="UpdateProductVariants" type="single" target="UpdateProductVariants?productId=${productId}" title="" default-map-name="product" header-row-style="header-row" default-table-style="basic-table"> - - <field name="virtualProductId"><hidden value="${productId}"/></field> + + <field name="virtualProductId"><hidden value="${productId}"/></field> <field name="removeBefore" position="1" title="${uiLabelMap.ProductRemoveBefore}"><check all-checked="false"/></field> <field name="duplicatePrices" position="2" title="${uiLabelMap.ProductPrices}"><check all-checked="true"/></field> <field name="duplicateIDs" position="3" title="${uiLabelMap.CommonId}"><check all-checked="true"/></field> @@ -333,9 +333,9 @@ <field name="duplicateLocations" position="4" title="${uiLabelMap.ProductLocations}"><check all-checked="true"/></field> <field name="commonGoButton" title="${uiLabelMap.CommonGo}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <!-- ProductPrice --> - <form name="AddProductPrice" type="single" target="createProductPrice" title="" + <form name="AddProductPrice" type="single" target="createProductPrice" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createProductPrice"/> <field name="productId"><hidden/></field> @@ -412,7 +412,7 @@ </entity-options> </drop-down> </field> - + <field name="lastUpdatedByText" title="${uiLabelMap.ProductLastModifiedBy}:"> <display description="[${lastModifiedByUserLogin}] ${uiLabelMap.CommonOn} ${lastModifiedDate}" also-hidden="false"/> </field> @@ -427,7 +427,7 @@ </form> <!-- ProductPaymentMethodType --> - <form name="AddProductPaymentMethodType" type="single" target="createProductPaymentMethodType" title="" + <form name="AddProductPaymentMethodType" type="single" target="createProductPaymentMethodType" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createProductPaymentMethodType"/> <field name="productId"><hidden/></field> @@ -454,7 +454,7 @@ <field name="productPricePurposeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ProductPricePurpose"/></field> <field name="paymentMethodTypeId"><display-entity entity-name="PaymentMethodType"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field> - + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteProductPaymentMethodType" description="${uiLabelMap.CommonDelete}" also-hidden="false"> @@ -517,7 +517,9 @@ <field name="useTimeUomId"><display/></field> <field name="useRoleTypeId"><display/></field> <field name="editContent" title="${uiLabelMap.ProductEditContent}" widget-style="buttontext"> - <hyperlink target="/content/control/EditContent?contentId=${contentId}" target-type="inter-app" description="${contentId}" also-hidden="false"/> + <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" also-hidden="false"> + <parameter param-name="contentId" from-field="contentId"/> + </hyperlink> </field> <field name="removeContent" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="removeContentFromProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false"> @@ -525,8 +527,8 @@ </hyperlink> </field> </form> - - <form name="AddProductContentAssoc" type="single" target="addContentToProduct" title="${uiLabelMap.ProductAddProductContentFromDate}" + + <form name="AddProductContentAssoc" type="single" target="addContentToProduct" title="${uiLabelMap.ProductAddProductContentFromDate}" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="ProductContent"/> <field name="productId" title="${uiLabelMap.ProductProductId}" map-name="product"><hidden/></field> @@ -622,7 +624,9 @@ description="${dataResourceId}" also-hidden="false"/> </field> <field name="editContent" widget-style="buttontext"> - <hyperlink target="/content/control/EditContent?contentId=${contentId}" target-type="inter-app" description="${contentId}" also-hidden="false"/> + <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" also-hidden="false"> + <parameter param-name="contentId" from-field="contentId"/> + </hyperlink> </field> </form> <form name="CreateSimpleTextContentForAlternateLocale" type="single" target="createSimpleTextContentForAlternateLocale" title="${uiLabelMap.ProductCreateSimpleTextContentForAlternateLocale}" @@ -733,7 +737,7 @@ <field use-when="contentId == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field use-when="contentId != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <form name="EditProductAdditionalImageContent" type="upload" target="addAdditionalImageContentForProduct" title=""> <auto-fields-entity entity-name="ProductContent" map-name="productContentData"/> <field name="productContentTypeId"><display-entity entity-name="ProductContentType" also-hidden="true"/></field> @@ -835,11 +839,13 @@ <field name="partyId" title="${uiLabelMap.ProductSupplier}" header-link="EditProductSuppliers?productId=${productId}&orderBy=partyId" header-link-style="buttontext"> <display-entity entity-name="PartyNameView" also-hidden="true" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="buttontext"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="supplierProductId"><display/></field> - <field name="minimumOrderQuantity" title="${uiLabelMap.ProductMinimumOrderQuantity}" + <field name="minimumOrderQuantity" title="${uiLabelMap.ProductMinimumOrderQuantity}" header-link="EditProductSuppliers?productId=${productId}&orderBy=minimumOrderQuantity" header-link-style="buttontext"> <display/> </field> @@ -867,7 +873,7 @@ </form> <!-- ProductConfig --> - <form name="AddProductConfig" type="single" target="createProductConfig" title="" + <form name="AddProductConfig" type="single" target="createProductConfig" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createProductConfig" map-name=""/> <field name="productId"><hidden value="${productId}"/></field> @@ -893,7 +899,11 @@ <!-- TODO: get descriptions from IDs <display description="${roleType.description}"/> --> <field name="sequenceNum"><display/></field> <field name="configItemId" title="${uiLabelMap.ProductConfigItem}"> - <display-entity entity-name="ProductConfigItem" key-field-name="configItemId" description="${configItemName} : (${description})"><sub-hyperlink target="EditProductConfigItem?configItemId=${configItemId}" description="[ ${configItemId} ]"/></display-entity> + <display-entity entity-name="ProductConfigItem" key-field-name="configItemId" description="${configItemName} : (${description})"> + <sub-hyperlink target="EditProductConfigItem" description="[ ${configItemId} ]"> + <parameter param-name="configItemId" from-field="configItemId"/> + </sub-hyperlink> + </display-entity> </field> <field name="configTypeId"> <drop-down allow-empty="false"> @@ -929,7 +939,7 @@ odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="ViewProductManufacturing"> <!-- <display-entity entity-name="FixedAsset" description="${fixedAssetName}[${fixedAssetId}]"/> --> - <field name="edit" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <field name="edit" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink description="${uiLabelMap.CommonEdit}" target="showFixedAssetProduct"> <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> <parameter param-name="productId" from-field="productId"/> @@ -937,7 +947,7 @@ <parameter param-name="fromDate" from-field="fromDate"/> </hyperlink> </field> - <field name="del" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" separate-column="false"> + <field name="del" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" separate-column="false"> <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFixedAssetProduct"> <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> <parameter param-name="productId" from-field="productId"/> @@ -945,7 +955,7 @@ <parameter param-name="fromDate" from-field="fromDate"/> </hyperlink> </field> - <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAsset} [${uiLabelMap.AccountingFixedAssetId}]" widget-style="buttontext" > + <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAsset} [${uiLabelMap.AccountingFixedAssetId}]" widget-style="buttontext" > <display-entity entity-name="FixedAsset" description="${fixedAssetName} [${fixedAssetId}]"/> </field> <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}"><display-entity entity-name="FixedAssetProductType"/></field> @@ -955,7 +965,7 @@ </form> <!-- create a fixed Asset link on a product --> - <form name="addFixedAssetProduct" type="single" target="addFixedAssetProduct" title="" + <form name="addFixedAssetProduct" type="single" target="addFixedAssetProduct" title="" header-row-style="header-row" default-table-style="basic-table"> <field name="productId"><hidden/></field> @@ -964,7 +974,7 @@ <drop-down allow-empty="true"> <entity-options entity-name="FixedAssetProductType" description="${description}"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> @@ -979,14 +989,14 @@ <drop-down allow-empty="true"> <entity-options entity-name="Uom" key-field-name="uomId" description="${description}"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="showFixedAssetProduct" type="single" default-map-name="fixedAssetProduct" target="updFixedAssetProduct" title="" + <form name="showFixedAssetProduct" type="single" default-map-name="fixedAssetProduct" target="updFixedAssetProduct" title="" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="fixedAssetId==null" target="addFixedAssetProduct"/> @@ -994,7 +1004,7 @@ <field use-when="fixedAssetId==null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}"><text size="20" maxlength="20"/></field> - <!-- <auto-fields-service service-name="org.ofbiz.accounting.fixedasset.FixedAssetServices.xml#addFixedAssetProduct" + <!-- <auto-fields-service service-name="org.ofbiz.accounting.fixedasset.FixedAssetServices.xml#addFixedAssetProduct" map-name="fixedAssetProduct"/> --> <field name="productId"><hidden/></field> @@ -1003,7 +1013,7 @@ <drop-down allow-empty="true"> <entity-options entity-name="FixedAssetProductType" description="${description}"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> @@ -1018,15 +1028,15 @@ <drop-down allow-empty="true"> <entity-options entity-name="Uom" key-field-name="uomId" description="${description}"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <!-- UNUSED FORMS - <form name="ListProductAssocs" type="list" use-row-submit="true" title="" list-name="productAssocs" + <!-- UNUSED FORMS + <form name="ListProductAssocs" type="list" use-row-submit="true" title="" list-name="productAssocs" odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="EditProductAssoc"> <auto-fields-entity entity-name="ProductAssoc" default-field-type="display"/> <field name="productId"><hidden/></field> @@ -1060,7 +1070,7 @@ <display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/> </field> </form> - <form name="ListProductParents" type="list" use-row-submit="true" title="" list-name="parents" + <form name="ListProductParents" type="list" use-row-submit="true" title="" list-name="parents" odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="ViewProductManufacturing"> <auto-fields-entity entity-name="ProductAssoc" default-field-type="display"/> <field name="productIdTo"><hidden/></field> @@ -1078,7 +1088,7 @@ <display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/> </field> </form> - <form name="ListProductRoutings" type="list" use-row-submit="true" title="" list-name="routings" + <form name="ListProductRoutings" type="list" use-row-submit="true" title="" list-name="routings" odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="ViewProductManufacturing"> <auto-fields-entity entity-name="WorkEffortGoodStandard" default-field-type="display"/> <field name="productId"><hidden/></field> @@ -1092,7 +1102,7 @@ </field> </form> - <form name="ListCostComponents" type="list" title="" list-name="costs" + <form name="ListCostComponents" type="list" title="" list-name="costs" odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="EditProductCosts"> <auto-fields-entity entity-name="CostComponent" default-field-type="display"/> <field name="cost"> @@ -1139,7 +1149,7 @@ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="CalculateProductCosts" type="single" target="calculateProductCosts" title="" + <form name="CalculateProductCosts" type="single" target="calculateProductCosts" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="calculateProductCosts" map-name=""/> <field name="productId"><hidden value="${productId}"/></field> @@ -1159,7 +1169,7 @@ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="OutstandingPurchaseOrders" type="list" list-name="purchaseOrders" + <form name="OutstandingPurchaseOrders" type="list" list-name="purchaseOrders" odd-row-style="alternate-row" default-table-style="basic-table"> <field name="orderDate"><display/></field> <field name="orderId"><hyperlink also-hidden="false" description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app"/></field> @@ -1171,19 +1181,19 @@ <field name="estimatedDeliveryDate"><display/></field> <field name="shipBeforeDate"><display/></field> <field name="shipAfterDate"><display/></field> - </form> + </form> <!-- create ProductMaint--> - <form name="AddProductMaint" type="single" target="createProductMaint" title="" + <form name="AddProductMaint" type="single" target="createProductMaint" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createProductMaint" /> + <auto-fields-service service-name="createProductMaint" /> <field name="productId"><hidden/></field> <field name="productMaintSeqId"><ignored/></field> <field name="productMaintTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="ProductMaintType" description="${description}"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field> @@ -1191,14 +1201,14 @@ <drop-down allow-empty="true"> <entity-options entity-name="Uom" description="${description}" key-field-name="uomId"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="intervalMeterTypeId"> <drop-down allow-empty="true"> <entity-options entity-name="ProductMeterType" description="${description}" key-field-name="productMeterTypeId"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -1220,15 +1230,15 @@ </entity-options> </drop-down> </field> - <field name="maintName"><text size="20" /></field> + <field name="maintName"><text size="20" /></field> <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="intervalUomId"> <drop-down allow-empty="false"> <entity-options entity-name="Uom" description="${description}" key-field-name="uomId"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> - + </field> <field name="intervalMeterTypeId"> <drop-down allow-empty="true"> @@ -1244,27 +1254,27 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <!-- create and update a ProductMeter --> - <form name="AddProductMeter" type="single" target="createProductMeter" title="" + <form name="AddProductMeter" type="single" target="createProductMeter" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createProductMeter" /> + <auto-fields-service service-name="createProductMeter" /> <field name="productId"><hidden/></field> <field name="productMeterTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="ProductMeterType" description="${description}"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="meterUomId"> <drop-down allow-empty="false"> <entity-options entity-name="Uom" description="${description}" key-field-name="uomId"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> - <field name="meterName"><text size="20" /></field> + <field name="meterName"><text size="20" /></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListProductMeters" type="list" list-name="productMeters" target="updateProductMeter" @@ -1283,10 +1293,10 @@ <drop-down allow-empty="false"> <entity-options entity-name="Uom" description="${description}" key-field-name="uomId"> <entity-order-by field-name="description"/> - </entity-options> + </entity-options> </drop-down> </field> - <field name="meterName"><text size="20" /></field> + <field name="meterName"><text size="20" /></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteProductMeter" description="${uiLabelMap.CommonDelete}" also-hidden="false"> <parameter param-name="productId"/><parameter param-name="productMeterTypeId"/> @@ -1350,22 +1360,22 @@ <field name="productId"><hidden/></field> <field name="productFeatureId"> <display-entity entity-name="ProductFeature" description="${description}"> - <sub-hyperlink target="EditFeature?productFeatureId=${productFeatureId}" description="[${productFeatureId}]"/> + <sub-hyperlink target="EditFeature?productFeatureId=${productFeatureId}" description="[${productFeatureId}]"/> </display-entity> </field> <field name="productFeatureIdTo"> <display-entity entity-name="ProductFeature" description="${description}" key-field-name="productFeatureId"> - <sub-hyperlink target="EditFeature?productFeatureId=${productFeatureIdTo}" description="[${productFeatureIdTo}]"/> + <sub-hyperlink target="EditFeature?productFeatureId=${productFeatureIdTo}" description="[${productFeatureIdTo}]"/> </display-entity> </field> <field name="productFeatureIactnTypeId"><display-entity entity-name="ProductFeatureIactnType"/></field> - + <field name="removeFeatureInterAction" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> <hyperlink target="removeFeatureIactn" description="${uiLabelMap.CommonDelete}"> <parameter param-name="productFeatureId"/><parameter param-name="productFeatureIdTo"/><parameter param-name="productId"/> </hyperlink> </field> - </form> + </form> <form name="AddFeatureInteraction" type="single" target="AddProductFeatureIactn" title="" default-map-name="productFeatureIactn" header-row-style="header-row" default-table-style="basic-table"> <field name="productId"><hidden value="${parameters.productId}"/></field> @@ -1393,12 +1403,12 @@ <entity-order-by field-name="description"/> </entity-options> </drop-down> - </field> + </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> + </form> <form name="AddProductFeatureApplAttr" type="single" target="createProductFeatureApplAttr" title="" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createProductFeatureApplAttr" /> + <auto-fields-service service-name="createProductFeatureApplAttr" /> <field name="productId"><hidden/></field> <field name="productFeatureId"> <drop-down allow-empty="false"> @@ -1407,7 +1417,7 @@ <entity-order-by field-name="sequenceNum"/> <entity-order-by field-name="defaultSequenceNum"/> <entity-order-by field-name="fromDate"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -1441,15 +1451,17 @@ </entity-condition> </actions> <auto-fields-service service-name="updateProductSubscriptionResource"/> - + <field name="productId"><hidden/></field> <field name="subscriptionResourceId"> <display-entity entity-name="SubscriptionResource" description="${description}"> - <sub-hyperlink target="EditSubscriptionResource?subscriptionResourceId=${subscriptionResourceId}" description="${subscriptionResourceId}" link-style="buttontext"/> + <sub-hyperlink target="EditSubscriptionResource" description="${subscriptionResourceId}" link-style="buttontext"> + <parameter param-name="subscriptionResourceId" from-field="subscriptionResourceId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate"><display/></field> - + <field name="useTimeUomId"> <drop-down allow-empty="false"> <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId"> @@ -1473,7 +1485,7 @@ </entity-options> </drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" widget-style="buttontext"> <hyperlink target="deleteProductSubscriptionResource" description="${uiLabelMap.CommonDelete}" also-hidden="false"> @@ -1484,7 +1496,7 @@ <form name="AddProductSubscriptionResource" type="single" target="createProductSubscriptionResource" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createProductSubscriptionResource"/> - + <field name="productId"><hidden/></field> <field name="subscriptionResourceId"> <drop-down allow-empty="false"> @@ -1493,7 +1505,7 @@ </entity-options> </drop-down> </field> - + <field name="useTimeUomId"> <drop-down allow-empty="false"> <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId"> @@ -1517,7 +1529,7 @@ </entity-options> </drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -1527,7 +1539,7 @@ <entity-one entity-name="Agreement" value-field="agreement"/> </row-actions> <field name="agreementId" widget-style="buttontext"> - <hyperlink target="/accounting/control/EditAgreement?agreementId=${agreementId}" target-type="inter-app" + <hyperlink target="/accounting/control/EditAgreement?agreementId=${agreementId}" target-type="inter-app" description="${agreementId}" also-hidden="false"/> </field> <field name="partyId" title="${uiLabelMap.ProductSupplier}"><display/></field> @@ -1541,7 +1553,7 @@ <form name="ListSalesAgreements" type="list" list-name="salesAgreements" odd-row-style="alternate-row" default-table-style="basic-table"> <field name="agreementId" widget-style="buttontext"> - <hyperlink target="/accounting/control/EditAgreementItemProduct?agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}&productId=${productId}" target-type="inter-app" + <hyperlink target="/accounting/control/EditAgreementItemProduct?agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}&productId=${productId}" target-type="inter-app" description="${agreementId}/${agreementItemSeqId}" also-hidden="false"/> </field> <field name="partyIdFrom" title="${uiLabelMap.ProductPartyCustomer}"><display/></field> @@ -1555,7 +1567,7 @@ <form name="ListProductAgreements" type="list" list-name="productAgreements" odd-row-style="alternate-row" default-table-style="basic-table"> <field name="agreementId" widget-style="buttontext"> - <hyperlink target="/accounting/control/EditAgreementItemProduct?agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}&productId=${productId}" target-type="inter-app" + <hyperlink target="/accounting/control/EditAgreementItemProduct?agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}&productId=${productId}" target-type="inter-app" description="${agreementId}/${agreementItemSeqId}" also-hidden="false"/> </field> <field name="partyIdTo"><display/></field> @@ -1592,7 +1604,7 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListProductWorkEfforts" type="list" target="updateWorkEffortGoodStandard" list-name="productWorkEfforts" + <form name="ListProductWorkEfforts" type="list" target="updateWorkEffortGoodStandard" list-name="productWorkEfforts" odd-row-style="alternate-row" default-table-style="basic-table"> <actions> <entity-and entity-name="WorkEffortGoodStandard" use-cache="true" list="productWorkEfforts"> @@ -1602,7 +1614,9 @@ <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit" /> <field name="workEffortId"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}" also-hidden="true"> - <sub-hyperlink target="/workeffort/control/EditWorkEffort?workEffortId=${workEffortId}" description="${workEffortId}" link-style="buttontext" target-type="inter-app"/> + <sub-hyperlink target="/workeffort/control/EditWorkEffort" description="${workEffortId}" link-style="buttontext" target-type="inter-app"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </sub-hyperlink> </display-entity> </field> <field name="workEffortGoodStdTypeId"><display-entity entity-name="WorkEffortGoodStandardType" description="${description}"/></field> @@ -1725,7 +1739,7 @@ </form> <!-- ProductKeywords --> <form name="AddProductKeyword" type="single" target="createProductKeyword" title="" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createProductKeyword"/> <field name="productId"><hidden/></field> <field name="relevancyWeight"><text default-value="1"/></field> @@ -1739,7 +1753,7 @@ </form> <!-- ProductAttribute --> <form name="AddProductAttribute" type="single" target="createProductAttribute" title="" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createProductAttribute"/> <field name="productId"><hidden/></field> <field name="attrName"></field> @@ -1767,8 +1781,8 @@ <condition-expr field-name="productId" from-field="productId"/> <order-by field-name="productId" /> </entity-condition> - </actions> - <field name="productId"><hidden/></field> + </actions> + <field name="productId"><hidden/></field> <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}"> <display-entity entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}" /> </field> @@ -1776,19 +1790,19 @@ <display description="${bsh: org.ofbiz.party.party.PartyHelper.getPartyName(delegator, organizationPartyId, true);} [${organizationPartyId}]"/> </field> <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}"> - <drop-down allow-empty="false"> - <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/> + <drop-down allow-empty="false"> + <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/> </drop-down> - </field> + </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title="" widget-style="buttontext"> <hyperlink target="deleteProductGlAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false"> <parameter param-name="productId"/><parameter param-name="organizationPartyId"/><parameter param-name="glAccountTypeId"/> </hyperlink> </field> - </form> + </form> <form name="AddProductGlAccount" type="single" target="createProductGlAccount" title="" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <field name="productId"><hidden/></field> <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}"> <drop-down allow-empty="false"> @@ -1797,7 +1811,7 @@ </field> <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}"> <drop-down allow-empty="false"> - <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/> + <list-options key-name="accountCode" list-name="glAccounts" description="${accountCode} ${accountName}"/> </drop-down> </field> <field name="organizationPartyId" title="${uiLabelMap.ProductOrganization}"> @@ -1810,14 +1824,14 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - + <!-- Vendor Product--> <form name="ListVendorProducts" type="list" list-name="vendorProductList" target="deleteVendorProduct" paginate-target="EditVendorProduct" odd-row-style="alternate-row" default-table-style="basic-table"> <field name="productId"><hidden/></field> <field name="vendorPartyId"><display/></field> <field name="productStoreGroupId"><display/></field> - + <field name="submitButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml Sun Mar 29 11:00:00 2009 @@ -25,11 +25,15 @@ paginate-target="ListQuantityBreaks" odd-row-style="alternate-row" default-table-style="basic-table"> <auto-fields-entity entity-name="QuantityBreak" default-field-type="display"/> <field name="quantityBreakId" widget-style="buttontext"> - <hyperlink target="ListQuantityBreaks?quantityBreakId=${quantityBreakId}" description="${quantityBreakId}" also-hidden="false"/> + <hyperlink target="ListQuantityBreaks" description="${quantityBreakId}" also-hidden="false"> + <parameter param-name="quantityBreakId" from-field="quantityBreakId"/> + </hyperlink> </field> <field name="quantityBreakTypeId" title="${uiLabelMap.CommonType}"><display-entity also-hidden="false" entity-name="QuantityBreakType"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteQuantityBreak?quantityBreakId=${quantityBreakId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/> + <hyperlink target="deleteQuantityBreak" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <parameter param-name="quantityBreakId" from-field="quantityBreakId"/> + </hyperlink> </field> </form> <form name="EditQuantityBreak" type="single" target="createQuantityBreak" title="" default-map-name="quantityBreak" @@ -50,10 +54,14 @@ paginate-target="ListShipmentMethodTypes" odd-row-style="alternate-row" default-table-style="basic-table"> <auto-fields-entity entity-name="ShipmentMethodType" default-field-type="display"/> <field name="shipmentMethodTypeId" widget-style="buttontext"> - <hyperlink target="ListShipmentMethodTypes?shipmentMethodTypeId=${shipmentMethodTypeId}" description="${shipmentMethodTypeId}" also-hidden="false"/> + <hyperlink target="ListShipmentMethodTypes" description="${shipmentMethodTypeId}" also-hidden="false"> + <parameter param-name="shipmentMethodTypeId" from-field="shipmentMethodTypeId"/> + </hyperlink> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteShipmentMethodType?shipmentMethodTypeId=${shipmentMethodTypeId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/> + <hyperlink target="deleteShipmentMethodType" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <parameter param-name="shipmentMethodTypeId" from-field="shipmentMethodTypeId"/> + </hyperlink> </field> </form> <form name="EditShipmentMethodType" type="single" target="createShipmentMethodType" title="" default-map-name="shipmentMethodType" Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Sun Mar 29 11:00:00 2009 @@ -23,7 +23,9 @@ <form name="FindProductStore" type="list" list-name="productStores" odd-row-style="alternate-row" default-table-style="basic-table"> <field name="ProductStoreNameId" title="${uiLabelMap.ProductStoreNameId}" widget-style="buttontext"> - <hyperlink target="EditProductStore?productStoreId=${productStoreId}" description="${storeName} [${productStoreId}]"/> + <hyperlink target="EditProductStore" description="${storeName} [${productStoreId}]"> + <parameter param-name="productStoreId" from-field="productStoreId"/> + </hyperlink> </field> <field name="title" title="${uiLabelMap.ProductTitle}"><display/></field> <field name="subtitle" title="${uiLabelMap.ProductSubTitle}"><display/></field> @@ -457,7 +459,9 @@ <field name="productStoreId"><hidden/></field> <field name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}"> <display-entity entity-name="ProdCatalog" description="${catalogName}" also-hidden="true"> - <sub-hyperlink target="EditProdCatalog?prodCatalogId=${prodCatalogId}" description="${prodCatalogId}" link-style="buttontext"/> + <sub-hyperlink target="EditProdCatalog" description="${prodCatalogId}" link-style="buttontext"> + <parameter param-name="prodCatalogId" from-field="prodCatalogId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Sun Mar 29 11:00:00 2009 @@ -102,7 +102,9 @@ <field name="datetimeReceived"><display/></field> <field name="expireDate" title="${uiLabelMap.ProductExpireDate}"><display/></field> <field name="productId"> - <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> + <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="internalName"><display/></field> <field name="locationSeqId" widget-style="buttontext"> @@ -142,7 +144,9 @@ <field name="datetimeReceived"><display/></field> <field name="expireDate" title="${uiLabelMap.ProductExpireDate}"><display/></field> <field name="productId"> - <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> + <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="lotId" title="${uiLabelMap.ProductLotId}"><display/></field> <field name="binNumber" title="${ProductBinNumber}"><display/></field> @@ -216,7 +220,9 @@ </hyperlink> </field> <field name="productId" position="1" use-when="showPosition1" widget-style="buttontext"> - <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> + <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="quantityOnHandTotal" position="1" use-when="showPosition1"> <display description="${quantityOnHandTotal}"/> @@ -237,15 +243,21 @@ </field> <field name="description" position="2"><display/></field> <field name="orderId" widget-style="buttontext" position="2"> - <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" /> + <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" > + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> </field> <field name="orderItemSeqId" position="2"><display/></field> <field name="shipmentId" widget-style="buttontext" position="2"> - <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}" /> + <hyperlink target="ViewShipment" description="${shipmentId}" > + <parameter param-name="shipmentId" from-field="shipmentId"/> + </hyperlink> </field> <field name="shipmentItemSeqId" position="2"><display/></field> <field name="workEffortId" widget-style="buttontext" position="2"> - <hyperlink target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app" description="${workEffortId}" /> + <hyperlink target="/workeffort/control/WorkEffortSummary" target-type="inter-app" description="${workEffortId}" > + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> </field> <field name="returnId" position="2"><display/></field> <field name="returnItemSeqId" position="2"><display/></field> @@ -264,7 +276,9 @@ </row-actions> <field name="productId" position="1" use-when="showPosition1" widget-style="buttontext"> - <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> + <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="effectiveDate" position="2"><display/></field> @@ -283,15 +297,21 @@ </field> <field name="description" position="2"><display/></field> <field name="orderId" widget-style="buttontext" position="2"> - <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" /> + <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" > + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> </field> <field name="orderItemSeqId" position="2"><display/></field> <field name="shipmentId" widget-style="buttontext" position="2"> - <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}" /> + <hyperlink target="ViewShipment" description="${shipmentId}" > + <parameter param-name="shipmentId" from-field="shipmentId"/> + </hyperlink> </field> <field name="shipmentItemSeqId" position="2"><display/></field> <field name="workEffortId" widget-style="buttontext" position="2"> - <hyperlink target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app" description="${workEffortId}" /> + <hyperlink target="/workeffort/control/WorkEffortSummary" target-type="inter-app" description="${workEffortId}" > + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> </field> <field name="returnId" position="2"><display/></field> <field name="returnItemSeqId" position="2"><display/></field> @@ -308,7 +328,9 @@ <field name="effectiveDate"><display/></field> <field name="productId" widget-style="buttontext"> - <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> + <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="inventoryItemId" widget-style="buttontext"> <hyperlink target="EditInventoryItem" description="${inventoryItemId}"> @@ -325,15 +347,21 @@ </field> <field name="description"><display/></field> <field name="orderId" widget-style="buttontext"> - <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" /> + <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" > + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> </field> <field name="orderItemSeqId"><display/></field> <field name="shipmentId" widget-style="buttontext"> - <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}" /> + <hyperlink target="ViewShipment" description="${shipmentId}" > + <parameter param-name="shipmentId" from-field="shipmentId"/> + </hyperlink> </field> <field name="shipmentItemSeqId"><display/></field> <field name="workEffortId" widget-style="buttontext"> - <hyperlink target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app" description="${workEffortId}" /> + <hyperlink target="/workeffort/control/WorkEffortSummary" target-type="inter-app" description="${workEffortId}" > + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> </field> <field name="returnId"><display/></field> <field name="returnItemSeqId"><display/></field> @@ -408,7 +436,9 @@ </field> <field name="productId" title="${uiLabelMap.CommonDescription}"> <display-entity entity-name="Product" description="${internalName}"> - <sub-hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${uiLabelMap.ProductCatalog}" link-style="buttontext"/> + <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${uiLabelMap.ProductCatalog}" link-style="buttontext"> + <parameter param-name="productId" from-field="productId"/> + </sub-hyperlink> </display-entity> </field> <field name="totalAvailableToPromise" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductAtp}"><display description="${resultMap.totalAvailableToPromise}"/></field> @@ -432,7 +462,9 @@ <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}"/> </field> <field name="primaryOrderId" title="${uiLabelMap.ProductOrderId}"> - <hyperlink target="/ordermgr/control/orderview?orderId=${primaryOrderId}" description="${primaryOrderId}" target-type="inter-app"/> + <hyperlink target="/ordermgr/control/orderview" description="${primaryOrderId}" target-type="inter-app"> + <parameter param-name="orderId" from-field="primaryOrderId"/> + </hyperlink> </field> <field name="shipmentRouteSegmentId"> <hyperlink target="EditShipmentRouteSegments?shipmentId=${shipmentId}" description="${shipmentRouteSegmentId}"/> @@ -468,7 +500,9 @@ <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}"/> </field> <field name="primaryOrderId" title="${uiLabelMap.ProductOrderId}"> - <hyperlink target="/ordermgr/control/orderview?orderId=${primaryOrderId}" description="${primaryOrderId}" target-type="inter-app"/> + <hyperlink target="/ordermgr/control/orderview" description="${primaryOrderId}" target-type="inter-app"> + <parameter param-name="orderId" from-field="primaryOrderId"/> + </hyperlink> </field> <field name="shipmentRouteSegmentId"><display/></field> <field name="shipmentPackageSeqId"><display/></field> @@ -608,7 +642,9 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="InventoryAverageCosts" override-list-size="${overrideListSize}"> <field name="productId2" title="${uiLabelMap.ProductProductId}" entry-name="productId" widget-style="buttontext"> - <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> + <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}"> + <parameter param-name="productId" from-field="productId"/> + </hyperlink> </field> <field name="totalQuantityOnHand" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductQoh}"><display/></field> <field name="productAverageCost" use-when="currencyUomId!=null" title="${uiLabelMap.ProductAverageCost}" ><display type="currency" currency="${currencyUomId}"/></field> @@ -695,7 +731,9 @@ </field> <field name="locationSeqId"><display/></field> <field name="productId" entry-name="product.productId" widget-style="buttontext"> - <hyperlink target="/catalog/control/EditProduct?productId=${product.productId}" target-type="inter-app" description="${product.productId}"/> + <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${product.productId}"> + <parameter param-name="productId" from-field="product.productId"/> + </hyperlink> </field> <field name="productName" title="${uiLabelMap.ProductProductName}" entry-name="product.internalName"><display/></field> <field name="serialNumber" entry-name="inventoryItem.serialNumber"><display/></field> @@ -731,7 +769,9 @@ </field> <field name="locationSeqIdTo"><display/></field> <field name="productId" entry-name="product.productId" widget-style="buttontext"> - <hyperlink target="/catalog/control/EditProduct?productId=${product.productId}" target-type="inter-app" description="${product.productId}"/> + <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${product.productId}"> + <parameter param-name="productId" from-field="product.productId"/> + </hyperlink> </field> <field name="productName" title="${uiLabelMap.ProductProductName}" entry-name="product.internalName"><display/></field> <field name="serialNumber" entry-name="inventoryItem.serialNumber"><display/></field> @@ -761,14 +801,18 @@ <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}" description="${inventoryItemId}"/> </field> <field name="facilityIdTo" widget-style="buttontext"> - <hyperlink target="EditFacility?facilityId=${facilityIdTo}" description="${facilityIdTo}" also-hidden="false"/> + <hyperlink target="EditFacility" description="${facilityIdTo}" also-hidden="false"> + <parameter param-name="facilityId" from-field="facilityIdTo"/> + </hyperlink> </field> <field name="facilityName" entry-name="facilityIdTo"> <display-entity entity-name="Facility" key-field-name="facilityId" description="${facilityName}" also-hidden="false"/> </field> <field name="locationSeqIdTo"><display also-hidden="false"/></field> <field name="productId" entry-name="product.productId" widget-style="buttontext"> - <hyperlink target="/catalog/control/EditProduct?productId=${product.productId}" target-type="inter-app" description="${product.productId}" also-hidden="false"/> + <hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${product.productId}" also-hidden="false"> + <parameter param-name="productId" from-field="product.productId"/> + </hyperlink> </field> <field name="productName" title="${uiLabelMap.ProductProductName}" entry-name="product.internalName"><display also-hidden="false"/></field> <field name="serialNumber" entry-name="inventoryItem.serialNumber"><display also-hidden="false"/></field> Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Sun Mar 29 11:00:00 2009 @@ -50,7 +50,9 @@ </field> <field name="productId"> <text> - <sub-hyperlink use-when="productId!=null" target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${uiLabelMap.ProductEditProduct} [${productId}]"/> + <sub-hyperlink use-when="productId!=null" target="/catalog/control/EditProduct" target-type="inter-app" description="${uiLabelMap.ProductEditProduct} [${productId}]"> + <parameter param-name="productId" from-field="productId"/> + </sub-hyperlink> </text> </field> <field name="statusId" use-when="inventoryItem==null"> @@ -83,7 +85,9 @@ <entity-options entity-name="Facility" description="${facilityName}" key-field-name="facilityId"> <entity-order-by field-name="facilityName"/> </entity-options> - <sub-hyperlink use-when="facilityId!=null" target="EditFacility?facilityId=${facilityId}" description="${uiLabelMap.ProductEditFacility} [${facilityId}]"/> + <sub-hyperlink use-when="facilityId!=null" target="EditFacility" description="${uiLabelMap.ProductEditFacility} [${facilityId}]"> + <parameter param-name="facilityId" from-field="facilityId"/> + </sub-hyperlink> </drop-down> </field> <field name="lotId" title="${uiLabelMap.ProductLotId}"/> @@ -156,10 +160,14 @@ <auto-fields-entity entity-name="InventoryItemDetail" map-name="inventoryItemDetail" default-field-type="display"/> <field name="inventoryItemId"><hidden/></field> <!-- this field is redundant --> <field name="orderId" widget-style="buttontext"> - <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" /> + <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" > + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> </field> <field name="shipmentId" widget-style="buttontext"> - <hyperlink target="ViewShipment?shipmentId=${shipmentId}" description="${shipmentId}" /> + <hyperlink target="ViewShipment" description="${shipmentId}" > + <parameter param-name="shipmentId" from-field="shipmentId"/> + </hyperlink> </field> <field name="reasonEnumId"> <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/> @@ -172,7 +180,9 @@ <auto-fields-entity entity-name="OrderItemShipGrpInvRes" default-field-type="display"/> <field name="inventoryItemId"><hidden/></field> <field name="orderId" widget-style="buttontext"> - <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}" /> + <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}" > + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> </field> </form> <!-- Inventory Item Labels --> @@ -180,7 +190,9 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateInventoryItemLabelAppl"/> <field name="inventoryItemLabelId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="EditInventoryItemLabel?inventoryItemLabelId=${inventoryItemLabelId}" description="${inventoryItemLabelId}" also-hidden="true"/> + <hyperlink target="EditInventoryItemLabel" description="${inventoryItemLabelId}" also-hidden="true"> + <parameter param-name="inventoryItemLabelId" from-field="inventoryItemLabelId"/> + </hyperlink> </field> <field name="facilityId"><hidden/></field> <field name="inventoryItemId"><hidden/></field> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml Sun Mar 29 11:00:00 2009 @@ -82,16 +82,16 @@ </field> <field name="estimatedShipWorkEffId" title="${uiLabelMap.ProductEstimatedShipWorkEffId}" widget-style="buttontext"> - <hyperlink target="/workeffort/control/WorkEffortSummary" also-hidden="false" description="${shipment.estimatedShipWorkEffId}" target-type="inter-app"> - <parameter param-name="workEffortId" from-field="shipment.estimatedShipWorkEffId"/> - </hyperlink> - </field> + <hyperlink target="/workeffort/control/WorkEffortSummary" also-hidden="false" description="${shipment.estimatedShipWorkEffId}" target-type="inter-app"> + <parameter param-name="workEffortId" from-field="shipment.estimatedShipWorkEffId"/> + </hyperlink> + </field> <field name="estimatedArrivalDate" title="${uiLabelMap.ProductEstimatedArrivalDate}"><date-time/></field> <field name="estimatedArrivalWorkEffId" title="${uiLabelMap.ProductEstimatedArrivalWorkEffId}" widget-style="buttontext"> - <hyperlink target="/workeffort/control/WorkEffortSummary" also-hidden="false" description="${shipment.estimatedArrivalWorkEffId}" target-type="inter-app"> - <parameter param-name="workEffortId" from-field="shipment.estimatedArrivalWorkEffId"/> - </hyperlink> - </field> + <hyperlink target="/workeffort/control/WorkEffortSummary" also-hidden="false" description="${shipment.estimatedArrivalWorkEffId}" target-type="inter-app"> + <parameter param-name="workEffortId" from-field="shipment.estimatedArrivalWorkEffId"/> + </hyperlink> + </field> <field name="latestCancelDate" title="${uiLabelMap.ProductLatestCancelDate}"><date-time/></field> <field name="estimatedShipCost" title="${uiLabelMap.ProductEstimatedShipCost}"><text/></field> <field name="currencyUomId" title="${uiLabelMap.ProductCurrencyUomId}"> Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?rev=759666&r1=759665&r2=759666&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Sun Mar 29 11:00:00 2009 @@ -100,7 +100,9 @@ <field name="subscriptionResourceId"> <display-entity entity-name="SubscriptionResource" description="${description}"> - <sub-hyperlink target="EditSubscriptionResource?subscriptionResourceId=${subscriptionResourceId}" description="${subscriptionResourceId}" link-style="buttontext"/> + <sub-hyperlink target="EditSubscriptionResource" description="${subscriptionResourceId}" link-style="buttontext"> + <parameter param-name="subscriptionResourceId" from-field="subscriptionResourceId"/> + </sub-hyperlink> </display-entity> </field> <field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscription} ${uiLabelMap.CommonType}"> @@ -109,29 +111,39 @@ <field name="originatedFromPartyId"> <display-entity entity-name="PartyNameView" description="${groupName} ${firstName} ${lastName}" key-field-name="partyId"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${originatedFromPartyId}" target-type="inter-app" description="${originatedFromPartyId}" link-style="buttontext"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${originatedFromPartyId}" link-style="buttontext"> + <parameter param-name="partyId" from-field="originatedFromPartyId"/> + </sub-hyperlink> </display-entity> </field> <field name="originatedFromRoleTypeId"><display-entity entity-name="RoleType" description="${description}" key-field-name="roleTypeId"/></field> <field name="partyId"> <display-entity entity-name="PartyNameView" description="${groupName} ${firstName} ${lastName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="buttontext"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}" key-field-name="roleTypeId"/></field> <field name="orderId" widget-style="buttontext"> - <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app" description="${orderId}"/> + <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}"> + <parameter param-name="orderId" from-field="orderId"/> + </hyperlink> </field> <field name="productId"> <display-entity entity-name="Product" description="${productName}"> - <sub-hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}" link-style="buttontext"/> + <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${productId}" link-style="buttontext"> + <parameter param-name="productId" from-field="productId"/> + </sub-hyperlink> </display-entity> </field> <field name="productCategoryId"> <display-entity entity-name="ProductCategory" description="${categoryName}"> - <sub-hyperlink target="/catalog/control/EditProductCategory?productCategoryId=${productCategoryId}" target-type="inter-app" description="${productCategoryId}" link-style="buttontext"/> + <sub-hyperlink target="/catalog/control/EditProductCategory" target-type="inter-app" description="${productCategoryId}" link-style="buttontext"> + <parameter param-name="productCategoryId" from-field="productCategoryId"/> + </sub-hyperlink> </display-entity> </field> @@ -187,7 +199,9 @@ <field name="originatedFromPartyId"> <lookup target-form-name="LookupPartyName"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${subscription.originatedFromPartyId}" target-type="inter-app" description="${subscription.originatedFromPartyId}" link-style="buttontext"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${subscription.originatedFromPartyId}" link-style="buttontext"> + <parameter param-name="partyId" from-field="subscription.originatedFromPartyId"/> + </sub-hyperlink> </lookup> </field> <field name="originatedFromRoleTypeId"> @@ -200,7 +214,9 @@ <field name="partyId"> <lookup target-form-name="LookupPartyName"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${subscription.partyId}" target-type="inter-app" description="${subscription.partyId}" link-style="buttontext"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${subscription.partyId}" link-style="buttontext"> + <parameter param-name="partyId" from-field="subscription.partyId"/> + </sub-hyperlink> </lookup> </field> <field name="roleTypeId"> @@ -213,7 +229,9 @@ <field name="partyNeedId"> <lookup target-form-name="LookupPartyName"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${subscription.partyNeedId}" target-type="inter-app" description="${subscription.partyId}" link-style="buttontext"/> + <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${subscription.partyId}" link-style="buttontext"> + <parameter param-name="partyId" from-field="subscription.partyNeedId"/> + </sub-hyperlink> </lookup> </field> <field name="needTypeId"> @@ -226,17 +244,23 @@ <field name="orderId"> <lookup target-form-name="LookupOrderHeader"> - <sub-hyperlink target="/ordermgr/control/orderview?orderId=${subscription.orderId}" target-type="inter-app" description="${subscription.orderId}" link-style="buttontext"/> + <sub-hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${subscription.orderId}" link-style="buttontext"> + <parameter param-name="orderId" from-field="subscription.orderId"/> + </sub-hyperlink> </lookup> </field> <field name="productId"> <lookup target-form-name="LookupProduct"> - <sub-hyperlink target="/catalog/control/EditProduct?productId=${subscription.productId}" target-type="inter-app" description="${subscription.productId}" link-style="buttontext"/> + <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${subscription.productId}" link-style="buttontext"> + <parameter param-name="productId" from-field="subscription.productId"/> + </sub-hyperlink> </lookup> </field> <field name="productCategoryId"> <lookup target-form-name="LookupProductCategory"> - <sub-hyperlink target="/catalog/control/EditProductCategory?productCategoryId=${subscription.productCategoryId}" target-type="inter-app" description="${subscription.productCategoryId}" link-style="buttontext"/> + <sub-hyperlink target="/catalog/control/EditProductCategory" target-type="inter-app" description="${subscription.productCategoryId}" link-style="buttontext"> + <parameter param-name="productCategoryId" from-field="subscription.productCategoryId"/> + </sub-hyperlink> </lookup> </field> <field name="useTimeUomId" title="${uiLabelMap.ProductUseTimeUom}"> @@ -276,12 +300,16 @@ <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> <field name="contentId"> <display-entity entity-name="Content" description="${contentName}"> - <sub-hyperlink target="/content/control/EditContent?contentId=${contentId}" target-type="inter-app" description="${contentId}" link-style="buttontext"/> + <sub-hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" link-style="buttontext"> + <parameter param-name="contentId" from-field="contentId"/> + </sub-hyperlink> </display-entity> </field> <field name="webSiteId"> <display-entity entity-name="WebSite" description="${siteName}"> - <sub-hyperlink target="/content/control/EditWebSite?webSiteId=${webSiteId}" target-type="inter-app" description="${webSiteId}" link-style="buttontext"/> + <sub-hyperlink target="/content/control/EditWebSite" target-type="inter-app" description="${webSiteId}" link-style="buttontext"> + <parameter param-name="webSiteId" from-field="webSiteId"/> + </sub-hyperlink> </display-entity> </field> @@ -424,7 +452,9 @@ <field name="subscriptionId"><hidden value="${parameters.subscriptionId}"/></field> <field name="communicationEventId"> <lookup target-form-name="LookupCommEvent"> - <sub-hyperlink target="/partymgr/control/ViewCommunicationEvent?communicationEventId=${subscription.communicationEventId}" target-type="inter-app" description="${subscription.communicationEventId}" link-style="buttontext"/> + <sub-hyperlink target="/partymgr/control/ViewCommunicationEvent" target-type="inter-app" description="${subscription.communicationEventId}" link-style="buttontext"> + <parameter param-name="communicationEventId" from-field="subscription.communicationEventId"/> + </sub-hyperlink> </lookup> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |