[ADD]GOLEM Member : new area field (m2o)

golem_member/__manifest__.py

@@ -20,7 +20,7 @@
     'name': 'GOLEM non-profit members',
     'summary': 'Extends Odoo contacts for MJC',
     'description': 'Extends Odoo contacts for MJC',
-    'version': '10.0.2.2.6',
+    'version': '10.0.2.3.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',
@@ -31,6 +31,7 @@
     'data': ['views/golem_member_views.xml',
              'views/res_partner_views.xml',
              'views/golem_member_numberconfig_views.xml',
+             'views/golem_partner_area_views.xml',
              'report/golem_member_card_templates.xml',
              'data/golem_member_numberconfig_data.xml',
              'security/ir.model.access.csv']

golem_member/i18n/fr.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-01 08:51+0000\n"
+"POT-Creation-Date: 2018-08-03 22:59+0000\n"
-"PO-Revision-Date: 2018-08-01 10:51+0200\n"
+"PO-Revision-Date: 2018-08-04 01:05+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -65,6 +65,32 @@ msgstr "Appliquer et recalculer tous les numéros d'adhérents"
 msgid "Apply for new members"
 msgstr "Appliquer pour les nouveaux adhérents"
 
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_member_area_id
+#: model:ir.model.fields,field_description:golem_member.field_res_partner_area_id
+#: model:ir.model.fields,field_description:golem_member.field_res_users_area_id
+msgid "Area"
+msgstr "Territoire"
+
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_member_form
+#: model:ir.ui.view,arch_db:golem_member.res_partner_form_inherit_golem_member
+msgid "Area, quarter..."
+msgstr "Lieu, quartier..."
+
+#. module: golem_member
+#: model:ir.model.fields,help:golem_member.field_golem_member_area_id
+#: model:ir.model.fields,help:golem_member.field_res_partner_area_id
+#: model:ir.model.fields,help:golem_member.field_res_users_area_id
+msgid "Area, quarter... for statistics and activity price."
+msgstr "Lieu, quartier... pour les statistiques et les tarifs des activités."
+
+#. module: golem_member
+#: model:ir.actions.act_window,name:golem_member.golem_partner_area_action
+#: model:ir.ui.menu,name:golem_member.golem_partner_area_menu
+msgid "Areas"
+msgstr "Territoires"
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_associate_member
 msgid "Associate Member"
@@ -241,7 +267,7 @@ msgstr "Contrats"
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_payment_token_count
 msgid "Count Payment Token"
-msgstr "Count Payment Token"
+msgstr "Nombre de méthodes de paiement"
 
 #. module: golem_member
 #: model:ir.model.fields,help:golem_member.field_golem_member_message_bounce
@@ -263,6 +289,7 @@ msgstr "Faire de ce contact un usager"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_create_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_create_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_create_uid
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_create_uid
 msgid "Created by"
 msgstr "Créé par"
 
@@ -270,6 +297,7 @@ msgstr "Créé par"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_create_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_create_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_create_date
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_create_date
 msgid "Created on"
 msgstr "Créé le"
 
@@ -296,7 +324,7 @@ msgstr "Conditions de Paiement Client"
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_date
 msgid "Date"
-msgstr "Date "
+msgstr "Date"
 
 #. module: golem_member
 #: model:ir.ui.view,arch_db:golem_member.golem_member_card_template
@@ -347,6 +375,7 @@ msgstr "Département"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_display_name
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_display_name
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_display_name
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
@@ -381,7 +410,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:40
+#: code:addons/golem_member/models/golem_member.py:57
 #, python-format
 msgid "Female"
 msgstr "Féminin"
@@ -443,7 +472,6 @@ msgid "GOLEM MemberShip invoicing"
 msgstr "GOLEM : facturation de l'adhésion"
 
 #. module: golem_member
-#: model:ir.ui.view,arch_db:golem_member.golem_member_graph
 #: model:ir.ui.view,arch_db:golem_member.golem_member_tree
 msgid "GOLEM Members"
 msgstr "Adhérents"
