From fb685fd908a3d345637b3f2c8ecceaa704a4c063 Mon Sep 17 00:00:00 2001 From: David Beal Date: Fri, 5 Apr 2019 18:11:30 +0200 Subject: [PATCH 01/31] PORT agreement_sale --- agreement_sale/README.rst | 92 ++++ agreement_sale/__init__.py | 1 + agreement_sale/__manifest__.py | 28 ++ agreement_sale/models/__init__.py | 1 + agreement_sale/models/sale.py | 14 + agreement_sale/readme/CONTRIBUTORS.rst | 1 + agreement_sale/readme/DESCRIPTION.rst | 1 + agreement_sale/readme/ROADMAP.rst | 4 + agreement_sale/security/ir.model.access.csv | 2 + agreement_sale/static/description/icon.png | Bin 0 -> 9455 bytes agreement_sale/static/description/index.html | 430 +++++++++++++++++++ agreement_sale/views/agreement.xml | 8 + 12 files changed, 582 insertions(+) create mode 100644 agreement_sale/README.rst create mode 100644 agreement_sale/__init__.py create mode 100644 agreement_sale/__manifest__.py create mode 100644 agreement_sale/models/__init__.py create mode 100644 agreement_sale/models/sale.py create mode 100644 agreement_sale/readme/CONTRIBUTORS.rst create mode 100644 agreement_sale/readme/DESCRIPTION.rst create mode 100644 agreement_sale/readme/ROADMAP.rst create mode 100644 agreement_sale/security/ir.model.access.csv create mode 100644 agreement_sale/static/description/icon.png create mode 100644 agreement_sale/static/description/index.html create mode 100644 agreement_sale/views/agreement.xml diff --git a/agreement_sale/README.rst b/agreement_sale/README.rst new file mode 100644 index 0000000000..c73fc7ed9c --- /dev/null +++ b/agreement_sale/README.rst @@ -0,0 +1,92 @@ +============== +Agreement Sale +============== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fcontract-lightgray.png?logo=github + :target: https://github.com/OCA/contract/tree/12.0/agreement_sale + :alt: OCA/contract +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-agreement_sale + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/110/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module adds *Agreement* field to Sales Orders + +**Table of contents** + +.. contents:: + :local: + +Known issues / Roadmap +====================== + +Features to evaluate before implementation + +* add smart button on agreement to access implied sales +* add module agreement_account: agreement_sale'll depends on it + +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 +~~~~~~~ + +* Akretion + +Contributors +~~~~~~~~~~~~ + +* Alexis de Lattre + +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. + +.. |maintainer-alexis-via| image:: https://github.com/alexis-via.png?size=40px + :target: https://github.com/alexis-via + :alt: alexis-via +.. |maintainer-bealdav| image:: https://github.com/bealdav.png?size=40px + :target: https://github.com/bealdav + :alt: bealdav + +Current `maintainers `__: + +|maintainer-alexis-via| |maintainer-bealdav| + +This module is part of the `OCA/contract `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/agreement_sale/__init__.py b/agreement_sale/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/agreement_sale/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/agreement_sale/__manifest__.py b/agreement_sale/__manifest__.py new file mode 100644 index 0000000000..e186f0f031 --- /dev/null +++ b/agreement_sale/__manifest__.py @@ -0,0 +1,28 @@ +# © 2017 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Agreement Sale', + 'summary': "Agreement on sales", + 'version': '12.0.1.0.0', + 'category': 'Contract', + 'author': 'Akretion, ' + 'Odoo Community Association (OCA)', + 'website': 'https://github.com/oca/contract', + 'license': 'AGPL-3', + 'depends': [ + 'sale', + 'agreement', + ], + 'data': [ + 'security/ir.model.access.csv', + 'views/agreement.xml', + ], + 'demo': [], + 'development_status': 'Beta', + 'maintainers': [ + 'alexis-via', + 'bealdav', + ], + 'installable': True, +} diff --git a/agreement_sale/models/__init__.py b/agreement_sale/models/__init__.py new file mode 100644 index 0000000000..8a0dc04e1f --- /dev/null +++ b/agreement_sale/models/__init__.py @@ -0,0 +1 @@ +from . import sale diff --git a/agreement_sale/models/sale.py b/agreement_sale/models/sale.py new file mode 100644 index 0000000000..f78bd4ae24 --- /dev/null +++ b/agreement_sale/models/sale.py @@ -0,0 +1,14 @@ +# © 2017 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + + +from odoo import models, fields + + +class SaleOrder(models.Model): + _inherit = 'sale.order' + + agreement_id = fields.Many2one( + comodel_name='agreement', string='Agreement', ondelete='restrict', + track_visibility='onchange', readonly=True, + states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) diff --git a/agreement_sale/readme/CONTRIBUTORS.rst b/agreement_sale/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..ff65d68ce6 --- /dev/null +++ b/agreement_sale/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Alexis de Lattre diff --git a/agreement_sale/readme/DESCRIPTION.rst b/agreement_sale/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..3f0417552f --- /dev/null +++ b/agreement_sale/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module adds *Agreement* field to Sales Orders diff --git a/agreement_sale/readme/ROADMAP.rst b/agreement_sale/readme/ROADMAP.rst new file mode 100644 index 0000000000..1edf6e09bf --- /dev/null +++ b/agreement_sale/readme/ROADMAP.rst @@ -0,0 +1,4 @@ +Features to evaluate before implementation + +* add smart button on agreement to access implied sales +* add module agreement_account: agreement_sale'll depends on it diff --git a/agreement_sale/security/ir.model.access.csv b/agreement_sale/security/ir.model.access.csv new file mode 100644 index 0000000000..89ad9808d5 --- /dev/null +++ b/agreement_sale/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +agreement.access_agreement_full,Full access on agreement grp,agreement.model_agreement,sales_team.group_sale_manager,1,1,1,1 \ No newline at end of file diff --git a/agreement_sale/static/description/icon.png b/agreement_sale/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/agreement_sale/static/description/index.html b/agreement_sale/static/description/index.html new file mode 100644 index 0000000000..304bdb8e1c --- /dev/null +++ b/agreement_sale/static/description/index.html @@ -0,0 +1,430 @@ + + + + + + +Agreement Sale + + + +
+

