diff --git a/stock_picking_comment_template/README.rst b/stock_picking_comment_template/README.rst index 7e7bd93..6374861 100644 --- a/stock_picking_comment_template/README.rst +++ b/stock_picking_comment_template/README.rst @@ -65,6 +65,11 @@ Contributors - Fekete Mihai +- `Sygel `__: + + - Valentín Vinagre + - Roger Sans + Do not contact contributors directly about support or help with technical issues. diff --git a/stock_picking_comment_template/__manifest__.py b/stock_picking_comment_template/__manifest__.py index d872a84..bb76b57 100644 --- a/stock_picking_comment_template/__manifest__.py +++ b/stock_picking_comment_template/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Picking Comments", "summary": "Comments texts templates on Picking documents", - "version": "14.0.1.1.0", + "version": "17.0.1.0.0", "category": "Warehouse Management", "website": "https://github.com/OCA/stock-logistics-reporting", "author": "C2i Change 2 improve," "Odoo Community Association (OCA)", diff --git a/stock_picking_comment_template/readme/CONTRIBUTORS.md b/stock_picking_comment_template/readme/CONTRIBUTORS.md index f5cd5c9..b428165 100644 --- a/stock_picking_comment_template/readme/CONTRIBUTORS.md +++ b/stock_picking_comment_template/readme/CONTRIBUTORS.md @@ -1,7 +1,12 @@ - [C2i Change 2 improve](http://www.c2i.es): - Eduardo Magdalena \<\> + - [NextERP Romania](https://www.nexterp.ro): - Fekete Mihai \<\> +- [Sygel](http://www.sygel.es): + - Valentín Vinagre \<\> + - Roger Sans \<\> + Do not contact contributors directly about support or help with technical issues. diff --git a/stock_picking_comment_template/static/description/index.html b/stock_picking_comment_template/static/description/index.html index 73c7a64..a6ed8c9 100644 --- a/stock_picking_comment_template/static/description/index.html +++ b/stock_picking_comment_template/static/description/index.html @@ -411,6 +411,11 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
  • Fekete Mihai <feketemihai@nexterp.ro>
    • +
  • Sygel: +

    • Do not contact contributors directly about support or help with technical issues.

    diff --git a/stock_picking_comment_template/tests/test_stock_picking_report.py b/stock_picking_comment_template/tests/test_stock_picking_report.py index b8d0db8..fc61919 100644 --- a/stock_picking_comment_template/tests/test_stock_picking_report.py +++ b/stock_picking_comment_template/tests/test_stock_picking_report.py @@ -5,55 +5,53 @@ from odoo.tests.common import TransactionCase class TestStockPickingReport(TransactionCase): - def setUp(self): - super().setUp() - self.company = self.env.ref("base.main_company") - self.base_comment_model = self.env["base.comment.template"] + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.company = cls.env.ref("base.main_company") + cls.base_comment_model = cls.env["base.comment.template"] # Create comment related to sale model - self.picking_obj = self.env.ref("stock.model_stock_picking") - self.before_comment = self._create_comment(self.picking_obj, "before_lines") - self.after_comment = self._create_comment(self.picking_obj, "after_lines") + cls.picking_obj = cls.env.ref("stock.model_stock_picking") + cls.before_comment = cls._create_comment(cls, "before_lines") + cls.after_comment = cls._create_comment(cls, "after_lines") # Create partner - self.partner = self.env["res.partner"].create({"name": "Partner Test"}) - self.partner.base_comment_template_ids = [ - (4, self.before_comment.id), - (4, self.after_comment.id), + cls.partner = cls.env["res.partner"].create({"name": "Partner Test"}) + cls.partner.base_comment_template_ids = [ + (4, cls.before_comment.id), + (4, cls.after_comment.id), ] - self.picking_model = self.env["stock.picking"] - self.picking = self.picking_model.create( + cls.picking_model = cls.env["stock.picking"] + cls.picking = cls.picking_model.create( { - "partner_id": self.partner.id, - "location_id": self.ref("stock.stock_location_stock"), - "location_dest_id": self.ref("stock.stock_location_customers"), - "picking_type_id": self.ref("stock.picking_type_out"), + "partner_id": cls.partner.id, + "location_id": cls.env.ref("stock.stock_location_stock").id, + "location_dest_id": cls.env.ref("stock.stock_location_customers").id, + "picking_type_id": cls.env.ref("stock.picking_type_out").id, } ) - def _create_comment(self, model, position): + def _create_comment(self, position): return self.base_comment_model.create( { "name": "Comment " + position, "company_id": self.company.id, "position": position, "text": "Text " + position, - "model_ids": [(6, 0, model.ids)], + "models": "stock.picking", + "model_ids": [(6, 0, self.picking_obj.ids)], } ) def test_comments_in_deliveryslip(self): - res = ( - self.env["ir.actions.report"] - ._get_report_from_name("stock.report_deliveryslip") - ._render_qweb_html(self.picking.ids) + res = self.env["ir.actions.report"]._render_qweb_html( + "stock.report_deliveryslip", self.picking.ids ) self.assertRegex(str(res[0]), self.before_comment.text) self.assertRegex(str(res[0]), self.after_comment.text) def test_comments_in_report_picking(self): - res = ( - self.env["ir.actions.report"] - ._get_report_from_name("stock.report_picking") - ._render_qweb_html(self.picking.ids) + res = self.env["ir.actions.report"]._render_qweb_html( + "stock.report_picking", self.picking.ids ) self.assertRegex(str(res[0]), self.before_comment.text) self.assertRegex(str(res[0]), self.after_comment.text)