Author: sichen
Date: Wed Jan 31 15:31:12 2007
New Revision: 502040
URL: http://svn.apache.org/viewvc?view=rev&rev=502040
Log:
Improvements to look of Approved Product Requirements.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?view=diff&rev=502040&r1=502039&r2=502040
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
Wed Jan 31 15:31:12 2007
@@ -281,7 +281,9 @@
<display-entity entity-name="Product" key-field-name="productId"
description="${internalName}"/>
</field>
<field name="facilityId"><display/></field>
- <field name="partyId"
title="${uiLabelMap.ProductSupplier}"><display/></field>
+ <field name="partyId" title="${uiLabelMap.ProductSupplier}">
+ <display description="${bsh:
org.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false);}"/>
+ </field>
<field name="supplierProductId"
title="${uiLabelMap.ProductSupplierProductId}"><display/></field>
<field name="idValue" title="UPCA"><display/></field>
<field name="minimumOrderQuantity"
widget-area-style="tabletextright"><display/></field>
@@ -303,7 +305,9 @@
<field name="internalName" entry-name="productId">
<display-entity entity-name="Product" key-field-name="productId"
description="${internalName}"/>
</field>
- <field name="partyId"
title="${uiLabelMap.ProductSupplier}"><display/></field>
+ <field name="partyId" title="${uiLabelMap.ProductSupplier}">
+ <display description="${bsh:
org.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false);}"/>
+ </field>
<field name="supplierProductId"
title="${uiLabelMap.ProductSupplierProductId}"><display/></field>
<field name="idValue" title="UPCA"><display/></field>
<field name="minimumOrderQuantity"
title="${uiLabelMap.FormFieldTitle_minimumOrderQuantity}"
widget-area-style="tabletextright"><display/></field>
@@ -315,7 +319,11 @@
<field name="quantity"><text size="4"/></field>
<field name="comments"><display/></field>
<field name="_rowSubmit"
title="${uiLabelMap.CommonSelect}"><check/></field>
- <field name="submitButton"
title="${uiLabelMap.OrderInputQuickPurchaseOrder}"
widget-style="smallSubmit"><submit/></field>
+ </form>
+ <form name="ApprovedProductRequirementsSubmit" type="single">
+ <field name="submitButton" title="" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain"
description="${uiLabelMap.OrderInputQuickPurchaseOrder}"
target="javascript:document.ApprovedProductRequirements.submit()"/>
+ </field>
</form>
<form name="ApprovedProductRequirementsSummary" type="single"
default-map-name="quantityReport"
default-title-style="tableheadtext" default-widget-style="tabletext"
default-tooltip-style="tabletext">
@@ -326,8 +334,7 @@
default-title-style="tableheadtext" default-widget-style="tabletext"
default-tooltip-style="tabletext"
paginate-target="ApprovedProductRequirementsByVendor">
<field name="partyId">
- <display-entity entity-name="PartyNameView"
key-field-name="partyId" description="${firstName} ${middleName} ${lastName}
${groupName} (${partyId})" also-hidden="true">
- </display-entity>
+ <display description="${bsh:
org.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false);}"/>
</field>
<field name="productId"
title="${uiLabelMap.OrderVendorRequirementCount}"
widget-area-style="tabletextright"><display/></field>
<field name="prepare" title="${uiLabelMap.OrderPrepareOrder}"
widget-style="buttontext">
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?view=diff&rev=502040&r1=502039&r2=502040
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Wed
Jan 31 15:31:12 2007
@@ -161,7 +161,10 @@
<label style="head2"
text="${uiLabelMap.RequirementList}"/>
</container>
<include-form
name="ApprovedProductRequirements"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
- <include-form
name="ApprovedProductRequirementsSummary"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ <container style="screenlet">
+ <include-form
name="ApprovedProductRequirementsSummary"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </container>
+ <include-form
name="ApprovedProductRequirementsSubmit"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
</widgets>
<fail-widgets>
<include-form
name="ApprovedProductRequirementsList"
location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
