diff --git a/__manifest__.py b/__manifest__.py index c7b9d0be62534a63f2bd20c5cfb5d43f4a11d1b5..00c298563eae1bab8a37038f93f2034ae9b33073 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -5,9 +5,7 @@ "website": "https://le-filament.com", "version": "18.0.1.0.0", "license": "AGPL-3", - "depends": [ - "contacts", "financial_partner" - ], + "depends": ["contacts", "financial_partner"], "data": [ # security "security/security_rules.xml", diff --git a/data/financial_suspensive_condition.xml b/data/financial_suspensive_condition.xml index 09bb307c69abded49a58a64d6c97a0fdf4d43dc7..0241d21e13bf811576a2d091cbde6123883720c2 100644 --- a/data/financial_suspensive_condition.xml +++ b/data/financial_suspensive_condition.xml @@ -1,31 +1,57 @@ <?xml version="1.0" encoding="utf-8" ?> <odoo noupdate="1"> - <record id="financial_suspensive_condition_drc" model="financial.suspensive.condition"> + <record + id="financial_suspensive_condition_drc" + model="financial.suspensive.condition" + > <field name="name">DRC</field> </record> - <record id="financial_suspensive_condition_contract" model="financial.suspensive.condition"> + <record + id="financial_suspensive_condition_contract" + model="financial.suspensive.condition" + > <field name="name">Contrat Banque</field> </record> - <record id="financial_suspensive_condition_kbis" model="financial.suspensive.condition"> + <record + id="financial_suspensive_condition_kbis" + model="financial.suspensive.condition" + > <field name="name">Kbis</field> </record> - <record id="financial_suspensive_condition_status" model="financial.suspensive.condition"> + <record + id="financial_suspensive_condition_status" + model="financial.suspensive.condition" + > <field name="name">Statuts</field> </record> - <record id="financial_suspensive_condition_id_dom" model="financial.suspensive.condition"> + <record + id="financial_suspensive_condition_id_dom" + model="financial.suspensive.condition" + > <field name="name">ID + DOM</field> </record> - <record id="financial_suspensive_condition_id_dom_be" model="financial.suspensive.condition"> + <record + id="financial_suspensive_condition_id_dom_be" + model="financial.suspensive.condition" + > <field name="name">ID + DOM BE</field> </record> - <record id="financial_suspensive_condition_be" model="financial.suspensive.condition"> + <record + id="financial_suspensive_condition_be" + model="financial.suspensive.condition" + > <field name="name">Liste BE</field> </record> - <record id="financial_suspensive_condition_liasse" model="financial.suspensive.condition"> + <record + id="financial_suspensive_condition_liasse" + model="financial.suspensive.condition" + > <field name="name">Liasse Fiscale</field> </record> - <record id="financial_suspensive_condition_lab" model="financial.suspensive.condition"> + <record + id="financial_suspensive_condition_lab" + model="financial.suspensive.condition" + > <field name="name">Dossier LAB</field> </record> - </odoo> diff --git a/models/financial_contract.py b/models/financial_contract.py index ce7419a60ab9c4af3ad8553e1549955620cdfb3b..be6d6c3d49d213363d9d5445c19e767bd1c99c1f 100644 --- a/models/financial_contract.py +++ b/models/financial_contract.py @@ -78,7 +78,7 @@ class FinancialContract(models.AbstractModel): - Soldé : Le contrat est soldé - Annulé : Le contrat est annulé (ex :pas de validation du CEF, notification dépassée, contrat non signé) - """ + """, ) date_notification = fields.Date("Date notification") @@ -122,7 +122,9 @@ contrat non signé) if contract.state != "init": continue raise UserError( - _("Seuls les contrats à l'état Initialisation peuvent être supprimés") + _( + "Seuls les contrats à l'état Initialisation peuvent être supprimés" + ) ) return super().unlink() diff --git a/security/security_rules.xml b/security/security_rules.xml index 81210a6e326834fe14b931e9be17abbcdbcf5eda..6450ce8b6b8495a5e90804499393b3961d2b73bd 100644 --- a/security/security_rules.xml +++ b/security/security_rules.xml @@ -29,9 +29,7 @@ <record id="financial_product_category_multi_company_rule" model="ir.rule"> <field name="name">Financial Product Category Multi Company</field> <field name="model_id" ref="model_financial_product_category" /> - <field - name="domain_force" - >[('company_id', 'in', company_ids + [False])]</field> + <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field> <field name="groups" eval="[(6, 0, [ref('financial_contract.group_financial_user')])]" @@ -44,9 +42,7 @@ <record id="financial_product_template_multi_company_rule" model="ir.rule"> <field name="name">Financial Product Template Multi Company</field> <field name="model_id" ref="model_financial_product_template" /> - <field - name="domain_force" - >[('company_id', 'in', company_ids + [False])]</field> + <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field> <field name="groups" eval="[(6, 0, [ref('financial_contract.group_financial_user')])]" @@ -59,9 +55,7 @@ <record id="financial_contract_multi_company_rule" model="ir.rule"> <field name="name">Financial Contract Multi Company</field> <field name="model_id" ref="model_financial_contract" /> - <field - name="domain_force" - >[('company_id', 'in', company_ids + [False])]</field> + <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field> <field name="groups" eval="[(6, 0, [ref('financial_contract.group_financial_user')])]" @@ -71,5 +65,4 @@ <field name="perm_create" eval="True" /> <field name="perm_unlink" eval="True" /> </record> - </odoo> diff --git a/views/financial_contract.xml b/views/financial_contract.xml index 57c8b6a031205c4148420eaffa42235137971b23..8e765838edfbb780f7135723a2bc6c9954405f23 100644 --- a/views/financial_contract.xml +++ b/views/financial_contract.xml @@ -21,26 +21,24 @@ <field name="arch" type="xml"> <form> <header> - <field name="state" widget="statusbar" options="{'clickable': '1'}" /> + <field + name="state" + widget="statusbar" + options="{'clickable': '1'}" + /> </header> <sheet> <group> <group name="contract_data" string="Contrat"> - <field - name="partner_id" - options="{'no_create': 1}" - /> - <field - name="company_id" - options="{'no_create': 1}" - /> + <field name="partner_id" options="{'no_create': 1}" /> + <field name="company_id" options="{'no_create': 1}" /> <field name="currency_id" invisible="1" /> <field name="amount" string="Montant emprunté" /> </group> </group> <notebook> <page name="comment" string="Description"> - <field name="comment"/> + <field name="comment" /> </page> </notebook> </sheet> @@ -50,8 +48,8 @@ <!-- Search --> <record id="financial_contract_search_view" model="ir.ui.view"> - <field name="name">financial.contract.search</field> - <field name="model">financial.contract</field> + <field name="name">financial.contract.search</field> + <field name="model">financial.contract</field> <field name="arch" type="xml"> <search string="Contracts"> <field name="name" /> @@ -75,21 +73,13 @@ name="signed" domain="[('state', '=', 'signed')]" /> - <filter - string="Versé" - name="paid" - domain="[('state', '=', 'paid')]" - /> + <filter string="Versé" name="paid" domain="[('state', '=', 'paid')]" /> <filter string="En contentieux" name="litigation" domain="[('state', '=', 'litigation')]" /> - <filter - string="Soldé" - name="done" - domain="[('state', '=', 'done')]" - /> + <filter string="Soldé" name="done" domain="[('state', '=', 'done')]" /> <filter string="Annulé" name="cancel" diff --git a/views/financial_external_guarantee.xml b/views/financial_external_guarantee.xml index 98d91dd6b2cad59cddd15cc95dcc7bd2c3d40a90..78b3ca5d3b761a9f8e826416f13147fcdef98634 100644 --- a/views/financial_external_guarantee.xml +++ b/views/financial_external_guarantee.xml @@ -15,10 +15,7 @@ </record> <!-- Action --> - <record - model="ir.actions.act_window" - id="financial_external_guarantee_act_window" - > + <record model="ir.actions.act_window" id="financial_external_guarantee_act_window"> <field name="name">Garantie</field> <field name="res_model">financial.external.guarantee</field> <field name="view_mode">list</field> diff --git a/views/financial_product_category.xml b/views/financial_product_category.xml index e68e242999182821e87fdf3c283d9f63bfa17616..b5533b90fcca5554e42f37caf91eca43eabe6a70 100644 --- a/views/financial_product_category.xml +++ b/views/financial_product_category.xml @@ -66,18 +66,15 @@ <field name="company_id" /> </group> </group> -<!-- <separator string="Produits" />--> -<!-- <field name="product_ids" readonly="1" />--> + <!-- <separator string="Produits" />--> + <!-- <field name="product_ids" readonly="1" />--> </sheet> </form> </field> </record> <!-- Action --> - <record - model="ir.actions.act_window" - id="financial_product_category_act_window" - > + <record model="ir.actions.act_window" id="financial_product_category_act_window"> <field name="name">Gammes de produits</field> <field name="res_model">financial.product.category</field> <field name="view_mode">list,form</field> diff --git a/views/financial_product_template.xml b/views/financial_product_template.xml index f5d918fe90adc9bd15df3dfce2b58632598bcc5d..fed1a4710231f44e658aa05cd2a25b08defccf0a 100644 --- a/views/financial_product_template.xml +++ b/views/financial_product_template.xml @@ -10,10 +10,7 @@ <field name="category_id" /> <field name="date_start" /> <field name="date_end" /> - <field - name="company_id" - options="{'no_create': 1, 'no_edit': 1}" - /> + <field name="company_id" options="{'no_create': 1, 'no_edit': 1}" /> <field name="currency_id" invisible="1" /> </list> </field> @@ -73,5 +70,4 @@ </form> </field> </record> - </odoo> diff --git a/views/menus.xml b/views/menus.xml index 128dc2dcd32f876a7179081b9c06b95237148ede..d1a329636020fcdea4b3fb68f1e08fbd224ff507 100644 --- a/views/menus.xml +++ b/views/menus.xml @@ -58,5 +58,4 @@ action="financial_funding_act_window" sequence="40" /> - </odoo> diff --git a/views/res_config_settings.xml b/views/res_config_settings.xml index c6d2c8f34d0e80c8133aa6c6897427d8c4139fed..6eacd5c0d65085a43e67eea60de87356b4876b95 100644 --- a/views/res_config_settings.xml +++ b/views/res_config_settings.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" ?> <odoo> <record id="res_config_settings_financial_contract_view_form" model="ir.ui.view"> - <field name="name">res.config.settings.view.financial.contract_form.inherit</field> + <field + name="name" + >res.config.settings.view.financial.contract_form.inherit</field> <field name="model">res.config.settings</field> <field name="priority" eval="40" /> <field name="inherit_id" ref="base.res_config_settings_view_form" /> @@ -12,8 +14,7 @@ string="Contrats financiers" name="financial_contract" groups="financial_contract.group_financial_admin" - > - </app> + /> </xpath> </field> </record> @@ -24,6 +25,8 @@ <field name="res_model">res.config.settings</field> <field name="view_mode">form</field> <field name="target">inline</field> - <field name="context">{'module' : 'financial_contract', 'bin_size': False}</field> + <field + name="context" + >{'module' : 'financial_contract', 'bin_size': False}</field> </record> </odoo>