From 78755dc2b0e5158c0bc62d1e6c5ab57afe442c8a Mon Sep 17 00:00:00 2001 From: Ajay Javiya Date: Tue, 12 May 2020 18:11:31 +0530 Subject: [PATCH] [MIG][13.0] partner_label --- partner_label/README.rst | 3 +- partner_label/__manifest__.py | 12 +-- partner_label/models/res_company.py | 13 ++- partner_label/models/res_config_settings.py | 50 +++++------ partner_label/readme/CONFIGURE.rst | 4 + partner_label/readme/CONTRIBUTERS.rst | 2 + partner_label/readme/USAGE.rst | 2 + partner_label/reports/res_partner.xml | 27 +++--- partner_label/tests/test_partner_label.py | 22 ++--- partner_label/views/base_config_settings.xml | 93 +++++++++++++++----- 10 files changed, 140 insertions(+), 88 deletions(-) create mode 100644 partner_label/readme/CONFIGURE.rst create mode 100644 partner_label/readme/CONTRIBUTERS.rst create mode 100644 partner_label/readme/USAGE.rst diff --git a/partner_label/README.rst b/partner_label/README.rst index 5400e4bd5..1e87a9e32 100644 --- a/partner_label/README.rst +++ b/partner_label/README.rst @@ -26,7 +26,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/134/10.0 + :target: https://runbot.odoo-community.org/runbot/134/13.0 Bug Tracker =========== @@ -48,6 +48,7 @@ Contributors ------------ * Holger Brunn +* Druidoo Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list `_ or the `appropriate specialized mailinglist `_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues. diff --git a/partner_label/__manifest__.py b/partner_label/__manifest__.py index 3c3a2ac8a..3e1e24064 100644 --- a/partner_label/__manifest__.py +++ b/partner_label/__manifest__.py @@ -1,18 +1,14 @@ # Copyright 2019 Therp BV +# Copyright 2019-2020: Druidoo () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "Partner labels", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "author": "Therp BV,Odoo Community Association (OCA)", "license": "AGPL-3", "category": "Base", "summary": "Print partner labels", - "depends": [ - 'base_setup', - ], - "data": [ - "views/base_config_settings.xml", - "reports/res_partner.xml", - ], + "depends": ["base_setup"], + "data": ["views/base_config_settings.xml", "reports/res_partner.xml"], "installable": True, } diff --git a/partner_label/models/res_company.py b/partner_label/models/res_company.py index 6ef0f7772..8446c787d 100644 --- a/partner_label/models/res_company.py +++ b/partner_label/models/res_company.py @@ -4,22 +4,19 @@ from odoo import fields, models class ResCompany(models.Model): - _inherit = 'res.company' + _inherit = "res.company" partner_labels_width = fields.Float( - 'Width', default=60, help='Width in millimeters', required=True, + "Width", default=60, help="Width in millimeters", required=True, ) partner_labels_height = fields.Float( - 'Height', default=42.3, help='Height in millimeters', required=True, + "Height", default=42.3, help="Height in millimeters", required=True, ) partner_labels_padding = fields.Float( - 'Padding', default=5, help='Padding in millimeters', required=True, + "Padding", default=5, help="Padding in millimeters", required=True, ) partner_labels_margin_top = fields.Float( - string="Margin Top", - default=1, - help="Margin top in millimeters", - required=True, + string="Margin Top", default=1, help="Margin top in millimeters", required=True, ) partner_labels_margin_bottom = fields.Float( string="Margin Bottom", diff --git a/partner_label/models/res_config_settings.py b/partner_label/models/res_config_settings.py index 98c60fd2b..d104fb74c 100644 --- a/partner_label/models/res_config_settings.py +++ b/partner_label/models/res_config_settings.py @@ -1,66 +1,58 @@ # Copyright 2017-2019 Therp BV # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models +from odoo import fields, models class ResConfigSettings(models.TransientModel): - _inherit = 'res.config.settings' + _inherit = "res.config.settings" partner_labels_width = fields.Float( - related='company_id.partner_labels_width', required=True, - readonly=False, + related="company_id.partner_labels_width", required=True, readonly=False, ) partner_labels_height = fields.Float( - related='company_id.partner_labels_height', required=True, - readonly=False, + related="company_id.partner_labels_height", required=True, readonly=False, ) partner_labels_padding = fields.Float( - related='company_id.partner_labels_padding', required=True, - readonly=False, + related="company_id.partner_labels_padding", required=True, readonly=False, ) partner_labels_margin_top = fields.Float( - related='company_id.partner_labels_margin_top', - required=True, readonly=False, + related="company_id.partner_labels_margin_top", required=True, readonly=False, ) partner_labels_margin_bottom = fields.Float( - related='company_id.partner_labels_margin_bottom', - required=True, readonly=False, + related="company_id.partner_labels_margin_bottom", + required=True, + readonly=False, ) partner_labels_margin_left = fields.Float( - related='company_id.partner_labels_margin_left', - required=True, readonly=False, + related="company_id.partner_labels_margin_left", required=True, readonly=False, ) partner_labels_margin_right = fields.Float( - related='company_id.partner_labels_margin_right', - required=True, readonly=False, + related="company_id.partner_labels_margin_right", required=True, readonly=False, ) partner_labels_paperformat_id = fields.Many2one( - 'report.paperformat', string='Paperformat', required=True, + "report.paperformat", + string="Paperformat", + required=True, default=lambda self: self.env.ref( - 'partner_label.report_res_partner_label' + "partner_label.report_res_partner_label" ).paperformat_id, - compute='_compute_partner_labels_paperformat_id', - inverse='_inverse_partner_labels_paperformat_id', + compute="_compute_partner_labels_paperformat_id", + inverse="_inverse_partner_labels_paperformat_id", ) - @api.multi def _compute_partner_labels_paperformat_id(self): for this in self: this.partner_labels_paperformat_id = self.env.ref( - 'partner_label.report_res_partner_label' + "partner_label.report_res_partner_label" ).paperformat_id - @api.multi def _inverse_partner_labels_paperformat_id(self): for this in self: self.env.ref( - 'partner_label.report_res_partner_label' + "partner_label.report_res_partner_label" ).paperformat_id = this.partner_labels_paperformat_id - @api.multi def action_partner_labels_preview(self): - return self.env.ref( - 'partner_label.report_res_partner_label' - ).report_action( - self.env['res.partner'].search([], limit=100), + return self.env.ref("partner_label.report_res_partner_label").report_action( + self.env["res.partner"].search([], limit=100), ) diff --git a/partner_label/readme/CONFIGURE.rst b/partner_label/readme/CONFIGURE.rst new file mode 100644 index 000000000..0bec98078 --- /dev/null +++ b/partner_label/readme/CONFIGURE.rst @@ -0,0 +1,4 @@ +#. go to `Settings / General settings` +#. scroll to header `Labels configuration` +#. change width, height, padding and margin to fit your label stickers, if necessary change the paper format +#. you can preview your changes by pressing the `Preview` button diff --git a/partner_label/readme/CONTRIBUTERS.rst b/partner_label/readme/CONTRIBUTERS.rst new file mode 100644 index 000000000..a70c0eece --- /dev/null +++ b/partner_label/readme/CONTRIBUTERS.rst @@ -0,0 +1,2 @@ +* Holger Brunn +* Druidoo diff --git a/partner_label/readme/USAGE.rst b/partner_label/readme/USAGE.rst new file mode 100644 index 000000000..51d9e5039 --- /dev/null +++ b/partner_label/readme/USAGE.rst @@ -0,0 +1,2 @@ +#. mark partners +#. print your labels diff --git a/partner_label/reports/res_partner.xml b/partner_label/reports/res_partner.xml index 6d84a4cef..743585e7e 100644 --- a/partner_label/reports/res_partner.xml +++ b/partner_label/reports/res_partner.xml @@ -1,27 +1,32 @@ - + - + res.config.settings @@ -10,47 +10,100 @@
- 

+
-
-
-
-
-
- 

+
-
-
-
-