Merge PR #797 into 14.0

Signed-off-by LoisRForgeFlow
This commit is contained in:
OCA-git-bot
2022-06-27 15:10:55 +00:00
26 changed files with 1351 additions and 0 deletions

View File

@@ -0,0 +1,79 @@
===============
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 <https://github.com/OCA/manufacture/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 <https://github.com/OCA/manufacture/issues/new?body=module:%20repair_discount%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues.
Credits
=======
Authors
~~~~~~~
* Agile Business Group
* Tecnativa
Contributors
~~~~~~~~~~~~
* Nicola Malcontenti <nicola.malcontenti@agilebg.com>
* Pedro M. Baeza <pedro.baeza@tecnativa.com>
* Lorenzo Battistini <lorenzo.battistini@agilebg.com>
* Ignacio Ales López <ignacio.ales@guadaltech.es>
* María Asunción Daza <mariaasuncion.daza@guadaltech.es>
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 <https://github.com/OCA/manufacture/tree/12.0/repair_discount>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

View File

@@ -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

View File

@@ -0,0 +1,18 @@
# Copyright 2015 Nicola Malcontenti - Agile Business Group
# Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
"name": "Repair Discount",
"version": "14.0.1.0.0",
"category": "Manufacturing",
"license": "AGPL-3",
"author": "Agile Business Group, " "Tecnativa, " "Odoo Community Association (OCA)",
"website": "https://github.com/OCA/manufacture",
"depends": ["repair"],
"data": [
"views/mrp_repair_view.xml",
"report/repair_templates_repair_order.xml",
],
"installable": True,
}

View File

@@ -0,0 +1,46 @@
# 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 <maria.sparenberg@gmx.net>\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: 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: repair_discount
#: model:ir.model,name:repair_discount.model_repair_fee
#, fuzzy
msgid "Repair Fees"
msgstr "Reparaturgebührenzeile"
#. module: repair_discount
#: model:ir.model,name:repair_discount.model_repair_line
#, fuzzy
msgid "Repair Line (parts)"
msgstr "Reparaturzeile"
#. 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 ""

View File

@@ -0,0 +1,48 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mrp_repair_discount
#
# Translators:
# enjolras <yo@miguelrevilla.com>, 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 <yo@miguelrevilla.com>, 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: 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: repair_discount
#: model:ir.model,name:repair_discount.model_repair_fee
#, fuzzy
msgid "Repair Fees"
msgstr "Línea de tarifa de reparación"
#. module: repair_discount
#: model:ir.model,name:repair_discount.model_repair_line
#, fuzzy
msgid "Repair Line (parts)"
msgstr "Línea de reparación"
#. 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 ""

View File

@@ -0,0 +1,49 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mrp_repair_discount
#
# Translators:
# Quentin THEURET <odoo@kerpeo.com>, 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 <william.olhasque@scopea.fr>\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: 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: repair_discount
#: model:ir.model,name:repair_discount.model_repair_fee
#, fuzzy
msgid "Repair Fees"
msgstr "Ligne de frais de réparation"
#. module: repair_discount
#: model:ir.model,name:repair_discount.model_repair_line
#, fuzzy
msgid "Repair Line (parts)"
msgstr "Ligne de réparation"
#. 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 ""

View File

@@ -0,0 +1,48 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mrp_repair_discount
#
# Translators:
# Bole <bole@dajmi5.com>, 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 <bole@dajmi5.com>, 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: 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
#, 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: 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 ""

View File

@@ -0,0 +1,49 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mrp_repair_discount
#
# Translators:
# Bole <bole@dajmi5.com>, 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 <bole@dajmi5.com>, 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: 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
#, 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: 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 ""

View File

@@ -0,0 +1,47 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mrp_repair_discount
#
# Translators:
# OCA Transbot <transbot@odoo-community.org>, 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 <transbot@odoo-community.org>, 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: 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
#, 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: 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 ""

View File

@@ -0,0 +1,48 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mrp_repair_discount
#
# Translators:
# Viktoras Norkus <viktoras@bmx.lt>, 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 <viktoras@bmx.lt>, 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: 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: 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: 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 ""

