diff --git a/golem_activity_session/security/ir.model.access.csv b/golem_activity_session/security/ir.model.access.csv index 1a881025..e10747c6 100644 --- a/golem_activity_session/security/ir.model.access.csv +++ b/golem_activity_session/security/ir.model.access.csv @@ -1,3 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_golem_activity_session_user,Access GOLEM Activity Session User,model_golem_activity_session,golem_base.group_golem_user,1,1,1,1 -access_golem_activity_session_manager,Access GOLEM Activity Session Manager,model_golem_activity_session,golem_base.group_golem_manager,1,1,1,1 +access_golem_product_template_user,Access GOLEM Product Template User,model_product_template,golem_base.group_golem_user,1,1,1,1 +access_golem_product_product_user,Access GOLEM Product Product User,product.model_product_product,golem_base.group_golem_user,1,1,1,1 +access_golem_product_pricehist_user,Access GOLEM Product Price History User,product.model_product_price_history,golem_base.group_golem_user,1,1,1,1 diff --git a/golem_base/i18n/fr.po b/golem_base/i18n/fr.po new file mode 100644 index 00000000..93f76481 --- /dev/null +++ b/golem_base/i18n/fr.po @@ -0,0 +1,28 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * golem_base +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-21 13:17+0000\n" +"PO-Revision-Date: 2016-07-21 13:17+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: golem_base +#: model:res.groups,name:golem_base.group_golem_manager +msgid "GOLEM Manager" +msgstr "Administrateur" + +#. module: golem_base +#: model:res.groups,name:golem_base.group_golem_user +msgid "GOLEM user" +msgstr "Utilisateur" + diff --git a/golem_base/i18n/golem_base.pot b/golem_base/i18n/golem_base.pot new file mode 100644 index 00000000..e7cfb84a --- /dev/null +++ b/golem_base/i18n/golem_base.pot @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * golem_base +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-21 13:17+0000\n" +"PO-Revision-Date: 2016-07-21 13:17+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: golem_base +#: model:res.groups,name:golem_base.group_golem_manager +msgid "GOLEM Manager" +msgstr "" + +#. module: golem_base +#: model:res.groups,name:golem_base.group_golem_user +msgid "GOLEM user" +msgstr "" + diff --git a/golem_base/security/golem_security.xml b/golem_base/security/golem_security.xml index 14195b47..157c86fb 100644 --- a/golem_base/security/golem_security.xml +++ b/golem_base/security/golem_security.xml @@ -25,7 +25,8 @@ along with this program. If not, see . + eval="[(4, + [ref('base.group_user'), ref('account.group_account_invoice')])]"/> GOLEM Manager diff --git a/golem_family/__openerp__.py b/golem_family/__openerp__.py index 92c99ad0..4c234830 100644 --- a/golem_family/__openerp__.py +++ b/golem_family/__openerp__.py @@ -26,7 +26,6 @@ 'application': False, 'installable': True, 'depends': ['golem_member'], - 'data': ['views/golem_family_view.xml', - 'views/golem_member_view.xml', - 'views/res_partner_view.xml'] + 'data': ['security/ir.model.access.csv', 'views/golem_family_view.xml', + 'views/golem_member_view.xml', 'views/res_partner_view.xml'] } diff --git a/golem_family/i18n/fr.po b/golem_family/i18n/fr.po index c8b51e7d..724f625c 100644 --- a/golem_family/i18n/fr.po +++ b/golem_family/i18n/fr.po @@ -60,13 +60,13 @@ msgstr "Pays" #. module: golem_family #: field:golem.family,create_uid:0 -#: field:golem.member.family.role,create_uid:0 +#: field:golem.family.role,create_uid:0 msgid "Created by" msgstr "Créé par" #. module: golem_family #: field:golem.family,create_date:0 -#: field:golem.member.family.role,create_date:0 +#: field:golem.family.role,create_date:0 msgid "Created on" msgstr "Créé le" @@ -77,7 +77,7 @@ msgstr "Date du dernier message posté sur l'enregistrement." #. module: golem_family #: field:golem.family,display_name:0 -#: field:golem.member.family.role,display_name:0 +#: field:golem.family.role,display_name:0 msgid "Display Name" msgstr "Nom affiché" @@ -122,7 +122,7 @@ msgid "Family members" msgstr "Membres de la famille" #. module: golem_family -#: sql_constraint:golem.member.family.role:0 +#: sql_constraint:golem.family.role:0 msgid "Family role must be unique." msgstr "Les rôles familiaux doivent être uniques." @@ -152,7 +152,7 @@ msgid "GOLEM Member" msgstr "GOLEM : Adhérent" #. module: golem_family -#: model:ir.model,name:golem_family.model_golem_member_family_role +#: model:ir.model,name:golem_family.model_golem_family_role msgid "GOLEM Member Family Role" msgstr "GOLEM : rôle du membre de la famille" @@ -168,7 +168,7 @@ msgstr "Contient le résumé des discussions (nombre de message...). Ce résumé #. module: golem_family #: field:golem.family,id:0 -#: field:golem.member.family.role,id:0 +#: field:golem.family.role,id:0 msgid "ID" msgstr "ID" @@ -189,19 +189,19 @@ msgstr "Last Message Date" #. module: golem_family #: field:golem.family,__last_update:0 -#: field:golem.member.family.role,__last_update:0 +#: field:golem.family.role,__last_update:0 msgid "Last Modified on" msgstr "Dernière modification le" #. module: golem_family #: field:golem.family,write_uid:0 -#: field:golem.member.family.role,write_uid:0 +#: field:golem.family.role,write_uid:0 msgid "Last Updated by" msgstr "Dernière modification par" #. module: golem_family #: field:golem.family,write_date:0 -#: field:golem.member.family.role,write_date:0 +#: field:golem.family.role,write_date:0 msgid "Last Updated on" msgstr "Dernière modification le" @@ -258,7 +258,7 @@ msgstr "Rédigez une note interne..." #. module: golem_family #: field:golem.member,family_role:0 -#: field:golem.member.family.role,name:0 +#: field:golem.family.role,name:0 #: field:res.partner,family_role:0 msgid "Role" msgstr "Rôle" diff --git a/golem_family/i18n/golem_family.pot b/golem_family/i18n/golem_family.pot index 8782e9c2..a5f940e7 100644 --- a/golem_family/i18n/golem_family.pot +++ b/golem_family/i18n/golem_family.pot @@ -59,13 +59,13 @@ msgstr "" #. module: golem_family #: field:golem.family,create_uid:0 -#: field:golem.member.family.role,create_uid:0 +#: field:golem.family.role,create_uid:0 msgid "Created by" msgstr "" #. module: golem_family #: field:golem.family,create_date:0 -#: field:golem.member.family.role,create_date:0 +#: field:golem.family.role,create_date:0 msgid "Created on" msgstr "" @@ -76,7 +76,7 @@ msgstr "" #. module: golem_family #: field:golem.family,display_name:0 -#: field:golem.member.family.role,display_name:0 +#: field:golem.family.role,display_name:0 msgid "Display Name" msgstr "" @@ -121,7 +121,7 @@ msgid "Family members" msgstr "" #. module: golem_family -#: sql_constraint:golem.member.family.role:0 +#: sql_constraint:golem.family.role:0 msgid "Family role must be unique." msgstr "" @@ -151,7 +151,7 @@ msgid "GOLEM Member" msgstr "" #. module: golem_family -#: model:ir.model,name:golem_family.model_golem_member_family_role +#: model:ir.model,name:golem_family.model_golem_family_role msgid "GOLEM Member Family Role" msgstr "" @@ -167,7 +167,7 @@ msgstr "" #. module: golem_family #: field:golem.family,id:0 -#: field:golem.member.family.role,id:0 +#: field:golem.family.role,id:0 msgid "ID" msgstr "" @@ -188,19 +188,19 @@ msgstr "" #. module: golem_family #: field:golem.family,__last_update:0 -#: field:golem.member.family.role,__last_update:0 +#: field:golem.family.role,__last_update:0 msgid "Last Modified on" msgstr "" #. module: golem_family #: field:golem.family,write_uid:0 -#: field:golem.member.family.role,write_uid:0 +#: field:golem.family.role,write_uid:0 msgid "Last Updated by" msgstr "" #. module: golem_family #: field:golem.family,write_date:0 -#: field:golem.member.family.role,write_date:0 +#: field:golem.family.role,write_date:0 msgid "Last Updated on" msgstr "" @@ -257,7 +257,7 @@ msgstr "" #. module: golem_family #: field:golem.member,family_role:0 -#: field:golem.member.family.role,name:0 +#: field:golem.family.role,name:0 #: field:res.partner,family_role:0 msgid "Role" msgstr "" diff --git a/golem_family/models/golem_family.py b/golem_family/models/golem_family.py index 56a9833f..5bebde37 100644 --- a/golem_family/models/golem_family.py +++ b/golem_family/models/golem_family.py @@ -23,8 +23,8 @@ class ResPartner(models.Model): _description = 'GOLEM Partner Family' family_id = fields.Many2one('golem.family', string='Family', index=True) - family_role = fields.Many2one('golem.member.family.role', - string='Role', index=True) + family_role = fields.Many2one('golem.family.role', string='Role', + index=True) family_count = fields.Integer('Family Count', related='family_id.count') @api.multi @@ -93,9 +93,9 @@ class GolemFamily(models.Model): class GolemFamilyRole(models.Model): - _name = 'golem.member.family.role' - _description = 'GOLEM Member Family Role' - _sql_constraints = [('golem_member_family_role_name_uniq', + _name = 'golem.family.role' + _description = 'GOLEM Family Role' + _sql_constraints = [('golem_family_role_name_uniq', 'UNIQUE (name)', 'Family role must be unique.')] diff --git a/golem_family/security/ir.model.access.csv b/golem_family/security/ir.model.access.csv new file mode 100644 index 00000000..8e3e8a50 --- /dev/null +++ b/golem_family/security/ir.model.access.csv @@ -0,0 +1,4 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_golem_family_user,Access GOLEM Family User,model_golem_family,golem_base.group_golem_user,1,1,1,1 +access_golem_family_role_user,Access GOLEM Family Role User,model_golem_family_role,golem_base.group_golem_user,1,0,0,0 +access_golem_family_role_manager,Access GOLEM Family Role Manager,model_golem_family_role,golem_base.group_golem_manager,1,1,1,1 diff --git a/golem_family/views/golem_family_view.xml b/golem_family/views/golem_family_view.xml index 29cff18b..f20184d4 100644 --- a/golem_family/views/golem_family_view.xml +++ b/golem_family/views/golem_family_view.xml @@ -105,7 +105,7 @@ along with this program. If not, see . Family Role List - golem.member.family.role + golem.family.role @@ -137,14 +137,15 @@ along with this program. If not, see . + res_model="golem.family.role" view_mode="tree" /> + sequence="10" groups="golem_base.group_golem_user" /> + action="family_role_action" sequence="3" + groups="golem_base.group_golem_manager" /> diff --git a/golem_member/__openerp__.py b/golem_member/__openerp__.py index e619cfaa..f55aede6 100644 --- a/golem_member/__openerp__.py +++ b/golem_member/__openerp__.py @@ -28,5 +28,5 @@ 'depends': ['golem_base', 'golem_activity', 'golem_season'], 'data': ['views/golem_member_view.xml', 'views/members_menu.xml', 'views/res_partner_view.xml', 'views/number_config.xml', - 'data/number_config.xml'] + 'data/number_config.xml', 'security/ir.model.access.csv'] } diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py index 47a7baec..ddb44654 100644 --- a/golem_member/models/golem_member.py +++ b/golem_member/models/golem_member.py @@ -141,7 +141,7 @@ class GolemMember(models.Model): self.is_number_manual = is_num_man -class GolemMemberSeason(models.Model): +class GolemMemberNumber(models.Model): """ GOLEM Member Numbers """ _name = 'golem.member.number' _description = 'GOLEM Member Numbers' diff --git a/golem_member/security/ir.model.access.csv b/golem_member/security/ir.model.access.csv new file mode 100644 index 00000000..5b3c6117 --- /dev/null +++ b/golem_member/security/ir.model.access.csv @@ -0,0 +1,3 @@ +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_golem_member_season_user,Access GOLEM Member Season User,model_golem_member_number,golem_base.group_golem_user,1,1,1,1 diff --git a/golem_member/views/golem_member_view.xml b/golem_member/views/golem_member_view.xml index fa7582fe..8e607541 100644 --- a/golem_member/views/golem_member_view.xml +++ b/golem_member/views/golem_member_view.xml @@ -182,9 +182,12 @@ along with this program. If not, see . + action="action" groups="golem_base.group_golem_user" /> + + action="tags_action_list" groups="golem_base.group_golem_manager" /> diff --git a/golem_member/views/number_config.xml b/golem_member/views/number_config.xml index 654d5ca2..a719bb4f 100644 --- a/golem_member/views/number_config.xml +++ b/golem_member/views/number_config.xml @@ -56,6 +56,7 @@ along with this program. If not, see . + parent="base.menu_marketing_config_association" sequence="3" + groups="golem_base.group_golem_manager" /> diff --git a/golem_member_skills/__openerp__.py b/golem_member_skills/__openerp__.py index 9aab560f..1b405aaa 100644 --- a/golem_member_skills/__openerp__.py +++ b/golem_member_skills/__openerp__.py @@ -26,5 +26,6 @@ 'application': False, 'installable': True, 'depends': ['golem_member'], - 'data': ['views/golem_member_view.xml', 'views/res_partner_view.xml'] + 'data': ['views/golem_member_view.xml', 'views/res_partner_view.xml', + 'security/ir.model.access.csv'] } diff --git a/golem_member_skills/security/ir.model.access.csv b/golem_member_skills/security/ir.model.access.csv new file mode 100644 index 00000000..62aea86e --- /dev/null +++ b/golem_member_skills/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_golem_member_skills_user,Access GOLEM Member Skills User,model_golem_member_skill,golem_base.group_golem_user,1,1,1,0 +access_golem_member_skills_manager,Access GOLEM Member Skills Manager,model_golem_member_skill,golem_base.group_golem_manager,1,1,1,1 diff --git a/golem_season/__openerp__.py b/golem_season/__openerp__.py index 9e6dbaca..20432911 100644 --- a/golem_season/__openerp__.py +++ b/golem_season/__openerp__.py @@ -28,5 +28,5 @@ 'application': False, 'installable': True, 'depends': ['golem_base'], - 'data': ['views/golem_season_view.xml'] + 'data': ['security/ir.model.access.csv', 'views/golem_season_view.xml'] } diff --git a/golem_season/security/ir.model.access.csv b/golem_season/security/ir.model.access.csv new file mode 100644 index 00000000..331bf24e --- /dev/null +++ b/golem_season/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_golem_season_user,Access GOLEM Season User,model_golem_season,golem_base.group_golem_user,1,0,0,0 +access_golem_season_manager,Access GOLEM Season Manager,model_golem_season,golem_base.group_golem_manager,1,1,1,1