Agreement Sale

+ + +

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

+

This module adds Agreement field to Sales Orders

+

Table of contents

+ +
+

Known issues / Roadmap

+

Features to evaluate before implementation

+
    +
  • add smart button on agreement to access implied sales
    • +
  • add module agreement_account: agreement_sale’ll depends on it
    • +
+
+
+

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

+
    +
  • Akretion
    • +
+
+
+

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.

+

Current maintainers:

+

alexis-via bealdav

+

This module is part of the OCA/contract project on GitHub.

+

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

+
+
+
+ + diff --git a/agreement_sale/views/agreement.xml b/agreement_sale/views/agreement.xml new file mode 100644 index 0000000000..43a2ea5d62 --- /dev/null +++ b/agreement_sale/views/agreement.xml @@ -0,0 +1,8 @@ + + + + + + + From bcee295db6459806772dbd7a6679cffac05de7d0 Mon Sep 17 00:00:00 2001 From: David Beal Date: Sat, 6 Apr 2019 14:02:23 +0200 Subject: [PATCH 02/31] FIX agreement_sale: oca remarks --- agreement_sale/__manifest__.py | 2 +- agreement_sale/models/sale.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agreement_sale/__manifest__.py b/agreement_sale/__manifest__.py index e186f0f031..50c9d932e7 100644 --- a/agreement_sale/__manifest__.py +++ b/agreement_sale/__manifest__.py @@ -11,7 +11,7 @@ 'website': 'https://github.com/oca/contract', 'license': 'AGPL-3', 'depends': [ - 'sale', + 'sale_management', 'agreement', ], 'data': [ diff --git a/agreement_sale/models/sale.py b/agreement_sale/models/sale.py index f78bd4ae24..556db2f7e5 100644 --- a/agreement_sale/models/sale.py +++ b/agreement_sale/models/sale.py @@ -10,5 +10,5 @@ class SaleOrder(models.Model): agreement_id = fields.Many2one( comodel_name='agreement', string='Agreement', ondelete='restrict', - track_visibility='onchange', readonly=True, + track_visibility='onchange', readonly=True, copy=False, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) From 4a6f7d8921ddd5862f12b9c5711c60c2b8aec85e Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Wed, 10 Apr 2019 17:26:31 -0500 Subject: [PATCH 03/31] Update ir.model.access.csv --- agreement_sale/security/ir.model.access.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agreement_sale/security/ir.model.access.csv b/agreement_sale/security/ir.model.access.csv index 89ad9808d5..4b3915cf47 100644 --- a/agreement_sale/security/ir.model.access.csv +++ b/agreement_sale/security/ir.model.access.csv @@ -1,2 +1,2 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -agreement.access_agreement_full,Full access on agreement grp,agreement.model_agreement,sales_team.group_sale_manager,1,1,1,1 \ No newline at end of file +agreement.access_agreement_full,Full access on agreement grp,agreement.model_agreement,sales_team.group_sale_manager,1,1,1,1 From bec5c3df86e6c6a23ab49fa9673adb045e234a6d Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Wed, 10 Apr 2019 17:27:03 -0500 Subject: [PATCH 04/31] Update __manifest__.py --- agreement_sale/__manifest__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/agreement_sale/__manifest__.py b/agreement_sale/__manifest__.py index 50c9d932e7..29ef5bc1b1 100644 --- a/agreement_sale/__manifest__.py +++ b/agreement_sale/__manifest__.py @@ -18,7 +18,6 @@ 'security/ir.model.access.csv', 'views/agreement.xml', ], - 'demo': [], 'development_status': 'Beta', 'maintainers': [ 'alexis-via', From 73f5abb1835cb4e21705fff76d0278f36123fbce Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 11 Apr 2019 15:02:41 +0000 Subject: [PATCH 05/31] [UPD] Update agreement_sale.pot --- agreement_sale/i18n/agreement_sale.pot | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 agreement_sale/i18n/agreement_sale.pot diff --git a/agreement_sale/i18n/agreement_sale.pot b/agreement_sale/i18n/agreement_sale.pot new file mode 100644 index 0000000000..8809a63f4e --- /dev/null +++ b/agreement_sale/i18n/agreement_sale.pot @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * agreement_sale +# +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: agreement_sale +#: model:ir.model.fields,field_description:agreement_sale.field_sale_order__agreement_id +msgid "Agreement" +msgstr "" + +#. module: agreement_sale +#: model:ir.model,name:agreement_sale.model_sale_order +msgid "Sale Order" +msgstr "" + From e227ee81a5006a052970b365b51bbc5db3e38aa7 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 29 Jul 2019 02:48:03 +0000 Subject: [PATCH 06/31] [UPD] README.rst --- agreement_sale/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agreement_sale/static/description/index.html b/agreement_sale/static/description/index.html index 304bdb8e1c..198c00cdc8 100644 --- a/agreement_sale/static/description/index.html +++ b/agreement_sale/static/description/index.html @@ -3,7 +3,7 @@ - + Agreement Sale + + +
+

Agreement Sale

+ + +

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

+

This module adds Agreement field to Sales Orders

+

Table of contents

+ +
+

Known issues / Roadmap

+

Features to evaluate before implementation

+
    +
  • add smart button on agreement to access implied sales
    • +
  • add module agreement_account: agreement_sale’ll depends on it
    • +
+
+
+

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

+
    +
  • Akretion
    • +
+
+
+

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.

+

Current maintainers:

+

alexis-via bealdav

+

This module is part of the OCA/contract project on GitHub.

+

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

+
+
+
+ + diff --git a/agreement_account/views/account_invoice.xml b/agreement_account/views/account_invoice.xml new file mode 100644 index 0000000000..891ca4f055 --- /dev/null +++ b/agreement_account/views/account_invoice.xml @@ -0,0 +1,54 @@ + + + + + + + + agreement.customer.invoice.form + account.invoice + + + + + + + + + + + agreement.supplier.invoice.form + account.invoice + + + + + + + + + + agreement.account.invoice.search + account.invoice + + + + + + + + + + + + + diff --git a/agreement_account/views/agreement.xml b/agreement_account/views/agreement.xml new file mode 100644 index 0000000000..4af14876aa --- /dev/null +++ b/agreement_account/views/agreement.xml @@ -0,0 +1,57 @@ + + + + + + + + + Vendor Bills + account.invoice + tree,form + [('type','in', ('in_invoice', 'in_refund')), ('state', 'not in', ('draft', 'cancel'))] + {'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'} + + + + + tree + + + + + + + form + + + + + + invoice.button.agreement.form + agreement + + +
+ + + +
+ + + + diff --git a/agreement_sale/__manifest__.py b/agreement_sale/__manifest__.py index 9ee05c394c..0392f15f5a 100644 --- a/agreement_sale/__manifest__.py +++ b/agreement_sale/__manifest__.py @@ -12,7 +12,8 @@ 'license': 'AGPL-3', 'depends': [ 'sale_management', - 'agreement', + 'agreement_account', + 'sale_commercial_partner', ], 'data': [ 'security/ir.model.access.csv', diff --git a/agreement_sale/models/__init__.py b/agreement_sale/models/__init__.py index 534c392d21..9576a5f735 100644 --- a/agreement_sale/models/__init__.py +++ b/agreement_sale/models/__init__.py @@ -1,2 +1,3 @@ +from . import agreement from . import sale from . import res_config_settings diff --git a/agreement_sale/models/agreement.py b/agreement_sale/models/agreement.py new file mode 100644 index 0000000000..1f6d435f51 --- /dev/null +++ b/agreement_sale/models/agreement.py @@ -0,0 +1,27 @@ +# Copyright 2017-2020 Akretion France (http://www.akretion.com/) +# @author: Alexis de Lattre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + + +from odoo import fields, models + + +class Agreement(models.Model): + _inherit = 'agreement' + + sale_ids = fields.One2many( + 'sale.order', 'agreement_id', string='Sale Orders', readonly=True) + sale_count = fields.Integer( + compute='_compute_sale_count', string='# of Sale Orders') + + def _compute_sale_count(self): + rg_res = self.env['sale.order'].read_group( + [ + ('agreement_id', 'in', self.ids), + ('state', 'not in', ('draft', 'sent', 'cancel')), + ], + ['agreement_id'], ['agreement_id']) + mapped_data = dict( + [(x['agreement_id'][0], x['agreement_id_count']) for x in rg_res]) + for agreement in self: + agreement.sale_count = mapped_data.get(agreement.id, 0) diff --git a/agreement_sale/models/sale.py b/agreement_sale/models/sale.py index bf97d9de2d..a87b1199be 100644 --- a/agreement_sale/models/sale.py +++ b/agreement_sale/models/sale.py @@ -1,4 +1,5 @@ -# © 2017 Akretion (Alexis de Lattre ) +# Copyright 2017-2020 Akretion France +# @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -18,3 +19,8 @@ class SaleOrder(models.Model): ondelete="restrict", track_visibility='onchange', readonly=True, copy=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) + + def _prepare_invoice(self): + vals = super(SaleOrder, self)._prepare_invoice() + vals['agreement_id'] = self.agreement_id.id or False + return vals diff --git a/agreement_sale/readme/DESCRIPTION.rst b/agreement_sale/readme/DESCRIPTION.rst index 3f0417552f..c78e1a42bd 100644 --- a/agreement_sale/readme/DESCRIPTION.rst +++ b/agreement_sale/readme/DESCRIPTION.rst @@ -1 +1 @@ -This module adds *Agreement* field to Sales Orders +This module adds *Agreement* field to Sales Orders. Upon invoice creation, that field is copied to the invoice. diff --git a/agreement_sale/security/ir.model.access.csv b/agreement_sale/security/ir.model.access.csv index f6e188f41b..7494f7f2e1 100644 --- a/agreement_sale/security/ir.model.access.csv +++ b/agreement_sale/security/ir.model.access.csv @@ -1,4 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink agreement.access_agreement_full,Full access on agreement grp,agreement.model_agreement,sales_team.group_sale_manager,1,1,1,1 agreement_sale.access_agreement_type_full,Full access on agreement type grp,agreement.model_agreement_type,sales_team.group_sale_manager,1,1,1,1 -agreement_sale.access_agreement_type_read,Read access on agreement grp,agreement.model_agreement_type,base.group_user,1,0,0,0 diff --git a/agreement_sale/views/agreement.xml b/agreement_sale/views/agreement.xml index cc30d5ce8f..b10eea8a44 100644 --- a/agreement_sale/views/agreement.xml +++ b/agreement_sale/views/agreement.xml @@ -7,4 +7,22 @@ + + + sale.button.agreement.form + agreement + + +
+ +
+ + + diff --git a/agreement_sale/views/sale_order.xml b/agreement_sale/views/sale_order.xml index e7e5b5ea42..fbd2dc4c88 100644 --- a/agreement_sale/views/sale_order.xml +++ b/agreement_sale/views/sale_order.xml @@ -6,7 +6,9 @@ - + + + agreement.sale.order.search + sale.order + + + + + + + + + + + From b7e2906eb51f6f3d7f36b7b576c4f42bd5aa45b3 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Thu, 21 May 2020 23:06:23 +0200 Subject: [PATCH 27/31] agreement: add tracking on important fields Improve agreement form view Improve handling of menus --- agreement_account/views/agreement.xml | 12 ++++++++---- agreement_sale/views/agreement.xml | 13 +++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/agreement_account/views/agreement.xml b/agreement_account/views/agreement.xml index 4af14876aa..4b77d36167 100644 --- a/agreement_account/views/agreement.xml +++ b/agreement_account/views/agreement.xml @@ -2,10 +2,14 @@ - - + + + 150 + + + + 155 + Vendor Bills diff --git a/agreement_sale/views/agreement.xml b/agreement_sale/views/agreement.xml index b10eea8a44..d7a40c22b3 100644 --- a/agreement_sale/views/agreement.xml +++ b/agreement_sale/views/agreement.xml @@ -2,11 +2,16 @@ - - + + + 150 + + + sale.button.agreement.form From 65df86e6d54abf4706cef9244064f76d36a708d2 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 22 May 2020 10:16:51 +0200 Subject: [PATCH 28/31] FIX agreement type menu entry --- agreement_account/views/agreement.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agreement_account/views/agreement.xml b/agreement_account/views/agreement.xml index 4b77d36167..36104570a3 100644 --- a/agreement_account/views/agreement.xml +++ b/agreement_account/views/agreement.xml @@ -6,10 +6,10 @@ 150 - - - 155 - + + Vendor Bills From ebdb4566116a7ee06dd6e29d579b520c29d84ac6 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 27 May 2020 23:58:18 +0200 Subject: [PATCH 29/31] [MIG] agreement_sale and agreement_account to v13 --- agreement_account/__manifest__.py | 6 +-- agreement_account/models/__init__.py | 2 +- .../{account_invoice.py => account_move.py} | 6 +-- agreement_account/models/agreement.py | 10 ++-- .../security/ir.model.access.csv | 4 +- agreement_account/views/account_invoice.xml | 54 ------------------- agreement_account/views/account_move.xml | 41 ++++++++++++++ agreement_account/views/agreement.xml | 39 ++++++-------- agreement_sale/__manifest__.py | 5 +- agreement_sale/models/res_config_settings.py | 4 +- agreement_sale/models/sale.py | 4 +- agreement_sale/security/ir.model.access.csv | 4 +- agreement_sale/views/agreement.xml | 14 ++--- agreement_sale/views/res_config_settings.xml | 2 +- agreement_sale/views/sale_order.xml | 2 +- 15 files changed, 89 insertions(+), 108 deletions(-) rename agreement_account/models/{account_invoice.py => account_move.py} (74%) delete mode 100644 agreement_account/views/account_invoice.xml create mode 100644 agreement_account/views/account_move.xml diff --git a/agreement_account/__manifest__.py b/agreement_account/__manifest__.py index d708314287..ef0ce3e157 100644 --- a/agreement_account/__manifest__.py +++ b/agreement_account/__manifest__.py @@ -5,19 +5,19 @@ { 'name': 'Agreement Account', 'summary': "Agreement on invoices", - 'version': '12.0.1.0.0', + 'version': '13.0.1.0.0', 'category': 'Contract', 'author': 'Akretion, Odoo Community Association (OCA)', 'website': 'https://github.com/OCA/contract', 'license': 'AGPL-3', 'depends': [ - 'agreement', + 'base_contract', 'account', ], 'data': [ 'security/ir.model.access.csv', 'views/agreement.xml', - 'views/account_invoice.xml', + 'views/account_move.xml', ], 'development_status': 'Beta', 'maintainers': [ diff --git a/agreement_account/models/__init__.py b/agreement_account/models/__init__.py index 720f31c8b3..b15c1f119f 100644 --- a/agreement_account/models/__init__.py +++ b/agreement_account/models/__init__.py @@ -1,2 +1,2 @@ from . import agreement -from . import account_invoice +from . import account_move diff --git a/agreement_account/models/account_invoice.py b/agreement_account/models/account_move.py similarity index 74% rename from agreement_account/models/account_invoice.py rename to agreement_account/models/account_move.py index a6bdc41223..e8cf37393e 100644 --- a/agreement_account/models/account_invoice.py +++ b/agreement_account/models/account_move.py @@ -6,10 +6,10 @@ from odoo import fields, models -class AccountInvoice(models.Model): - _inherit = 'account.invoice' +class AccountMove(models.Model): + _inherit = 'account.move' agreement_id = fields.Many2one( comodel_name='agreement', string='Agreement', ondelete='restrict', - track_visibility='onchange', readonly=True, copy=False, + tracking=True, readonly=True, copy=False, states={'draft': [('readonly', False)]}) diff --git a/agreement_account/models/agreement.py b/agreement_account/models/agreement.py index ddbc4ef42e..a856511fa1 100644 --- a/agreement_account/models/agreement.py +++ b/agreement_account/models/agreement.py @@ -10,7 +10,7 @@ class Agreement(models.Model): _inherit = 'agreement' invoice_ids = fields.One2many( - 'account.invoice', 'agreement_id', string='Invoices', readonly=True) + 'account.move', 'agreement_id', string='Invoices', readonly=True) out_invoice_count = fields.Integer( compute='_compute_invoice_count', string='# of Customer Invoices') in_invoice_count = fields.Integer( @@ -19,14 +19,14 @@ class Agreement(models.Model): def _compute_invoice_count(self): base_domain = [ ('agreement_id', 'in', self.ids), - ('state', 'not in', ('draft', 'cancel'))] - aio = self.env['account.invoice'] - out_rg_res = aio.read_group( + ('state', '=', 'posted')] + amo = self.env['account.move'] + out_rg_res = amo.read_group( base_domain + [('type', 'in', ('out_invoice', 'out_refund'))], ['agreement_id'], ['agreement_id']) out_data = dict( [(x['agreement_id'][0], x['agreement_id_count']) for x in out_rg_res]) - in_rg_res = aio.read_group( + in_rg_res = amo.read_group( base_domain + [('type', 'in', ('in_invoice', 'in_refund'))], ['agreement_id'], ['agreement_id']) in_data = dict( diff --git a/agreement_account/security/ir.model.access.csv b/agreement_account/security/ir.model.access.csv index c1b7f487c2..4d9cdcb133 100644 --- a/agreement_account/security/ir.model.access.csv +++ b/agreement_account/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_agreement_full,Full access on agreement to Financial mgr,agreement.model_agreement,account.group_account_manager,1,1,1,1 -access_agreement_type_full,Full access on agreement type to Financial mgr,agreement.model_agreement_type,account.group_account_manager,1,1,1,1 +access_agreement_full,Full access on agreement to Financial mgr,base_contract.model_agreement,account.group_account_manager,1,1,1,1 +access_agreement_type_full,Full access on agreement type to Financial mgr,base_contract.model_agreement_type,account.group_account_manager,1,1,1,1 diff --git a/agreement_account/views/account_invoice.xml b/agreement_account/views/account_invoice.xml deleted file mode 100644 index 891ca4f055..0000000000 --- a/agreement_account/views/account_invoice.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - agreement.customer.invoice.form - account.invoice - - - - - - - - - - - agreement.supplier.invoice.form - account.invoice - - - - - - - - - - agreement.account.invoice.search - account.invoice - - - - - - - - - - - - - diff --git a/agreement_account/views/account_move.xml b/agreement_account/views/account_move.xml new file mode 100644 index 0000000000..5068f964ed --- /dev/null +++ b/agreement_account/views/account_move.xml @@ -0,0 +1,41 @@ + + + + + + + + agreement.invoice.form + account.move + + + + + + + + + + + agreement.invoice.search + account.move + + + + + + + + + + + + + diff --git a/agreement_account/views/agreement.xml b/agreement_account/views/agreement.xml index 36104570a3..ddaaaa493c 100644 --- a/agreement_account/views/agreement.xml +++ b/agreement_account/views/agreement.xml @@ -2,58 +2,51 @@ - + 150 - + groups="base_contract.group_use_agreement_type"/> - + Vendor Bills - account.invoice + account.move tree,form - [('type','in', ('in_invoice', 'in_refund')), ('state', 'not in', ('draft', 'cancel'))] - {'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'} + [('type','in', ('in_invoice', 'in_refund')), ('state', '=', 'posted')] + {'default_type': 'in_invoice'} - - - tree - - - - - - - form - - + + Customer Invoices + account.move + tree,form + [('type','in', ('out_invoice', 'out_refund')), ('state', '=', 'posted')] + {'default_type': 'out_invoice'} invoice.button.agreement.form agreement - +
-
diff --git a/agreement_sale/__manifest__.py b/agreement_sale/__manifest__.py index 0392f15f5a..e12c80ddab 100644 --- a/agreement_sale/__manifest__.py +++ b/agreement_sale/__manifest__.py @@ -1,10 +1,11 @@ -# © 2017 Akretion (Alexis de Lattre ) +# Copyright 2017-2020 Akretion France (http://www.akretion.com/) +# @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Agreement Sale', 'summary': "Agreement on sales", - 'version': '12.0.1.0.1', + 'version': '13.0.1.0.0', 'category': 'Contract', 'author': 'Akretion, ' 'Odoo Community Association (OCA)', diff --git a/agreement_sale/models/res_config_settings.py b/agreement_sale/models/res_config_settings.py index 167bc9c482..e7a3b6a8fd 100644 --- a/agreement_sale/models/res_config_settings.py +++ b/agreement_sale/models/res_config_settings.py @@ -6,9 +6,9 @@ class ResConfigSettings(models.TransientModel): group_use_agreement_type = fields.Boolean( 'Use agreement types', - implied_group='agreement.group_use_agreement_type' + implied_group='base_contract.group_use_agreement_type' ) group_use_agreement_template = fields.Boolean( 'Use agreement template', - implied_group='agreement.group_use_agreement_template' + implied_group='base_contract.group_use_agreement_template' ) diff --git a/agreement_sale/models/sale.py b/agreement_sale/models/sale.py index a87b1199be..497fc8df18 100644 --- a/agreement_sale/models/sale.py +++ b/agreement_sale/models/sale.py @@ -11,13 +11,13 @@ class SaleOrder(models.Model): agreement_id = fields.Many2one( comodel_name='agreement', string='Agreement', ondelete='restrict', - track_visibility='onchange', readonly=True, copy=False, + tracking=True, readonly=True, copy=False, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) agreement_type_id = fields.Many2one( comodel_name="agreement.type", string="Agreement Type", ondelete="restrict", - track_visibility='onchange', readonly=True, copy=True, + tracking=True, readonly=True, copy=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) def _prepare_invoice(self): diff --git a/agreement_sale/security/ir.model.access.csv b/agreement_sale/security/ir.model.access.csv index 7494f7f2e1..81ee13e365 100644 --- a/agreement_sale/security/ir.model.access.csv +++ b/agreement_sale/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -agreement.access_agreement_full,Full access on agreement grp,agreement.model_agreement,sales_team.group_sale_manager,1,1,1,1 -agreement_sale.access_agreement_type_full,Full access on agreement type grp,agreement.model_agreement_type,sales_team.group_sale_manager,1,1,1,1 +access_agreement_full,Full access on agreement grp,base_contract.model_agreement,sales_team.group_sale_manager,1,1,1,1 +access_agreement_type_full,Full access on agreement type grp,base_contract.model_agreement_type,sales_team.group_sale_manager,1,1,1,1 diff --git a/agreement_sale/views/agreement.xml b/agreement_sale/views/agreement.xml index d7a40c22b3..0ab8375219 100644 --- a/agreement_sale/views/agreement.xml +++ b/agreement_sale/views/agreement.xml @@ -2,21 +2,21 @@ - + 150 - - + + sale.button.agreement.form agreement - +
diff --git a/agreement_sale/views/sale_order.xml b/agreement_sale/views/sale_order.xml index fbd2dc4c88..2b1c9fdd93 100644 --- a/agreement_sale/views/sale_order.xml +++ b/agreement_sale/views/sale_order.xml @@ -12,7 +12,7 @@ From e19f4ed4582e94830755802f56ea6e6366dc9978 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Thu, 28 May 2020 00:00:13 +0200 Subject: [PATCH 30/31] Run pre-commit --- agreement_account/__manifest__.py | 36 ++++------ agreement_account/models/account_move.py | 13 ++-- agreement_account/models/agreement.py | 39 ++++++----- agreement_account/views/account_move.xml | 69 ++++++++++--------- agreement_account/views/agreement.xml | 69 +++++++++++-------- agreement_sale/__manifest__.py | 40 +++++------ agreement_sale/models/agreement.py | 23 ++++--- agreement_sale/models/res_config_settings.py | 9 ++- agreement_sale/models/sale.py | 27 +++++--- agreement_sale/views/agreement.xml | 44 +++++++----- agreement_sale/views/res_config_settings.xml | 40 +++++++---- agreement_sale/views/sale_order.xml | 27 +++++--- setup/.setuptools-odoo-make-default-ignore | 2 + setup/README | 2 + .../odoo/addons/agreement_account | 1 + setup/agreement_account/setup.py | 6 ++ .../agreement_sale/odoo/addons/agreement_sale | 1 + setup/agreement_sale/setup.py | 6 ++ 18 files changed, 262 insertions(+), 192 deletions(-) create mode 100644 setup/.setuptools-odoo-make-default-ignore create mode 100644 setup/README create mode 120000 setup/agreement_account/odoo/addons/agreement_account create mode 100644 setup/agreement_account/setup.py create mode 120000 setup/agreement_sale/odoo/addons/agreement_sale create mode 100644 setup/agreement_sale/setup.py diff --git a/agreement_account/__manifest__.py b/agreement_account/__manifest__.py index ef0ce3e157..7572d08df6 100644 --- a/agreement_account/__manifest__.py +++ b/agreement_account/__manifest__.py @@ -3,26 +3,20 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Agreement Account', - 'summary': "Agreement on invoices", - 'version': '13.0.1.0.0', - 'category': 'Contract', - 'author': 'Akretion, Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/contract', - 'license': 'AGPL-3', - 'depends': [ - 'base_contract', - 'account', + "name": "Agreement Account", + "summary": "Agreement on invoices", + "version": "13.0.1.0.0", + "category": "Contract", + "author": "Akretion, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/contract", + "license": "AGPL-3", + "depends": ["base_contract", "account",], + "data": [ + "security/ir.model.access.csv", + "views/agreement.xml", + "views/account_move.xml", ], - 'data': [ - 'security/ir.model.access.csv', - 'views/agreement.xml', - 'views/account_move.xml', - ], - 'development_status': 'Beta', - 'maintainers': [ - 'alexis-via', - 'bealdav', - ], - 'installable': True, + "development_status": "Beta", + "maintainers": ["alexis-via", "bealdav",], + "installable": True, } diff --git a/agreement_account/models/account_move.py b/agreement_account/models/account_move.py index e8cf37393e..e8e0d798d1 100644 --- a/agreement_account/models/account_move.py +++ b/agreement_account/models/account_move.py @@ -7,9 +7,14 @@ class AccountMove(models.Model): - _inherit = 'account.move' + _inherit = "account.move" agreement_id = fields.Many2one( - comodel_name='agreement', string='Agreement', ondelete='restrict', - tracking=True, readonly=True, copy=False, - states={'draft': [('readonly', False)]}) + comodel_name="agreement", + string="Agreement", + ondelete="restrict", + tracking=True, + readonly=True, + copy=False, + states={"draft": [("readonly", False)]}, + ) diff --git a/agreement_account/models/agreement.py b/agreement_account/models/agreement.py index a856511fa1..c6b9e620a2 100644 --- a/agreement_account/models/agreement.py +++ b/agreement_account/models/agreement.py @@ -7,30 +7,37 @@ class Agreement(models.Model): - _inherit = 'agreement' + _inherit = "agreement" invoice_ids = fields.One2many( - 'account.move', 'agreement_id', string='Invoices', readonly=True) + "account.move", "agreement_id", string="Invoices", readonly=True + ) out_invoice_count = fields.Integer( - compute='_compute_invoice_count', string='# of Customer Invoices') + compute="_compute_invoice_count", string="# of Customer Invoices" + ) in_invoice_count = fields.Integer( - compute='_compute_invoice_count', string='# of Vendor Bills') + compute="_compute_invoice_count", string="# of Vendor Bills" + ) def _compute_invoice_count(self): - base_domain = [ - ('agreement_id', 'in', self.ids), - ('state', '=', 'posted')] - amo = self.env['account.move'] + base_domain = [("agreement_id", "in", self.ids), ("state", "=", "posted")] + amo = self.env["account.move"] out_rg_res = amo.read_group( - base_domain + [('type', 'in', ('out_invoice', 'out_refund'))], - ['agreement_id'], ['agreement_id']) - out_data = dict( - [(x['agreement_id'][0], x['agreement_id_count']) for x in out_rg_res]) + base_domain + [("type", "in", ("out_invoice", "out_refund"))], + ["agreement_id"], + ["agreement_id"], + ) + out_data = { + x["agreement_id"][0]: x["agreement_id_count"] for x in out_rg_res + } in_rg_res = amo.read_group( - base_domain + [('type', 'in', ('in_invoice', 'in_refund'))], - ['agreement_id'], ['agreement_id']) - in_data = dict( - [(x['agreement_id'][0], x['agreement_id_count']) for x in in_rg_res]) + base_domain + [("type", "in", ("in_invoice", "in_refund"))], + ["agreement_id"], + ["agreement_id"], + ) + in_data = { + x["agreement_id"][0]: x["agreement_id_count"] for x in in_rg_res + } for agreement in self: agreement.out_invoice_count = out_data.get(agreement.id, 0) agreement.in_invoice_count = in_data.get(agreement.id, 0) diff --git a/agreement_account/views/account_move.xml b/agreement_account/views/account_move.xml index 5068f964ed..e282225e25 100644 --- a/agreement_account/views/account_move.xml +++ b/agreement_account/views/account_move.xml @@ -1,41 +1,44 @@ - + - - - - - agreement.invoice.form - account.move - - - - - - - - - - - agreement.invoice.search - account.move - - - - + + agreement.invoice.form + account.move + + + + + + - - - - - - - + + + agreement.invoice.search + account.move + + + + + + + + + + diff --git a/agreement_account/views/agreement.xml b/agreement_account/views/agreement.xml index ddaaaa493c..74548b6a56 100644 --- a/agreement_account/views/agreement.xml +++ b/agreement_account/views/agreement.xml @@ -1,54 +1,69 @@ - - + - - + 150 - - - + Vendor Bills account.move tree,form - [('type','in', ('in_invoice', 'in_refund')), ('state', '=', 'posted')] + [('type','in', ('in_invoice', 'in_refund')), ('state', '=', 'posted')] {'default_type': 'in_invoice'} - Customer Invoices account.move tree,form - [('type','in', ('out_invoice', 'out_refund')), ('state', '=', 'posted')] + [('type','in', ('out_invoice', 'out_refund')), ('state', '=', 'posted')] {'default_type': 'out_invoice'} - invoice.button.agreement.form agreement - +
- -
- diff --git a/agreement_sale/__manifest__.py b/agreement_sale/__manifest__.py index e12c80ddab..2c80c34c93 100644 --- a/agreement_sale/__manifest__.py +++ b/agreement_sale/__manifest__.py @@ -3,29 +3,21 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Agreement Sale', - 'summary': "Agreement on sales", - 'version': '13.0.1.0.0', - 'category': 'Contract', - 'author': 'Akretion, ' - 'Odoo Community Association (OCA)', - 'website': 'https://github.com/oca/contract', - 'license': 'AGPL-3', - 'depends': [ - 'sale_management', - 'agreement_account', - 'sale_commercial_partner', + "name": "Agreement Sale", + "summary": "Agreement on sales", + "version": "13.0.1.0.0", + "category": "Contract", + "author": "Akretion, " "Odoo Community Association (OCA)", + "website": "https://github.com/oca/contract", + "license": "AGPL-3", + "depends": ["sale_management", "agreement_account", "sale_commercial_partner",], + "data": [ + "security/ir.model.access.csv", + "views/agreement.xml", + "views/sale_order.xml", + "views/res_config_settings.xml", ], - 'data': [ - 'security/ir.model.access.csv', - 'views/agreement.xml', - 'views/sale_order.xml', - 'views/res_config_settings.xml', - ], - 'development_status': 'Beta', - 'maintainers': [ - 'alexis-via', - 'bealdav', - ], - 'installable': True, + "development_status": "Beta", + "maintainers": ["alexis-via", "bealdav",], + "installable": True, } diff --git a/agreement_sale/models/agreement.py b/agreement_sale/models/agreement.py index 1f6d435f51..9e64199f44 100644 --- a/agreement_sale/models/agreement.py +++ b/agreement_sale/models/agreement.py @@ -7,21 +7,26 @@ class Agreement(models.Model): - _inherit = 'agreement' + _inherit = "agreement" sale_ids = fields.One2many( - 'sale.order', 'agreement_id', string='Sale Orders', readonly=True) + "sale.order", "agreement_id", string="Sale Orders", readonly=True + ) sale_count = fields.Integer( - compute='_compute_sale_count', string='# of Sale Orders') + compute="_compute_sale_count", string="# of Sale Orders" + ) def _compute_sale_count(self): - rg_res = self.env['sale.order'].read_group( + rg_res = self.env["sale.order"].read_group( [ - ('agreement_id', 'in', self.ids), - ('state', 'not in', ('draft', 'sent', 'cancel')), + ("agreement_id", "in", self.ids), + ("state", "not in", ("draft", "sent", "cancel")), ], - ['agreement_id'], ['agreement_id']) - mapped_data = dict( - [(x['agreement_id'][0], x['agreement_id_count']) for x in rg_res]) + ["agreement_id"], + ["agreement_id"], + ) + mapped_data = { + x["agreement_id"][0]: x["agreement_id_count"] for x in rg_res + } for agreement in self: agreement.sale_count = mapped_data.get(agreement.id, 0) diff --git a/agreement_sale/models/res_config_settings.py b/agreement_sale/models/res_config_settings.py index e7a3b6a8fd..f93c972537 100644 --- a/agreement_sale/models/res_config_settings.py +++ b/agreement_sale/models/res_config_settings.py @@ -2,13 +2,12 @@ class ResConfigSettings(models.TransientModel): - _inherit = 'res.config.settings' + _inherit = "res.config.settings" group_use_agreement_type = fields.Boolean( - 'Use agreement types', - implied_group='base_contract.group_use_agreement_type' + "Use agreement types", implied_group="base_contract.group_use_agreement_type" ) group_use_agreement_template = fields.Boolean( - 'Use agreement template', - implied_group='base_contract.group_use_agreement_template' + "Use agreement template", + implied_group="base_contract.group_use_agreement_template", ) diff --git a/agreement_sale/models/sale.py b/agreement_sale/models/sale.py index 497fc8df18..12bafffc8e 100644 --- a/agreement_sale/models/sale.py +++ b/agreement_sale/models/sale.py @@ -3,24 +3,33 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models, fields +from odoo import fields, models class SaleOrder(models.Model): - _inherit = 'sale.order' + _inherit = "sale.order" agreement_id = fields.Many2one( - comodel_name='agreement', string='Agreement', ondelete='restrict', - tracking=True, readonly=True, copy=False, - states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) + comodel_name="agreement", + string="Agreement", + ondelete="restrict", + tracking=True, + readonly=True, + copy=False, + states={"draft": [("readonly", False)], "sent": [("readonly", False)]}, + ) agreement_type_id = fields.Many2one( - comodel_name="agreement.type", string="Agreement Type", + comodel_name="agreement.type", + string="Agreement Type", ondelete="restrict", - tracking=True, readonly=True, copy=True, - states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) + tracking=True, + readonly=True, + copy=True, + states={"draft": [("readonly", False)], "sent": [("readonly", False)]}, + ) def _prepare_invoice(self): vals = super(SaleOrder, self)._prepare_invoice() - vals['agreement_id'] = self.agreement_id.id or False + vals["agreement_id"] = self.agreement_id.id or False return vals diff --git a/agreement_sale/views/agreement.xml b/agreement_sale/views/agreement.xml index 0ab8375219..10bbf03b20 100644 --- a/agreement_sale/views/agreement.xml +++ b/agreement_sale/views/agreement.xml @@ -1,33 +1,39 @@ - - + - - + 150 - - - - + + sale.button.agreement.form agreement - +
-
- diff --git a/agreement_sale/views/res_config_settings.xml b/agreement_sale/views/res_config_settings.xml index 060a0be29f..fcc93da973 100644 --- a/agreement_sale/views/res_config_settings.xml +++ b/agreement_sale/views/res_config_settings.xml @@ -1,40 +1,52 @@ - + - res.config.settings.view.form.inherit.agreement res.config.settings - - + +

Agreements

-
+
- +
-
-
+
- +
-