[MIG] delivery_carrier_deposit: Migration to 14.0

Author: florian-dacosta

delivery_carrier_deposit/__manifest__.py

@@ -3,25 +3,25 @@
 
 {
     "name": "Delivery Deposit",
-    "version": "10.0.0.1.2",
+    "version": "14.0.1.0.0",
     "category": "Delivery",
     "author": "Akretion,Odoo Community Association (OCA)",
     "maintainer": "Akretion",
     "summary": "Create deposit slips",
     "depends": [
-        "base_delivery_carrier_label",
+        "delivery",
     ],
     "website": "https://github.com/OCA/delivery-carrier",
     "data": [
-        "views/stock_view.xml",
-        "wizards/deposit.xml",
+        "views/deposit_slip_view.xml",
+        "views/stock_picking_view.xml",
+        "wizards/delivery_deposit_wizard_view.xml",
         "data/ir_sequence_data.xml",
         "report/report.xml",
         "report/deposit_slip.xml",
         "security/ir.model.access.csv",
         "security/model_security.xml",
     ],
-    "demo": [],
     "installable": True,
     "license": "AGPL-3",
 }

delivery_carrier_deposit/models/__init__.py

@@ -1 +1,2 @@
+from . import stock_picking
 from . import deposit_slip

delivery_carrier_deposit/models/deposit_slip.py

@@ -7,46 +7,27 @@
 
 from odoo import api, fields, models
 
-import odoo.addons.decimal_precision as dp
-
 
 class DepositSlip(models.Model):
     _name = "deposit.slip"
     _description = "Deposit Slip"
     _order = "id desc"
-    _inherit = ["mail.thread"]
-    _track = {
-        "state": {
-            "delivery_carrier_deposit.deposit_slip_done": lambda self, cr, uid, obj, ctx=None: obj.state
-            == "done",
-        }
-    }
+    _inherit = ["mail.thread", "mail.activity.mixin"]
 
-    @api.one
     @api.depends("picking_ids")
-    def _compute_deposit_slip(self):
+    def _compute_weight(self):
         weight = 0.0
-        number_of_packages = 0
         for picking in self.picking_ids:
-            number_of_packages += picking.number_of_packages
-            weight += picking.weight
+            weight += picking.shipping_weight
         self.weight = weight
-        self.number_of_packages = number_of_packages
-
-    @api.model
-    def _get_carrier_type_selection(self):
-        return self.env["delivery.carrier"]._get_carrier_type_selection()
 
     name = fields.Char(
         readonly=True, states={"draft": [("readonly", False)]}, default="/", copy=False
     )
