From 6ef09695f6cfdcd028e38f4abdbef913efd37a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Asunci=C3=B3n=20Daza?= Date: Fri, 27 Dec 2019 13:39:49 +0100 Subject: [PATCH 1/8] [MIG] repair_discount: Migration to 12.0 --- repair_discount/README.rst | 78 ++++ repair_discount/__init__.py | 4 + repair_discount/__manifest__.py | 17 + repair_discount/i18n/de.po | 38 ++ repair_discount/i18n/es.po | 40 ++ repair_discount/i18n/fr.po | 41 ++ repair_discount/i18n/hr.po | 41 ++ repair_discount/i18n/hr_HR.po | 42 ++ repair_discount/i18n/it.po | 40 ++ repair_discount/i18n/lt.po | 41 ++ repair_discount/i18n/mrp_repair_discount.pot | 36 ++ repair_discount/i18n/nl_NL.po | 41 ++ repair_discount/models/__init__.py | 4 + repair_discount/models/mrp_repair.py | 125 ++++++ repair_discount/readme/CONTRIBUTORS.rst | 5 + repair_discount/readme/DESCRIPTION.rst | 2 + repair_discount/static/description/icon.png | Bin 0 -> 9455 bytes repair_discount/static/description/index.html | 424 ++++++++++++++++++ repair_discount/tests/__init__.py | 3 + .../tests/test_mrp_repair_discount.py | 76 ++++ repair_discount/views/mrp_repair_view.xml | 16 + 21 files changed, 1114 insertions(+) create mode 100644 repair_discount/README.rst create mode 100644 repair_discount/__init__.py create mode 100644 repair_discount/__manifest__.py create mode 100644 repair_discount/i18n/de.po create mode 100644 repair_discount/i18n/es.po create mode 100644 repair_discount/i18n/fr.po create mode 100644 repair_discount/i18n/hr.po create mode 100644 repair_discount/i18n/hr_HR.po create mode 100644 repair_discount/i18n/it.po create mode 100644 repair_discount/i18n/lt.po create mode 100644 repair_discount/i18n/mrp_repair_discount.pot create mode 100644 repair_discount/i18n/nl_NL.po create mode 100644 repair_discount/models/__init__.py create mode 100644 repair_discount/models/mrp_repair.py create mode 100644 repair_discount/readme/CONTRIBUTORS.rst create mode 100644 repair_discount/readme/DESCRIPTION.rst create mode 100644 repair_discount/static/description/icon.png create mode 100644 repair_discount/static/description/index.html create mode 100644 repair_discount/tests/__init__.py create mode 100644 repair_discount/tests/test_mrp_repair_discount.py create mode 100644 repair_discount/views/mrp_repair_view.xml diff --git a/repair_discount/README.rst b/repair_discount/README.rst new file mode 100644 index 000000000..1176ce77f --- /dev/null +++ b/repair_discount/README.rst @@ -0,0 +1,78 @@ +=================== +MRP Repair Discount +=================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github + :target: https://github.com/OCA/manufacture/tree/12.0/repair_discount + :alt: OCA/manufacture +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/manufacture-12-0/manufacture-12-0-repair_discount + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/129/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the functionality of mrp repair adding +new field discount on operations lines + +**Table of contents** + +.. contents:: + :local: + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Agile Business Group +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* Nicola Malcontenti +* Pedro M. Baeza +* Lorenzo Battistini +* María Asunción Daza + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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/manufacture `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/repair_discount/__init__.py b/repair_discount/__init__.py new file mode 100644 index 000000000..1fd09b272 --- /dev/null +++ b/repair_discount/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2015 Nicola Malcontenti - Agile Business Group +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import models diff --git a/repair_discount/__manifest__.py b/repair_discount/__manifest__.py new file mode 100644 index 000000000..1d6258ff7 --- /dev/null +++ b/repair_discount/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2015 Nicola Malcontenti - Agile Business Group +# Copyright 2016 Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Repair Discount", + "version": "12.0.1.0.0", + "category": "Manufacturing", + "license": "AGPL-3", + "author": "Agile Business Group, " + "Tecnativa, " + "Odoo Community Association (OCA)", + "website": "http://www.agilebg.com", + 'depends': ['repair'], + "data": ["views/mrp_repair_view.xml"], + "installable": True, +} diff --git a/repair_discount/i18n/de.po b/repair_discount/i18n/de.po new file mode 100644 index 000000000..99d37bcc3 --- /dev/null +++ b/repair_discount/i18n/de.po @@ -0,0 +1,38 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_repair_discount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2018-12-10 11:58+0000\n" +"Last-Translator: Maria Sparenberg \n" +"Language-Team: none\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.3\n" + +#. module: mrp_repair_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +msgid "Discount (%)" +msgstr "Rabatt (%)" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee +msgid "Repair Fees Line" +msgstr "Reparaturgebührenzeile" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line +msgid "Repair Line" +msgstr "Reparaturzeile" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +msgid "Repair Order" +msgstr "Reparaturauftrag" diff --git a/repair_discount/i18n/es.po b/repair_discount/i18n/es.po new file mode 100644 index 000000000..967b2c71e --- /dev/null +++ b/repair_discount/i18n/es.po @@ -0,0 +1,40 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_repair_discount +# +# Translators: +# enjolras , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-12 03:48+0000\n" +"PO-Revision-Date: 2018-02-12 03:48+0000\n" +"Last-Translator: enjolras , 2018\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mrp_repair_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +msgid "Discount (%)" +msgstr "Descuento (%)" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee +msgid "Repair Fees Line" +msgstr "Línea de tarifa de reparación" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line +msgid "Repair Line" +msgstr "Línea de reparación" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +msgid "Repair Order" +msgstr "Pedido de reparación" diff --git a/repair_discount/i18n/fr.po b/repair_discount/i18n/fr.po new file mode 100644 index 000000000..9c1f633b7 --- /dev/null +++ b/repair_discount/i18n/fr.po @@ -0,0 +1,41 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_repair_discount +# +# Translators: +# Quentin THEURET , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 03:44+0000\n" +"PO-Revision-Date: 2018-09-26 08:27+0000\n" +"Last-Translator: William Olhasque \n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.1.1\n" + +#. module: mrp_repair_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +msgid "Discount (%)" +msgstr "Remise (%)" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee +msgid "Repair Fees Line" +msgstr "Ligne de frais de réparation" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line +msgid "Repair Line" +msgstr "Ligne de réparation" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +msgid "Repair Order" +msgstr "Ordre de réparation" diff --git a/repair_discount/i18n/hr.po b/repair_discount/i18n/hr.po new file mode 100644 index 000000000..0b8dbd4c9 --- /dev/null +++ b/repair_discount/i18n/hr.po @@ -0,0 +1,41 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_repair_discount +# +# Translators: +# Bole , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-12 03:48+0000\n" +"PO-Revision-Date: 2018-02-12 03:48+0000\n" +"Last-Translator: Bole , 2018\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: mrp_repair_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +msgid "Discount (%)" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee +msgid "Repair Fees Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line +msgid "Repair Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +msgid "Repair Order" +msgstr "Nalog za popravak" diff --git a/repair_discount/i18n/hr_HR.po b/repair_discount/i18n/hr_HR.po new file mode 100644 index 000000000..6ded97874 --- /dev/null +++ b/repair_discount/i18n/hr_HR.po @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_repair_discount +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 03:44+0000\n" +"PO-Revision-Date: 2017-11-28 03:44+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/" +"hr_HR/)\n" +"Language: hr_HR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: mrp_repair_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +msgid "Discount (%)" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee +msgid "Repair Fees Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line +msgid "Repair Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +msgid "Repair Order" +msgstr "Nalog za popravak" diff --git a/repair_discount/i18n/it.po b/repair_discount/i18n/it.po new file mode 100644 index 000000000..2ba4ffabe --- /dev/null +++ b/repair_discount/i18n/it.po @@ -0,0 +1,40 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_repair_discount +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 03:44+0000\n" +"PO-Revision-Date: 2017-11-28 03:44+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mrp_repair_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +msgid "Discount (%)" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee +msgid "Repair Fees Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line +msgid "Repair Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +msgid "Repair Order" +msgstr "Ordine di riparazione" diff --git a/repair_discount/i18n/lt.po b/repair_discount/i18n/lt.po new file mode 100644 index 000000000..bfaea9f73 --- /dev/null +++ b/repair_discount/i18n/lt.po @@ -0,0 +1,41 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_repair_discount +# +# Translators: +# Viktoras Norkus , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-01-16 08:02+0000\n" +"PO-Revision-Date: 2018-01-16 08:02+0000\n" +"Last-Translator: Viktoras Norkus , 2018\n" +"Language-Team: Lithuanian (https://www.transifex.com/oca/teams/23907/lt/)\n" +"Language: lt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" + +#. module: mrp_repair_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +msgid "Discount (%)" +msgstr "Nuolaida (%)" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee +msgid "Repair Fees Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line +msgid "Repair Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +msgid "Repair Order" +msgstr "Remonto užsakymas" diff --git a/repair_discount/i18n/mrp_repair_discount.pot b/repair_discount/i18n/mrp_repair_discount.pot new file mode 100644 index 000000000..30e129885 --- /dev/null +++ b/repair_discount/i18n/mrp_repair_discount.pot @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_repair_discount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mrp_repair_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +msgid "Discount (%)" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee +msgid "Repair Fees Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line +msgid "Repair Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +msgid "Repair Order" +msgstr "" + diff --git a/repair_discount/i18n/nl_NL.po b/repair_discount/i18n/nl_NL.po new file mode 100644 index 000000000..fe21ba410 --- /dev/null +++ b/repair_discount/i18n/nl_NL.po @@ -0,0 +1,41 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_repair_discount +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-28 03:44+0000\n" +"PO-Revision-Date: 2017-11-28 03:44+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" +"teams/23907/nl_NL/)\n" +"Language: nl_NL\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mrp_repair_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount +#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +msgid "Discount (%)" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee +msgid "Repair Fees Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line +msgid "Repair Line" +msgstr "" + +#. module: mrp_repair_discount +#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +msgid "Repair Order" +msgstr "Reparatieorder" diff --git a/repair_discount/models/__init__.py b/repair_discount/models/__init__.py new file mode 100644 index 000000000..a36a7886c --- /dev/null +++ b/repair_discount/models/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2015 Nicola Malcontenti - Agile Business Group +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import mrp_repair diff --git a/repair_discount/models/mrp_repair.py b/repair_discount/models/mrp_repair.py new file mode 100644 index 000000000..071347914 --- /dev/null +++ b/repair_discount/models/mrp_repair.py @@ -0,0 +1,125 @@ +# Copyright 2015 Nicola Malcontenti - Agile Business Group +# Copyright 2016 Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, fields, models +import odoo.addons.decimal_precision as dp + + +class RepairFee(models.Model): + _inherit = 'repair.fee' + + @api.depends( + 'invoiced', + 'price_unit', + 'repair_id', + 'product_uom_qty', + 'product_id') + def _compute_price_subtotal(self): + for record in self: + taxes = self.env['account.tax'].compute_all( + record.price_unit, record.repair_id.pricelist_id.currency_id, + record.product_uom_qty, record.product_id, + record.repair_id.partner_id + ) + + record.price_subtotal = ( + taxes['total_excluded'] * (1 - (record.discount or 0.0) / 100.0) + ) + + discount = fields.Float(string='Discount (%)') + price_subtotal = fields.Float( + 'Subtotal', + compute='_compute_price_subtotal', + digits=dp.get_precision('Account')) + + +class RepairLine(models.Model): + _inherit = 'repair.line' + + @api.depends( + 'invoiced', + 'price_unit', + 'repair_id', + 'product_uom_qty', + 'product_id') + def _compute_price_subtotal(self): + for repair_line in self: + taxes = self.env['account.tax'].compute_all( + repair_line.price_unit, + repair_line.repair_id.pricelist_id.currency_id, + repair_line.product_uom_qty, repair_line.product_id, + repair_line.repair_id.partner_id + ) + repair_line.price_subtotal = ( + taxes['total_excluded'] * (1 - (repair_line.discount or 0.0) / 100.0) + ) + + discount = fields.Float(string='Discount (%)') + price_subtotal = fields.Float( + 'Subtotal', + compute='_compute_price_subtotal', + digits=dp.get_precision('Account')) + + +class RepairOrder(models.Model): + _inherit = 'repair.order' + + @api.multi + def action_invoice_create(self, group=False): + res = super(RepairOrder, self).action_invoice_create(group) + for repair in self.filtered( + lambda _repair: _repair.invoice_method != 'none' + ): + operations = repair.operations + fees_lines = repair.fees_lines + + for op in operations.filtered( + lambda item: item.invoice_line_id + ): + op.invoice_line_id.discount = op.discount + if operations: + repair.invoice_id.compute_taxes() + + for fee_lines in fees_lines.filtered( + lambda item: item.invoice_line_id + ): + fee_lines.invoice_line_id.discount = fee_lines.discount + if fees_lines: + repair.invoice_id.compute_taxes() + + return res + + def _calculate_line_base_price(self, line): + return line.price_unit * (1 - (line.discount or 0.0) / 100.0) + + @api.depends('operations', 'fees_lines', 'operations.invoiced', + 'fees_lines.invoiced') + def _amount_tax(self): + for repair in self: + taxed_amount = 0.0 + currency = repair.pricelist_id.currency_id + + for line in repair.operations: + tax_calculate = line.tax_id.compute_all( + self._calculate_line_base_price(line), + self.pricelist_id.currency_id, + line.product_uom_qty, + line.product_id, + repair.partner_id + ) + + for c in tax_calculate['taxes']: + taxed_amount += c['amount'] + + for line in repair.fees_lines: + tax_calculate = line.tax_id.compute_all( + self._calculate_line_base_price(line), + self.pricelist_id.currency_id, + line.product_uom_qty, + line.product_id, + repair.partner_id) + for c in tax_calculate['taxes']: + taxed_amount += c['amount'] + + repair.amount_tax = currency.round(taxed_amount) diff --git a/repair_discount/readme/CONTRIBUTORS.rst b/repair_discount/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..0ed494164 --- /dev/null +++ b/repair_discount/readme/CONTRIBUTORS.rst @@ -0,0 +1,5 @@ +* Nicola Malcontenti +* Pedro M. Baeza +* Lorenzo Battistini +* Ignacio Ales López +* María Asunción Daza diff --git a/repair_discount/readme/DESCRIPTION.rst b/repair_discount/readme/DESCRIPTION.rst new file mode 100644 index 000000000..f30da6f96 --- /dev/null +++ b/repair_discount/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module extends the functionality of mrp repair adding +new field discount on operations lines diff --git a/repair_discount/static/description/icon.png b/repair_discount/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/repair_discount/static/description/index.html b/repair_discount/static/description/index.html new file mode 100644 index 000000000..4bb4ebe7d --- /dev/null +++ b/repair_discount/static/description/index.html @@ -0,0 +1,424 @@ + + + + + + +MRP Repair Discount + + + +
+

