diff --git a/stock_card_report/__manifest__.py b/stock_card_report/__manifest__.py index f56a1b9..8fda04f 100644 --- a/stock_card_report/__manifest__.py +++ b/stock_card_report/__manifest__.py @@ -4,13 +4,14 @@ { "name": "Stock Card Report", "summary": "Add stock card report on Inventory Reporting.", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "category": "Warehouse", "website": "https://github.com/OCA/stock-logistics-reporting", "author": "Ecosoft, Odoo Community Association (OCA)", "license": "AGPL-3", "depends": ["stock", "date_range", "report_xlsx_helper"], "data": [ + "security/ir.model.access.csv", "data/paper_format.xml", "data/report_data.xml", "reports/stock_card_report.xml", diff --git a/stock_card_report/data/report_data.xml b/stock_card_report/data/report_data.xml index 873a0ab..0c0535e 100644 --- a/stock_card_report/data/report_data.xml +++ b/stock_card_report/data/report_data.xml @@ -1,3 +1,4 @@ + @@ -6,25 +7,26 @@ - + + Stock Card PDF + report.stock.card.report + qweb-pdf + stock_card_report.report_stock_card_report_pdf + stock_card_report.report_stock_card_report_pdf + 'Stock Card Report - [%s]' % (object.location_id.complete_name) + + - + + Stock Card XLSX + report.stock.card.report + xlsx + stock_card_report.report_stock_card_report_xlsx + Stock Card Report + diff --git a/stock_card_report/readme/CONTRIBUTORS.rst b/stock_card_report/readme/CONTRIBUTORS.rst index 0ef1f84..1def9e8 100644 --- a/stock_card_report/readme/CONTRIBUTORS.rst +++ b/stock_card_report/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Pimolnat Suntian +* Prapassorn Sornkaew diff --git a/stock_card_report/reports/stock_card_report.py b/stock_card_report/reports/stock_card_report.py index 425715a..ea7f57c 100644 --- a/stock_card_report/reports/stock_card_report.py +++ b/stock_card_report/reports/stock_card_report.py @@ -98,7 +98,7 @@ class StockCardReport(models.TransientModel): rcontext["o"] = report result["html"] = self.env.ref( "stock_card_report.report_stock_card_report_html" - ).render(rcontext) + )._render(rcontext) return result @api.model diff --git a/stock_card_report/reports/stock_card_report_xlsx.py b/stock_card_report/reports/stock_card_report_xlsx.py index 8a9f41a..f05451c 100644 --- a/stock_card_report/reports/stock_card_report_xlsx.py +++ b/stock_card_report/reports/stock_card_report_xlsx.py @@ -5,6 +5,11 @@ import logging from odoo import models +from odoo.addons.report_xlsx_helper.report.report_xlsx_format import ( + FORMATS, + XLS_HEADERS, +) + _logger = logging.getLogger(__name__) @@ -29,33 +34,33 @@ class ReportStockCardReportXlsx(models.AbstractModel): "header": {"value": "Date from"}, "data": { "value": self._render("date_from"), - "format": self.format_tcell_date_center, + "format": FORMATS["format_tcell_date_center"], }, }, "2_date_to": { "header": {"value": "Date to"}, "data": { "value": self._render("date_to"), - "format": self.format_tcell_date_center, + "format": FORMATS["format_tcell_date_center"], }, }, "3_location": { "header": {"value": "Location"}, "data": { "value": self._render("location"), - "format": self.format_tcell_center, + "format": FORMATS["format_tcell_center"], }, }, } initial_template = { "1_ref": { - "data": {"value": "Initial", "format": self.format_tcell_center}, + "data": {"value": "Initial", "format": FORMATS["format_tcell_center"]}, "colspan": 4, }, "2_balance": { "data": { "value": self._render("balance"), - "format": self.format_tcell_amount_right, + "format": FORMATS["format_tcell_amount_right"], } }, } @@ -64,7 +69,7 @@ class ReportStockCardReportXlsx(models.AbstractModel): "header": {"value": "Date"}, "data": { "value": self._render("date"), - "format": self.format_tcell_date_left, + "format": FORMATS["format_tcell_date_left"], }, "width": 25, }, @@ -72,7 +77,7 @@ class ReportStockCardReportXlsx(models.AbstractModel): "header": {"value": "Reference"}, "data": { "value": self._render("reference"), - "format": self.format_tcell_left, + "format": FORMATS["format_tcell_left"], }, "width": 25, }, @@ -109,8 +114,8 @@ class ReportStockCardReportXlsx(models.AbstractModel): def _stock_card_report(self, wb, ws, ws_params, data, objects, product): ws.set_portrait() ws.fit_to_pages(1, 0) - ws.set_header(self.xls_headers["standard"]) - ws.set_footer(self.xls_footers["standard"]) + ws.set_header(XLS_HEADERS["xls_headers"]["standard"]) + ws.set_footer(XLS_HEADERS["xls_footers"]["standard"]) self._set_column_width(ws, ws_params) # Title row_pos = 0 @@ -121,7 +126,7 @@ class ReportStockCardReportXlsx(models.AbstractModel): row_pos, ws_params, col_specs_section="header", - default_format=self.format_theader_blue_center, + default_format=FORMATS["format_theader_blue_center"], col_specs="col_specs_filter", wanted_list="wanted_list_filter", ) @@ -145,7 +150,7 @@ class ReportStockCardReportXlsx(models.AbstractModel): row_pos, ws_params, col_specs_section="header", - default_format=self.format_theader_blue_center, + default_format=FORMATS["format_theader_blue_center"], ) ws.freeze_panes(row_pos, 0) balance = objects._get_initial( @@ -177,5 +182,5 @@ class ReportStockCardReportXlsx(models.AbstractModel): "output": line.product_out or 0, "balance": balance, }, - default_format=self.format_tcell_amount_right, + default_format=FORMATS["format_tcell_amount_right"], ) diff --git a/stock_card_report/security/ir.model.access.csv b/stock_card_report/security/ir.model.access.csv new file mode 100644 index 0000000..851a6cf --- /dev/null +++ b/stock_card_report/security/ir.model.access.csv @@ -0,0 +1,4 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_stock_card_report_wizard,access.stock.card.report.wizard,model_stock_card_report_wizard,base.group_user,1,1,1,0 +access_report_stock_card_report,access.report.stock.card.report,model_report_stock_card_report,base.group_user,1,1,1,0 +access_stock_card_view,access.stock.card.view,model_stock_card_view,base.group_user,1,1,1,0