Merge pull request #82 from gurneyalex/12.0-rma_multicompany_rule_creation

[FIX][12.0] multicompany: wrong company on stock rules
This commit is contained in:
Aarón Henríquez
2019-06-21 16:07:42 +02:00
committed by GitHub
2 changed files with 7 additions and 1 deletions

View File

@@ -113,6 +113,7 @@
<record id="route_rma_customer" model='stock.location.route'>
<field name="name">RMA Customer</field>
<field name="company_id" eval="0"/>
<field name="sequence">10</field>
<field name="sale_selectable" eval="False"/>
<field name="product_selectable" eval="False"/>
@@ -123,6 +124,7 @@
<record id="route_rma_supplier" model='stock.location.route'>
<field name="name">RMA Supplier</field>
<field name="company_id" eval="0"/>
<field name="sequence">10</field>
<field name="sale_selectable" eval="False"/>
<field name="product_selectable" eval="False"/>
@@ -133,6 +135,7 @@
<record id="route_rma_dropship" model='stock.location.route'>
<field name="name">RMA Dropship</field>
<field name="company_id" eval="0"/>
<field name="sequence">10</field>
<field name="sale_selectable" eval="False"/>
<field name="product_selectable" eval="False"/>

View File

@@ -174,13 +174,13 @@ class StockWarehouse(models.Model):
self.ensure_one()
rma_rules = dict()
customer_loc, supplier_loc = self._get_partner_locations()
# TODO: company_id?
rma_rules['rma_customer_in'] = {
'name': self._format_rulename(self,
customer_loc,
self.lot_rma_id.name),
'action': 'pull',
'warehouse_id': self.id,
'company_id': self.company_id.id,
'location_src_id': customer_loc.id,
'location_id': self.lot_rma_id.id,
'procure_method': 'make_to_stock',
@@ -194,6 +194,7 @@ class StockWarehouse(models.Model):
customer_loc.name),
'action': 'pull',
'warehouse_id': self.id,
'company_id': self.company_id.id,
'location_src_id': self.lot_rma_id.id,
'location_id': customer_loc.id,
'procure_method': 'make_to_stock',
@@ -207,6 +208,7 @@ class StockWarehouse(models.Model):
self.lot_rma_id.name),
'action': 'pull',
'warehouse_id': self.id,
'company_id': self.company_id.id,
'location_src_id': supplier_loc.id,
'location_id': self.lot_rma_id.id,
'procure_method': 'make_to_stock',
@@ -220,6 +222,7 @@ class StockWarehouse(models.Model):
supplier_loc.name),
'action': 'pull',
'warehouse_id': self.id,
'company_id': self.company_id.id,
'location_src_id': self.lot_rma_id.id,
'location_id': supplier_loc.id,
'procure_method': 'make_to_stock',