[MIG] sale_margin_delivered: Migration to 15.0

OCA · rrebollo · Jul 9, 2018 · Nov 13, 2018 · Jan 14, 2019 · Apr 15, 2019
commit 8cc7cd669ac36c972198a011349042a7c3e45f13
diff --git a/sale_margin_delivered/README.rst b/sale_margin_delivered/README.rst
@@ -14,13 +14,13 @@ Sale Margin Delivered
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmargin--analysis-lightgray.png?logo=github
-    :target: https://github.com/OCA/margin-analysis/tree/13.0/sale_margin_delivered
+    :target: https://github.com/OCA/margin-analysis/tree/15.0/sale_margin_delivered
     :alt: OCA/margin-analysis
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/margin-analysis-13-0/margin-analysis-13-0-sale_margin_delivered
+    :target: https://translation.odoo-community.org/projects/margin-analysis-15-0/margin-analysis-15-0-sale_margin_delivered
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/132/13.0
+    :target: https://runbot.odoo-community.org/runbot/132/15.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -66,7 +66,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/margin-analysis/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/margin-analysis/issues/new?body=module:%20sale_margin_delivered%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/margin-analysis/issues/new?body=module:%20sale_margin_delivered%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -84,8 +84,9 @@ Contributors
 
 * `Tecnativa <https://www.tecnativa.com>`_:
 
-    * Sergio Teruel <sergio.teruel@tecnativa.com>
-    * David Vidal <david.vidal@tecnativa.com>
+  * Sergio Teruel
+  * David Vidal
+  * Carlos Roca
 
 Maintainers
 ~~~~~~~~~~~
@@ -108,6 +109,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-sergio-teruel| 
 
-This module is part of the `OCA/margin-analysis <https://github.com/OCA/margin-analysis/tree/13.0/sale_margin_delivered>`_ project on GitHub.
+This module is part of the `OCA/margin-analysis <https://github.com/OCA/margin-analysis/tree/15.0/sale_margin_delivered>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/sale_margin_delivered/__manifest__.py b/sale_margin_delivered/__manifest__.py
@@ -2,12 +2,12 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Sale Margin Delivered",
-    "version": "13.0.1.0.2",
-    "author": "Tecnativa," "Odoo Community Association (OCA)",
+    "version": "15.0.1.0.0",
+    "author": "Tecnativa, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/margin-analysis",
     "category": "Sales",
     "license": "AGPL-3",
-    "depends": ["stock_account", "sale_margin_security"],
+    "depends": ["sale_stock", "sale_margin_security"],
     "data": ["views/sale_margin_delivered_view.xml"],
     "installable": True,
     "development_status": "Production/Stable",

diff --git a/sale_margin_delivered/models/sale_margin.py b/sale_margin_delivered/models/sale_margin.py
@@ -7,17 +7,13 @@
 class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
 
-    margin_delivered = fields.Float(
-        string="Margin Delivered", compute="_compute_margin_delivered", store=True
-    )
+    margin_delivered = fields.Float(compute="_compute_margin_delivered", store=True)
     margin_delivered_percent = fields.Float(
-        string="Margin Delivered Percent",
         compute="_compute_margin_delivered",
         store=True,
         readonly=True,
     )
     purchase_price_delivery = fields.Float(
-        string="Purchase Price Delivered",
         compute="_compute_margin_delivered",
         store=True,
     )

diff --git a/sale_margin_delivered/readme/CONTRIBUTORS.rst b/sale_margin_delivered/readme/CONTRIBUTORS.rst
@@ -1,5 +1,6 @@
 
 * `Tecnativa <https://www.tecnativa.com>`_:
 
-    * Sergio Teruel <sergio.teruel@tecnativa.com>
-    * David Vidal <david.vidal@tecnativa.com>
+  * Sergio Teruel
+  * David Vidal
+  * Carlos Roca
diff --git a/sale_margin_delivered/reports/sale_report.py b/sale_margin_delivered/reports/sale_report.py
@@ -7,7 +7,7 @@
 class SaleReport(models.Model):
     _inherit = "sale.report"
 
-    margin_delivered = fields.Float(string="Margin Delivered", readonly=True)
+    margin_delivered = fields.Float(readonly=True)
 
     def _query(self, with_clause="", fields=None, groupby="", from_clause=""):
         if fields is None:

diff --git a/sale_margin_delivered/static/description/index.html b/sale_margin_delivered/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Sale Margin Delivered</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Sale Margin Delivered</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/margin-analysis/tree/13.0/sale_margin_delivered"><img alt="OCA/margin-analysis" src="https://img.shields.io/badge/github-OCA%2Fmargin--analysis-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/margin-analysis-13-0/margin-analysis-13-0-sale_margin_delivered"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/132/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/margin-analysis/tree/15.0/sale_margin_delivered"><img alt="OCA/margin-analysis" src="https://img.shields.io/badge/github-OCA%2Fmargin--analysis-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/margin-analysis-15-0/margin-analysis-15-0-sale_margin_delivered"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/132/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Computes sale order lines margins for the delivered items.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -412,7 +412,7 @@ <h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/margin-analysis/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/margin-analysis/issues/new?body=module:%20sale_margin_delivered%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/margin-analysis/issues/new?body=module:%20sale_margin_delivered%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -425,14 +425,12 @@ <h2><a class="toc-backref" href="#id5">Authors</a></h2>
 </div>
 <div class="section" id="contributors">
 <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
-<ul>
-<li><p class="first"><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:</p>
-<blockquote>
 <ul class="simple">
