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

stock_valuation_xlsx: add barcode in report

Browse Source 
Don't display '0' when the product code is empty
This commit is contained in:
Alexis de Lattre
2022-05-16 19:30:05 +02:00
parent abb36545d9
commit a89f1a9ae7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stock_valuation_xlsx/wizard/stock_valuation_xlsx.py
View File

@@ -124,7 +124,7 @@ class StockValuationXlsx(models.TransientModel):
return products.ids return products.ids
def _prepare_product_fields(self): def _prepare_product_fields(self):
return ['uom_id', 'name', 'default_code', 'categ_id'] return ['uom_id', 'name', 'default_code', 'barcode', 'categ_id']
def _prepare_expiry_depreciation_rules(self, company_id, past_date): def _prepare_expiry_depreciation_rules(self, company_id, past_date):
rules = self.env['stock.expiry.depreciation.rule'].search_read([('company_id', '=', company_id)], ['start_limit_days', 'ratio'], order='start_limit_days desc') rules = self.env['stock.expiry.depreciation.rule'].search_read([('company_id', '=', company_id)], ['start_limit_days', 'ratio'], order='start_limit_days desc')
@@ -517,11 +517,10 @@ class StockValuationXlsx(models.TransientModel):
sheet.write_formula(i, cols['subtotal']['pos'], subtotal_formula, styles['regular_currency'], l['subtotal']) sheet.write_formula(i, cols['subtotal']['pos'], subtotal_formula, styles['regular_currency'], l['subtotal'])
for col_name, col in cols.items(): for col_name, col in cols.items():
if not col.get('formula'): if not col.get('formula'):
if col.get('type') == 'date': if not l[col_name]:
if l[col_name]: l[col_name] = '' # to avoid display of 31/12/1899 (dates) or '0' (char)
if col.get('type') == 'date' and l[col_name]:
l[col_name] = fields.Date.from_string(l[col_name]) l[col_name] = fields.Date.from_string(l[col_name])
else:
l[col_name] = '' # to avoid display of 31/12/1899
sheet.write(i, col['pos'], l[col_name], styles[col['style']]) sheet.write(i, col['pos'], l[col_name], styles[col['style']])
if categ_subtotal: if categ_subtotal:
if categ_has_line: if categ_has_line:
@@ -601,6 +600,7 @@ class StockValuationXlsx(models.TransientModel):
def _prepare_cols(self): def _prepare_cols(self):
cols = { cols = {
'default_code': {'width': 18, 'style': 'regular', 'sequence': 10, 'title': _('Product Code')}, 'default_code': {'width': 18, 'style': 'regular', 'sequence': 10, 'title': _('Product Code')},
'barcode': {'width': 18, 'style': 'regular', 'sequence': 10, 'title': _('Product Barcode')},
'product_name': {'width': 40, 'style': 'regular', 'sequence': 20, 'title': _('Product Name')}, 'product_name': {'width': 40, 'style': 'regular', 'sequence': 20, 'title': _('Product Name')},
'loc_name': {'width': 25, 'style': 'regular_small', 'sequence': 30, 'title': _('Location Name')}, 'loc_name': {'width': 25, 'style': 'regular_small', 'sequence': 30, 'title': _('Location Name')},
'lot_name': {'width': 18, 'style': 'regular', 'sequence': 40, 'title': _('Lot')}, 'lot_name': {'width': 18, 'style': 'regular', 'sequence': 40, 'title': _('Lot')},