From 00339e44b62147b8cccca4757a36618338d26ca3 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Wed, 25 Aug 2021 21:57:43 +0200
Subject: [PATCH] MIG delivery_usability to v14

---
 delivery_usability/__init__.py                |  2 +-
 delivery_usability/__manifest__.py            | 10 ++++----
 .../{stock.py => models/stock_picking.py}     |  6 ++---
 delivery_usability/sale_view.xml              | 23 -------------------
 .../stock_picking.xml}                        |  3 ++-
 5 files changed, 10 insertions(+), 34 deletions(-)
 rename delivery_usability/{stock.py => models/stock_picking.py} (54%)
 delete mode 100644 delivery_usability/sale_view.xml
 rename delivery_usability/{stock_view.xml => views/stock_picking.xml} (90%)

diff --git a/delivery_usability/__init__.py b/delivery_usability/__init__.py
index 12bab77..0650744 100644
--- a/delivery_usability/__init__.py
+++ b/delivery_usability/__init__.py
@@ -1 +1 @@
-from . import stock
+from . import models
diff --git a/delivery_usability/__manifest__.py b/delivery_usability/__manifest__.py
index 11ccc2b..1ec0678 100644
--- a/delivery_usability/__manifest__.py
+++ b/delivery_usability/__manifest__.py
@@ -1,10 +1,10 @@
-# Copyright 2018-2019 Akretion (http://www.akretion.com)
+# Copyright 2018-2021 Akretion (http://www.akretion.com)
 # @author Alexis de Lattre <alexis.delattre@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     'name': 'Delivery Usability',
-    'version': '12.0.1.0.0',
+    'version': '14.0.1.0.0',
     'category': 'Stock',
     'license': 'AGPL-3',
     'summary': 'Several usability enhancements in Delivery',
@@ -14,7 +14,6 @@ Delivery Usability
 
 The usability enhancements include:
 * allow modification of carrier and it's tracking ref. on a done picking
-* display field 'invoice_shipping_on_delivery' on sale.order form view
 
 This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
     """,
@@ -22,8 +21,7 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
     'website': 'http://www.akretion.com',
     'depends': ['delivery'],
     'data': [
-        'sale_view.xml',
-        'stock_view.xml',
+        'views/stock_picking.xml',
         ],
-    'installable': False,
+    'installable': True,
 }
diff --git a/delivery_usability/stock.py b/delivery_usability/models/stock_picking.py
similarity index 54%
rename from delivery_usability/stock.py
rename to delivery_usability/models/stock_picking.py
index 2330767..fad12e5 100644
--- a/delivery_usability/stock.py
+++ b/delivery_usability/models/stock_picking.py
@@ -1,4 +1,4 @@
-# Copyright 2018-2019 Akretion (http://www.akretion.com)
+# Copyright 2018-2021 Akretion (http://www.akretion.com)
 # @author Alexis de Lattre <alexis.delattre@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
@@ -8,5 +8,5 @@ from odoo import fields, models
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
-    carrier_id = fields.Many2one(track_visibility='onchange')
-    carrier_tracking_ref = fields.Char(track_visibility='onchange')
+    carrier_id = fields.Many2one(tracking=True)
+    carrier_tracking_ref = fields.Char(tracking=True)
diff --git a/delivery_usability/sale_view.xml b/delivery_usability/sale_view.xml
deleted file mode 100644
index 7be9e30..0000000
--- a/delivery_usability/sale_view.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2018-2019 Akretion
-  @author: Alexis de Lattre <alexis.delattre@akretion.com>
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--->
-
-<odoo>
-
-
-<record id="view_order_form_with_carrier" model="ir.ui.view">
-    <field name="name">delivery_usability.sale.order.form</field>
-    <field name="model">sale.order</field>
-    <field name="inherit_id" ref="delivery.view_order_form_with_carrier"/>
-    <field name="arch" type="xml">
-        <group name="sale_pay" position="inside">
-            <field name="invoice_shipping_on_delivery"/>
-        </group>
-    </field>
-</record>
-
-
-</odoo>
diff --git a/delivery_usability/stock_view.xml b/delivery_usability/views/stock_picking.xml
similarity index 90%
rename from delivery_usability/stock_view.xml
rename to delivery_usability/views/stock_picking.xml
index f6a4b98..86a67b6 100644
--- a/delivery_usability/stock_view.xml
+++ b/delivery_usability/views/stock_picking.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2018 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+  Copyright 2018-2021 Akretion France
+  @author: Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->