diff --git a/models/res_company.py b/models/res_company.py index f635dbb0b7489ce971b33d9c9d382db6e6708619..3f6dacc7c2f212f47523df4b399b0582bcd8c5fc 100644 --- a/models/res_company.py +++ b/models/res_company.py @@ -20,7 +20,9 @@ class ResCompany(models.Model): # ------------------------------------------------------ # Constraints # ------------------------------------------------------ - @api.constrains("company_share_line_ids",) + @api.constrains( + "company_share_line_ids", + ) def _check_share_line(self): for company in self: company_share_line = company.company_share_line_ids diff --git a/models/res_config_settings.py b/models/res_config_settings.py index d2fa6eef0384aefd98f8e895badcfedb43d4bd8c..c1080c7aba719017d9f3391f2953fffb88c8e5e7 100644 --- a/models/res_config_settings.py +++ b/models/res_config_settings.py @@ -10,7 +10,7 @@ class ResConfigSettings(models.TransientModel): share_unit_price = fields.Monetary( string="Valeur de la part", related="company_id.share_unit_price", - currency_field='company_currency_id', + currency_field="company_currency_id", readonly=False, ) company_currency_id = fields.Many2one(related="company_id.currency_id") diff --git a/models/res_partner.py b/models/res_partner.py index 2c65a3a4a33aa4f6e269ab514bae0c2e28bf53a7..a12a01f2666f4d3aba6f77e6d4d834ddddb72767 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -1,8 +1,7 @@ # Copyright 2023- Le Filament (https://le-filament.com) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from odoo import _, api, fields, models -from odoo.exceptions import ValidationError +from odoo import fields, models class ResPartner(models.Model): @@ -15,7 +14,9 @@ class ResPartner(models.Model): comodel_name="company.share.line", inverse_name="partner_id", ) - company_share_total = fields.Float(compute="_compute_company_share_total", store=True) + company_share_total = fields.Float( + compute="_compute_company_share_total", store=True + ) # ------------------------------------------------------ # Constraints @@ -30,7 +31,9 @@ class ResPartner(models.Model): # ------------------------------------------------------ def _compute_company_share_total(self): for partner in self: - partner.company_share_total = sum(partner.company_share_line_ids.mapped("share_total_amount")) + partner.company_share_total = sum( + partner.company_share_line_ids.mapped("share_total_amount") + ) # ------------------------------------------------------ # Onchange / Constraints diff --git a/views/company_share_line_views.xml b/views/company_share_line_views.xml index 0525003469b06be53b09edb137a638e9c8781f63..1e0721056352f2363c85c0f91c1a925fb4ecdcdb 100644 --- a/views/company_share_line_views.xml +++ b/views/company_share_line_views.xml @@ -62,14 +62,8 @@ /> <group expand="0" name="group_by" string="Group By"> - <filter - name="Contact" - context="{'group_by':'partner_id'}" - /> - <filter - name="Payment date" - context="{'group_by':'payment_date'}" - /> + <filter name="Contact" context="{'group_by':'partner_id'}" /> + <filter name="Payment date" context="{'group_by':'payment_date'}" /> </group> </search> </field> diff --git a/views/menus.xml b/views/menus.xml index 72578adbff8152c888745626fb5a723e6e5e0382..2b15059c3c925592d2cbcd2cbae1fdc9dcd4e723 100644 --- a/views/menus.xml +++ b/views/menus.xml @@ -24,5 +24,4 @@ action="action_company_shares_config" sequence="100" /> - </odoo> diff --git a/views/res_config_settings.xml b/views/res_config_settings.xml index b1e0a0aeb532161e24c92c51dd4bf33664f04c16..920fb097bb065e8ee955729660e88162c043a36a 100644 --- a/views/res_config_settings.xml +++ b/views/res_config_settings.xml @@ -32,5 +32,4 @@ <field name="target">inline</field> <field name="context">{'module' : 'company_shares', 'bin_size': False}</field> </record> - </odoo> diff --git a/views/res_partner.xml b/views/res_partner.xml index d44333d44b974458fd1c3a49cb20724cc163616f..e1463b0291e4f27fbf734d97d7d55357b0cc5f4b 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -4,10 +4,10 @@ <record model="ir.ui.view" id="res_partner_list_inherit"> <field name="name">res.partner.list.inherit</field> <field name="model">res.partner</field> - <field name="inherit_id" ref="base.view_partner_tree"/> + <field name="inherit_id" ref="base.view_partner_tree" /> <field name="arch" type="xml"> <xpath expr="//field[@name='company_id']" position="after"> - <field name="company_share_total" optional="hide"/> + <field name="company_share_total" optional="hide" /> </xpath> </field> </record> @@ -16,14 +16,11 @@ <record id="res_partner_company_share_line_form" model="ir.ui.view"> <field name="name">res.partner.company.share.line.form</field> <field name="model">res.partner</field> - <field name="inherit_id" ref="base.view_partner_form"/> + <field name="inherit_id" ref="base.view_partner_form" /> <field name="arch" type="xml"> <xpath expr="//notebook" position="inside"> <page string="Company Shares"> - <field - name="company_share_line_ids" - nolabel="1" - /> + <field name="company_share_line_ids" nolabel="1" /> </page> </xpath> </field>