View File

@@ -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 ""

View File

@@ -0,0 +1,48 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mrp_repair_discount
#
# Translators:
# Peter Hageman <hageman.p@gmail.com>, 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 <hageman.p@gmail.com>, 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: 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
#, fuzzy
msgid "Repair Fees"
msgstr "Reparatieorder"
#. 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 "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 ""

View File

@@ -0,0 +1,44 @@
# 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"
"PO-Revision-Date: 2020-06-22 18:19+0000\n"
"Last-Translator: Fernando Colus <fcolus1@gmail.com>\n"
"Language-Team: none\n"
"Language: pt_BR\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.10\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 "Desconto (%)"
#. module: repair_discount
#: model:ir.model,name:repair_discount.model_repair_fee
msgid "Repair Fees"
msgstr "Taxas de Reparo"
#. module: repair_discount
#: model:ir.model,name:repair_discount.model_repair_line
msgid "Repair Line (parts)"
msgstr "Linha de Reparo (partes)"
#. module: repair_discount
#: model:ir.model,name:repair_discount.model_repair_order
msgid "Repair Order"
msgstr "Ordem de Reparo"
#. 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 "Sub-total"

View File

@@ -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 ""

View File

@@ -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

View File

@@ -0,0 +1,156 @@
# Copyright 2015 Nicola Malcontenti - Agile Business Group
# Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
# Copyright 2022 Manuel Regidor <manuel.regidor@sygel.es>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import api, fields, models
class RepairFee(models.Model):
_inherit = "repair.fee"
discount = fields.Float(string="Discount (%)")
@api.depends("price_unit", "repair_id", "product_uom_qty", "product_id", "discount")
def _compute_price_subtotal(self):
for fee in self:
taxes = self.env["account.tax"].compute_all(
fee.price_unit,
fee.repair_id.pricelist_id.currency_id,
fee.product_uom_qty,
fee.product_id,
fee.repair_id.partner_id,
)
fee.price_subtotal = taxes["total_excluded"] * (
1 - (fee.discount or 0.0) / 100.0
)
@api.depends(
"price_unit", "repair_id", "product_uom_qty", "product_id", "tax_id", "discount"
)
def _compute_price_total(self):
for fee in self:
taxes = fee.tax_id.compute_all(
fee.price_unit,
fee.repair_id.pricelist_id.currency_id,
fee.product_uom_qty,
fee.product_id,
fee.repair_id.partner_id,
)
fee.price_total = taxes["total_included"] * (
1 - (fee.discount or 0.0) / 100.0
)
class RepairLine(models.Model):
_inherit = "repair.line"
discount = fields.Float(string="Discount (%)")
@api.depends(
"price_unit",
"repair_id",
"product_uom_qty",
"product_id",
"repair_id.invoice_method",
"discount",
)
def _compute_price_subtotal(self):
for line in self:
taxes = self.env["account.tax"].compute_all(
line.price_unit,
line.repair_id.pricelist_id.currency_id,
line.product_uom_qty,
line.product_id,
line.repair_id.partner_id,
)
line.price_subtotal = taxes["total_excluded"] * (
1 - (line.discount or 0.0) / 100.0
)
@api.depends(
"price_unit",
"repair_id",
"product_uom_qty",
"product_id",
"tax_id",
"repair_id.invoice_method",
"discount",
)
def _compute_price_total(self):
for line in self:
taxes = line.tax_id.compute_all(
line.price_unit,
line.repair_id.pricelist_id.currency_id,
line.product_uom_qty,
line.product_id,
line.repair_id.partner_id,
)
line.price_total = taxes["total_included"] * (
1 - (line.discount or 0.0) / 100.0
)
class RepairOrder(models.Model):
_inherit = "repair.order"
def _create_invoices(self, group=False):
res = super(RepairOrder, self)._create_invoices(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.discount and item.invoice_line_id
):
op.invoice_line_id.with_context(check_move_validity=False).update(
{"discount": op.discount}
)
for fee_lines in fees_lines.filtered(
lambda item: item.discount and item.invoice_line_id
):
fee_lines.invoice_line_id.with_context(
check_move_validity=False
).update({"discount": fee_lines.discount})
self.invoice_id.with_context(
check_move_validity=False
)._recompute_dynamic_lines(
recompute_all_taxes=True, recompute_tax_base_amount=True
)
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)

