OFBiz › OFBiz - Commits

svn commit: r1736868 [20/20] - in /ofbiz/trunk/applications/order: template/ template/entry/ template/entry/cart/ template/entry/catalog/ template/entry/order/ template/order/ template/product/ template/quote/ template/reports/ template/request/ templa...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r1736868 [20/20] - in /ofbiz/trunk/applications/order: template/ template/entry/ template/entry/cart/ template/entry/catalog/ template/entry/order/ template/order/ template/product/ template/quote/ template/reports/ template/request/ templa...

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Mon Mar 28 11:14:22 2016
@@ -64,13 +64,13 @@ under the License.
<include-screen name="orderHeader"/>
<container style="clear"/>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/orderitems.ftl"/></html>
+ <html><html-template location="component://order/template/order/orderitems.ftl"/></html>
</platform-specific>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/ordernotes.ftl"/></html>
+ <html><html-template location="component://order/template/order/ordernotes.ftl"/></html>
</platform-specific>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/transitions.ftl"/></html>
+ <html><html-template location="component://order/template/order/transitions.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -107,7 +107,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/orderinfo.ftl"/></html>
+ <html><html-template location="component://order/template/order/orderinfo.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -116,7 +116,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/orderterms.ftl"/></html>
+ <html><html-template location="component://order/template/order/orderterms.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -125,7 +125,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/orderpaymentinfo.ftl"/></html>
+ <html><html-template location="component://order/template/order/orderpaymentinfo.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -164,7 +164,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/ordercontactinfo.ftl"/></html>
+ <html><html-template location="component://order/template/order/ordercontactinfo.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -182,7 +182,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/ordershippinginfo.ftl"/></html>
+ <html><html-template location="component://order/template/order/ordershippinginfo.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -191,7 +191,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/OrderSalesReps.ftl"/></html>
+ <html><html-template location="component://order/template/order/OrderSalesReps.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -209,7 +209,7 @@ under the License.
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/orderlist.ftl"/></html>
+ <html><html-template location="component://order/template/order/orderlist.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -230,10 +230,10 @@ under the License.
<include-screen name="orderHeader"/>
<container style="clear"/>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/editorderitems.ftl"/></html>
+ <html><html-template location="component://order/template/order/editorderitems.ftl"/></html>
</platform-specific>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/appendorderitem.ftl"/></html>
+ <html><html-template location="component://order/template/order/appendorderitem.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -262,7 +262,7 @@ under the License.
<decorator-section name="body">
<platform-specific><html><html-template location="component://common/webcommon/includes/setMultipleSelectJs.ftl"/></html></platform-specific>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/findOrders.ftl"/></html>
+ <html><html-template location="component://order/template/order/findOrders.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -311,7 +311,7 @@ under the License.
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl"/></html>
+ <html><html-template location="component://order/template/order/OrderDeliveryScheduleInfo.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -329,7 +329,7 @@ under the License.
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/orderstats.ftl"/></html>
+ <html><html-template location="component://order/template/order/orderstats.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -354,7 +354,7 @@ under the License.
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/receivepayment.ftl"/></html>
+ <html><html-template location="component://order/template/order/receivepayment.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -368,7 +368,7 @@ under the License.
<script location="component://order/webapp/ordermgr/WEB-INF/actions/order/ViewImage.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/webapp/ordermgr/order/viewimage.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/order/viewimage.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -384,7 +384,7 @@ under the License.
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/sendconfirmationemail.ftl"/></html>
+ <html><html-template location="component://order/template/order/sendconfirmationemail.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -403,7 +403,7 @@ under the License.
<decorator-screen name="CommonOrderViewDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/sendconfirmationemail.ftl"/></html>
+ <html><html-template location="component://order/template/order/sendconfirmationemail.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -548,7 +548,7 @@ under the License.
</condition>
<widgets>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/order/OrderListByDate.ftl"/></html>
+ <html><html-template location="component://order/template/order/OrderListByDate.ftl"/></html>
</platform-specific>
</widgets>
<fail-widgets>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Mon Mar 28 11:14:22 2016
@@ -116,7 +116,7 @@ under the License.
<include-screen name="ViewQuoteTemplate"/>
<screenlet title="${uiLabelMap.OrderCopyQuote}">
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/CopyQuote.ftl"/></html>
+ <html><html-template location="component://order/template/quote/CopyQuote.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -194,7 +194,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/quote/quoteReportHeaderInfo.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -204,11 +204,11 @@ under the License.
<widgets>

<platform-specific>
- <xsl-fo><html-template location="component://order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/quote/quoteReportContactMechs.fo.ftl"/></xsl-fo>
</platform-specific>

<platform-specific>
- <xsl-fo><html-template location="component://order/webapp/ordermgr/quote/quoteReportBody.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/quote/quoteReportBody.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -506,13 +506,13 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.OrderOrderQuotePrices}">
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/ManageQuotePrices.ftl"/></html>
+ <html><html-template location="component://order/template/quote/ManageQuotePrices.ftl"/></html>
</platform-specific>
</screenlet>
<screenlet title="${uiLabelMap.OrderOrderQuotePrices}">
<include-form name="ManageQuotePrices" location="component://order/widget/ordermgr/QuoteForms.xml"/>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl"/></html>
+ <html><html-template location="component://order/template/quote/ManageQuotePricesTotals.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -610,7 +610,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.OrderOrderQuoteViewProfit}">
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteProfit.ftl"/></html>
+ <html><html-template location="component://order/template/quote/ViewQuoteProfit.ftl"/></html>
</platform-specific>
<include-form name="ViewQuoteProfit" location="component://order/widget/ordermgr/QuoteForms.xml"/>
</screenlet>
@@ -691,7 +691,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/quoteInfo.ftl"/></html>
+ <html><html-template location="component://order/template/quote/quoteInfo.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -724,7 +724,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/quoteDate.ftl"/></html>
+ <html><html-template location="component://order/template/quote/quoteDate.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -733,7 +733,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/quoteRoles.ftl"/></html>
+ <html><html-template location="component://order/template/quote/quoteRoles.ftl"/></html>
</platform-specific>
</widgets>
</section>
@@ -754,7 +754,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl"/></html>
+ <html><html-template location="component://order/template/quote/ViewQuoteItemInfo.ftl"/></html>
</platform-specific>
</widgets>
</section>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=1736868&r1=1736867&r2=1736868&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Mon Mar 28 11:14:22 2016
@@ -143,7 +143,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/reports/OrderPurchaseReportPayment.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -182,7 +182,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/reports/OrderPurchaseReportProduct.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -223,7 +223,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/reports/SalesByStoreReport.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -288,7 +288,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/reports/PurchasesByOrganizationReport.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>