Author: jacopoc
Date: Tue Apr 29 16:52:54 2008
New Revision: 652191
URL: http://svn.apache.org/viewvc?rev=652191&view=rev
Log:
Converted ftl file to the widgets.
Removed:
ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipment.ftl
Modified:
ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
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=652191&r1=652190&r2=652191&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
Tue Apr 29 16:52:54 2008
@@ -140,6 +140,14 @@
</entity-options>
</drop-down>
</field>
+ <field name="defaultSalesChannelEnumId">
+ <drop-down allow-empty="true">
+ <entity-options key-field-name="enumId"
description="${description}" entity-name="Enumeration">
+ <entity-constraint name="enumTypeId" operator="equals"
value="ORDER_SALES_CHANNEL"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="allowPassword">
<drop-down allow-empty="false" no-current-selected-key="Y"><option
key="Y" description="${uiLabelMap.CommonY}"/><option key="N"
description="${uiLabelMap.CommonN}"/></drop-down>
</field>
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=652191&r1=652190&r2=652191&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Tue
Apr 29 16:52:54 2008
@@ -90,9 +90,9 @@
<widgets>
<decorator-screen name="CommonShipmentDecorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template
location="component://product/webapp/facility/shipment/ViewShipment.ftl"/></html>
- </platform-specific>
+ <container>
+ <link style="buttontext"
text="${uiLabelMap.ProductGenerateShipmentManifestReport}"
target="ShipmentManifest.pdf?shipmentId=${shipment.shipmentId}"/>
+ </container>
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/ViewShipmentInfo.ftl"/></html>
</platform-specific>
