diff --git a/stock_inventory_valuation_report/__manifest__.py b/stock_inventory_valuation_report/__manifest__.py index 77d4387..d9c3c01 100644 --- a/stock_inventory_valuation_report/__manifest__.py +++ b/stock_inventory_valuation_report/__manifest__.py @@ -4,7 +4,7 @@ { 'name': 'Stock Inventory Valuation Report', 'summary': 'Add report button on Inventory Valuation.', - 'version': '12.0.1.0.0', + 'version': '12.0.1.1.1', 'category': 'Warehouse', 'website': 'https://github.com/OCA/stock-logistics-reporting', 'author': 'Ecosoft,Odoo Community Association (OCA)', diff --git a/stock_inventory_valuation_report/i18n/stock_inventory_valuation_report.pot b/stock_inventory_valuation_report/i18n/stock_inventory_valuation_report.pot index 5b8ac8a..fff9049 100644 --- a/stock_inventory_valuation_report/i18n/stock_inventory_valuation_report.pot +++ b/stock_inventory_valuation_report/i18n/stock_inventory_valuation_report.pot @@ -23,6 +23,12 @@ msgstr "" msgid "Print" msgstr "" +#. module: stock_inventory_valuation_report +#: model:ir.model.fields,field_description:stock_inventory_valuation_report.field_stock_inventory_valuation_view__barcode +#: model_terms:ir.ui.view,arch_db:stock_inventory_valuation_report.report_stock_inventory_valuation_lines_header +msgid "Barcode" +msgstr "" + #. module: stock_inventory_valuation_report #: model:ir.model.fields,field_description:stock_inventory_valuation_report.field_report_stock_inventory_valuation_report__company_id msgid "Company" @@ -77,7 +83,6 @@ msgstr "" #: model:ir.model.fields,field_description:stock_inventory_valuation_report.field_report_s_i_v_r_report_stock_inventory_valuation_report_xlsx__display_name #: model:ir.model.fields,field_description:stock_inventory_valuation_report.field_report_stock_inventory_valuation_report__display_name #: model:ir.model.fields,field_description:stock_inventory_valuation_report.field_stock_inventory_valuation_view__display_name -#: model_terms:ir.ui.view,arch_db:stock_inventory_valuation_report.report_stock_inventory_valuation_lines_header msgid "Display Name" msgstr "" @@ -125,6 +130,12 @@ msgstr "" msgid "Last Updated on" msgstr "" +#. module: stock_inventory_valuation_report +#: model:ir.model.fields,field_description:stock_inventory_valuation_report.field_stock_inventory_valuation_view__name +#: model_terms:ir.ui.view,arch_db:stock_inventory_valuation_report.report_stock_inventory_valuation_lines_header +msgid "Name" +msgstr "" + #. module: stock_inventory_valuation_report #: model_terms:ir.ui.view,arch_db:stock_inventory_valuation_report.report_stock_inventory_valuation_report_filters msgid "Partner" @@ -140,6 +151,12 @@ msgstr "" msgid "Quantity" msgstr "" +#. module: stock_inventory_valuation_report +#: model:ir.model.fields,field_description:stock_inventory_valuation_report.field_stock_inventory_valuation_view__reference +#: model_terms:ir.ui.view,arch_db:stock_inventory_valuation_report.report_stock_inventory_valuation_lines_header +msgid "Reference" +msgstr "" + #. module: stock_inventory_valuation_report #: model:ir.model.fields,field_description:stock_inventory_valuation_report.field_report_stock_inventory_valuation_report__results msgid "Results" diff --git a/stock_inventory_valuation_report/reports/stock_inventory_valuation_report.py b/stock_inventory_valuation_report/reports/stock_inventory_valuation_report.py index e4c4e08..768206c 100644 --- a/stock_inventory_valuation_report/reports/stock_inventory_valuation_report.py +++ b/stock_inventory_valuation_report/reports/stock_inventory_valuation_report.py @@ -8,7 +8,9 @@ class StockInventoryValuationView(models.TransientModel): _name = 'stock.inventory.valuation.view' _description = 'Stock Inventory Valuation View' - display_name = fields.Char() + name = fields.Char() + reference = fields.Char() + barcode = fields.Char() qty_at_date = fields.Float() uom_id = fields.Many2one( comodel_name='uom.uom', @@ -59,7 +61,9 @@ class StockInventoryValuationReport(models.TransientModel): self.env.user.company_id.id, date=self.date) line = { - 'display_name': product.display_name, + 'name': product.name, + 'reference': product.default_code, + 'barcode': product.barcode, 'qty_at_date': product.qty_at_date, 'uom_id': product.uom_id, 'currency_id': product.currency_id, diff --git a/stock_inventory_valuation_report/reports/stock_inventory_valuation_report.xml b/stock_inventory_valuation_report/reports/stock_inventory_valuation_report.xml index 6f5fdb7..c927aba 100644 --- a/stock_inventory_valuation_report/reports/stock_inventory_valuation_report.xml +++ b/stock_inventory_valuation_report/reports/stock_inventory_valuation_report.xml @@ -99,7 +99,9 @@
#
-
Display Name
+
Reference
+
Name
+
Barcode
Quantity
Cost
Value
@@ -113,7 +115,13 @@
- + +
+
+ +
+
+
diff --git a/stock_inventory_valuation_report/reports/stock_inventory_valuation_report_xlsx.py b/stock_inventory_valuation_report/reports/stock_inventory_valuation_report_xlsx.py index 3cf992e..12e51fd 100644 --- a/stock_inventory_valuation_report/reports/stock_inventory_valuation_report_xlsx.py +++ b/stock_inventory_valuation_report/reports/stock_inventory_valuation_report_xlsx.py @@ -23,16 +23,34 @@ class ReportStockInventoryValuationReportXlsx(models.TransientModel): }, 'width': 12, }, - '2_display_name': { + '2_reference': { 'header': { - 'value': 'Display Name', + 'value': 'Reference', }, 'data': { - 'value': self._render('display_name'), + 'value': self._render('reference'), + }, + 'width': 15, + }, + '3_name': { + 'header': { + 'value': 'Name', + }, + 'data': { + 'value': self._render('name'), }, 'width': 36, }, - '3_qty_at_date': { + '4_barcode': { + 'header': { + 'value': 'Barcode', + }, + 'data': { + 'value': self._render('barcode'), + }, + 'width': 15, + }, + '5_qty_at_date': { 'header': { 'value': 'Quantity', }, @@ -42,7 +60,7 @@ class ReportStockInventoryValuationReportXlsx(models.TransientModel): }, 'width': 18, }, - '4_standard_price': { + '6_standard_price': { 'header': { 'value': 'Cost', }, @@ -52,7 +70,7 @@ class ReportStockInventoryValuationReportXlsx(models.TransientModel): }, 'width': 18, }, - '5_stock_value': { + '7_stock_value': { 'header': { 'value': 'Value', }, @@ -109,7 +127,9 @@ class ReportStockInventoryValuationReportXlsx(models.TransientModel): ws, row_pos, ws_params, col_specs_section='data', render_space={ 'n': row_pos-5, - 'display_name': line.display_name or '', + 'name': line.name or '', + 'reference': line.reference or '', + 'barcode': line.barcode or '', 'qty_at_date': line.qty_at_date or 0.000, 'standard_price': line.standard_price or 0.00, 'stock_value': line.stock_value or 0.00, @@ -117,4 +137,4 @@ class ReportStockInventoryValuationReportXlsx(models.TransientModel): default_format=self.format_tcell_left) total += line.stock_value - ws.write(row_pos, 4, total, self.format_theader_blue_amount_right) + ws.write(row_pos, 6, total, self.format_theader_blue_amount_right)