@@ -454,7 +482,7 @@ msgid "GOLEM Members Tags"
 msgstr "Catégories d'adhérents"
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:343
+#: code:addons/golem_member/models/golem_member.py:360
 #, python-format
 msgid "GOLEM Members merge has not been implemented yet. Please only merge partners, not members, or delete GOLEM Members manually before merging."
 msgstr "La fusion d'adhérents n'a pas encore été implémentée. Merci de ne fusionner que des contacts non adhérents, ou bien de supprimer les adhérents manuellement en premier lieu."
@@ -503,6 +531,7 @@ msgstr "A des écritures non lettrées"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_id
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_id
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_id
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_id
 msgid "ID"
 msgstr "ID"
 
@@ -642,6 +671,7 @@ msgstr "Langue"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member___last_update
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number___last_update
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig___last_update
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area___last_update
 msgid "Last Modified on"
 msgstr "Dernière Modification le"
 
@@ -649,6 +679,7 @@ msgstr "Dernière Modification le"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_write_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_write_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_write_uid
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
@@ -656,6 +687,7 @@ msgstr "Dernière mise à jour par"
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_write_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_write_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_write_date
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
@@ -675,7 +707,7 @@ msgid "Latest Invoices & Payments Matching Date"
 msgstr "Date de dernière correspondance des factures et paiements"
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:40
+#: code:addons/golem_member/models/golem_member.py:57
 #, python-format
 msgid "Male"
 msgstr "Masculin"
@@ -705,11 +737,6 @@ msgstr "Image de taille moyenne de ce contact. Elle est automatiquement redimens
 msgid "Member"
 msgstr "Adhérent"
 
-#. module: golem_member
-#: model:ir.ui.menu,name:golem_member.res_partner_category_menu
-msgid "Member Tags"
-msgstr "Catégories de l'adhérent"
-
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name
 msgid "Member computed name"
@@ -773,6 +800,7 @@ msgstr "NIC"
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_name
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name_4260
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_name
 msgid "Name"
 msgstr "Nom"
 
@@ -784,8 +812,8 @@ msgid "Nationality"
 msgstr "Nationalité"
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:283
+#: code:addons/golem_member/models/golem_member.py:300
-#: code:addons/golem_member/models/golem_member.py:286
+#: code:addons/golem_member/models/golem_member.py:303
 #: selection:golem.member.numberconfig,is_automatic:0
 #: selection:golem.member.numberconfig,is_per_season:0
 #, python-format
@@ -842,6 +870,11 @@ msgstr "Nom du parent"
 msgid "Partner"
 msgstr "Partenaire"
 
+#. module: golem_member
+#: model:ir.model,name:golem_member.model_golem_partner_area
+msgid "Partner Area"
+msgstr "Territoire du contact"
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_partner_id
 msgid "Partner id"
@@ -961,6 +994,16 @@ msgstr "Sélectionner l'option 'Avertissement' notifiera l'utilisateur avec le M
 msgid "Self"
 msgstr "Self"
 
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_sequence
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: golem_member
+#: model:ir.ui.menu,name:golem_member.res_partner_category_menu
+msgid "Service User Tags"
+msgstr "Catégories usagers"
+
 #. module: golem_member
 #: model:ir.ui.view,arch_db:golem_member.golem_member_form
 msgid "Service User form"
@@ -968,6 +1011,7 @@ msgstr "Fiche usager"
 
 #. module: golem_member
 #: model:ir.actions.act_window,name:golem_member.golem_member_user_action
+#: model:ir.ui.view,arch_db:golem_member.golem_member_graph
 msgid "Service Users"
 msgstr "Usagers"
 