MRP Repair Discount

+ + +

Beta License: AGPL-3 OCA/manufacture Translate me on Weblate Try me on Runbot

+

This module extends the functionality of mrp repair adding +new field discount on operations lines

+

Table of contents

+ +
+

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.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Agile Business Group
    • +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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/manufacture project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/repair_discount/tests/__init__.py b/repair_discount/tests/__init__.py new file mode 100644 index 000000000..ebd10d3b0 --- /dev/null +++ b/repair_discount/tests/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import test_mrp_repair_discount diff --git a/repair_discount/tests/test_mrp_repair_discount.py b/repair_discount/tests/test_mrp_repair_discount.py new file mode 100644 index 000000000..66738fca4 --- /dev/null +++ b/repair_discount/tests/test_mrp_repair_discount.py @@ -0,0 +1,76 @@ +# Copyright 2016 Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.tests import common + + +class TestMrpRepairDiscount(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(TestMrpRepairDiscount, cls).setUpClass() + cls.product = cls.env['product.product'].create({ + 'name': 'Test product', + 'standard_price': 10, + 'list_price': 20, + }) + cls.product_service = cls.env['product.product'].create({ + 'name': 'Test product service', + 'standard_price': 10, + 'list_price': 20, + }) + # cls.partner = cls.env['res.partner'].create({ + # 'name': 'Test partner', + # }) + cls.partner = cls.env.ref('base.res_partner_address_1') + cls.location = cls.env['stock.location'].create({ + 'name': 'Test location', + }) + cls.repair = cls.env['repair.order'].create({ + 'product_id': cls.product.id, + 'partner_id': cls.partner.id, + 'partner_invoice_id': cls.partner.id, + 'product_uom': cls.product.uom_id.id, + 'location_id': cls.location.id, + 'invoice_method': 'b4repair', + }) + domain_location = [('usage', '=', 'production')] + stock_location_id = cls.env['stock.location'].search(domain_location, limit=1) + cls.repair_line = cls.env['repair.line'].create({ + 'repair_id': cls.repair.id, + 'type': 'add', + 'product_id': cls.product.id, + 'product_uom': cls.product.uom_id.id, + 'name': 'Test line', + 'location_id': cls.repair.location_id.id, + 'location_dest_id': stock_location_id.id, + 'product_uom_qty': 1, + 'price_unit': 20, + 'discount': 50, + }) + + cls.repair_fee = cls.env['repair.fee'].create({ + 'repair_id': cls.repair.id, + 'name': 'Test Service', + 'product_id': cls.product_service.id, + 'product_uom_qty': 1, + 'product_uom': cls.product_service.uom_id.id, + 'price_unit': 20, + 'discount': 50, + }) + + def test_discount(self): + self.assertAlmostEqual( + self.repair_line.price_subtotal, 10) + self.assertAlmostEqual( + self.repair_fee.price_subtotal, 10) + self.assertAlmostEqual( + self.repair.amount_total, 20) + + def test_invoice_create(self): + self.repair.state = '2binvoiced' + res = self.repair.action_invoice_create() + invoice = self.env['account.invoice'].browse(res.values())[0] + invoice_line = invoice.invoice_line_ids[0] + self.assertEqual(invoice_line.discount, 50) + self.assertAlmostEqual( + invoice_line.price_subtotal, 10) diff --git a/repair_discount/views/mrp_repair_view.xml b/repair_discount/views/mrp_repair_view.xml new file mode 100644 index 000000000..ed7d01a16 --- /dev/null +++ b/repair_discount/views/mrp_repair_view.xml @@ -0,0 +1,16 @@ + + + + repair.discount.form + repair.order + + + + + + + + + + + From deb23d96ca334d2db51cd316cb88ae3976ba6ccf Mon Sep 17 00:00:00 2001 From: oca-travis Date: Mon, 10 Feb 2020 16:58:00 +0000 Subject: [PATCH 2/8] [UPD] Update repair_discount.pot --- repair_discount/i18n/de.po | 32 +++++++++++------- repair_discount/i18n/es.po | 30 ++++++++++------- repair_discount/i18n/fr.po | 30 ++++++++++------- repair_discount/i18n/hr.po | 33 +++++++++++-------- repair_discount/i18n/hr_HR.po | 33 +++++++++++-------- repair_discount/i18n/it.po | 33 +++++++++++-------- repair_discount/i18n/lt.po | 33 +++++++++++-------- repair_discount/i18n/nl_NL.po | 33 +++++++++++-------- repair_discount/i18n/repair_discount.pot | 42 ++++++++++++++++++++++++ 9 files changed, 200 insertions(+), 99 deletions(-) create mode 100644 repair_discount/i18n/repair_discount.pot diff --git a/repair_discount/i18n/de.po b/repair_discount/i18n/de.po index 99d37bcc3..e727f25dd 100644 --- a/repair_discount/i18n/de.po +++ b/repair_discount/i18n/de.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * mrp_repair_discount +# * mrp_repair_discount # msgid "" msgstr "" @@ -16,23 +16,31 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 3.3\n" -#. module: mrp_repair_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__discount msgid "Discount (%)" msgstr "Rabatt (%)" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee -msgid "Repair Fees Line" +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_fee +#, fuzzy +msgid "Repair Fees" msgstr "Reparaturgebührenzeile" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line -msgid "Repair Line" +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_line +#, fuzzy +msgid "Repair Line (parts)" msgstr "Reparaturzeile" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_order msgid "Repair Order" msgstr "Reparaturauftrag" + +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__price_subtotal +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__price_subtotal +msgid "Subtotal" +msgstr "" diff --git a/repair_discount/i18n/es.po b/repair_discount/i18n/es.po index 967b2c71e..0eb53f0c8 100644 --- a/repair_discount/i18n/es.po +++ b/repair_discount/i18n/es.po @@ -18,23 +18,31 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. module: mrp_repair_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__discount msgid "Discount (%)" msgstr "Descuento (%)" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee -msgid "Repair Fees Line" +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_fee +#, fuzzy +msgid "Repair Fees" msgstr "Línea de tarifa de reparación" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line -msgid "Repair Line" +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_line +#, fuzzy +msgid "Repair Line (parts)" msgstr "Línea de reparación" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_order msgid "Repair Order" msgstr "Pedido de reparación" + +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__price_subtotal +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__price_subtotal +msgid "Subtotal" +msgstr "" diff --git a/repair_discount/i18n/fr.po b/repair_discount/i18n/fr.po index 9c1f633b7..6e2e4a1b6 100644 --- a/repair_discount/i18n/fr.po +++ b/repair_discount/i18n/fr.po @@ -19,23 +19,31 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Weblate 3.1.1\n" -#. module: mrp_repair_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__discount msgid "Discount (%)" msgstr "Remise (%)" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee -msgid "Repair Fees Line" +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_fee +#, fuzzy +msgid "Repair Fees" msgstr "Ligne de frais de réparation" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line -msgid "Repair Line" +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_line +#, fuzzy +msgid "Repair Line (parts)" msgstr "Ligne de réparation" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_order msgid "Repair Order" msgstr "Ordre de réparation" + +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__price_subtotal +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__price_subtotal +msgid "Subtotal" +msgstr "" diff --git a/repair_discount/i18n/hr.po b/repair_discount/i18n/hr.po index 0b8dbd4c9..00e356d0b 100644 --- a/repair_discount/i18n/hr.po +++ b/repair_discount/i18n/hr.po @@ -19,23 +19,30 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#. module: mrp_repair_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__discount msgid "Discount (%)" msgstr "" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee -msgid "Repair Fees Line" +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_fee +#, fuzzy +msgid "Repair Fees" +msgstr "Nalog za popravak" + +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_line +msgid "Repair Line (parts)" msgstr "" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line -msgid "Repair Line" -msgstr "" - -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_order msgid "Repair Order" msgstr "Nalog za popravak" + +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__price_subtotal +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__price_subtotal +msgid "Subtotal" +msgstr "" diff --git a/repair_discount/i18n/hr_HR.po b/repair_discount/i18n/hr_HR.po index 6ded97874..d15124f8e 100644 --- a/repair_discount/i18n/hr_HR.po +++ b/repair_discount/i18n/hr_HR.po @@ -20,23 +20,30 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#. module: mrp_repair_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__discount msgid "Discount (%)" msgstr "" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee -msgid "Repair Fees Line" +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_fee +#, fuzzy +msgid "Repair Fees" +msgstr "Nalog za popravak" + +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_line +msgid "Repair Line (parts)" msgstr "" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line -msgid "Repair Line" -msgstr "" - -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_order msgid "Repair Order" msgstr "Nalog za popravak" + +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__price_subtotal +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__price_subtotal +msgid "Subtotal" +msgstr "" diff --git a/repair_discount/i18n/it.po b/repair_discount/i18n/it.po index 2ba4ffabe..b1e28eaf8 100644 --- a/repair_discount/i18n/it.po +++ b/repair_discount/i18n/it.po @@ -18,23 +18,30 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. module: mrp_repair_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__discount msgid "Discount (%)" msgstr "" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee -msgid "Repair Fees Line" +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_fee +#, fuzzy +msgid "Repair Fees" +msgstr "Ordine di riparazione" + +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_line +msgid "Repair Line (parts)" msgstr "" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line -msgid "Repair Line" -msgstr "" - -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_order msgid "Repair Order" msgstr "Ordine di riparazione" + +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__price_subtotal +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__price_subtotal +msgid "Subtotal" +msgstr "" diff --git a/repair_discount/i18n/lt.po b/repair_discount/i18n/lt.po index bfaea9f73..9f2d7f5ca 100644 --- a/repair_discount/i18n/lt.po +++ b/repair_discount/i18n/lt.po @@ -19,23 +19,30 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2);\n" -#. module: mrp_repair_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__discount msgid "Discount (%)" msgstr "Nuolaida (%)" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee -msgid "Repair Fees Line" +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_fee +#, fuzzy +msgid "Repair Fees" +msgstr "Remonto užsakymas" + +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_line +msgid "Repair Line (parts)" msgstr "" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line -msgid "Repair Line" -msgstr "" - -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_order msgid "Repair Order" msgstr "Remonto užsakymas" + +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__price_subtotal +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__price_subtotal +msgid "Subtotal" +msgstr "" diff --git a/repair_discount/i18n/nl_NL.po b/repair_discount/i18n/nl_NL.po index fe21ba410..1e9af1849 100644 --- a/repair_discount/i18n/nl_NL.po +++ b/repair_discount/i18n/nl_NL.po @@ -19,23 +19,30 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. module: mrp_repair_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_fee_discount -#: model:ir.model.fields,field_description:mrp_repair_discount.field_mrp_repair_line_discount +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__discount msgid "Discount (%)" msgstr "" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_fee -msgid "Repair Fees Line" +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_fee +#, fuzzy +msgid "Repair Fees" +msgstr "Reparatieorder" + +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_line +msgid "Repair Line (parts)" msgstr "" -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair_line -msgid "Repair Line" -msgstr "" - -#. module: mrp_repair_discount -#: model:ir.model,name:mrp_repair_discount.model_mrp_repair +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_order msgid "Repair Order" msgstr "Reparatieorder" + +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__price_subtotal +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__price_subtotal +msgid "Subtotal" +msgstr "" diff --git a/repair_discount/i18n/repair_discount.pot b/repair_discount/i18n/repair_discount.pot new file mode 100644 index 000000000..fb972c9f2 --- /dev/null +++ b/repair_discount/i18n/repair_discount.pot @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * repair_discount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__discount +msgid "Discount (%)" +msgstr "" + +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_fee +msgid "Repair Fees" +msgstr "" + +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_line +msgid "Repair Line (parts)" +msgstr "" + +#. module: repair_discount +#: model:ir.model,name:repair_discount.model_repair_order +msgid "Repair Order" +msgstr "" + +#. module: repair_discount +#: model:ir.model.fields,field_description:repair_discount.field_repair_fee__price_subtotal +#: model:ir.model.fields,field_description:repair_discount.field_repair_line__price_subtotal +msgid "Subtotal" +msgstr "" + From db95bef43e57f90e8b2781afdf39c184c7f825d4 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 10 Feb 2020 17:21:38 +0000 Subject: [PATCH 3/8] [UPD] README.rst --- repair_discount/README.rst | 7 ++++--- repair_discount/static/description/index.html | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/repair_discount/README.rst b/repair_discount/README.rst index 1176ce77f..ca3114e15 100644 --- a/repair_discount/README.rst +++ b/repair_discount/README.rst @@ -1,6 +1,6 @@ -=================== -MRP Repair Discount -=================== +=============== +Repair Discount +=============== .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! @@ -58,6 +58,7 @@ Contributors * Nicola Malcontenti * Pedro M. Baeza * Lorenzo Battistini +* Ignacio Ales López * María Asunción Daza Maintainers diff --git a/repair_discount/static/description/index.html b/repair_discount/static/description/index.html index 4bb4ebe7d..0e02e06c5 100644 --- a/repair_discount/static/description/index.html +++ b/repair_discount/static/description/index.html @@ -4,7 +4,7 @@ -MRP Repair Discount +Repair Discount -
-

MRP Repair Discount

+
+

Repair Discount