From 35b3165524f1753a1dcb6595da9363d27e51d9b4 Mon Sep 17 00:00:00 2001 From: Hugo Trentesaux <hugo@le-filament.com> Date: Tue, 18 Mar 2025 11:10:18 +0100 Subject: [PATCH 1/3] [UPD] add partner tags on invoice and sale order --- models/account.py | 3 +++ models/sale.py | 3 +++ views/account_views.xml | 50 ++++++++++++++++++++++++++++++++--------- 3 files changed, 45 insertions(+), 11 deletions(-) diff --git a/models/account.py b/models/account.py index 123760c..9371944 100644 --- a/models/account.py +++ b/models/account.py @@ -22,6 +22,9 @@ class AccountInvoice(models.Model): "res.partner", string="Apporteur", tracking=True, copy=False ) + # add partner tags + partner_category_id = fields.Many2many(related="partner_id.category_id") + # ------------------------------------------------------ # SQL Constraints # ------------------------------------------------------ diff --git a/models/sale.py b/models/sale.py index be9320f..dc3e8f6 100644 --- a/models/sale.py +++ b/models/sale.py @@ -22,6 +22,9 @@ class SaleOrder(models.Model): "res.partner", string="Apporteur", tracking=True, copy=False ) + # add partner tags + partner_category_id = fields.Many2many(related="partner_id.category_id") + # ------------------------------------------------------ # SQL Constraints # ------------------------------------------------------ diff --git a/views/account_views.xml b/views/account_views.xml index d8d679c..a61e97d 100644 --- a/views/account_views.xml +++ b/views/account_views.xml @@ -2,19 +2,47 @@ <!-- Copyright 2019- Le Filament (https://le-filament.com) License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> <odoo> - <record id="account_move_3ad_form" model="ir.ui.view"> - <field name="name">account.3a.move.form</field> - <field name="model">account.move</field> - <field name="inherit_id" ref="account.view_move_form" /> - <field name="arch" type="xml"> - <field name="invoice_user_id" position="after"> - <field + <record id="account_move_3ad_form" model="ir.ui.view"> + <field name="name">account.3a.move.form</field> + <field name="model">account.move</field> + <field name="inherit_id" ref="account.view_move_form" /> + <field name="arch" type="xml"> + <!-- add user second id in other info --> + <field name="invoice_user_id" position="after"> + <field name="user_second_ids" options="{'no_create_edit': 1}" widget="many2many_tags" /> - <field name="user_provider_id" options="{'no_create_edit': 1}" /> - </field> - </field> - </record> + <field + name="user_provider_id" + options="{'no_create_edit': 1}" + /> + </field> + <!-- add partner tags --> + <field name="partner_id" position="after"> + <field + name="partner_category_id" + widget="many2many_tags" + options="{'color_field': 'color'}" + /> + </field> + </field> + </record> + + <record id="sale_order_3ad_form" model="ir.ui.view"> + <field name="name">sale.order.3a.form</field> + <field name="model">sale.order</field> + <field name="inherit_id" ref="sale.view_order_form" /> + <field name="arch" type="xml"> + <!-- add partner tags --> + <field name="partner_id" position="after"> + <field + name="partner_category_id" + widget="many2many_tags" + options="{'color_field': 'color'}" + /> + </field> + </field> + </record> </odoo> -- GitLab From 3c61f04a02d1ee62f67b9fc0082bea98a44ff250 Mon Sep 17 00:00:00 2001 From: Hugo Trentesaux <hugo@le-filament.com> Date: Tue, 18 Mar 2025 11:31:38 +0100 Subject: [PATCH 2/3] [FIX] review --- models/account.py | 2 +- models/sale.py | 2 +- views/account_views.xml | 18 +------------- views/sale_views.xml | 53 ++++++++++++++++++++++++++--------------- 4 files changed, 37 insertions(+), 38 deletions(-) diff --git a/models/account.py b/models/account.py index 9371944..b3abb22 100644 --- a/models/account.py +++ b/models/account.py @@ -23,7 +23,7 @@ class AccountInvoice(models.Model): ) # add partner tags - partner_category_id = fields.Many2many(related="partner_id.category_id") + partner_category_ids = fields.Many2many(related="partner_id.category_id") # ------------------------------------------------------ # SQL Constraints diff --git a/models/sale.py b/models/sale.py index dc3e8f6..f48e170 100644 --- a/models/sale.py +++ b/models/sale.py @@ -23,7 +23,7 @@ class SaleOrder(models.Model): ) # add partner tags - partner_category_id = fields.Many2many(related="partner_id.category_id") + partner_category_ids = fields.Many2many(related="partner_id.category_id") # ------------------------------------------------------ # SQL Constraints diff --git a/views/account_views.xml b/views/account_views.xml index a61e97d..f5ca7e3 100644 --- a/views/account_views.xml +++ b/views/account_views.xml @@ -22,23 +22,7 @@ <!-- add partner tags --> <field name="partner_id" position="after"> <field - name="partner_category_id" - widget="many2many_tags" - options="{'color_field': 'color'}" - /> - </field> - </field> - </record> - - <record id="sale_order_3ad_form" model="ir.ui.view"> - <field name="name">sale.order.3a.form</field> - <field name="model">sale.order</field> - <field name="inherit_id" ref="sale.view_order_form" /> - <field name="arch" type="xml"> - <!-- add partner tags --> - <field name="partner_id" position="after"> - <field - name="partner_category_id" + name="partner_category_ids" widget="many2many_tags" options="{'color_field': 'color'}" /> diff --git a/views/sale_views.xml b/views/sale_views.xml index ceaadc5..c8cd7b8 100644 --- a/views/sale_views.xml +++ b/views/sale_views.xml @@ -2,35 +2,50 @@ <!-- Copyright 2019- Le Filament (https://le-filament.com) License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> <odoo> - <record id="view_order_form" model="ir.ui.view"> - <field name="name">sale.3a.order.form</field> - <field name="model">sale.order</field> - <field name="inherit_id" ref="sale.view_order_form" /> - <field name="arch" type="xml"> - <xpath + <record id="view_order_form" model="ir.ui.view"> + <field name="name">sale.3a.order.form</field> + <field name="model">sale.order</field> + <field name="inherit_id" ref="sale.view_order_form" /> + <field name="arch" type="xml"> + <xpath expr="//notebook//page[@name='other_information']//group//group//field[@name='user_id']" position="after" > - <field + <field name="user_second_ids" options="{'no_create_edit': 1}" widget="many2many_tags" /> - <field + <field name="user_provider_id" options="{'no_create_edit': 1}" /> - </xpath> + </xpath> + </field> + </record> + <record id="view_order_crm_form" model="ir.ui.view"> + <field name="name">sale.3a.order.crm.form</field> + <field name="model">sale.order</field> + <field name="inherit_id" ref="sale_crm.sale_view_inherit123" /> + <field name="arch" type="xml"> + <field name="opportunity_id" position="attributes"> + <attribute name="groups" /> </field> - </record> - <record id="view_order_crm_form" model="ir.ui.view"> - <field name="name">sale.3a.order.crm.form</field> - <field name="model">sale.order</field> - <field name="inherit_id" ref="sale_crm.sale_view_inherit123" /> - <field name="arch" type="xml"> - <field name="opportunity_id" position="attributes"> - <attribute name="groups" /> - </field> + </field> + </record> + <record id="sale_order_3ad_form" model="ir.ui.view"> + <field name="name">sale.order.3a.form</field> + <field name="model">sale.order</field> + <field name="inherit_id" ref="sale.view_order_form" /> + <field name="arch" type="xml"> + <!-- add partner tags --> + <field name="partner_id" position="after"> + <field + name="partner_category_ids" + widget="many2many_tags" + options="{'color_field': 'color'}" + /> </field> - </record> + </field> + </record> </odoo> -- GitLab From d2f6d8d7e53be83db681249b68f3056f81fee6f4 Mon Sep 17 00:00:00 2001 From: Hugo Trentesaux <hugo@le-filament.com> Date: Tue, 18 Mar 2025 11:41:42 +0100 Subject: [PATCH 3/3] [FIX] labels --- models/account.py | 4 +++- models/sale.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/models/account.py b/models/account.py index b3abb22..5a5f0cb 100644 --- a/models/account.py +++ b/models/account.py @@ -23,7 +23,9 @@ class AccountInvoice(models.Model): ) # add partner tags - partner_category_ids = fields.Many2many(related="partner_id.category_id") + partner_category_ids = fields.Many2many( + related="partner_id.category_id", string="Etiquettes du contact" + ) # ------------------------------------------------------ # SQL Constraints diff --git a/models/sale.py b/models/sale.py index f48e170..0e4eca8 100644 --- a/models/sale.py +++ b/models/sale.py @@ -23,7 +23,9 @@ class SaleOrder(models.Model): ) # add partner tags - partner_category_ids = fields.Many2many(related="partner_id.category_id") + partner_category_ids = fields.Many2many( + related="partner_id.category_id", string="Etiquettes du client" + ) # ------------------------------------------------------ # SQL Constraints -- GitLab