-<li>Sergio Teruel &lt;<a class="reference external" href="mailto:sergio.teruel&#64;tecnativa.com">sergio.teruel&#64;tecnativa.com</a>&gt;</li>
-<li>David Vidal &lt;<a class="reference external" href="mailto:david.vidal&#64;tecnativa.com">david.vidal&#64;tecnativa.com</a>&gt;</li>
+<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
+<li>Sergio Teruel</li>
+<li>David Vidal</li>
+<li>Carlos Roca</li>
 </ul>
-</blockquote>
 </li>
 </ul>
 </div>
@@ -445,7 +443,7 @@ <h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" href="https://github.com/sergio-teruel"><img alt="sergio-teruel" src="https://github.com/sergio-teruel.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/margin-analysis/tree/13.0/sale_margin_delivered">OCA/margin-analysis</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/margin-analysis/tree/15.0/sale_margin_delivered">OCA/margin-analysis</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

diff --git a/sale_margin_delivered/tests/test_sale_margin_delivered.py b/sale_margin_delivered/tests/test_sale_margin_delivered.py
@@ -1,11 +1,10 @@
 #  Copyright 2019 Tecnativa - Sergio Teruel
 #  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl
-from datetime import datetime
 
-from odoo.tests import Form, SavepointCase
+from odoo.tests import Form, TransactionCase
 
 
-class TestSaleMarginDelivered(SavepointCase):
+class TestSaleMarginDelivered(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -50,26 +49,12 @@ def setUpClass(cls):
         )
 
     def _new_sale_order(self):
-        sale_order = self.SaleOrder.new(
-            {
-                "date_order": datetime.today(),
-                "name": "Test_SO011",
-                "partner_id": self.partner.id,
-                "order_line": [
-                    (
-                        0,
-                        0,
-                        {
-                            "product_id": self.product.id,
-                            "product_uom_qty": 6,
-                            "product_uom": self.product.uom_id.id,
-                        },
-                    )
-                ],
-            }
-        )
-        sale_order.onchange_partner_id()
-        return self.SaleOrder.create(sale_order._convert_to_write(sale_order._cache))
+        sale_order_form = Form(self.SaleOrder)
+        sale_order_form.partner_id = self.partner
+        with sale_order_form.order_line.new() as order_line_form:
+            order_line_form.product_id = self.product
+            order_line_form.product_uom_qty = 6
+        return sale_order_form.save()
 
     def get_return_picking_wizard(self, picking):
         stock_return_picking_form = Form(
@@ -94,7 +79,7 @@ def test_sale_margin_delivered(self):
         picking = sale_order.picking_ids
         picking.action_assign()
         picking.move_line_ids.qty_done = 3.0
-        picking.action_done()
+        picking._action_done()
         order_line = sale_order.order_line[:1]
         self.assertEqual(order_line.margin_delivered, 30.0)
         self.assertEqual(order_line.margin_delivered_percent, 50.0)
@@ -117,7 +102,7 @@ def _validate_so_picking(self, sale_order):
         picking = sale_order.picking_ids
         picking.action_assign()
         picking.move_line_ids.qty_done = 6.0
-        picking.action_done()
+        picking._action_done()
         return picking
 
     def test_sale_margin_delivered_return_to_refund(self):
@@ -126,7 +111,7 @@ def test_sale_margin_delivered_return_to_refund(self):
         picking = self._validate_so_picking(sale_order)
         picking_return = self._create_return(picking, to_refund=True)
         picking_return.move_line_ids.qty_done = 3.0
-        picking_return.action_done()
+        picking_return._action_done()
         order_line = sale_order.order_line[:1]
         self.assertEqual(order_line.margin_delivered, 30.0)
         self.assertEqual(order_line.margin_delivered_percent, 50.0)
@@ -138,7 +123,7 @@ def test_sale_margin_delivered_return_no_refund(self):
         picking = self._validate_so_picking(sale_order)
         picking_return = self._create_return(picking, to_refund=False)
         picking_return.move_line_ids.qty_done = 3.0
-        picking_return.action_done()
+        picking_return._action_done()
         order_line = sale_order.order_line[:1]
         self.assertEqual(order_line.margin_delivered, 60.0)
         self.assertEqual(order_line.margin_delivered_percent, 50.0)

diff --git a/sale_margin_delivered/views/sale_margin_delivered_view.xml b/sale_margin_delivered/views/sale_margin_delivered_view.xml
@@ -4,20 +4,24 @@
 <odoo>
     <record id="view_order_form" model="ir.ui.view">
         <field name="model">sale.order</field>
-        <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="inherit_id" ref="sale_margin.sale_margin_sale_order_line_form" />
         <field
             name="groups_id"
             eval="[(4,ref('sale_margin_security.group_sale_margin_security'))]"
         />
         <field name="arch" type="xml">
-            <xpath
-                expr="//field[@name='order_line']/tree//field[@name='tax_id']"
-                position="before"
-            >
-                <field name="margin" string="Margin" />
-                <field name="purchase_price_delivery" string="Cost Price dlvd." />
-                <field name="margin_delivered_percent" string="% Margin" />
-                <field name="margin_delivered" string="Margin dlvd." />
+            <xpath expr="//field[@name='margin']" position="after">
+                <field
+                    name="purchase_price_delivery"
+                    string="Cost Price dlvd."
+                    optional="hide"
+                />
+                <field
+                    name="margin_delivered_percent"
+                    string="% Margin"
+                    optional="hide"
+                />
+                <field name="margin_delivered" string="Margin dlvd." optional="hide" />
             </xpath>
         </field>
     </record>