Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the computation of product domain inheritable

Browse Source
This commit is contained in:
Alexis de Lattre
2016-06-18 17:29:49 +02:00
parent 25d8a50d3a
commit 6812d2e68b
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
purchase_suggest/wizard/purchase_suggest.py
View File

@@ -29,7 +29,7 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class PurchaseSuggestionGenerate(models.TransientModel): class PurchaseSuggestGenerate(models.TransientModel):
_name = 'purchase.suggest.generate' _name = 'purchase.suggest.generate'
_description = 'Start to generate the purchase suggestions' _description = 'Start to generate the purchase suggestions'
@@ -68,6 +68,17 @@ class PurchaseSuggestionGenerate(models.TransientModel):
} }
return sline return sline
@api.model
def _prepare_product_domain(self):
product_domain = []
if self.categ_ids:
product_domain.append(
('categ_id', 'child_of', self.categ_ids.ids))
if self.seller_ids:
product_domain.append(
('seller_id', 'in', self.seller_ids.ids))
return product_domain
@api.model @api.model
def generate_products_dict(self): def generate_products_dict(self):
ppo = self.env['product.product'] ppo = self.env['product.product']
@@ -79,14 +90,8 @@ class PurchaseSuggestionGenerate(models.TransientModel):
('location_id', 'child_of', self.location_id.id), ('location_id', 'child_of', self.location_id.id),
] ]
if self.categ_ids or self.seller_ids: if self.categ_ids or self.seller_ids:
product_domain = []
if self.categ_ids: products_subset = ppo.search(self._prepare_product_domain())
product_domain.append(
('categ_id', 'child_of', self.categ_ids.ids))
if self.seller_ids:
product_domain.append(
('seller_id', 'in', self.seller_ids.ids))
products_subset = ppo.search(product_domain)
op_domain.append(('product_id', 'in', products_subset.ids)) op_domain.append(('product_id', 'in', products_subset.ids))
ops = swoo.search(op_domain) ops = swoo.search(op_domain)
for op in ops: for op in ops:

9
purchase_suggest_min_qty_on_product/wizard/purchase_suggest.py
View File

@@ -46,17 +46,10 @@ class PurchaseSuggestionGenerate(models.TransientModel):
def generate_products_dict(self): def generate_products_dict(self):
'''inherit the native method to use min_qty on product.product''' '''inherit the native method to use min_qty on product.product'''
ppo = self.env['product.product'] ppo = self.env['product.product']
product_domain = []
products = {} products = {}
product_domain = self._prepare_product_domain()
if self.product_type == 'product': if self.product_type == 'product':
product_domain.append(('type', '=', 'product')) product_domain.append(('type', '=', 'product'))
if self.categ_ids or self.seller_ids:
if self.categ_ids:
product_domain.append(
('categ_id', 'child_of', self.categ_ids.ids))
if self.seller_ids:
product_domain.append(
('seller_id', 'in', self.seller_ids.ids))
product_to_analyse = ppo.search(product_domain) product_to_analyse = ppo.search(product_domain)
for product in product_to_analyse: for product in product_to_analyse:
# We also want the missing product that have min_qty = 0 # We also want the missing product that have min_qty = 0