pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] stock: use current company

Browse Source 
Since changes made on multi-company, env.user.company_id doesn't
reprsent the the current company anymore, it is only the company in
which the user will be connected by default in Odoo.

The current main company is now available under env.company, so we use
now the current company instead of the user default.

closes odoo/odoo#35129

Signed-off-by: Arnold Moyaux <amoyaux@users.noreply.github.com>
This commit is contained in:
Pierre Masereel
2019-07-24 07:53:34 +00:00
parent 00476acea0
commit 66c49dd451
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/models/product.py
+1 -1
View File
@@ -422,7 +422,7 @@ class Product(models.Model):
self = self.with_context(inventory_mode=True)
# Set default location id if multilocations is inactive
if not self.user_has_groups('stock.group_stock_multi_locations'):
user_company = self.env.user.company_id
user_company = self.env.company
warehouse = self.env['stock.warehouse'].search(
[('company_id', '=', user_company.id)], limit=1
)
addons/stock/models/stock_quant.py
+3 -3
View File
@@ -21,7 +21,7 @@ class StockQuant(models.Model):
def _domain_location_id(self):
if not self._is_inventory_mode():
return
return ['&', ('company_id', '=', self.env.user.company_id.id), ('usage', 'in', ['internal', 'transit'])]
return ['&', ('company_id', '=', self.env.company.id), ('usage', 'in', ['internal', 'transit'])]
def _domain_product_id(self):
if not self._is_inventory_mode():
@@ -170,7 +170,7 @@ class StockQuant(models.Model):
# fixme: erase the following condition when it'll be possible to create a new record
# from a empty grouped editable list without go through the form view.
if self.search_count([
('company_id', '=', self.env.user.company_id.id),
('company_id', '=', self.env.company.id),
('location_id.usage', 'in', ['internal', 'transit'])
]):
self = self.with_context(
@@ -178,7 +178,7 @@ class StockQuant(models.Model):
search_default_locationgroup=1
)
if not self.user_has_groups('stock.group_stock_multi_locations'):
company_user = self.env.user.company_id
company_user = self.env.company
warehouse = self.env['stock.warehouse'].search([('company_id', '=', company_user.id)], limit=1)
if warehouse:
self = self.with_context(default_location_id=warehouse.lot_stock_id.id)