View File

@@ -0,0 +1,6 @@
* Nicola Malcontenti <nicola.malcontenti@agilebg.com>
* Pedro M. Baeza <pedro.baeza@tecnativa.com>
* Lorenzo Battistini <lorenzo.battistini@agilebg.com>
* Ignacio Ales López <ignacio.ales@guadaltech.es>
* María Asunción Daza <mariaasuncion.daza@guadaltech.es>
* Manuel Regidor <manuel.regidor@sygel.es>

View File

@@ -0,0 +1,2 @@
This module extends the functionality of mrp repair adding
new field discount on operations lines

View File

@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<template
id="repair_discount_report_repairorder"
inherit_id="repair.report_repairorder"
>
<xpath
expr="//table[hasclass('o_main_table')]/thead/tr/t/th[1]"
position="after"
>
<th
t-if="any(o.operations.mapped('discount')) or any(o.fees_lines.mapped('discount'))"
class="text-center"
>Discount (%)</th>
</xpath>
<xpath expr="//t[@t-if='o.operations']/tr[1]/td[1]" position="attributes">
<attribute name="colspan">6</attribute>
</xpath>
<xpath expr="//tr[@t-as='line']/t/td[1]" position="after">
<td
t-if="any(o.operations.mapped('discount')) or any(o.fees_lines.mapped('discount'))"
class="text-center"
>
<span t-if="line.discount" t-esc="line.discount" />
</td>
</xpath>
<xpath expr="//t[@t-if='o.fees_lines']/tr[1]/td[1]" position="attributes">
<attribute name="colspan">6</attribute>
</xpath>
<xpath expr="//tr[@t-as='fees']/t/td[1]" position="after">
<td
t-if="any(o.operations.mapped('discount')) or any(o.fees_lines.mapped('discount'))"
class="text-center"
>
<span t-if="fees.discount" t-esc="fees.discount" />
</td>
</xpath>
</template>
</odoo>

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

