diff --git a/datas/scop.contribution.type.csv b/datas/scop.contribution.type.csv index b59ea594568be78b1a3ecf92d2fcd372a2a476ec..06fb3aefa015d9ca46b664fd26e71c50a980bc3a 100644 --- a/datas/scop.contribution.type.csv +++ b/datas/scop.contribution.type.csv @@ -1,4 +1,6 @@ -id,name -contribution_type_1,Cotisation CG -contribution_type_2,Cotisation UR -contribution_type_3,Cotisation Fédération +"id","id_riga","name" +"riga_14397",14397,"Cotisation CG SCOP" +"riga_14398",14398,"Cotisation Fédération" +"riga_14399",14399,"Cotisation UR" +"riga_14400",14400,"Droits d'adhésion (adhésion forfaitaire)" +"riga_14461",14461,"Toutes les cotisations CG SCOP " diff --git a/models/scop_contribution.py b/models/scop_contribution.py index 411415ae5ef292dc26bc7686b15ffe715fc6d85e..c7e65a2fa1bca398dc73ee136f66a6ddd76356b7 100644 --- a/models/scop_contribution.py +++ b/models/scop_contribution.py @@ -31,3 +31,4 @@ class ScopContributionType(models.Model): _description = "Contribution type" name = fields.Char('Contribution type') + id_riga = fields.Integer("ID RIGA") diff --git a/views/res_partner.xml b/views/res_partner.xml index 289165b1245a00b07334fec7217e15337fe0207c..0725445d12d113601f4c254c9226d643bf6081a3 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -97,7 +97,7 @@ </group> <group attrs="{'invisible': [('is_company','=', True)]}"> <field name="title" options='{"no_open": True}' attrs="{'invisible': [('is_company','=', True)]}"/> - <field name="mandate_id" options='{"no_create": True}' attrs="{'invisible': [('is_company','=', False)]}"/> + <field name="mandate_id" options='{"no_create": True}' attrs="{'invisible': [('is_company','=', True)]}"/> <field name="function"/> <field name="birthyear" attrs="{'invisible': [('is_company','=', True)]}"/> <field name="education_level" attrs="{'invisible': [('is_company','=', True)]}" options="{'no_create': True}"/> diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index 33cfb9ac625291cc90af6630112cf6d9d341955e..832821a482ecf5856ead3e3238a78046c6e30dad 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -345,7 +345,7 @@ <page name="scop_periods" string="Historique des périodes" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> <field name="scop_period_ids" mode="tree" context="{'default_partner_id': active_id, 'default_name': name, 'default_cooperative_form_id': cooperative_form_id, 'default_partner_company_type_id': partner_company_type_id, 'default_siret': siret, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_cedex': cedex, 'default_state_id': state_id, 'default_zip': zip, 'default_zip_id': zip_id, 'default_country_id': country_id, 'default_naf_id': naf_id, 'default_cae': cae, 'default_is_main_location': is_main_location, 'default_parent_group_name': parent_group_name}"> - <tree string="Périodes" decoration-success="end_reason==False" decoration-muted="end_reason!=False" create="false" edit="false" delete="false"> + <tree string="Périodes" decoration-muted="end_reason!=False" create="false" edit="false" delete="false"> <field name="partner_id" invisible="1"/> <field name="start"/> <field name="end"/>