-    carrier_type = fields.Selection(
-        selection="_get_carrier_type_selection",
-        string="Type",
-        readonly=True,
-        required=True,
-        copy=False,
-        help="Carrier type (combines several delivery methods)",
+    delivery_type = fields.Selection(
+        selection=lambda self: self.env["delivery.carrier"]
+        ._fields["delivery_type"]
+        .selection
     )
     picking_ids = fields.One2many(
         comodel_name="stock.picking",
@@ -67,18 +48,11 @@ def _get_carrier_type_selection(self):
     company_id = fields.Many2one(
         comodel_name="res.company",
         string="Company",
-        default=lambda self: self.env["res.company"]._company_default_get(
-            "deposit.slip"
-        ),
+        default=lambda self: self.env.company,
     )
     weight = fields.Float(
         string="Total Weight",
-        compute="_compute_deposit_slip",
-        digits=dp.get_precision("Stock Weight"),
-        readonly=True,
-    )
-    number_of_packages = fields.Integer(
-        string="Number of Packages", compute="_compute_deposit_slip", readonly=True
+        compute="_compute_weight",
     )
 
     _sql_constraints = [
@@ -95,32 +69,15 @@ def create(self, vals=None):
             vals = {}
         if vals.get("name", "/") == "/":
             vals["name"] = self.env["ir.sequence"].next_by_code("delivery.deposit")
-        return super(DepositSlip, self).create(vals)
+        return super().create(vals)
 
-    @api.multi
     def create_edi_file(self):
         """
         Override this method for the proper carrier
         """
         return True
 
-    @api.multi
     def validate_deposit(self):
         self.create_edi_file()
         self.write({"state": "done"})
         return True
-
-
-class StockPicking(models.Model):
-    _inherit = "stock.picking"
-
-    deposit_slip_id = fields.Many2one("deposit.slip", "Deposit Slip")
-
-
-class DeliveryCarrier(models.Model):
-    _inherit = "delivery.carrier"
-
-    deposit_slip = fields.Boolean(
-        string="Deposit Slip",
-        help="Allow to create a 'Deposit Slip' report on delivery orders",
-    )

delivery_carrier_deposit/models/stock_picking.py

@@ -0,0 +1,9 @@
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+
+from odoo import fields, models
+
+
+class StockPicking(models.Model):
+    _inherit = "stock.picking"
+
+    deposit_slip_id = fields.Many2one("deposit.slip", "Deposit Slip")

delivery_carrier_deposit/report/deposit_slip.xml

@@ -3,7 +3,7 @@
 
 <template id="report_generic_deposit_slip">
 
-<t t-call="report.html_container">
+<t t-call="web.html_container">
 <t t-call="report.internal_layout">
 
 
@@ -13,7 +13,7 @@
 
 <h1>Deposit Slip n°<span t-field="o.name" /></h1>
 
-    <div>Delivery Method Type: <span t-field="o.carrier_type" /></div>
+    <div>Delivery Method Type: <span t-field="o.delivery_type" /></div>
     <div>Customer No.: </div>
     <div>Account Name: <span t-field="user.company_id.name" /></div>
     <div>Date: <span t-field="o.create_date" /></div>
@@ -27,7 +27,6 @@
             <th class="small">ZIP</th>
             <th class="small">Country</th>
             <th class="small">Weight<br />(kg)</th>
-            <th class="small">Nr of<br />packages</th>
         </tr>
     </thead>
     <tbody>
@@ -39,13 +38,11 @@
             <td><span t-field="p.partner_id.zip" /></td>
             <td><span t-field="p.partner_id.country_id.code" /></td>
             <td><span t-field="p.weight" /></td>
-            <td><span t-field="p.number_of_packages" /></td>
         </tr>
 
     </tbody>
     </table>
     <div>Total Weight: <span t-field="o.weight" /> kg</div>
-    <div>Total Number of Packages: <span t-field="o.number_of_packages" /></div>
 </div>
 </t>
 
@@ -55,7 +52,7 @@
 </template>
 
 <template id="report_generic_deposit_slip_trans">
-  <t t-call="report.html_container">
+  <t t-call="web.html_container">
     <t t-foreach="doc_ids" t-as="doc_id">
       <t
                     t-raw="translate_doc(doc_id, doc_model, 'partner_id.lang', 'delivery_carrier_deposit.report_generic_deposit_slip')"

delivery_carrier_deposit/security/ir.model.access.csv

@@ -1,3 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_deposit_slip_user","access_deposit_slip","model_deposit_slip","base.group_user",1,0,0,0
 "access_deposit_slip_stock_user","access_deposit_slip_stock_user","model_deposit_slip","stock.group_stock_user",1,1,1,1
+"access_deposit_slip_wizard_stock_user","access_deposit_slip_wizard_stock_user","model_delivery_deposit_wizard","stock.group_stock_user",1,1,1,1

delivery_carrier_deposit/security/model_security.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<openerp>
-<data>
+<odoo>
 
     <!-- Multi - Company Rules -->
 
@@ -9,8 +8,7 @@
         <field name="model_id" ref="model_deposit_slip" />
         <field name="global" eval="True" />
         <field
-                name="domain_force"
-            >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+            name="domain_force"
+        >['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field>
     </record>
-</data>
-</openerp>
+</odoo>

delivery_carrier_deposit/tests/__init__.py

@@ -0,0 +1 @@
+from . import test_deposit_slip

delivery_carrier_deposit/tests/models.py

@@ -0,0 +1,16 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from odoo import fields, models
+
+
+class FakeDeliveryCarrier(models.Model):
+    _inherit = "delivery.carrier"
+
+    delivery_type = fields.Selection(
+        selection_add=[("test", "Test Carrier")], ondelete={"test": "set default"}
+    )
+
+    def test_send_shipping(self, pickings):
+        res = []
+        for _p in pickings:
+            res = res + [{"exact_price": 0.0, "tracking_number": False}]
+        return res

delivery_carrier_deposit/tests/test_deposit_slip.py

@@ -0,0 +1,44 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo_test_helper import FakeModelLoader
+
+from odoo.tests.common import SavepointCase
+
+
+class TestDepositSlip(SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.loader = FakeModelLoader(cls.env, cls.__module__)
+        cls.loader.backup_registry()
+
+        # The fake class is imported here !! After the backup_registry
+        from .models import FakeDeliveryCarrier
+
+        cls.loader.update_registry((FakeDeliveryCarrier,))
+
+        delivery_free_product = cls.env.ref("delivery.product_product_delivery")
+        cls.carrier = cls.env["delivery.carrier"].create(
+            {
+                "name": "Test Carrier",
+                "delivery_type": "test",
+                "product_id": delivery_free_product.id,
+            }
+        )
+        cls.delivery_order = cls.env.ref("stock.outgoing_shipment_main_warehouse4")
+        cls.delivery_order.write({"carrier_id": cls.carrier.id})
+
+    def test_delivery_slip_creation(self):
+        self.delivery_order._action_done()
+        wizard = self.env["delivery.deposit.wizard"].create(
+            {
+                "delivery_type": "test",
+            }
+        )
+        wizard.create_deposit_slip()
+        deposit = self.env["deposit.slip"].search([("state", "=", "draft")])
+        self.assertEqual(len(deposit), 1)
+        self.assertEqual(len(deposit.picking_ids), 1)
+        self.assertEqual(deposit.weight, self.delivery_order.shipping_weight)
+        deposit.validate_deposit()
+        self.assertEqual(deposit.state, "done")