@@ -0,0 +1,425 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
<title>Repair Discount</title>
<style type="text/css">
/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/
/* used to remove borders from tables and images */
.borderless, table.borderless td, table.borderless th {
border: 0 }
table.borderless td, table.borderless th {
/* Override padding for "table.docutils td" with "! important".
The right padding separates the table cells. */
padding: 0 0.5em 0 0 ! important }
.first {
/* Override more specific margin styles with "! important". */
margin-top: 0 ! important }
.last, .with-subtitle {
margin-bottom: 0 ! important }
.hidden {
display: none }
.subscript {
vertical-align: sub;
font-size: smaller }
.superscript {
vertical-align: super;
font-size: smaller }
a.toc-backref {
text-decoration: none ;
color: black }
blockquote.epigraph {
margin: 2em 5em ; }
dl.docutils dd {
margin-bottom: 0.5em }
object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
overflow: hidden;
}
/* Uncomment (and remove this text!) to get bold-faced definition list terms
dl.docutils dt {
font-weight: bold }
*/
div.abstract {
margin: 2em 5em }
div.abstract p.topic-title {
font-weight: bold ;
text-align: center }
div.admonition, div.attention, div.caution, div.danger, div.error,
div.hint, div.important, div.note, div.tip, div.warning {
margin: 2em ;
border: medium outset ;
padding: 1em }
div.admonition p.admonition-title, div.hint p.admonition-title,
div.important p.admonition-title, div.note p.admonition-title,
div.tip p.admonition-title {
font-weight: bold ;
font-family: sans-serif }
div.attention p.admonition-title, div.caution p.admonition-title,
div.danger p.admonition-title, div.error p.admonition-title,
div.warning p.admonition-title, .code .error {
color: red ;
font-weight: bold ;
font-family: sans-serif }
/* Uncomment (and remove this text!) to get reduced vertical space in
compound paragraphs.
div.compound .compound-first, div.compound .compound-middle {
margin-bottom: 0.5em }
div.compound .compound-last, div.compound .compound-middle {
margin-top: 0.5em }
*/
div.dedication {
margin: 2em 5em ;
text-align: center ;
font-style: italic }
div.dedication p.topic-title {
font-weight: bold ;
font-style: normal }
div.figure {
margin-left: 2em ;
margin-right: 2em }
div.footer, div.header {
clear: both;
font-size: smaller }
div.line-block {
display: block ;
margin-top: 1em ;
margin-bottom: 1em }
div.line-block div.line-block {
margin-top: 0 ;
margin-bottom: 0 ;
margin-left: 1.5em }
div.sidebar {
margin: 0 0 0.5em 1em ;
border: medium outset ;
padding: 1em ;
background-color: #ffffee ;
width: 40% ;
float: right ;
clear: right }
div.sidebar p.rubric {
font-family: sans-serif ;
font-size: medium }
div.system-messages {
margin: 5em }
div.system-messages h1 {
color: red }
div.system-message {
border: medium outset ;
padding: 1em }
div.system-message p.system-message-title {
color: red ;
font-weight: bold }
div.topic {
margin: 2em }
h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
margin-top: 0.4em }
h1.title {
text-align: center }
h2.subtitle {
text-align: center }
hr.docutils {
width: 75% }
img.align-left, .figure.align-left, object.align-left, table.align-left {
clear: left ;
float: left ;
margin-right: 1em }
img.align-right, .figure.align-right, object.align-right, table.align-right {
clear: right ;
float: right ;
margin-left: 1em }
img.align-center, .figure.align-center, object.align-center {
display: block;
margin-left: auto;
margin-right: auto;
}
table.align-center {
margin-left: auto;
margin-right: auto;
}
.align-left {
text-align: left }
.align-center {
clear: both ;
text-align: center }
.align-right {
text-align: right }
/* reset inner alignment in figures */
div.align-right {
text-align: inherit }
/* div.align-center * { */
/* text-align: left } */
.align-top {
vertical-align: top }
.align-middle {
vertical-align: middle }
.align-bottom {
vertical-align: bottom }
ol.simple, ul.simple {
margin-bottom: 1em }
ol.arabic {
list-style: decimal }
ol.loweralpha {
list-style: lower-alpha }
ol.upperalpha {
list-style: upper-alpha }
ol.lowerroman {
list-style: lower-roman }
ol.upperroman {
list-style: upper-roman }
p.attribution {
text-align: right ;
margin-left: 50% }
p.caption {
font-style: italic }
p.credits {
font-style: italic ;
font-size: smaller }
p.label {
white-space: nowrap }
p.rubric {
font-weight: bold ;
font-size: larger ;
color: maroon ;
text-align: center }
p.sidebar-title {
font-family: sans-serif ;
font-weight: bold ;
font-size: larger }
p.sidebar-subtitle {
font-family: sans-serif ;
font-weight: bold }
p.topic-title {
font-weight: bold }
pre.address {
margin-bottom: 0 ;
margin-top: 0 ;
font: inherit }
pre.literal-block, pre.doctest-block, pre.math, pre.code {
margin-left: 2em ;
margin-right: 2em }
pre.code .ln { color: grey; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
pre.code .literal.string, code .literal.string { color: #0C5404 }
pre.code .name.builtin, code .name.builtin { color: #352B84 }
pre.code .deleted, code .deleted { background-color: #DEB0A1}
pre.code .inserted, code .inserted { background-color: #A3D289}
span.classifier {
font-family: sans-serif ;
font-style: oblique }
span.classifier-delimiter {
font-family: sans-serif ;
font-weight: bold }
span.interpreted {
font-family: sans-serif }
span.option {
white-space: nowrap }
span.pre {
white-space: pre }
span.problematic {
color: red }
span.section-subtitle {
/* font-size relative to parent (h1..h6 element) */
font-size: 80% }
table.citation {
border-left: solid 1px gray;
margin-left: 1px }
table.docinfo {
margin: 2em 4em }
table.docutils {
margin-top: 0.5em ;
margin-bottom: 0.5em }
table.footnote {
border-left: solid 1px black;
margin-left: 1px }
table.docutils td, table.docutils th,
table.docinfo td, table.docinfo th {
padding-left: 0.5em ;
padding-right: 0.5em ;
vertical-align: top }
table.docutils th.field-name, table.docinfo th.docinfo-name {
font-weight: bold ;
text-align: left ;
white-space: nowrap ;
padding-left: 0 }
/* "booktabs" style (no vertical lines) */
table.docutils.booktabs {
border: 0px;
border-top: 2px solid;
border-bottom: 2px solid;
border-collapse: collapse;
}
table.docutils.booktabs * {
border: 0px;
}
table.docutils.booktabs th {
border-bottom: thin solid;
text-align: left;
}
h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
font-size: 100% }
ul.auto-toc {
list-style-type: none }
</style>
</head>
<body>
<div class="document" id="repair-discount">
<h1 class="title">Repair Discount</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/manufacture/tree/12.0/repair_discount"><img alt="OCA/manufacture" src="https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/manufacture-12-0/manufacture-12-0-repair_discount"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/129/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>This module extends the functionality of mrp repair adding
new field discount on operations lines</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/manufacture/issues">GitHub Issues</a>.
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
<a class="reference external" href="https://github.com/OCA/manufacture/issues/new?body=module:%20repair_discount%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#id2">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id3">Authors</a></h2>
<ul class="simple">
<li>Agile Business Group</li>
<li>Tecnativa</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
<ul class="simple">
<li>Nicola Malcontenti &lt;<a class="reference external" href="mailto:nicola.malcontenti&#64;agilebg.com">nicola.malcontenti&#64;agilebg.com</a>&gt;</li>
<li>Pedro M. Baeza &lt;<a class="reference external" href="mailto:pedro.baeza&#64;tecnativa.com">pedro.baeza&#64;tecnativa.com</a>&gt;</li>
<li>Lorenzo Battistini &lt;<a class="reference external" href="mailto:lorenzo.battistini&#64;agilebg.com">lorenzo.battistini&#64;agilebg.com</a>&gt;</li>
<li>Ignacio Ales López &lt;<a class="reference external" href="mailto:ignacio.ales&#64;guadaltech.es">ignacio.ales&#64;guadaltech.es</a>&gt;</li>
<li>María Asunción Daza &lt;<a class="reference external" href="mailto:mariaasuncion.daza&#64;guadaltech.es">mariaasuncion.daza&#64;guadaltech.es</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>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.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/manufacture/tree/12.0/repair_discount">OCA/manufacture</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
</div>
</body>
</html>

View File

@@ -0,0 +1,3 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import test_mrp_repair_discount

View File

@@ -0,0 +1,81 @@
# Copyright 2016 Pedro M. Baeza <pedro.baeza@tecnativa.com>
# 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.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._create_invoices()
invoice = self.env["account.move"].browse(res.values())[0]
invoice_line = invoice.invoice_line_ids[0]
self.assertEqual(invoice_line.discount, 50)
self.assertAlmostEqual(invoice_line.price_subtotal, 10)

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="view_repair_order_discount_form" model="ir.ui.view">
<field name="name">repair.discount.form</field>
<field name="model">repair.order</field>
<field name="inherit_id" ref="repair.view_repair_order_form" />
<field name="arch" type="xml">
<xpath
expr="//field[@name='operations']/tree/field[@name='price_subtotal']"
position='before'
>
<field name="discount" />
</xpath>
<xpath
expr="//field[@name='fees_lines']/tree/field[@name='price_unit']"
position='after'
>
<field name="discount" />
</xpath>
</field>
</record>
</odoo>

View File

@@ -0,0 +1 @@
../../../../repair_discount

View File

@@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)