diff options
| author | Simon Lejeune <sle@openerp.com> | 2019-08-22 09:32:23 +0000 |
|---|---|---|
| committer | Simon Lejeune <sle@openerp.com> | 2019-09-03 15:05:04 +0000 |
| commit | 20692736a99934bb26268d28cdece69b4229425b (patch) | |
| tree | ad893df62d1c1502e8f01d095d90768f254b2b56 /addons/delivery | |
| parent | 9d4a5526906e20a8628d3f52674c466a0625bad7 (diff) | |
[REF] delivery: multi company
Ensure proper domains are applied and enforced on relation fields thanks
to the `check_company` attributes.
task-1985992
Diffstat (limited to 'addons/delivery')
| -rw-r--r-- | addons/delivery/models/stock_picking.py | 3 | ||||
| -rw-r--r-- | addons/delivery/wizard/choose_delivery_package.py | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py index fb31d2da7c4..66bea256e92 100644 --- a/addons/delivery/models/stock_picking.py +++ b/addons/delivery/models/stock_picking.py @@ -77,7 +77,7 @@ class StockPicking(models.Model): carrier_price = fields.Float(string="Shipping Cost") delivery_type = fields.Selection(related='carrier_id.delivery_type', readonly=True) - carrier_id = fields.Many2one("delivery.carrier", string="Carrier", domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]") + carrier_id = fields.Many2one("delivery.carrier", string="Carrier", check_company=True) volume = fields.Float(copy=False) weight = fields.Float(compute='_cal_weight', digits='Stock Weight', store=True, help="Total weight of the products in the picking.") carrier_tracking_ref = fields.Char(string='Tracking Reference', copy=False) @@ -161,7 +161,6 @@ class StockPicking(models.Model): self.message_post(body=msg) self._add_delivery_cost_to_so() - def print_return_label(self): self.ensure_one() res = self.carrier_id.get_return_label(self) diff --git a/addons/delivery/wizard/choose_delivery_package.py b/addons/delivery/wizard/choose_delivery_package.py index 32e95e67544..04b03e3f501 100644 --- a/addons/delivery/wizard/choose_delivery_package.py +++ b/addons/delivery/wizard/choose_delivery_package.py @@ -22,9 +22,10 @@ class ChooseDeliveryPackage(models.TransientModel): return total_weight picking_id = fields.Many2one('stock.picking', 'Picking') - delivery_packaging_id = fields.Many2one('product.packaging', 'Delivery Packaging') + delivery_packaging_id = fields.Many2one('product.packaging', 'Delivery Packaging', check_company=True) shipping_weight = fields.Float('Shipping Weight', default=_default_shipping_weight) weight_uom_name = fields.Char(string='Weight unit of measure label', compute='_compute_weight_uom_name') + company_id = fields.Many2one(related='picking_id.company_id') @api.depends('delivery_packaging_id') def _compute_weight_uom_name(self): |