Skip to content

Commit

Permalink
[MIG] agreement_rebate: Migration to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@stefan-tecnativa
stefan-tecnativa committed Jul 19, 2023
1 parent e6f6959 commit 87c9ffd
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 60 deletions.
35 changes: 21 additions & 14 deletions agreement_rebate/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
Agreement Rebate
================

.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:da94ef5774ee8e52f93d43b2e2ef3e81251d117d818e401ca8d9b680b26f1cff
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
Expand All @@ -14,13 +17,16 @@ Agreement Rebate
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fagreement-lightgray.png?logo=github
:target: https://github.com/OCA/agreement/tree/15.0/agreement_rebate
:target: https://github.com/OCA/agreement/tree/16.0/agreement_rebate
:alt: OCA/agreement
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/agreement-15-0/agreement-15-0-agreement_rebate
:target: https://translation.odoo-community.org/projects/agreement-16-0/agreement-16-0-agreement_rebate
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/agreement&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4|
|badge1| |badge2| |badge3| |badge4| |badge5|

This module extends the functionality of agreement module to allow define
rebate conditions.
Expand All @@ -41,47 +47,47 @@ To use this module you need to:

Basic global rappel discount

.. image:: https://raw.githubusercontent.com/OCA/agreement/15.0/agreement_rebate/static/img/agreement_discount_global.png
.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_global.png
:width: 80 %
:align: center

Basic rappel discount by line items

.. image:: https://raw.githubusercontent.com/OCA/agreement/15.0/agreement_rebate/static/img/agreement_discount_line.png
.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_line.png
:width: 80 %
:align: center

Section rappel discount rule match

.. image:: https://raw.githubusercontent.com/OCA/agreement/15.0/agreement_rebate/static/img/agreement_discount_section_rule_match.png
.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_section_rule_match.png
:width: 80 %
:align: center

Calculate the discount in each amount section

.. image:: https://raw.githubusercontent.com/OCA/agreement/15.0/agreement_rebate/static/img/agreement_discount_section.png
.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_section.png
:width: 80 %
:align: center

#. Create any rebate lines to apply this agreement.

Add a product template filter to apply this agreement

.. image:: https://raw.githubusercontent.com/OCA/agreement/15.0/agreement_rebate/static/img/agreement_rebate_lines_filter.png
.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_rebate_lines_filter.png
:width: 80 %
:align: center

#. Do some invoices of products included in any rebate agreement
#. Create rebate settlements from *Agreements > Settlements > Create Settlements*
wizard

.. image:: https://raw.githubusercontent.com/OCA/agreement/15.0/agreement_rebate/static/img/create_settlements_wizard.png
.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/create_settlements_wizard.png
:width: 80 %
:align: center

#. Create rappel invoices from *Agreements > Settlements > Create Invoices* wizard

.. image:: https://raw.githubusercontent.com/OCA/agreement/15.0/agreement_rebate/static/img/create_settlement_invoices.png
.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/create_settlement_invoices.png
:width: 80 %
:align: center

Expand All @@ -90,8 +96,8 @@ Bug Tracker

