diff --git a/oca_dependencies.txt b/oca_dependencies.txt index ca3c726..e0f610c 100644 --- a/oca_dependencies.txt +++ b/oca_dependencies.txt @@ -1 +1,2 @@ # See https://github.com/OCA/odoo-community.org/blob/master/website/Contribution/CONTRIBUTING.rst#oca_dependencies-txt +reporting-engine diff --git a/stock_picking_comment_template/README.rst b/stock_picking_comment_template/README.rst index 5611bc7..fe3a944 100644 --- a/stock_picking_comment_template/README.rst +++ b/stock_picking_comment_template/README.rst @@ -14,25 +14,19 @@ Picking Comments :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--reporting-lightgray.png?logo=github - :target: https://github.com/OCA/stock-logistics-reporting/tree/12.0/stock_picking_comment_template + :target: https://github.com/OCA/stock-logistics-reporting/tree/14.0/stock_picking_comment_template :alt: OCA/stock-logistics-reporting .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/stock-logistics-reporting-12-0/stock-logistics-reporting-12-0-stock_picking_comment_template + :target: https://translation.odoo-community.org/projects/stock-logistics-reporting-14-0/stock-logistics-reporting-14-0-stock_picking_comment_template :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/151/12.0 + :target: https://runbot.odoo-community.org/runbot/151/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| Adds comments on stock picking. -The comments can be edited directly on the stock picking or loaded from -templates. - -Two positions are available for the comments: - -- above stock picking lines -- below stock picking lines +The comments can be added/edited from Inventory -> Configuration -> Document Comments **Table of contents** @@ -45,7 +39,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -64,6 +58,10 @@ Contributors * Eduardo Magdalena +* `NextERP Romania `_: + + * Fekete Mihai + Do not contact contributors directly about support or help with technical issues. Maintainers @@ -79,6 +77,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/stock-logistics-reporting `_ project on GitHub. +This module is part of the `OCA/stock-logistics-reporting `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_picking_comment_template/__manifest__.py b/stock_picking_comment_template/__manifest__.py index cdd51d0..b214179 100644 --- a/stock_picking_comment_template/__manifest__.py +++ b/stock_picking_comment_template/__manifest__.py @@ -4,20 +4,16 @@ { "name": "Picking Comments", "summary": "Comments texts templates on Picking documents", - "version": "12.0.1.0.0", + "version": "14.0.1.0.0", "category": "Warehouse Management", "website": "https://github.com/OCA/stock-logistics-reporting", "author": "C2i Change 2 improve," "Odoo Community Association (OCA)", "license": "AGPL-3", - "depends": [ - "stock", - "sale", - "base_comment_template", - ], + "depends": ["stock", "base_comment_template"], "data": [ "views/base_comment_template_view.xml", - "views/report_picking.xml", "views/report_delivery_document.xml", + "views/report_picking.xml", "views/stock_picking_view.xml", "security/ir.model.access.csv", ], diff --git a/stock_picking_comment_template/models/__init__.py b/stock_picking_comment_template/models/__init__.py index 722ac40..ae4c272 100644 --- a/stock_picking_comment_template/models/__init__.py +++ b/stock_picking_comment_template/models/__init__.py @@ -1,4 +1 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - from . import stock_picking -from . import res_partner diff --git a/stock_picking_comment_template/models/res_partner.py b/stock_picking_comment_template/models/res_partner.py deleted file mode 100644 index de5b922..0000000 --- a/stock_picking_comment_template/models/res_partner.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2019 C2i Change 2 improve - Eduardo Magdalena -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from odoo import fields, models - - -class ResPartner(models.Model): - _inherit = "res.partner" - - comment_template_id = fields.Many2one( - comodel_name="base.comment.template", - string="Picking conditions template", - ) diff --git a/stock_picking_comment_template/models/stock_picking.py b/stock_picking_comment_template/models/stock_picking.py index 7934b1a..ff30df1 100644 --- a/stock_picking_comment_template/models/stock_picking.py +++ b/stock_picking_comment_template/models/stock_picking.py @@ -1,39 +1,9 @@ # Copyright 2019 C2i Change 2 improve - Eduardo Magdalena # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models +from odoo import models class StockPicking(models.Model): - """Add text comment""" - - _inherit = "stock.picking" - - comment_template1_id = fields.Many2one( - "base.comment.template", string="Top Comment Template" - ) - comment_template2_id = fields.Many2one( - "base.comment.template", string="Bottom Comment Template" - ) - note1 = fields.Html("Top Comment") - note2 = fields.Html("Bottom Comment") - - @api.onchange("comment_template1_id") - def _set_note1(self): - comment = self.comment_template1_id - if comment: - self.note1 = comment.get_value(self.partner_id.id) - - @api.onchange("comment_template2_id") - def _set_note2(self): - comment = self.comment_template2_id - if comment: - self.note2 = comment.get_value(self.partner_id.id) - - @api.onchange("partner_id") - def _onchange_partner_id(self): - comment_template = self.partner_id.comment_template_id - if comment_template.position == "before_lines": - self.comment_template1_id = comment_template - elif comment_template.position == "after_lines": - self.comment_template2_id = comment_template + _inherit = ["stock.picking", "comment.template"] + _name = "stock.picking" diff --git a/stock_picking_comment_template/readme/CONTRIBUTORS.rst b/stock_picking_comment_template/readme/CONTRIBUTORS.rst index 89aca85..d53f7c2 100644 --- a/stock_picking_comment_template/readme/CONTRIBUTORS.rst +++ b/stock_picking_comment_template/readme/CONTRIBUTORS.rst @@ -2,4 +2,8 @@ * Eduardo Magdalena +* `NextERP Romania `_: + + * Fekete Mihai + Do not contact contributors directly about support or help with technical issues. diff --git a/stock_picking_comment_template/readme/DESCRIPTION.rst b/stock_picking_comment_template/readme/DESCRIPTION.rst index 22f0014..cd26c7d 100644 --- a/stock_picking_comment_template/readme/DESCRIPTION.rst +++ b/stock_picking_comment_template/readme/DESCRIPTION.rst @@ -1,8 +1,2 @@ Adds comments on stock picking. -The comments can be edited directly on the stock picking or loaded from -templates. - -Two positions are available for the comments: - -- above stock picking lines -- below stock picking lines +The comments can be added/edited from Inventory -> Configuration -> Document Comments diff --git a/stock_picking_comment_template/security/ir.model.access.csv b/stock_picking_comment_template/security/ir.model.access.csv index 9f5bcf9..ba945d5 100644 --- a/stock_picking_comment_template/security/ir.model.access.csv +++ b/stock_picking_comment_template/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_base_comment_template_account_user,access_base_comment_template user,base_comment_template.model_base_comment_template,account.group_account_user,1,0,0,0 -access_base_comment_template_account_manager,access_base_comment_template manager,base_comment_template.model_base_comment_template,account.group_account_manager,1,1,1,1 +access_base_comment_template_stock_user,access_base_comment_template stock_user,base_comment_template.model_base_comment_template,stock.group_stock_user,1,0,0,0 +access_base_comment_template_stock_manager,access_base_comment_template stock_manager,base_comment_template.model_base_comment_template,stock.group_stock_manager,1,1,1,1 diff --git a/stock_picking_comment_template/static/description/index.html b/stock_picking_comment_template/static/description/index.html index f74dd4a..cd8ce70 100644 --- a/stock_picking_comment_template/static/description/index.html +++ b/stock_picking_comment_template/static/description/index.html @@ -3,7 +3,7 @@ - + Picking Comments