diff --git a/golem_pcs/data/golem_pcs_data.xml b/golem_pcs/data/golem_pcs_data.xml
index 2378cb3..dd63638 100644
--- a/golem_pcs/data/golem_pcs_data.xml
+++ b/golem_pcs/data/golem_pcs_data.xml
@@ -24,39 +24,35 @@ along with this program. If not, see .
Agriculteurs exploitants
- 1
+ 01
Artisans, commerçants et chefs d’entreprise
- 2
+ 02
Cadres et professions intellectuelles supérieures
- 3
+ 03
Professions intermédiaires
- 4
+ 04
Employés
- 5
+ 05
Ouvriers
- 6
+ 06
Retraités
- 7
-
-
- Retraités
- 7
+ 07
Autres personnes sans activité professionnelle
- 8
+ 08
diff --git a/golem_pcs/models/golem_member.py b/golem_pcs/models/golem_member.py
index c5e586c..3eead3d 100644
--- a/golem_pcs/models/golem_member.py
+++ b/golem_pcs/models/golem_member.py
@@ -18,11 +18,11 @@
""" GOLEM Member adaptations """
-from odoo import models, fields, api, _
+from odoo import models, fields
class GolemMember(models.Model):
""" GOLEM Member extention """
_inherit = 'golem.member'
- pcs_id = fields.Many2one('golem.pcs', string='Professions and Socioprofessional Categories',
- domain="[('parent_id', '!=', False)]")
+ pcs_id = fields.Many2one('golem.pcs', string='PCS', index=True,
+ help='Professions and Socioprofessional Categories')
diff --git a/golem_pcs/models/golem_pcs.py b/golem_pcs/models/golem_pcs.py
index 52f9ccf..82a9960 100644
--- a/golem_pcs/models/golem_pcs.py
+++ b/golem_pcs/models/golem_pcs.py
@@ -18,12 +18,21 @@
""" GOLEM PCS """
-from odoo import models, fields, api, _
+from odoo import models, fields, api
class GolemPCS(models.Model):
""" GOLEM PCS """
_name = 'golem.pcs'
+ _rec_name = 'full_name'
+ _order = 'code asc'
- name = fields.Char(required=True, index=True)
+ full_name = fields.Char(compute='_compute_full_name', store=True, index=True)
+ name = fields.Char(required=True)
code = fields.Char()
- parent_id = fields.Many2one('golem.pcs', ondelete='cascade', index=True)
+ parent_id = fields.Many2one('golem.pcs', ondelete='cascade')
+
+ @api.depends('name', 'code')
+ def _compute_full_name(self):
+ """ Computes full name """
+ for pcs in self:
+ pcs.full_name = u'%s - %s' % (pcs.code, pcs.name) if pcs.code else pcs.name
diff --git a/golem_pcs/views/golem_member_views.xml b/golem_pcs/views/golem_member_views.xml
index 2d4957e..67bdf1e 100644
--- a/golem_pcs/views/golem_member_views.xml
+++ b/golem_pcs/views/golem_member_views.xml
@@ -28,10 +28,11 @@ along with this program. If not, see .
-
+
+
GOLEM Member Search PCS adaptations
@@ -39,10 +40,10 @@ along with this program. If not, see .
-
+
-
+