From 2ec4dbeb4952c3b3b1a1917f96832151eba1d751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Mon, 4 Sep 2017 10:49:30 +0200
Subject: [PATCH] [MOV] sale: put all assets in same file and rename portal
 templates

---
 addons/sale/__manifest__.py                        |  2 +-
 addons/sale/controllers/portal.py                  |  4 ++--
 addons/sale/views/assets.xml                       | 14 ++++++++++++++
 addons/sale/views/sale_portal_templates.xml        |  9 +--------
 addons/sale/views/sale_templates.xml               |  9 ---------
 addons/website_sale/views/templates.xml            |  2 +-
 .../views/website_sale_delivery_templates.xml      |  2 +-
 addons/website_sale_digital/controllers/main.py    |  4 ++--
 .../views/website_sale_digital.xml                 |  2 +-
 .../views/website_sale_stock_templates.xml         |  2 +-
 10 files changed, 24 insertions(+), 26 deletions(-)
 create mode 100644 addons/sale/views/assets.xml
 delete mode 100644 addons/sale/views/sale_templates.xml

diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py
index 662edad980c..c70b8ba17ed 100644
--- a/addons/sale/__manifest__.py
+++ b/addons/sale/__manifest__.py
@@ -26,7 +26,7 @@ This module contains all the common features of Sales Management and eCommerce.
         'views/account_invoice_views.xml',
         'views/sales_team_views.xml',
         'views/res_partner_views.xml',
-        'views/sale_templates.xml',
+        'views/assets.xml',
         'views/sale_portal_templates.xml',
         'views/sale_layout_category_view.xml',
         'views/res_config_settings_views.xml',
diff --git a/addons/sale/controllers/portal.py b/addons/sale/controllers/portal.py
index fe87b2005c0..e1a54d85922 100644
--- a/addons/sale/controllers/portal.py
+++ b/addons/sale/controllers/portal.py
@@ -160,11 +160,11 @@ class CustomerPortal(CustomerPortal):
         return request.render("sale.portal_my_orders", values)
 
     @http.route(['/my/orders/<int:order>'], type='http', auth="public", website=True)
-    def orders_followup(self, order=None, access_token=None, **kw):
+    def portal_order_page(self, order=None, access_token=None, **kw):
         try:
             order_sudo = self._order_check_access(order, access_token=access_token)
         except AccessError:
             return request.redirect('/my')
 
         values = self._order_get_page_view_values(order_sudo, access_token, **kw)
-        return request.render("sale.orders_followup", values)
+        return request.render("sale.portal_order_page", values)
diff --git a/addons/sale/views/assets.xml b/addons/sale/views/assets.xml
new file mode 100644
index 00000000000..ac906fd317f
--- /dev/null
+++ b/addons/sale/views/assets.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="assets_backend" inherit_id="sales_team.assets_backend" name="Sale backend assets">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/sale/static/src/js/sale.js"></script>
+        </xpath>
+    </template>
+
+    <template id="assets_frontend" inherit_id="web.assets_frontend" name="Sale frontend assets">
+      <xpath expr="." position="inside">
+          <link rel='stylesheet' href='/sale/static/src/less/sale_portal.less'/>
+      </xpath>
+    </template>
+</odoo>
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index 50bc33e5052..2f85b785bbb 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -1,11 +1,4 @@
 <odoo>
-
-    <template id="assets_frontend" inherit_id="web.assets_frontend" name="Website Portal Sale">
-      <xpath expr="." position="inside">
-          <link rel='stylesheet' href='/sale/static/src/less/sale_portal.less'/>
-      </xpath>
-    </template>
-
     <template id="portal_my_home_menu_sale" name="Portal layout : sales menu entries" inherit_id="portal.portal_layout" priority="20">
         <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
             <li t-if="page_name == 'quote' or sales_order and sales_order.state == 'sent'">
@@ -135,7 +128,7 @@
       </t>
     </template>
 
-    <template id="orders_followup" name="Sales Order">
+    <template id="portal_order_page" name="Sales Order">
       <t t-call="portal.portal_layout">
         <t t-set="sales_order" t-value="order"/> <!-- rename to ensure breadcrumb compatibility (differentiate with purchase orders) -->
         <div id="optional_placeholder"></div>
