Author: jacopoc
Date: Sat May 19 02:31:30 2007
New Revision: 539723
URL: http://svn.apache.org/viewvc?view=rev&rev=539723
Log:
Renamed OrderPrintForms.xml to OrderPrintScreens.xml, since the file contains
screen definitions.
Thanks to Vikas Mayur for the patch; OFBIZ-976
Added:
ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
- copied, changed from r539714,
ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintForms.xml
Removed:
ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintForms.xml
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl?view=diff&rev=539723&r1=539722&r2=539723
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
Sat May 19 02:31:30 2007
@@ -36,7 +36,7 @@
fo:page-sequence -->
<fo:static-content flow-name="xsl-region-before">
<fo:block space-after=".10in">
-
${screens.render("component://order/widget/ordermgr/OrderPrintForms.xml#CompanyLogo")}
+
${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}
</fo:block>
<fo:block white-space-collapse="false" >
</fo:block>
Modified: ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml?view=diff&rev=539723&r1=539722&r2=539723
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml Sat May 19
02:31:30 2007
@@ -39,7 +39,7 @@
<decorator-section name="topLeft">
<section>
<widgets>
- <include-screen name="CompanyLogo"
location="component://order/widget/ordermgr/OrderPrintForms.xml"/>
+ <include-screen name="CompanyLogo"
location="component://order/widget/ordermgr/OrderPrintScreens.xml"/>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?view=diff&rev=539723&r1=539722&r2=539723
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat
May 19 02:31:30 2007
@@ -1652,9 +1652,9 @@
<view-map name="LookupBulkAddProducts" type="screen"
page="component://order/widget/ordermgr/OrderEntryCartScreens.xml#LookupBulkAddProducts"/>
<view-map name="LookupBulkAddSupplierProducts" type="screen"
page="component://order/widget/ordermgr/OrderEntryCartScreens.xml#LookupBulkAddSupplierProducts"/>
<!-- PDFs -->
- <view-map name="OrderPDF" type="screenfop"
page="component://order/widget/ordermgr/OrderPrintForms.xml#OrderPDF"
content-type="application/pdf" encoding="none"/>
- <view-map name="ReturnPDF" type="screenfop"
page="component://order/widget/ordermgr/OrderPrintForms.xml#ReturnPDF"
content-type="application/pdf" encoding="none"/>
- <view-map name="ShipGroupsPDF" type="screenfop"
page="component://order/widget/ordermgr/OrderPrintForms.xml#ShipGroupsPDF"
content-type="application/pdf" encoding="none"/>
+ <view-map name="OrderPDF" type="screenfop"
page="component://order/widget/ordermgr/OrderPrintScreens.xml#OrderPDF"
content-type="application/pdf" encoding="none"/>
+ <view-map name="ReturnPDF" type="screenfop"
page="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF"
content-type="application/pdf" encoding="none"/>
+ <view-map name="ShipGroupsPDF" type="screenfop"
page="component://order/widget/ordermgr/OrderPrintScreens.xml#ShipGroupsPDF"
content-type="application/pdf" encoding="none"/>
<view-map name="SendConfirmationMail" type="screen"
page="component://order/widget/ordermgr/OrderViewScreens.xml#SendOrderConfirmation"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?view=diff&rev=539723&r1=539722&r2=539723
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Sat May
19 02:31:30 2007
@@ -407,7 +407,7 @@
<div> </div>
<div align="right" class="tabletext">
<input type="hidden" name="orderIdList" value=""/>
- <input type="hidden" name="screenLocation"
value="component://order/widget/ordermgr/OrderPrintForms.xml#OrderPDF"/>
+ <input type="hidden" name="screenLocation"
value="component://order/widget/ordermgr/OrderPrintScreens.xml#OrderPDF"/>
<select name="serviceName" class="selectBox"
onchange="javascript:setServiceName(this);">
<option value="javascript:void();"> </option>
<option
value="<@ofbizUrl>massApproveOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</option>
Copied: ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
(from r539714,
ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintForms.xml)
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml?view=diff&rev=539723&p1=ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintForms.xml&r1=539714&p2=ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml&r2=539723
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintForms.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml Sat
May 19 02:31:30 2007
@@ -40,7 +40,7 @@
<decorator-section name="topLeft">
<section>
<widgets>
- <include-screen name="CompanyLogo"
location="component://order/widget/ordermgr/OrderPrintForms.xml"/>
+ <include-screen name="CompanyLogo"
location="component://order/widget/ordermgr/OrderPrintScreens.xml"/>
</widgets>
</section>
</decorator-section>
@@ -102,7 +102,7 @@
<decorator-section name="topLeft">
<section>
<widgets>
- <include-screen name="CompanyLogo"
location="component://order/widget/ordermgr/OrderPrintForms.xml"/>
+ <include-screen name="CompanyLogo"
location="component://order/widget/ordermgr/OrderPrintScreens.xml"/>
</widgets>
</section>
</decorator-section>
@@ -152,7 +152,7 @@
<decorator-section name="topLeft">
<section>
<widgets>
- <include-screen name="CompanyLogo"
location="component://order/widget/ordermgr/OrderPrintForms.xml"/>
+ <include-screen name="CompanyLogo"
location="component://order/widget/ordermgr/OrderPrintScreens.xml"/>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?view=diff&rev=539723&r1=539722&r2=539723
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Sat May 19
02:31:30 2007
@@ -149,7 +149,7 @@
<decorator-section name="topLeft">
<section>
<widgets>
- <include-screen name="CompanyLogo"
location="component://order/widget/ordermgr/OrderPrintForms.xml"/>
+ <include-screen name="CompanyLogo"
location="component://order/widget/ordermgr/OrderPrintScreens.xml"/>
</widgets>
</section>
</decorator-section>
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl?view=diff&rev=539723&r1=539722&r2=539723
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
Sat May 19 02:31:30 2007
@@ -39,7 +39,7 @@
<#list packages as package>
<fo:block>
-
${screens.render("component://order/widget/ordermgr/OrderPrintForms.xml#CompanyLogo")}
+
${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}
</fo:block>
<fo:block text-align="right">
<fo:instream-foreign-object>
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl?view=diff&rev=539723&r1=539722&r2=539723
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl
Sat May 19 02:31:30 2007
@@ -40,7 +40,7 @@
</fo:static-content>
<fo:flow flow-name="xsl-region-body" font-family="Helvetica">
<fo:block>
-
${screens.render("component://order/widget/ordermgr/OrderPrintForms.xml#CompanyLogo")}
+
${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}
</fo:block>
<fo:block text-align="right">
<fo:instream-foreign-object>
