[MIG] stock_picking_rate: Migrate to 10.0

* Re-add `partner_id` to `delivery.carrier`
OCA · Mar 22, 2017 · 32a4497 · 32a4497
1 parent 13d09ce
commit 32a4497
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 21 deletions.
diff --git a/stock_picking_rate/__init__.py b/stock_picking_rate/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 LasLabs Inc.
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import models

diff --git a/stock_picking_rate/__openerp__.py → stock_picking_rate/__manifest__.py b/stock_picking_rate/__openerp__.py → stock_picking_rate/__manifest__.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 LasLabs Inc.
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
     "name": "Stock Picking Rate",
     "summary": "Adds a concept of rate quotes for stock pickings",
-    "version": "9.0.1.0.0",
+    "version": "10.0.1.0.0",
     "category": "Inventory, Logistics, Warehousing",
     "website": "https://laslabs.com/",
     "author": "LasLabs, Odoo Community Association (OCA)",

diff --git a/stock_picking_rate/models/__init__.py b/stock_picking_rate/models/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 LasLabs Inc.
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+from . import delivery_carrier
 from . import stock_picking
 from . import stock_picking_rate
diff --git a/stock_picking_rate/models/delivery_carrier.py b/stock_picking_rate/models/delivery_carrier.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Copyright 2017 LasLabs Inc.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class DeliveryCarrier(models.Model):
+    _inherit = 'delivery.carrier'
+
+    partner_id = fields.Many2one(
+        string='Carrier Partner',
+        comodel_name='res.partner',
+    )
diff --git a/stock_picking_rate/models/stock_picking.py b/stock_picking_rate/models/stock_picking.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 LasLabs Inc.
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import fields, models
+from odoo import fields, models
 
 
 class StockPicking(models.Model):

diff --git a/stock_picking_rate/models/stock_picking_rate.py b/stock_picking_rate/models/stock_picking_rate.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 LasLabs Inc.
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import api, fields, models
+from odoo import api, fields, models
 import openerp.addons.decimal_precision as dp
 
 

diff --git a/stock_picking_rate/tests/__init__.py b/stock_picking_rate/tests/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 LasLabs Inc.
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import test_stock_picking_rate

diff --git a/stock_picking_rate/tests/common.py b/stock_picking_rate/tests/common.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 LasLabs Inc.
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp.tests.common import TransactionCase
+from odoo.tests.common import TransactionCase
 
 
 class TestHelper(TransactionCase):
@@ -17,8 +17,8 @@ def setUp(self):
         })
         self.partner_id = self.env['res.partner'].create({'name': 'Carrier'})
         self.service_id = self.env['delivery.carrier'].create({
-            'partner_id': self.partner_id.id,
             'name': 'Test Method',
+            'partner_id': self.partner_id.id,
         })
         self.rate = 1.23
         self.rate_vals = {

diff --git a/stock_picking_rate/tests/test_stock_picking_rate.py b/stock_picking_rate/tests/test_stock_picking_rate.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 LasLabs Inc.
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import mock

diff --git a/stock_picking_rate/tests/test_stock_picking_rate_purchase.py b/stock_picking_rate/tests/test_stock_picking_rate_purchase.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 LasLabs Inc.
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from .common import TestHelper

diff --git a/stock_picking_rate/views/stock_picking_rate_view.xml b/stock_picking_rate/views/stock_picking_rate_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-    Copyright 2016 LasLabs Inc.
+    Copyright 2016-2017 LasLabs Inc.
     @license AGPL-3 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 
@@ -66,7 +66,7 @@
         <field name="model">stock.picking.rate</field>
         <field name="arch" type="xml">
             <search string="Dispatch Rates">
-                
+
                 <field name="picking_id"/>
                 <field name="date_generated" />
                 <field name="date_purchased" />
@@ -91,7 +91,7 @@
                 <filter string="Currency"
                         domain=""
                         context="{'group_by': 'rate_currency_id'}" />
-                
+
             </search>
         </field>
     </record>

diff --git a/stock_picking_rate/views/stock_picking_view.xml b/stock_picking_rate/views/stock_picking_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-    Copyright 2016 LasLabs Inc.
+    Copyright 2016-2017 LasLabs Inc.
     @license AGPL-3 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 

diff --git a/stock_picking_rate/wizards/__init__.py b/stock_picking_rate/wizards/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 LasLabs Inc.
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from . import stock_picking_rate_purchase
diff --git a/stock_picking_rate/wizards/stock_picking_rate_purchase.py b/stock_picking_rate/wizards/stock_picking_rate_purchase.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 LasLabs Inc.
+# Copyright 2016-2017 LasLabs Inc.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import api, models, fields
+from odoo import api, models, fields
 
 
 class StockPickingRatePurchase(models.TransientModel):