From 71abadcc580295b7c9e10aa5708dc46936372dc9 Mon Sep 17 00:00:00 2001
From: Remi <remi@le-filament.com>
Date: Fri, 20 Sep 2019 06:53:08 +0200
Subject: [PATCH] Rename NAF
---
__manifest__.py | 2 +-
models/res_partner.py | 9 +++------
models/scop_period.py | 9 +++------
views/res_partner_cooperative.xml | 10 +++++-----
4 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/__manifest__.py b/__manifest__.py
index 344d5a4..2509c56 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -10,7 +10,7 @@
"installable": True,
"depends": [
"base_location_geonames_import",
- "l10n_fr_naf_ape",
+ "lefilament_naf",
"partner_address_street3",
"partner_company_type",
],
diff --git a/models/res_partner.py b/models/res_partner.py
index 65d8ae0..06858bd 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -89,12 +89,9 @@ class ScopPartner(models.Model):
registration_date = fields.Date(
string="Date d'immatriculation RCS")
social_object = fields.Char('Objet Social')
- ape_id = fields.Many2one(
- 'res.partner.category',
- string='APE',
- help="If the partner is a French company, enter its official "
- "main activity in this field. The APE is chosen among the "
- "NAF nomenclature.",
+ naf_id = fields.Many2one(
+ 'res.partner.naf',
+ string='Code NAF',
on_delete='restrict')
industry_id = fields.Many2one('res.partner.industry', 'Industry',
on_delete='restrict')
diff --git a/models/scop_period.py b/models/scop_period.py
index 370f415..b291339 100644
--- a/models/scop_period.py
+++ b/models/scop_period.py
@@ -52,12 +52,9 @@ class ScopPeriod(models.Model):
domain="[('country_id', '=?', country_id)]")
country_id = fields.Many2one(
'res.country', string='Country', ondelete='restrict')
- ape_id = fields.Many2one(
- 'res.partner.category',
- string='APE',
- help="If the partner is a French company, enter its official "
- "main activity in this field. The APE is chosen among the "
- "NAF nomenclature.",
+ naf_id = fields.Many2one(
+ 'res.partner.naf',
+ string='Code NAF',
on_delete='restrict')
industry_id = fields.Many2one('res.partner.industry', 'Industry',
on_delete='restrict')
diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml
index 9cd4b6f..2a6c157 100644
--- a/views/res_partner_cooperative.xml
+++ b/views/res_partner_cooperative.xml
@@ -111,7 +111,7 @@
<field name="member_number" readonly="True" class="o_field_header"/>
</h3>
<!-- <h3> -->
- <field name="cae" class="o_field_header"/>
+ <field name="cae" readonly="True" class="o_field_header"/>
<!-- </h3> -->
<field name="supplier" invisible="True"/>
<field name="customer" invisible="True"/>
@@ -255,7 +255,7 @@
<field name="date_1st_sign" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
<field name="registration_date" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
<field name="social_object" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
- <field name="ape_id" readonly="True" context="{'partner_category_display': 'short'}"/>
+ <field name="naf_id" readonly="True" context="{'partner_category_display': 'short'}"/>
<field name="industry_id"/>
<field name="certification_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/>
<field name="siret" readonly="True"/>
@@ -321,7 +321,7 @@
</page>
<page name="scop_periods" string="Historique des périodes" autofocus="autofocus">
<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_city_id': city_id, 'default_state_id': state_id, 'default_zip': zip, 'default_zip_id': zip_id, 'default_country_id': country_id, 'default_ape_id': ape_id, 'default_cae': cae, 'default_is_main_location': is_main_location, 'default_parent_group_name': parent_group_name}">
+ 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_city_id': city_id, '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">
<field name="partner_id" invisible="1"/>
<field name="start"/>
@@ -341,7 +341,7 @@
<field name="city_id"/>
<field name="state_id" invisible="1"/>
<field name="country_id" invisible="1"/>
- <field name="ape_id"/>
+ <field name="naf_id"/>
<field name="cae"/>
<field name="is_main_location"/>
<field name="parent_group_name"/>
@@ -377,7 +377,7 @@
<field name="country_id" invisible="1"/>
</group>
<group>
- <field name="ape_id" readonly="1"/>
+ <field name="naf_id" readonly="1"/>
<field name="cae" readonly="1"/>
<field name="is_main_location" readonly="1"/>
<field name="parent_group_name" readonly="1"/>
--
GitLab