Author: sichen
Date: Thu Sep 14 16:43:13 2006
New Revision: 443521
URL: http://svn.apache.org/viewvc?view=rev&rev=443521
Log:
Print gift messages on the pick/pack reports and packing slips, to help the
shipping people remember these things
Modified:
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
Modified:
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl?view=diff&rev=443521&r1=443520&r2=443521
==============================================================================
---
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
(original)
+++
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
Thu Sep 14 16:43:13 2006
@@ -258,6 +258,25 @@
</fo:table-body>
</fo:table>
</fo:block>
+ <fo:block space-after.optimum="10pt" font-size="10pt">
+ <fo:table>
+ <fo:table-column column-width="450pt"/>
+ <fo:table-body>
+ <#if
picklistBinInfo.primaryOrderItemShipGroup.giftMessage?has_content>
+ <fo:table-row font-weight="bold">
+ <fo:table-cell>
+
<fo:block>${uiLabelMap.OrderGiftMessage}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row >
+ <fo:table-cell>
+
<fo:block>${picklistBinInfo.primaryOrderItemShipGroup.giftMessage}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </#if>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
</fo:flow>
</fo:page-sequence>
</#list>
Modified:
incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl?view=diff&rev=443521&r1=443520&r2=443521
==============================================================================
---
incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
(original)
+++
incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
Thu Sep 14 16:43:13 2006
@@ -148,6 +148,25 @@
</fo:table-body>
</fo:table>
</fo:block>
+ <fo:block space-after.optimum="10pt" font-size="10pt">
+ <fo:table>
+ <fo:table-column column-width="450pt"/>
+ <fo:table-body>
+ <#if shipGroup.giftMessage?exists >
+ <fo:table-row font-weight="bold">
+ <fo:table-cell>
+
<fo:block>${uiLabelMap.OrderGiftMessage}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row >
+ <fo:table-cell>
+ <fo:block>${shipGroup.giftMessage}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </#if>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
</fo:flow>
</fo:page-sequence>
Modified:
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=443521&r1=443520&r2=443521
==============================================================================
---
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
(original)
+++
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
Thu Sep 14 16:43:13 2006
@@ -670,6 +670,7 @@
<section>
<actions>
<!-- base/top/specific map first, then more common map added
for shared labels -->
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
Modified:
incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?view=diff&rev=443521&r1=443520&r2=443521
==============================================================================
---
incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
(original)
+++
incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
Thu Sep 14 16:43:13 2006
@@ -267,6 +267,7 @@
<section>
<actions>
<!-- base/top/specific map first, then more common map added
for shared labels -->
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
