From 514cb1757f51ce6e4b0b92fed66365de1af28fbd Mon Sep 17 00:00:00 2001 From: Remi <remi@le-filament.com> Date: Wed, 14 Aug 2019 13:53:47 +0200 Subject: [PATCH] Update fields and make use of external (OCA) dependencies --- __manifest__.py | 8 ++++++-- datas/res.partner.company.type.csv | 4 ++++ models/res_partner.py | 26 +++++++------------------- views/res_partner_cooperative.xml | 2 +- 4 files changed, 18 insertions(+), 22 deletions(-) create mode 100644 datas/res.partner.company.type.csv diff --git a/__manifest__.py b/__manifest__.py index fcd9c40..303c544 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -1,8 +1,8 @@ { "name": "CG SCOP - Gestion Contacts", "summary": "CG SCOP - Gestion des contacts", - "version": "12.0.1.0.0", - "development_status": "Alpha", + "version": "12.0.1.0.1", + "development_status": "Beta", "author": "Le Filament", "maintainers": ["remi-filament"], "license": "AGPL-3", @@ -11,11 +11,15 @@ "depends": [ "base_location", "contacts", + "l10n_fr_naf_ape", + "partner_address_street3", + "partner_company_type", ], "data": [ "security/ir.model.access.csv", "views/res_partner_cooperative.xml", "datas/res.partner.certification.csv", + "datas/res.partner.company.type.csv", "datas/res.partner.cooperative.form.csv", "datas/res.partner.dissolution.reason.csv", "datas/res.partner.organization.type.csv", diff --git a/datas/res.partner.company.type.csv b/datas/res.partner.company.type.csv new file mode 100644 index 0000000..60b3480 --- /dev/null +++ b/datas/res.partner.company.type.csv @@ -0,0 +1,4 @@ +id,name,shortcut +sarl,Société à Responsabilité Limitée,SARL +sa,Société Anonyme,SA +sas,Société par Actions Simplifiée,SAS \ No newline at end of file diff --git a/models/res_partner.py b/models/res_partner.py index 748c71d..10b1560 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -36,19 +36,6 @@ class ScopPartner(models.Model): social_object = fields.Char('Objet Social') admin_email = fields.Char('E-mail administratif') - postal_street = fields.Char() - postal_street2 = fields.Char() - postal_street3 = fields.Char() - postal_zip = fields.Char() - postal_zip_id = fields.Many2one('res.city.zip', 'Postal ZIP Location') - postal_city = fields.Char() - postal_city_id = fields.Many2one('res.city', string='Postal City Location') - postal_state_id = fields.Many2one( - "res.country.state", string='Postal State', ondelete='restrict', - domain="[('country_id', '=?', country_id)]") - postal_country_id = fields.Many2one('res.country', - string='Postal Country', - ondelete='restrict') # Informations coopératives creation_origin = fields.Selection( @@ -130,7 +117,7 @@ class ScopPartner(models.Model): seed_scop = fields.Boolean("Scop d'amorçage Oui/Non", track_visibility='onchange') siret = fields.Char(string='SIRET', size=14, track_visibility='onchange') - name = fields.Char(index=True, track_visibility='onchange') + name = fields.Char(index=True, track_visibility='always') street = fields.Char(track_visibility='onchange') street2 = fields.Char(track_visibility='onchange') street3 = fields.Char(track_visibility='onchange') @@ -156,11 +143,12 @@ class ScopPartner(models.Model): track_visibility='onchange') # Informations juridiques - juridical_status = fields.Selection( - [('sa', 'SA'), - ('sarl', 'SARL'), - ('sas', 'SAS')], - string='Statut juridique', track_visibility='onchange') + partner_company_type_id = fields.Many2one( + comodel_name='res.partner.company.type', + string='Legal Form', + track_visibility='onchange', + on_delete='restrict' + ) capital = fields.Integer('Capital social', track_visibility='onchange') ape_id = fields.Many2one( 'res.partner.category', diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index ea04624..583805c 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -136,7 +136,7 @@ <field name="social_object"/> <field name="sigle"/> <field name="organization_type_id"/> - <field name="juridical_status"/> + <field name="partner_company_type_id"/> <field name="certification_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/> <field name="website" widget="url"/> <field name="siren" /> -- GitLab