You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/05/15 06:06:13 UTC
svn commit: r1743881 [1/2] - in /ofbiz/trunk:
applications/order/email/default/
applications/order/src/org/ofbiz/order/order/
applications/order/template/entry/ applications/order/template/entry/cart/
applications/order/template/entry/catalog/ applicat...
Author: deepak
Date: Sun May 15 06:06:11 2016
New Revision: 1743881
URL: http://svn.apache.org/viewvc?rev=1743881&view=rev
Log:
(OFBIZ-7021) Renamed order component ftl file name from lower case to upper case pattern.
Added:
ofbiz/trunk/applications/order/email/default/EmailProcessNotify.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl
ofbiz/trunk/applications/order/template/entry/AdditionalPartyListing.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
ofbiz/trunk/applications/order/template/entry/AddrSettings.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
ofbiz/trunk/applications/order/template/entry/BillSettings.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/billsettings.ftl
ofbiz/trunk/applications/order/template/entry/CheckInits.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/checkinits.ftl
ofbiz/trunk/applications/order/template/entry/CheckoutOptions.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
ofbiz/trunk/applications/order/template/entry/CheckoutPayment.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
ofbiz/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
ofbiz/trunk/applications/order/template/entry/CustSettings.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/custsettings.ftl
ofbiz/trunk/applications/order/template/entry/CustomerTaxInfo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
ofbiz/trunk/applications/order/template/entry/EditShipAddress.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl
ofbiz/trunk/applications/order/template/entry/OptionSettings.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/optionsettings.ftl
ofbiz/trunk/applications/order/template/entry/OrderAgreements.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/orderagreements.ftl
ofbiz/trunk/applications/order/template/entry/OrderHeaderInfo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl
ofbiz/trunk/applications/order/template/entry/OrderParty.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/orderparty.ftl
ofbiz/trunk/applications/order/template/entry/OrderShortcuts.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl
ofbiz/trunk/applications/order/template/entry/OrderTerms.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/orderterms.ftl
ofbiz/trunk/applications/order/template/entry/PoHeader.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/poheader.ftl
ofbiz/trunk/applications/order/template/entry/SetAdditionalParty.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
ofbiz/trunk/applications/order/template/entry/ShipSettings.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/shipsettings.ftl
ofbiz/trunk/applications/order/template/entry/Survey.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/survey.ftl
ofbiz/trunk/applications/order/template/entry/cart/AddItemsToShoppingList.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
ofbiz/trunk/applications/order/template/entry/cart/AssociatedProducts.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
ofbiz/trunk/applications/order/template/entry/cart/Javascript.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
ofbiz/trunk/applications/order/template/entry/cart/ManualPromotions.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
ofbiz/trunk/applications/order/template/entry/cart/MiniCart.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
ofbiz/trunk/applications/order/template/entry/cart/PromoCodes.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
ofbiz/trunk/applications/order/template/entry/cart/PromoText.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
ofbiz/trunk/applications/order/template/entry/cart/PromoUseDetailsInline.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
ofbiz/trunk/applications/order/template/entry/cart/PromotionCategories.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
ofbiz/trunk/applications/order/template/entry/cart/PromotionDetails.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
ofbiz/trunk/applications/order/template/entry/cart/PromotionProducts.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
ofbiz/trunk/applications/order/template/entry/cart/PromotionsApplied.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
ofbiz/trunk/applications/order/template/entry/cart/ShowAllPromotions.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
ofbiz/trunk/applications/order/template/entry/cart/ShowCart.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
ofbiz/trunk/applications/order/template/entry/cart/ShowCartItems.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
ofbiz/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
ofbiz/trunk/applications/order/template/entry/catalog/BreadCrumbs.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl
ofbiz/trunk/applications/order/template/entry/catalog/Category.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/category.ftl
ofbiz/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl
ofbiz/trunk/applications/order/template/entry/catalog/ChooseCatalog.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl
ofbiz/trunk/applications/order/template/entry/catalog/CompareProducts.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl
ofbiz/trunk/applications/order/template/entry/catalog/CompareProductsList.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl
ofbiz/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl
ofbiz/trunk/applications/order/template/entry/catalog/EditProduct.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl
ofbiz/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl
ofbiz/trunk/applications/order/template/entry/catalog/KeywordSearch.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl
ofbiz/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl
ofbiz/trunk/applications/order/template/entry/catalog/Product.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/product.ftl
ofbiz/trunk/applications/order/template/entry/catalog/ProductDetail.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl
ofbiz/trunk/applications/order/template/entry/catalog/ProductSummary.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
ofbiz/trunk/applications/order/template/entry/catalog/QuickAdd.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
ofbiz/trunk/applications/order/template/entry/catalog/QuickAddSummary.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
ofbiz/trunk/applications/order/template/entry/catalog/SideDeepCategory.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
ofbiz/trunk/applications/order/template/entry/catalog/TagSearch.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
ofbiz/trunk/applications/order/template/entry/order/OrderHeaderInfo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl
ofbiz/trunk/applications/order/template/entry/order/OrderItems.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl
ofbiz/trunk/applications/order/template/entry/order/OrderPaymentInfo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl
ofbiz/trunk/applications/order/template/entry/order/ShipGroupConfirmSummary.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl
ofbiz/trunk/applications/order/template/order/AppendOrderItem.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
ofbiz/trunk/applications/order/template/order/CompanyHeader.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
ofbiz/trunk/applications/order/template/order/EditOrderItems.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/editorderitems.ftl
ofbiz/trunk/applications/order/template/order/FindOrders.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/findOrders.ftl
ofbiz/trunk/applications/order/template/order/OrderContactInfo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl
ofbiz/trunk/applications/order/template/order/OrderInfo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/orderinfo.ftl
ofbiz/trunk/applications/order/template/order/OrderItems.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/orderitems.ftl
ofbiz/trunk/applications/order/template/order/OrderList.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/orderlist.ftl
ofbiz/trunk/applications/order/template/order/OrderNotes.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/ordernotes.ftl
ofbiz/trunk/applications/order/template/order/OrderPaymentInfo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl
ofbiz/trunk/applications/order/template/order/OrderReportBody.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl
ofbiz/trunk/applications/order/template/order/OrderReportConditions.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
ofbiz/trunk/applications/order/template/order/OrderReportContactMechs.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl
ofbiz/trunk/applications/order/template/order/OrderReportHeaderInfo.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl
ofbiz/trunk/applications/order/template/order/OrderShippingInfo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl
ofbiz/trunk/applications/order/template/order/OrderStats.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/orderstats.ftl
ofbiz/trunk/applications/order/template/order/OrderTerms.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/orderterms.ftl
ofbiz/trunk/applications/order/template/order/ReceivePayment.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/receivepayment.ftl
ofbiz/trunk/applications/order/template/order/SendConfirmationEmail.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl
ofbiz/trunk/applications/order/template/order/ShipGroups.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl
ofbiz/trunk/applications/order/template/order/Transitions.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/transitions.ftl
ofbiz/trunk/applications/order/template/order/ViewImage.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/order/viewimage.ftl
ofbiz/trunk/applications/order/template/quote/QuoteDate.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/quote/quoteDate.ftl
ofbiz/trunk/applications/order/template/quote/QuoteInfo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl
ofbiz/trunk/applications/order/template/quote/QuoteReportBody.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
ofbiz/trunk/applications/order/template/quote/QuoteReportHeaderInfo.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
ofbiz/trunk/applications/order/template/quote/QuoteRoles.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl
ofbiz/trunk/applications/order/template/reports/ReportList.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/reports/reportlist.ftl
ofbiz/trunk/applications/order/template/request/RequestContactMech.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
ofbiz/trunk/applications/order/template/request/RequestDate.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/request/requestDate.ftl
ofbiz/trunk/applications/order/template/request/RequestItemNotes.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
ofbiz/trunk/applications/order/template/return/QuickReturn.ftl
- copied, changed from r1743788, ofbiz/trunk/applications/order/template/return/quickReturn.ftl
ofbiz/trunk/applications/order/template/return/ReturnHeader.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/return/returnHeader.ftl
ofbiz/trunk/applications/order/template/return/ReturnItemInc.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/return/returnItemInc.ftl
ofbiz/trunk/applications/order/template/return/ReturnItems.ftl
- copied, changed from r1743788, ofbiz/trunk/applications/order/template/return/returnItems.ftl
ofbiz/trunk/applications/order/template/return/ReturnLinks.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/return/returnLinks.ftl
ofbiz/trunk/applications/order/template/return/ReturnList.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/return/returnList.ftl
ofbiz/trunk/applications/order/template/return/ReturnReportBody.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl
ofbiz/trunk/applications/order/template/return/ReturnReportConditions.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl
ofbiz/trunk/applications/order/template/return/ReturnReportContactMechs.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl
ofbiz/trunk/applications/order/template/return/ReturnReportHeaderInfo.fo.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
ofbiz/trunk/applications/order/template/setup/PaymentSetup.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl
ofbiz/trunk/applications/order/template/task/OrderTaskList.ftl
- copied unchanged from r1743788, ofbiz/trunk/applications/order/template/task/ordertasklist.ftl
Removed:
ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl
ofbiz/trunk/applications/order/template/entry/additionalPartyListing.ftl
ofbiz/trunk/applications/order/template/entry/addrsettings.ftl
ofbiz/trunk/applications/order/template/entry/billsettings.ftl
ofbiz/trunk/applications/order/template/entry/cart/addItemsToShoppingList.ftl
ofbiz/trunk/applications/order/template/entry/cart/associatedProducts.ftl
ofbiz/trunk/applications/order/template/entry/cart/javascript.ftl
ofbiz/trunk/applications/order/template/entry/cart/manualPromotions.ftl
ofbiz/trunk/applications/order/template/entry/cart/minicart.ftl
ofbiz/trunk/applications/order/template/entry/cart/promoCodes.ftl
ofbiz/trunk/applications/order/template/entry/cart/promoText.ftl
ofbiz/trunk/applications/order/template/entry/cart/promoUseDetailsInline.ftl
ofbiz/trunk/applications/order/template/entry/cart/promotioncategories.ftl
ofbiz/trunk/applications/order/template/entry/cart/promotiondetails.ftl
ofbiz/trunk/applications/order/template/entry/cart/promotionproducts.ftl
ofbiz/trunk/applications/order/template/entry/cart/promotionsApplied.ftl
ofbiz/trunk/applications/order/template/entry/cart/showAllPromotions.ftl
ofbiz/trunk/applications/order/template/entry/cart/showcart.ftl
ofbiz/trunk/applications/order/template/entry/cart/showcartitems.ftl
ofbiz/trunk/applications/order/template/entry/catalog/advancedsearch.ftl
ofbiz/trunk/applications/order/template/entry/catalog/breadcrumbs.ftl
ofbiz/trunk/applications/order/template/entry/catalog/category.ftl
ofbiz/trunk/applications/order/template/entry/catalog/categorydetail.ftl
ofbiz/trunk/applications/order/template/entry/catalog/choosecatalog.ftl
ofbiz/trunk/applications/order/template/entry/catalog/compareproducts.ftl
ofbiz/trunk/applications/order/template/entry/catalog/compareproductslist.ftl
ofbiz/trunk/applications/order/template/entry/catalog/configproductdetail.ftl
ofbiz/trunk/applications/order/template/entry/catalog/editProduct.ftl
ofbiz/trunk/applications/order/template/entry/catalog/inlineProductDetail.ftl
ofbiz/trunk/applications/order/template/entry/catalog/keywordsearch.ftl
ofbiz/trunk/applications/order/template/entry/catalog/keywordsearchbox.ftl
ofbiz/trunk/applications/order/template/entry/catalog/product.ftl
ofbiz/trunk/applications/order/template/entry/catalog/productdetail.ftl
ofbiz/trunk/applications/order/template/entry/catalog/productsummary.ftl
ofbiz/trunk/applications/order/template/entry/catalog/quickadd.ftl
ofbiz/trunk/applications/order/template/entry/catalog/quickaddsummary.ftl
ofbiz/trunk/applications/order/template/entry/catalog/sidedeepcategory.ftl
ofbiz/trunk/applications/order/template/entry/catalog/tagsearch.ftl
ofbiz/trunk/applications/order/template/entry/checkinits.ftl
ofbiz/trunk/applications/order/template/entry/checkoutoptions.ftl
ofbiz/trunk/applications/order/template/entry/checkoutpayment.ftl
ofbiz/trunk/applications/order/template/entry/checkoutshippingaddress.ftl
ofbiz/trunk/applications/order/template/entry/customertaxinfo.ftl
ofbiz/trunk/applications/order/template/entry/custsettings.ftl
ofbiz/trunk/applications/order/template/entry/editShipAddress.ftl
ofbiz/trunk/applications/order/template/entry/optionsettings.ftl
ofbiz/trunk/applications/order/template/entry/order/orderheaderinfo.ftl
ofbiz/trunk/applications/order/template/entry/order/orderitems.ftl
ofbiz/trunk/applications/order/template/entry/order/orderpaymentinfo.ftl
ofbiz/trunk/applications/order/template/entry/order/shipGroupConfirmSummary.ftl
ofbiz/trunk/applications/order/template/entry/orderHeaderInfo.ftl
ofbiz/trunk/applications/order/template/entry/orderShortcuts.ftl
ofbiz/trunk/applications/order/template/entry/orderagreements.ftl
ofbiz/trunk/applications/order/template/entry/orderparty.ftl
ofbiz/trunk/applications/order/template/entry/orderterms.ftl
ofbiz/trunk/applications/order/template/entry/poheader.ftl
ofbiz/trunk/applications/order/template/entry/setAdditionalParty.ftl
ofbiz/trunk/applications/order/template/entry/shipsettings.ftl
ofbiz/trunk/applications/order/template/entry/survey.ftl
ofbiz/trunk/applications/order/template/order/appendorderitem.ftl
ofbiz/trunk/applications/order/template/order/companyHeader.fo.ftl
ofbiz/trunk/applications/order/template/order/editorderitems.ftl
ofbiz/trunk/applications/order/template/order/findOrders.ftl
ofbiz/trunk/applications/order/template/order/orderReportBody.fo.ftl
ofbiz/trunk/applications/order/template/order/orderReportConditions.fo.ftl
ofbiz/trunk/applications/order/template/order/orderReportContactMechs.fo.ftl
ofbiz/trunk/applications/order/template/order/orderReportHeaderInfo.fo.ftl
ofbiz/trunk/applications/order/template/order/ordercontactinfo.ftl
ofbiz/trunk/applications/order/template/order/orderinfo.ftl
ofbiz/trunk/applications/order/template/order/orderitems.ftl
ofbiz/trunk/applications/order/template/order/orderlist.ftl
ofbiz/trunk/applications/order/template/order/ordernotes.ftl
ofbiz/trunk/applications/order/template/order/orderpaymentinfo.ftl
ofbiz/trunk/applications/order/template/order/ordershippinginfo.ftl
ofbiz/trunk/applications/order/template/order/orderstats.ftl
ofbiz/trunk/applications/order/template/order/orderterms.ftl
ofbiz/trunk/applications/order/template/order/receivepayment.ftl
ofbiz/trunk/applications/order/template/order/sendconfirmationemail.ftl
ofbiz/trunk/applications/order/template/order/shipGroups.fo.ftl
ofbiz/trunk/applications/order/template/order/transitions.ftl
ofbiz/trunk/applications/order/template/order/viewimage.ftl
ofbiz/trunk/applications/order/template/quote/quoteDate.ftl
ofbiz/trunk/applications/order/template/quote/quoteInfo.ftl
ofbiz/trunk/applications/order/template/quote/quoteReportBody.fo.ftl
ofbiz/trunk/applications/order/template/quote/quoteReportContactMechs.fo.ftl
ofbiz/trunk/applications/order/template/quote/quoteReportHeaderInfo.fo.ftl
ofbiz/trunk/applications/order/template/quote/quoteRoles.ftl
ofbiz/trunk/applications/order/template/reports/reportlist.ftl
ofbiz/trunk/applications/order/template/request/requestContactMech.ftl
ofbiz/trunk/applications/order/template/request/requestDate.ftl
ofbiz/trunk/applications/order/template/request/requestitemnotes.ftl
ofbiz/trunk/applications/order/template/return/quickReturn.ftl
ofbiz/trunk/applications/order/template/return/returnHeader.ftl
ofbiz/trunk/applications/order/template/return/returnItemInc.ftl
ofbiz/trunk/applications/order/template/return/returnItems.ftl
ofbiz/trunk/applications/order/template/return/returnLinks.ftl
ofbiz/trunk/applications/order/template/return/returnList.ftl
ofbiz/trunk/applications/order/template/return/returnReportBody.fo.ftl
ofbiz/trunk/applications/order/template/return/returnReportConditions.fo.ftl
ofbiz/trunk/applications/order/template/return/returnReportContactMechs.fo.ftl
ofbiz/trunk/applications/order/template/return/returnReportHeaderInfo.fo.ftl
ofbiz/trunk/applications/order/template/setup/paymentsetup.ftl
ofbiz/trunk/applications/order/template/task/ordertasklist.ftl
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
ofbiz/trunk/applications/product/template/facility/NotReadyToPick.fo.ftl
ofbiz/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl
ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Sun May 15 06:06:11 2016
@@ -2806,7 +2806,7 @@ public class OrderServices {
// prepare the mail info
String ofbizHome = System.getProperty("ofbiz.home");
- String templateName = ofbizHome + "/applications/order/email/default/emailprocessnotify.ftl";
+ String templateName = ofbizHome + "/applications/order/email/default/EmailProcessNotify.ftl";
Map<String, Object> sendMailContext = new HashMap<String, Object>();
sendMailContext.put("sendTo", emailList.toString());
Copied: ofbiz/trunk/applications/order/template/return/QuickReturn.ftl (from r1743788, ofbiz/trunk/applications/order/template/return/quickReturn.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/QuickReturn.ftl?p2=ofbiz/trunk/applications/order/template/return/QuickReturn.ftl&p1=ofbiz/trunk/applications/order/template/return/quickReturn.ftl&r1=1743788&r2=1743881&rev=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/return/quickReturn.ftl (original)
+++ ofbiz/trunk/applications/order/template/return/QuickReturn.ftl Sun May 15 06:06:11 2016
@@ -36,7 +36,7 @@ under the License.
<#if (orderHeader?has_content) && (orderHeader.currencyUom?has_content)>
<input type="hidden" name="currencyUomId" value="${orderHeader.currencyUom}"/>
</#if>
- <#include "returnItemInc.ftl"/>
+ <#include "ReturnItemInc.ftl"/>
<hr />
<#if "CUSTOMER_RETURN" == returnHeaderTypeId>
<h3>${uiLabelMap.FormFieldTitle_paymentMethodId}:</h3>
Copied: ofbiz/trunk/applications/order/template/return/ReturnItems.ftl (from r1743788, ofbiz/trunk/applications/order/template/return/returnItems.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/ReturnItems.ftl?p2=ofbiz/trunk/applications/order/template/return/ReturnItems.ftl&p1=ofbiz/trunk/applications/order/template/return/returnItems.ftl&r1=1743788&r2=1743881&rev=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/return/returnItems.ftl (original)
+++ ofbiz/trunk/applications/order/template/return/ReturnItems.ftl Sun May 15 06:06:11 2016
@@ -389,7 +389,7 @@ under the License.
<form name="returnItems" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="returnId" value="${returnId}" />
<input type="hidden" name="_useRowSubmit" value="Y" />
- <#include "returnItemInc.ftl"/>
+ <#include "ReturnItemInc.ftl"/>
</form>
<#else>
${uiLabelMap.CommonErrorMessage2} : ${uiLabelMap.CommonPleaseSelect}. ${uiLabelMap.CommonUseBackButton}
Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Sun May 15 06:06:11 2016
@@ -123,7 +123,7 @@ under the License.
<include-form name="ViewRequestStatus" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
</screenlet>
<platform-specific>
- <html><html-template location="component://order/template/request/requestContactMech.ftl"/></html>
+ <html><html-template location="component://order/template/request/RequestContactMech.ftl"/></html>
</platform-specific>
<screenlet title="${uiLabelMap.PartyListCommunicationEvents}" navigation-form-name="ViewRequest">
<include-form name="ViewRequestCommunicationEvents" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
@@ -322,7 +322,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}">
<platform-specific>
- <html><html-template location="component://order/template/request/requestitemnotes.ftl"/></html>
+ <html><html-template location="component://order/template/request/RequestItemNotes.ftl"/></html>
</platform-specific>
<include-form name="ListRequestItemNotes" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
<include-form name="EditRequestItemNote" location="component://order/widget/ordermgr/CustRequestForms.xml"/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml Sun May 15 06:06:11 2016
@@ -29,7 +29,7 @@ under the License.
<set field="hidebottomlinks" value="Y"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/cart/minicart.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/MiniCart.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -37,14 +37,14 @@ under the License.
<screen name="promoUseDetailsInline">
<section>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/cart/promoUseDetailsInline.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/PromoUseDetailsInline.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
<screen name="orderHeaderInfo">
<section>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/orderHeaderInfo.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/OrderHeaderInfo.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -54,7 +54,7 @@ under the License.
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/orderShortcuts.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/OrderShortcuts.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -80,15 +80,15 @@ under the License.
<widgets>
<decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/template/entry/cart/javascript.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://order/template/entry/cart/showcart.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://order/template/entry/cart/addItemsToShoppingList.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://order/template/entry/cart/showcartitems.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://order/template/entry/cart/promoCodes.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://order/template/entry/cart/manualPromotions.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://order/template/entry/cart/promoText.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://order/template/entry/cart/associatedProducts.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://order/template/entry/cart/promotionsApplied.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/Javascript.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/ShowCart.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/AddItemsToShoppingList.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/ShowCartItems.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/PromoCodes.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/ManualPromotions.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/PromoText.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/AssociatedProducts.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/PromotionsApplied.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -106,7 +106,7 @@ under the License.
<widgets>
<decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/template/entry/survey.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/Survey.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -123,7 +123,7 @@ under the License.
<widgets>
<decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/template/entry/cart/showAllPromotions.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/ShowAllPromotions.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -151,9 +151,9 @@ under the License.
<not><if-empty field="productPromo"/></not>
</condition>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/cart/promotiondetails.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://order/template/entry/cart/promotioncategories.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://order/template/entry/cart/promotionproducts.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/PromotionDetails.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/PromotionCategories.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/cart/PromotionProducts.ftl"/></html></platform-specific>
</widgets>
<fail-widgets>
<label text="${uiLabelMap.OrderErrorNoPromotionFoundWithID} [${productPromoId?if_exists}]" style="h2"/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml Sun May 15 06:06:11 2016
@@ -28,7 +28,7 @@ under the License.
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ChooseCatalog.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/catalog/choosecatalog.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/ChooseCatalog.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -38,7 +38,7 @@ under the License.
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearchOptions.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/catalog/keywordsearchbox.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/KeywordSearchBox.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -48,7 +48,7 @@ under the License.
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/catalog/sidedeepcategory.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/SideDeepCategory.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -61,7 +61,7 @@ under the License.
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/catalog/productsummary.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/ProductSummary.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -72,7 +72,7 @@ under the License.
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/catalog/breadcrumbs.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/BreadCrumbs.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -80,7 +80,7 @@ under the License.
<screen name="compareproductslist">
<section>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/catalog/compareproductslist.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/CompareProductsList.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -129,7 +129,7 @@ under the License.
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/catalog/categorydetail.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/CategoryDetail.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -169,10 +169,10 @@ under the License.
</actions>
<widgets>
<include-screen name="breadcrumbs"/>
- <platform-specific><html><html-template location="component://order/template/entry/catalog/editProduct.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/EditProduct.ftl"/></html></platform-specific>
<!--<platform-specific><html><html-template location="component://order/template/product/productdetail.ftl"/></html></platform-specific>-->
<!-- Warning: this ftl file in the order component is slightly different from that of the ecommerce one (the edit product link is shown) -->
- <platform-specific><html><html-template location="component://order/template/entry/catalog/productdetail.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/ProductDetail.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -187,9 +187,9 @@ under the License.
</actions>
<widgets>
<include-screen name="breadcrumbs"/>
- <platform-specific><html><html-template location="component://order/template/entry/catalog/editProduct.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/EditProduct.ftl"/></html></platform-specific>
<!--<platform-specific><html><html-template location="component://order/template/product/configproductdetail.ftl"/></html></platform-specific>-->
- <platform-specific><html><html-template location="component://order/template/entry/catalog/configproductdetail.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/ConfigProductDetail.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -199,7 +199,7 @@ under the License.
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/catalog/inlineProductDetail.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/InlineProductDetail.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -213,7 +213,7 @@ under the License.
<widgets>
<decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/template/entry/catalog/keywordsearch.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/KeywordSearch.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -236,7 +236,7 @@ under the License.
<widgets>
<decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/template/entry/catalog/advancedsearch.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/AdvancedSearch.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -252,7 +252,7 @@ under the License.
<widgets>
<decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/template/entry/catalog/quickadd.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/QuickAdd.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -264,7 +264,7 @@ under the License.
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/catalog/quickaddsummary.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/catalog/QuickAddSummary.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
@@ -281,7 +281,7 @@ under the License.
<decorator-section name="body">
<platform-specific>
<html>
- <html-template location="component://order/template/entry/catalog/compareproducts.ftl"/>
+ <html-template location="component://order/template/entry/catalog/CompareProducts.ftl"/>
</html>
</platform-specific>
</decorator-section>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sun May 15 06:06:11 2016
@@ -61,7 +61,7 @@ under the License.
<container>
<label style="h1" text="${uiLabelMap.OrderQuickFinalizeOrder}"/>
</container>
- <platform-specific><html><html-template location="component://order/template/entry/checkoutoptions.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/CheckoutOptions.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -78,7 +78,7 @@ under the License.
<decorator-screen name="CommonOrderCheckoutDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/template/entry/custsettings.ftl"/></html>
+ <html><html-template location="component://order/template/entry/CustSettings.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -96,7 +96,7 @@ under the License.
<decorator-screen name="CommonOrderCheckoutDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/template/entry/shipsettings.ftl"/></html>
+ <html><html-template location="component://order/template/entry/ShipSettings.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -114,7 +114,7 @@ under the License.
<decorator-screen name="CommonOrderCheckoutDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/template/entry/editShipAddress.ftl"/></html>
+ <html><html-template location="component://order/template/entry/EditShipAddress.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -151,7 +151,7 @@ under the License.
<decorator-screen name="CommonOrderCheckoutDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/template/entry/optionsettings.ftl"/></html>
+ <html><html-template location="component://order/template/entry/OptionSettings.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -169,7 +169,7 @@ under the License.
<decorator-screen name="CommonOrderCheckoutDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/template/entry/billsettings.ftl"/></html>
+ <html><html-template location="component://order/template/entry/BillSettings.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -198,10 +198,10 @@ under the License.
<decorator-section name="body">
<platform-specific><html><html-template location="component://common/template/includes/setMultipleSelectJs.ftl"/></html></platform-specific>
<platform-specific>
- <html><html-template location="component://order/template/entry/setAdditionalParty.ftl"/></html>
+ <html><html-template location="component://order/template/entry/SetAdditionalParty.ftl"/></html>
</platform-specific>
<platform-specific>
- <html><html-template location="component://order/template/entry/additionalPartyListing.ftl"/></html>
+ <html><html-template location="component://order/template/entry/AdditionalPartyListing.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -219,7 +219,7 @@ under the License.
<decorator-screen name="CommonOrderCheckoutDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/template/entry/orderterms.ftl"/></html>
+ <html><html-template location="component://order/template/entry/OrderTerms.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -238,16 +238,16 @@ under the License.
<decorator-screen name="CommonOrderCheckoutDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/template/entry/order/orderheaderinfo.ftl"/></html>
+ <html><html-template location="component://order/template/entry/order/OrderHeaderInfo.ftl"/></html>
</platform-specific>
<platform-specific>
- <html><html-template location="component://order/template/entry/order/orderpaymentinfo.ftl"/></html>
+ <html><html-template location="component://order/template/entry/order/OrderPaymentInfo.ftl"/></html>
</platform-specific>
<platform-specific>
- <html><html-template location="component://order/template/entry/order/shipGroupConfirmSummary.ftl"/></html>
+ <html><html-template location="component://order/template/entry/order/ShipGroupConfirmSummary.ftl"/></html>
</platform-specific>
<platform-specific>
- <html><html-template location="component://order/template/entry/order/orderitems.ftl"/></html>
+ <html><html-template location="component://order/template/entry/order/OrderItems.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
@@ -266,7 +266,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/template/entry/checkoutshippingaddress.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/CheckoutShippingAddress.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -285,7 +285,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/template/entry/checkoutpayment.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/CheckoutPayment.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -307,7 +307,7 @@ under the License.
</entity-condition>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/template/entry/customertaxinfo.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/CustomerTaxInfo.ftl"/></html></platform-specific>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml Sun May 15 06:06:11 2016
@@ -28,7 +28,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/template/entry/checkinits.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/CheckInits.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -44,7 +44,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://order/template/entry/orderagreements.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/template/entry/OrderAgreements.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml Sun May 15 06:06:11 2016
@@ -49,7 +49,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://order/template/order/orderReportHeaderInfo.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/order/OrderReportHeaderInfo.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -59,15 +59,15 @@ under the License.
<widgets>
<!-- the contach mechanisms, terms, payment and shipping methods are shown in the first page -->
<platform-specific>
- <xsl-fo><html-template location="component://order/template/order/orderReportContactMechs.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/order/OrderReportContactMechs.fo.ftl"/></xsl-fo>
</platform-specific>
<!-- order items and totals -->
<platform-specific>
- <xsl-fo><html-template location="component://order/template/order/orderReportBody.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/order/OrderReportBody.fo.ftl"/></xsl-fo>
</platform-specific>
<!-- return policies and notes are shown in the last page -->
<platform-specific>
- <xsl-fo><html-template location="component://order/template/order/orderReportConditions.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/order/OrderReportConditions.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -82,7 +82,7 @@ under the License.
<script location="component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy"/>
</actions>
<widgets>
- <platform-specific><xsl-fo><html-template location="component://order/template/order/companyHeader.fo.ftl"/></xsl-fo></platform-specific>
+ <platform-specific><xsl-fo><html-template location="component://order/template/order/CompanyHeader.fo.ftl"/></xsl-fo></platform-specific>
</widgets>
</section>
</screen>
@@ -111,7 +111,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://order/template/return/returnReportHeaderInfo.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/return/ReturnReportHeaderInfo.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -121,15 +121,15 @@ under the License.
<widgets>
<!-- the contach mechanisms, terms, payment and shipping methods are shown in the first page -->
<platform-specific>
- <xsl-fo><html-template location="component://order/template/return/returnReportContactMechs.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/return/ReturnReportContactMechs.fo.ftl"/></xsl-fo>
</platform-specific>
<!-- order items and totals -->
<platform-specific>
- <xsl-fo><html-template location="component://order/template/return/returnReportBody.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/return/ReturnReportBody.fo.ftl"/></xsl-fo>
</platform-specific>
<!-- return policies and notes are shown in the last page -->
<platform-specific>
- <xsl-fo><html-template location="component://order/template/return/returnReportConditions.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/return/ReturnReportConditions.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -160,7 +160,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://order/template/order/shipGroups.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/order/ShipGroups.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml Sun May 15 06:06:11 2016
@@ -44,7 +44,7 @@ under the License.
<decorator-screen name="CommonOrderReportDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/template/reports/reportlist.ftl"/></html>
+ <html><html-template location="component://order/template/reports/ReportList.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Sun May 15 06:06:11 2016
@@ -27,7 +27,7 @@ under the License.
<widgets>
<platform-specific>
<html>
- <html-template location="component://order/template/return/returnLinks.ftl"/>
+ <html-template location="component://order/template/return/ReturnLinks.ftl"/>
</html>
</platform-specific>
<decorator-section-include name="body"/>
@@ -74,7 +74,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleFindQuickReturn}">
<platform-specific>
- <html><html-template location="component://order/template/return/quickReturn.ftl"/></html>
+ <html><html-template location="component://order/template/return/QuickReturn.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -117,7 +117,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleReturnList}">
<platform-specific>
- <html><html-template location="component://order/template/return/returnList.ftl"/></html>
+ <html><html-template location="component://order/template/return/ReturnList.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -140,7 +140,7 @@ under the License.
<widgets>
<platform-specific>
<html>
- <html-template location="component://order/template/return/returnItems.ftl"/>
+ <html-template location="component://order/template/return/ReturnItems.ftl"/>
</html>
</platform-specific>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml Sun May 15 06:06:11 2016
@@ -44,7 +44,7 @@ under the License.
<decorator-screen name="CommonOrderTaskDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/template/setup/paymentsetup.ftl"/></html>
+ <html><html-template location="component://order/template/setup/PaymentSetup.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml Sun May 15 06:06:11 2016
@@ -92,7 +92,7 @@ Also add this back to appheader.ftl:
<decorator-screen name="CommonOrderTaskDecorator">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://order/template/task/ordertasklist.ftl"/></html>
+ <html><html-template location="component://order/template/task/OrderTaskList.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Sun May 15 06:06:11 2016
@@ -64,13 +64,13 @@ under the License.
<include-screen name="orderHeader"/>
<container style="clear"/>
<platform-specific>
- <html><html-template location="component://order/template/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/template/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/template/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/template/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/template/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/template/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/template/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/template/order/ordershippinginfo.ftl"/></html>
+ <html><html-template location="component://order/template/order/OrderShippingInfo.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/template/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/template/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/template/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/template/includes/setMultipleSelectJs.ftl"/></html></platform-specific>
<platform-specific>
- <html><html-template location="component://order/template/order/findOrders.ftl"/></html>
+ <html><html-template location="component://order/template/order/FindOrders.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/template/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/template/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/template/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/template/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/template/order/sendconfirmationemail.ftl"/></html>
+ <html><html-template location="component://order/template/order/SendConfirmationEmail.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Sun May 15 06:06:11 2016
@@ -194,7 +194,7 @@ under the License.
<section>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://order/template/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>
<!-- the contach mechanisms, terms, payment and shipping methods are shown in the first page -->
<platform-specific>
- <xsl-fo><html-template location="component://order/template/quote/quoteReportContactMechs.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/quote/QuoteReportContactMechs.fo.ftl"/></xsl-fo>
</platform-specific>
<!-- quote items and totals -->
<platform-specific>
- <xsl-fo><html-template location="component://order/template/quote/quoteReportBody.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://order/template/quote/QuoteReportBody.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
@@ -691,7 +691,7 @@ under the License.
</actions>
<widgets>
<platform-specific>
- <html><html-template location="component://order/template/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/template/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/template/quote/quoteRoles.ftl"/></html>
+ <html><html-template location="component://order/template/quote/QuoteRoles.ftl"/></html>
</platform-specific>
</widgets>
</section>
Modified: ofbiz/trunk/applications/product/template/facility/NotReadyToPick.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/facility/NotReadyToPick.fo.ftl?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/facility/NotReadyToPick.fo.ftl (original)
+++ ofbiz/trunk/applications/product/template/facility/NotReadyToPick.fo.ftl Sun May 15 06:06:11 2016
@@ -29,7 +29,7 @@ under the License.
<fo:page-sequence master-reference="main">
<fo:flow flow-name="xsl-region-body" font-family="Helvetica">
- <#include "component://order/webapp/ordermgr/order/companyHeader.fo.ftl"/>
+ <#include "component://order/template/order/CompanyHeader.fo.ftl"/>
<fo:table table-layout="fixed" border-width="1pt" border-style="solid">
<fo:table-column column-width="250pt"/>
<fo:table-body>
Modified: ofbiz/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl?rev=1743881&r1=1743880&r2=1743881&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl (original)
+++ ofbiz/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl Sun May 15 06:06:11 2016
@@ -30,7 +30,7 @@ under the License.
<#list orderHeaderList as order>
<fo:page-sequence master-reference="main">
<fo:flow flow-name="xsl-region-body" font-family="Helvetica">
- <#include "component://order/webapp/ordermgr/order/companyHeader.fo.ftl"/>
+ <#include "component://order/template/order/CompanyHeader.fo.ftl"/>
<#assign orderId = order.orderId>
<#assign orderDate = order.orderDate>
<#list orderInfoList as orderInfo>