diff --git a/addons/sale/views/sale_templates.xml b/addons/sale/views/sale_templates.xml
deleted file mode 100644
index 103b2f6ad5b..00000000000
--- a/addons/sale/views/sale_templates.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <!-- inherits from sales_team.assets_backend to override certain attributes defined in sales_team -->
-        <template id="assets_backend" name="project assets" inherit_id="sales_team.assets_backend">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/sale/static/src/js/sale.js"></script>
-            </xpath>
-        </template>
-</odoo>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index e1a7f4670b6..44631c7a3f7 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1666,7 +1666,7 @@
         </xpath>
     </template>
 
-    <template id="orders_followup_products_links" name="Orders Followup Products Links" inherit_id="sale.orders_followup">
+    <template id="portal_order_page_products_links" name="Orders Followup Products Links" inherit_id="sale.portal_order_page">
         <xpath expr="//div[@id='product_name']/*" position="replace">
             <a t-if="ol.product_id.website_published" t-att-href="ol.product_id.website_url">
                 <span t-esc="ol.name" />
diff --git a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
index 5c87f8d7e2c..b0eac51f6cb 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
@@ -48,7 +48,7 @@
         </xpath>
     </template>
 
-    <template id="shipping_tracking" name="Shipping tracking on orders followup" inherit_id="website_sale_stock.orders_followup_shipping">
+    <template id="portal_order_page_shipping_tracking" name="Shipping tracking on orders followup" inherit_id="website_sale_stock.portal_order_page_shipping">
         <xpath expr="//div[@id='picking_info']" position="after">
             <div t-if="i.carrier_tracking_ref">
                 Tracking: <span t-field="i.carrier_id.name"/>
diff --git a/addons/website_sale_digital/controllers/main.py b/addons/website_sale_digital/controllers/main.py
index 90f6de0c48a..f498af49330 100644
--- a/addons/website_sale_digital/controllers/main.py
+++ b/addons/website_sale_digital/controllers/main.py
@@ -29,8 +29,8 @@ class WebsiteSaleDigital(CustomerPortal):
     @http.route([
         '/my/orders/<int:order>',
     ], type='http', auth='user', website=True)
-    def orders_followup(self, order=None, **post):
-        response = super(WebsiteSaleDigital, self).orders_followup(order=order, **post)
+    def portal_order_page(self, order=None, **post):
+        response = super(WebsiteSaleDigital, self).portal_order_page(order=order, **post)
         if not 'order' in response.qcontext:
             return response
         order = response.qcontext['order']
diff --git a/addons/website_sale_digital/views/website_sale_digital.xml b/addons/website_sale_digital/views/website_sale_digital.xml
index 147f4a0932d..448118d6198 100644
--- a/addons/website_sale_digital/views/website_sale_digital.xml
+++ b/addons/website_sale_digital/views/website_sale_digital.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="orders_followup_downloads" name="Orders Downloads Followup" inherit_id="sale.orders_followup">
+    <template id="portal_order_page_downloads" name="Orders Downloads Followup" inherit_id="sale.portal_order_page">
         <xpath expr="//div[@id='product_name']" position="inside">
             <t t-set="attachments" t-value="digital_attachments.get(ol.product_id.id)"/>
             <t t-if="attachments">
diff --git a/addons/website_sale_stock/views/website_sale_stock_templates.xml b/addons/website_sale_stock/views/website_sale_stock_templates.xml
index 7177b99a341..af77baf95f0 100644
--- a/addons/website_sale_stock/views/website_sale_stock_templates.xml
+++ b/addons/website_sale_stock/views/website_sale_stock_templates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-  <template id="orders_followup_shipping" name="Orders Shipping Followup" inherit_id="sale.orders_followup">
+  <template id="portal_order_page_shipping" name="Orders Shipping Followup" inherit_id="sale.portal_order_page">
     <xpath expr="//div[@id='shipping_address']" position="inside">
       <t t-if="order.picking_ids">
         <div>