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

stock_inventory_xlsx: small fixes

Browse Source
This commit is contained in:
Alexis de Lattre
2020-09-22 00:15:07 +02:00
parent de5470e5bd
commit 3043ad11a8
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
stock_valuation_xlsx/wizard/stock_valuation_xlsx.py
View File

@@ -93,23 +93,20 @@ class StockValuationXlsx(models.TransientModel):
domain += [('categ_id', 'child_of', self.categ_ids.ids)] domain += [('categ_id', 'child_of', self.categ_ids.ids)]
return domain return domain
def _prepare_product_fields(self):
return ['default_code', 'name', 'categ_id', 'uom_id']
def compute_product_data(self, company_id, past_date=False): def compute_product_data(self, company_id, past_date=False):
self.ensure_one() self.ensure_one()
ppo = self.env['product.product'] ppo = self.env['product.product']
domain = self._prepare_product_domain() domain = self._prepare_product_domain()
products = ppo.with_context(active_test=False).search_read(domain, self._prepare_product_fields()) products = ppo.with_context(active_test=False).search(domain)
product_ids = [x['id'] for x in products] product_ids = [x['id'] for x in products]
product_id2data = {} product_id2data = {}
for p in products: for p in products:
standard_price = ppo.get_history_price(company_id, date=past_date) standard_price = p.get_history_price(company_id, date=past_date)
product_id2data[p['id']] = { product_id2data[p['id']] = {
'default_code': p['default_code'], 'default_code': p.default_code,
'name': p['name'], 'name': p.name,
'categ_id': p['categ_id'][0], 'categ_id': p.categ_id.id,
'uom_id': p['uom_id'][0], 'uom_id': p.uom_id.id,
'standard_price': standard_price, 'standard_price': standard_price,
} }
return product_id2data, product_ids return product_id2data, product_ids
@@ -390,8 +387,8 @@ class StockValuationXlsx(models.TransientModel):
sheet.write(crow, x + 1, '', categ_title) sheet.write(crow, x + 1, '', categ_title)
for l in filter(lambda x: x['categ_id'] == categ_id, res): for l in filter(lambda x: x['categ_id'] == categ_id, res):
i += 1 i += 1
total += l['qty'] total += l['subtotal']
ctotal += l['qty'] ctotal += l['subtotal']
categ_has_line = True categ_has_line = True
subtotal_formula = '=%s%d*%s%d' % (letter_qty, i + 1, letter_price, i + 1) subtotal_formula = '=%s%d*%s%d' % (letter_qty, i + 1, letter_price, i + 1)
sheet.write_formula(i, cols['subtotal']['pos'], subtotal_formula, regular_currency, l['subtotal']) sheet.write_formula(i, cols['subtotal']['pos'], subtotal_formula, regular_currency, l['subtotal'])