@@ -1137,12 +1181,19 @@ msgid "This field holds the image used as avatar for this contact, limited to 10
 msgstr "Ce champ contient l'image utilisée comme photo d'identité pour ce contact, limitée à 1024x1024px."
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:91
+#: code:addons/golem_member/models/golem_member.py:108
 #: sql_constraint:golem.member:0
 #, python-format
 msgid "This member number has already been used."
 msgstr "Ce numéro d'adhérent a été déjà utilisé."
 
+#. module: golem_member
+#: code:addons/golem_member/models/golem_member.py:33
+#: sql_constraint:golem.partner.area:0
+#, python-format
+msgid "This patner area has already been used."
+msgstr "Un territoire porte déjà ce nom."
+
 #. module: golem_member
 #: model:ir.model.fields,help:golem_member.field_golem_member_property_supplier_payment_term_id
 msgid "This payment term will be used instead of the default one for purchase orders and vendor bills"
@@ -1204,7 +1255,7 @@ msgid "Total amount you have to pay to this vendor."
 msgstr "Montant total à payer au fournisseur."
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:158
+#: code:addons/golem_member/models/golem_member.py:175
 #, python-format
 msgid "Unsupported operator for defautl season search"
 msgstr "Opérateur de recherche non supporté pour le filtre de saison par défaut"
@@ -1240,8 +1291,8 @@ msgid "Website of Partner or Company"
 msgstr "Site Web pour les Partenaires ou les Sociétés"
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:283
+#: code:addons/golem_member/models/golem_member.py:300
-#: code:addons/golem_member/models/golem_member.py:286
+#: code:addons/golem_member/models/golem_member.py:303
 #: selection:golem.member.numberconfig,is_automatic:0
 #: selection:golem.member.numberconfig,is_per_season:0
 #, python-format

golem_member/i18n/golem_member.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-01 08:51+0000\n"
+"POT-Creation-Date: 2018-08-03 22:59+0000\n"
-"PO-Revision-Date: 2018-08-01 08:51+0000\n"
+"PO-Revision-Date: 2018-08-03 22:59+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -65,6 +65,32 @@ msgstr ""
 msgid "Apply for new members"
 msgstr ""
 
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_member_area_id
+#: model:ir.model.fields,field_description:golem_member.field_res_partner_area_id
+#: model:ir.model.fields,field_description:golem_member.field_res_users_area_id
+msgid "Area"
+msgstr ""
+
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_member_form
+#: model:ir.ui.view,arch_db:golem_member.res_partner_form_inherit_golem_member
+msgid "Area, quarter..."
+msgstr ""
+
+#. module: golem_member
+#: model:ir.model.fields,help:golem_member.field_golem_member_area_id
+#: model:ir.model.fields,help:golem_member.field_res_partner_area_id
+#: model:ir.model.fields,help:golem_member.field_res_users_area_id
+msgid "Area, quarter... for statistics and activity price."
+msgstr ""
+
+#. module: golem_member
+#: model:ir.actions.act_window,name:golem_member.golem_partner_area_action
+#: model:ir.ui.menu,name:golem_member.golem_partner_area_menu
+msgid "Areas"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_associate_member
 msgid "Associate Member"
@@ -263,6 +289,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_create_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_create_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_create_uid
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_create_uid
 msgid "Created by"
 msgstr ""
 
@@ -270,6 +297,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_create_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_create_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_create_date
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_create_date
 msgid "Created on"
 msgstr ""
 
@@ -347,6 +375,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_display_name
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_display_name
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_display_name
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_display_name
 msgid "Display Name"
 msgstr ""
 
@@ -381,7 +410,7 @@ msgid "Fax"
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:40
+#: code:addons/golem_member/models/golem_member.py:57
 #, python-format
 msgid "Female"
 msgstr ""
@@ -443,7 +472,6 @@ msgid "GOLEM MemberShip invoicing"
 msgstr ""
 
 #. module: golem_member
-#: model:ir.ui.view,arch_db:golem_member.golem_member_graph
 #: model:ir.ui.view,arch_db:golem_member.golem_member_tree
 msgid "GOLEM Members"
 msgstr ""
