Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OCA/delivery-carrier
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fcaf5ad53bedd330c0764c647b16489a93835f28
Choose a base ref
..
head repository: OCA/delivery-carrier
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 44e8fef8c7ff09fbf58b7381aec57916b1ebc1c2
Choose a head ref
2 changes: 1 addition & 1 deletion delivery_carrier_deposit/models/deposit_slip.py
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ class DepositSlip(models.Model):
def _compute_weight(self):
weight = 0.0
for picking in self.picking_ids:
weight += picking.weight
weight += picking.shipping_weight
self.weight = weight

name = fields.Char(
1 change: 1 addition & 0 deletions delivery_carrier_deposit/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import test_deposit_slip
16 changes: 16 additions & 0 deletions delivery_carrier_deposit/tests/models.py
Original file line number Diff line number Diff line change
@@ -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
44 changes: 44 additions & 0 deletions delivery_carrier_deposit/tests/test_deposit_slip.py
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion delivery_carrier_deposit/views/deposit_slip_view.xml
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@
name="picking_ids"
nolabel="1"
widget="many2many"
options="{'not_delete': True}"
options="{'not_delete': True, 'no_create': True}"
>
<tree>
<field name="name" />
2 changes: 1 addition & 1 deletion delivery_carrier_deposit/views/stock_picking_view.xml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<field name="weight" position="after">
<field
name="deposit_slip_id"
attrs="{'readonly': True,'invisible': [('deposit_slip_id','=','')]}"
attrs="{'readonly': True,'invisible': [('deposit_slip_id', '=', False)]}"
/>
</field>
</field>
1 change: 1 addition & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
odoo-test-helper >= 1.1.0