diff options
| author | Simon Lejeune <sle@openerp.com> | 2019-08-26 15:37:16 +0000 |
|---|---|---|
| committer | Simon Lejeune <sle@openerp.com> | 2019-09-03 15:05:03 +0000 |
| commit | 9d4a5526906e20a8628d3f52674c466a0625bad7 (patch) | |
| tree | b6b87392100f49167872239c29b758ad483e72ec /addons/mrp_subcontracting/models | |
| parent | 96406dc2a9e06595961f6d4bec6b66f27b94e2ff (diff) | |
[REF] mrp_subcontracting: multi company
Ensure proper domains are applied and enforced on relation fields thanks
to the `check_company` attributes.
task-1985992
Diffstat (limited to 'addons/mrp_subcontracting/models')
| -rw-r--r-- | addons/mrp_subcontracting/models/mrp_bom.py | 3 | ||||
| -rw-r--r-- | addons/mrp_subcontracting/models/stock_warehouse.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/mrp_subcontracting/models/mrp_bom.py b/addons/mrp_subcontracting/models/mrp_bom.py index a0a1d054cb9..a34e3bda163 100644 --- a/addons/mrp_subcontracting/models/mrp_bom.py +++ b/addons/mrp_subcontracting/models/mrp_bom.py @@ -8,10 +8,11 @@ class MrpBom(models.Model): _inherit = 'mrp.bom' type = fields.Selection(selection_add=[('subcontract', 'Subcontracting')]) - subcontractor_ids = fields.Many2many('res.partner', 'mrp_bom_subcontractor', string='Subcontractors') + subcontractor_ids = fields.Many2many('res.partner', 'mrp_bom_subcontractor', string='Subcontractors', check_company=True) def _bom_subcontract_find(self, product_tmpl=None, product=None, picking_type=None, company_id=False, bom_type='subcontract', subcontractor=False): domain = self._bom_find_domain(product_tmpl=product_tmpl, product=product, picking_type=picking_type, company_id=company_id, bom_type=bom_type) if subcontractor: domain = AND([domain, [('subcontractor_ids', 'in', subcontractor.id)]]) return self.search(domain, order='subcontractor_ids, sequence, product_id', limit=1) + diff --git a/addons/mrp_subcontracting/models/stock_warehouse.py b/addons/mrp_subcontracting/models/stock_warehouse.py index 41e5d704bc1..ef1a605608e 100644 --- a/addons/mrp_subcontracting/models/stock_warehouse.py +++ b/addons/mrp_subcontracting/models/stock_warehouse.py @@ -110,6 +110,7 @@ class StockWarehouse(models.Model): 'use_create_components_lots': True, 'sequence': next_sequence + 2, 'sequence_code': 'SBC', + 'company_id': self.company_id.id, }, }) return data, max_sequence + 4 @@ -117,7 +118,7 @@ class StockWarehouse(models.Model): def _get_sequence_values(self): values = super(StockWarehouse, self)._get_sequence_values() values.update({ - 'subcontracting_type_id': {'name': self.name + ' ' + _('Sequence subcontracting'), 'prefix': self.code + '/SBC/', 'padding': 5}, + 'subcontracting_type_id': {'name': self.name + ' ' + _('Sequence subcontracting'), 'prefix': self.code + '/SBC/', 'padding': 5, 'company_id': self.company_id.id}, }) return values |