From fa3e4830268062e9bd94829514c29fdb9242ece4 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Tue, 9 Jul 2019 17:40:50 +0200
Subject: [PATCH] MIG delivery_usability from v10 to v12

---
 delivery_usability/__init__.py       |  2 --
 delivery_usability/__manifest__.py   |  9 ++++-----
 delivery_usability/delivery_view.xml | 21 ---------------------
 delivery_usability/sale_view.xml     |  5 ++++-
 delivery_usability/stock.py          |  4 ++--
 delivery_usability/stock_view.xml    |  3 +++
 6 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 delivery_usability/delivery_view.xml

diff --git a/delivery_usability/__init__.py b/delivery_usability/__init__.py
index b857415..12bab77 100644
--- a/delivery_usability/__init__.py
+++ b/delivery_usability/__init__.py
@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-
 from . import stock
diff --git a/delivery_usability/__manifest__.py b/delivery_usability/__manifest__.py
index af65a8e..48bc8cb 100644
--- a/delivery_usability/__manifest__.py
+++ b/delivery_usability/__manifest__.py
@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
-# Copyright 2018 Akretion (http://www.akretion.com)
+# Copyright 2018-2019 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': '10.0.1.0.0',
+    'version': '12.0.1.0.0',
     'category': 'Stock',
     'license': 'AGPL-3',
     'summary': 'Several usability enhancements in Delivery',
@@ -14,7 +13,8 @@ Delivery Usability
 ===================
 
 The usability enhancements include:
-* display product_id in form view of delivery.carrier (allows to create a delivery carrier from a pre-existing product)
+* 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,7 +22,6 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
     'website': 'http://www.akretion.com',
     'depends': ['delivery'],
     'data': [
-        'delivery_view.xml',
         'sale_view.xml',
         'stock_view.xml',
         ],
diff --git a/delivery_usability/delivery_view.xml b/delivery_usability/delivery_view.xml
deleted file mode 100644
index 2b2a32e..0000000
--- a/delivery_usability/delivery_view.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2018 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--->
-
-<odoo>
-
-<record id="view_delivery_carrier_form" model="ir.ui.view">
-    <field name="name">usability.delivery.carrier.form</field>
-    <field name="model">delivery.carrier</field>
-    <field name="inherit_id" ref="delivery.view_delivery_carrier_form"/>
-    <field name="arch" type="xml">
-        <field name="delivery_type" position="before">
-            <field name="id" invisible="1"/>
-            <field name="product_id" readonly="1" required="0" attrs="{'invisible': [('id', '=', False)]}"/>
-        </field>
-    </field>
-</record>
-
-</odoo>
diff --git a/delivery_usability/sale_view.xml b/delivery_usability/sale_view.xml
index 847b22f..7be9e30 100644
--- a/delivery_usability/sale_view.xml
+++ b/delivery_usability/sale_view.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2018 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+  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>
@@ -17,4 +19,5 @@
     </field>
 </record>
 
+
 </odoo>
diff --git a/delivery_usability/stock.py b/delivery_usability/stock.py
index 9fb3571..2330767 100644
--- a/delivery_usability/stock.py
+++ b/delivery_usability/stock.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# Copyright 2018 Akretion (http://www.akretion.com)
+# Copyright 2018-2019 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).
 
@@ -10,3 +9,4 @@ class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
     carrier_id = fields.Many2one(track_visibility='onchange')
+    carrier_tracking_ref = fields.Char(track_visibility='onchange')
diff --git a/delivery_usability/stock_view.xml b/delivery_usability/stock_view.xml
index b0a0b43..f6a4b98 100644
--- a/delivery_usability/stock_view.xml
+++ b/delivery_usability/stock_view.xml
@@ -17,6 +17,9 @@
             field definition -->
             <attribute name="attrs">{}</attribute>
         </field>
+        <field name="carrier_tracking_ref" position="attributes">
+            <attribute name="attrs">{}</attribute>
+        </field>
     </field>
 </record>