@@ -454,7 +482,7 @@ msgid "GOLEM Members Tags"
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:343
+#: code:addons/golem_member/models/golem_member.py:360
 #, python-format
 msgid "GOLEM Members merge has not been implemented yet. Please only merge partners, not members, or delete GOLEM Members manually before merging."
 msgstr ""
@@ -503,6 +531,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_id
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_id
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_id
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_id
 msgid "ID"
 msgstr ""
 
@@ -636,6 +665,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member___last_update
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number___last_update
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig___last_update
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area___last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -643,6 +673,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_write_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_write_uid
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_write_uid
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_write_uid
 msgid "Last Updated by"
 msgstr ""
 
@@ -650,6 +681,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_write_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_numberconfig_write_date
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_write_date
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_write_date
 msgid "Last Updated on"
 msgstr ""
 
@@ -669,7 +701,7 @@ msgid "Latest Invoices & Payments Matching Date"
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:40
+#: code:addons/golem_member/models/golem_member.py:57
 #, python-format
 msgid "Male"
 msgstr ""
@@ -699,11 +731,6 @@ msgstr ""
 msgid "Member"
 msgstr ""
 
-#. module: golem_member
-#: model:ir.ui.menu,name:golem_member.res_partner_category_menu
-msgid "Member Tags"
-msgstr ""
-
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name
 msgid "Member computed name"
@@ -767,6 +794,7 @@ msgstr ""
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_name
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_number_name_4260
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_name
 msgid "Name"
 msgstr ""
 
@@ -778,8 +806,8 @@ msgid "Nationality"
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:283
+#: code:addons/golem_member/models/golem_member.py:300
-#: code:addons/golem_member/models/golem_member.py:286
+#: code:addons/golem_member/models/golem_member.py:303
 #: selection:golem.member.numberconfig,is_automatic:0
 #: selection:golem.member.numberconfig,is_per_season:0
 #, python-format
@@ -836,6 +864,11 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+#. module: golem_member
+#: model:ir.model,name:golem_member.model_golem_partner_area
+msgid "Partner Area"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_partner_id
 msgid "Partner id"
@@ -953,6 +986,16 @@ msgstr ""
 msgid "Self"
 msgstr ""
 
+#. module: golem_member
+#: model:ir.model.fields,field_description:golem_member.field_golem_partner_area_sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: golem_member
+#: model:ir.ui.menu,name:golem_member.res_partner_category_menu
+msgid "Service User Tags"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.ui.view,arch_db:golem_member.golem_member_form
 msgid "Service User form"
@@ -960,6 +1003,7 @@ msgstr ""
 
 #. module: golem_member
 #: model:ir.actions.act_window,name:golem_member.golem_member_user_action
+#: model:ir.ui.view,arch_db:golem_member.golem_member_graph
 msgid "Service Users"
 msgstr ""
 
@@ -1129,12 +1173,19 @@ msgid "This field holds the image used as avatar for this contact, limited to 10
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:91
+#: code:addons/golem_member/models/golem_member.py:108
 #: sql_constraint:golem.member:0
 #, python-format
 msgid "This member number has already been used."
 msgstr ""
 
+#. module: golem_member
+#: code:addons/golem_member/models/golem_member.py:33
+#: sql_constraint:golem.partner.area:0
+#, python-format
+msgid "This patner area has already been used."
+msgstr ""
+
 #. module: golem_member
 #: model:ir.model.fields,help:golem_member.field_golem_member_property_supplier_payment_term_id
 msgid "This payment term will be used instead of the default one for purchase orders and vendor bills"
@@ -1196,7 +1247,7 @@ msgid "Total amount you have to pay to this vendor."
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:158
+#: code:addons/golem_member/models/golem_member.py:175
 #, python-format
 msgid "Unsupported operator for defautl season search"
 msgstr ""