Bugs are tracked on `GitHub Issues <https://github.com/OCA/agreement/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/agreement/issues/new?body=module:%20agreement_rebate%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/agreement/issues/new?body=module:%20agreement_rebate%0Aversion:%2016.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.

Expand All @@ -110,6 +116,7 @@ Contributors

* Carlos Dauden <[email protected]>
* Sergio Teruel <[email protected]>
* Stefan Ungureanu <[email protected]>

Maintainers
~~~~~~~~~~~
Expand All @@ -124,6 +131,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.

This module is part of the `OCA/agreement <https://github.com/OCA/agreement/tree/15.0/agreement_rebate>`_ project on GitHub.
This module is part of the `OCA/agreement <https://github.com/OCA/agreement/tree/16.0/agreement_rebate>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion agreement_rebate/__manifest__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"name": "Agreement Rebate",
"summary": "Rebate in agreements",
"version": "15.0.1.1.0",
"version": "16.0.1.1.0",
"development_status": "Beta",
"category": "Agreement",
"website": "https://github.com/OCA/agreement",
Expand Down
13 changes: 7 additions & 6 deletions agreement_rebate/i18n/agreement_rebate.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 15.0\n"
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-19 09:07+0000\n"
"PO-Revision-Date: 2023-07-19 09:07+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
Expand All @@ -19,6 +21,7 @@ msgid "% Dto"
msgstr ""

#. module: agreement_rebate
#. odoo-python
#: code:addons/agreement_rebate/models/agreement_rebate_settlement.py:0
#, python-format
msgid "%(name)s - Period: %(date_from)s - %(date_to)s"
Expand Down Expand Up @@ -269,6 +272,7 @@ msgid "Dates filter"
msgstr ""

#. module: agreement_rebate
#. odoo-python
#: code:addons/agreement_rebate/models/agreement_rebate_settlement.py:0
#: code:addons/agreement_rebate/models/agreement_rebate_settlement.py:0
#, python-format
Expand Down Expand Up @@ -493,6 +497,7 @@ msgid "Period"
msgstr ""

#. module: agreement_rebate
#. odoo-python
#: code:addons/agreement_rebate/models/agreement_rebate_settlement.py:0
#, python-format
msgid "Please define an accounting sales journal for this company."
Expand Down Expand Up @@ -597,6 +602,7 @@ msgid "Rebate settlements"
msgstr ""

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement__rebate_type
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement_line__rebate_type
msgid "Rebate type"
msgstr ""
Expand Down Expand Up @@ -693,8 +699,3 @@ msgstr ""
#: model:ir.model.fields.selection,name:agreement_rebate.selection__agreement_invoice_create_wiz__invoice_type__in_refund
msgid "Vendor Credit Note"
msgstr ""

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement__rebate_type
msgid "rebate type"
msgstr ""
45 changes: 22 additions & 23 deletions agreement_rebate/i18n/es.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,28 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-18 18:50+0000\n"
"PO-Revision-Date: 2022-02-18 19:52+0100\n"
"POT-Creation-Date: 2023-07-19 09:07+0000\n"
"PO-Revision-Date: 2023-07-19 11:15+0200\n"
"Last-Translator: Sergio Teruel <[email protected]>\n"
"Language-Team: \n"
"Language: es_ES\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.3\n"
"X-Generator: Poedit 3.0.1\n"

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_section__rebate_discount
msgid "% Dto"
msgstr "% Dto"

#. module: agreement_rebate
#. odoo-python
#: code:addons/agreement_rebate/models/agreement_rebate_settlement.py:0
#, python-format
msgid "%(name)s - Period: %(date_from)s - %(date_to)s"
msgstr ""
msgstr "%(name)s - Periodo: %(date_from)s - %(date_to)s"

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_form
Expand Down Expand Up @@ -54,18 +55,18 @@ msgstr "<span>Detalles</span>"
#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_form
msgid "<span>Lines</span>"
msgstr ""
msgstr "<span>Líneas</span>"

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement__active
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement_line__active
msgid "Active"
msgstr ""
msgstr "Activo"

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement__additional_consumption
msgid "Additional Consumption"
msgstr ""
msgstr "Consumo adicional"

#. module: agreement_rebate
#: model:ir.model,name:agreement_rebate.model_agreement
Expand Down Expand Up @@ -108,9 +109,8 @@ msgstr "Tipos de Acuerdo"

#. module: agreement_rebate
#: model:ir.model,name:agreement_rebate.model_agreement_invoice_create_wiz
#, fuzzy
msgid "Agreement invoice create wizard"
msgstr "Líneas de rappel"
msgstr "Asistente para facturas de acuerdos"

#. module: agreement_rebate
#: model:ir.actions.act_window,name:agreement_rebate.agreement_rebate_condition_action
Expand All @@ -129,9 +129,8 @@ msgstr "Tramos de rappel"

#. module: agreement_rebate
#: model:ir.model,name:agreement_rebate.model_agreement_settlement_create_wiz
#, fuzzy
msgid "Agreement settlement create wizard"
msgstr "Líneas de liquidaciones del acuerdo"
msgstr "Asistente de líneas de liquidaciones del acuerdo"

#. module: agreement_rebate
#: model:ir.actions.act_window,name:agreement_rebate.agreement_rebate_settlement_line_action
Expand Down Expand Up @@ -162,26 +161,26 @@ msgstr "Acuerdos"
#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement_line__amount_gross
msgid "Amount Gross"
msgstr ""
msgstr "Importe bruto"

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement__amount_invoiced
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement_line__amount_invoiced
msgid "Amount Invoiced"
msgstr ""
msgstr "Importe facturado"

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement__amount_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement_line__amount_rebate
msgid "Amount Rebate"
msgstr ""
msgstr "Importe de rappel"

#. module: agreement_rebate
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_form
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_line_search
#: model_terms:ir.ui.view,arch_db:agreement_rebate.agreement_rebate_settlement_search
msgid "Archived"
msgstr ""
msgstr "Archivado"

#. module: agreement_rebate
#: model:ir.model.fields.selection,name:agreement_rebate.selection__agreement__rebate_type__section_prorated
Expand Down Expand Up @@ -280,6 +279,7 @@ msgid "Dates filter"
msgstr "Filtrar por fechas"

#. module: agreement_rebate
#. odoo-python
#: code:addons/agreement_rebate/models/agreement_rebate_settlement.py:0
#, python-format
msgid "Details"
Expand Down Expand Up @@ -410,9 +410,8 @@ msgstr "Diario"

#. module: agreement_rebate
#: model:ir.model,name:agreement_rebate.model_account_move_line
#, fuzzy
msgid "Journal Item"
msgstr "Diario"
msgstr "Apunte contable"

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_settlement_create_wiz__journal_ids
Expand Down Expand Up @@ -506,6 +505,7 @@ msgid "Period"
msgstr "Período"

#. module: agreement_rebate
#. odoo-python
#: code:addons/agreement_rebate/models/agreement_rebate_settlement.py:0
#, python-format
msgid "Please define an accounting sales journal for this company."
Expand Down Expand Up @@ -549,12 +549,12 @@ msgstr "Rappel"
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement__rebate_discount
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_line__rebate_discount
msgid "Rebate Discount"
msgstr ""
msgstr "Descuento de rappel"

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_line__rebate_domain
msgid "Rebate Domain"
msgstr ""
msgstr "Dominio de rappel"

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement_line__rebate_line_id
Expand Down Expand Up @@ -610,6 +610,7 @@ msgid "Rebate settlements"
msgstr "Liquidaciónes rappel"

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement__rebate_type
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement_rebate_settlement_line__rebate_type
msgid "Rebate type"
msgstr "Tipo rappel"
Expand Down Expand Up @@ -707,10 +708,8 @@ msgstr "Factura de proveedor"
msgid "Vendor Credit Note"
msgstr "Factura rectificativa de proveedor"

#. module: agreement_rebate
#: model:ir.model.fields,field_description:agreement_rebate.field_agreement__rebate_type
msgid "rebate type"
msgstr "Tipo rappel"
#~ msgid "rebate type"
#~ msgstr "Tipo rappel"

#~ msgid "Settings"
#~ msgstr "Ajustes"
Expand Down
2 changes: 1 addition & 1 deletion agreement_rebate/models/agreement.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Agreement(models.Model):
("section_total", "Compute total and apply discount rule match"),
("section_prorated", "Calculate the discount in each amount section"),
],
string="rebate type",
string="Rebate type",
)
rebate_line_ids = fields.One2many(
comodel_name="agreement.rebate.line",
Expand Down
2 changes: 1 addition & 1 deletion agreement_rebate/models/agreement_rebate_settlement.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def _prepare_invoice_line(self, invoice_vals):
)
invoice_line.move_id = invoice
# Get other invoice line values from product onchange
invoice_line._onchange_product_id()
invoice_line.name = invoice_line._compute_name()
invoice_line_vals = invoice_line._convert_to_write(invoice_line._cache)
invoice_line_vals.update(
{
Expand Down
1 change: 1 addition & 0 deletions agreement_rebate/readme/CONTRIBUTORS.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

* Carlos Dauden <[email protected]>
* Sergio Teruel <[email protected]>
* Stefan Ungureanu <[email protected]>
Loading

0 comments on commit 87c9ffd

Please sign in to comment.