@@ -1232,8 +1283,8 @@ msgid "Website of Partner or Company"
 msgstr ""
 
 #. module: golem_member
-#: code:addons/golem_member/models/golem_member.py:283
+#: code:addons/golem_member/models/golem_member.py:300
-#: code:addons/golem_member/models/golem_member.py:286
+#: code:addons/golem_member/models/golem_member.py:303
 #: selection:golem.member.numberconfig,is_automatic:0
 #: selection:golem.member.numberconfig,is_per_season:0
 #, python-format

golem_member/models/golem_member.py

@@ -23,6 +23,19 @@ from odoo.exceptions import UserError
 _LOGGER = logging.getLogger(__name__)
 
 
+class PartnerArea(models.Model):
+    """ Partner Area """
+    _name = 'golem.partner.area'
+    _description = 'Partner Area'
+    _order = 'sequence asc, name asc'
+    _sql_constraints = [('golem_partner_area_uniq',
+                         'UNIQUE (name)',
+                         _('This patner area has already been used.'))]
+
+    name = fields.Char(required=True, index=True)
+    sequence = fields.Integer()
+
+
 class ResPartner(models.Model):
     """ GOLEM Member partner adaptations """
     _inherit = 'res.partner'
@@ -34,6 +47,10 @@ class ResPartner(models.Model):
     nationality_id = fields.Many2one('res.country', 'Nationality',
                                      auto_join=True,
                                      default=_get_default_nationality_id)
+    area_id = fields.Many2one(
+        'golem.partner.area', index=True, auto_join=True, string='Area',
+        help="Area, quarter... for statistics and activity price."
+    )
     country_id = fields.Many2one(default=_get_default_nationality_id)
 
     # Gender overwriting : no need for 'other' choice

golem_member/security/ir.model.access.csv

@@ -1,4 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_golem_member_user,Access GOLEM Member User,model_golem_member,golem_base.group_golem_user,1,1,1,1
+access_partner_area_user,Access GOLEM Partner Area User,model_golem_partner_area,golem_base.group_golem_user,1,1,1,1
 access_golem_member_season_user,Access GOLEM Member Season User,model_golem_member_number,golem_base.group_golem_user,1,1,1,1
 access_ir_config_parameter_manager,Access IR Config Parameter Manager,base.model_ir_config_parameter,golem_base.group_golem_manager,1,1,1,1

golem_member/views/golem_member_views.xml

@@ -90,6 +90,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                   <group>
                     <field name="street" placeholder="Street..." />
                     <field name="street2" />
+                    <field name="area_id" placeholder="Area, quarter..."
+                      options="{'no_create': true}" />
                     <field name="zip" placeholder="ZIP" />
                     <field name="city" placeholder="City" />
                   </group>
@@ -307,7 +309,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="name">GOLEM Member Graph</field>
       <field name="model">golem.member</field>
       <field name="arch" type="xml">
-        <graph string="GOLEM Members" type="pivot">
+        <graph string="Service Users" type="pivot">
           <field name="partner_id" />
         </graph>
       </field>
@@ -324,7 +326,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <menuitem id="golem_member_tool_menu" name="Tools"
       parent="golem_membership.menu_association" sequence="80"
       groups="golem_base.group_golem_user" />
-    <menuitem id="res_partner_category_menu" name="Member Tags"
+    <menuitem id="res_partner_category_menu" name="Service User Tags"
       parent="golem_membership.menu_config_association" sequence="15"
       action="res_partner_category_action"
       groups="golem_base.group_golem_manager" />

golem_member/views/res_partner_views.xml

@@ -44,6 +44,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             attrs="{'invisible': ['|', ('is_company', '=', True),
             ('is_service_user', '!=', False)]}" />
         </h1>
+        <xpath expr="//div[@class='o_address_format'][1]/field[@name='street2']"
+          position="after">
+          <field name="area_id" placeholder="Area, quarter..."
+            options="{'no_create': true}" />
+        </xpath>
       </field>
     </record>