Skip to content
Extraits de code Groupes Projets
Valider b385b874 rédigé par Rémi - Le Filament's avatar Rémi - Le Filament
Parcourir les fichiers

Add UR_ID for projects and Financial tools + security

parent 52e23b4a
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -15,6 +15,7 @@
],
"data": [
"security/ir.model.access.csv",
"security/security_rules.xml",
"views/assets.xml",
"views/cgscop_timesheet_code.xml",
"views/hr_timesheet.xml",
......
......@@ -6,12 +6,7 @@ from odoo import models, fields
class ScopTimesheetCode(models.Model):
_name = "cgscop.timesheet.code"
_description = "Code activite cgscop"
_description = "Code activité National"
_order = 'name'
name = fields.Char('Nom')
company_id = fields.Many2one(
comodel_name='res.company',
string='Company',
required=True,
default=lambda self: self.env.user.company_id)
......@@ -7,10 +7,16 @@ from odoo import models, fields
class ScopProjectTimesheet(models.Model):
_inherit = "project.project"
def _default_ur(self):
return self.env['res.company']._ur_default_get()
cgscop_timesheet_code_id = fields.Many2one(
comodel_name='cgscop.timesheet.code',
string='Code Activité CG')
privacy_visibility = fields.Selection(default="employees")
ur_id = fields.Many2one(
'union.regionale',
string='Union Régionale',
index=True,
on_delete='restrict',
default=_default_ur)
......@@ -8,8 +8,17 @@ class ScopTimesheetCode(models.Model):
_name = "ur.financial.system"
_description = "Dispositif financier UR"
def _default_ur(self):
return self.env['res.company']._ur_default_get()
name = fields.Char('Nom')
company_id = fields.Many2one(
comodel_name='res.company',
string='UR',
string='Société',
default=lambda self: self.env.user.company_id)
ur_id = fields.Many2one(
'union.regionale',
string='Union Régionale',
index=True,
on_delete='restrict',
default=_default_ur)
<?xml version="1.0"?>
<!-- Copyright 2019 Le Filament
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
<odoo>
<data noupdate="1">
<record id="ur_financial_system_rule_ur" model="ir.rule">
<field name="name">ur financial system rule per ur</field>
<field name="model_id" ref="model_ur_financial_system"/>
<field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field>
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]"/>
<field eval="True" name="global"/>
</record>
<record id="project_rule_ur" model="ir.rule">
<field name="name">project rule per ur</field>
<field name="model_id" ref="project.model_project_project"/>
<field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field>
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]"/>
<field eval="True" name="global"/>
</record>
<record id="project_rule_administrator_ur" model="ir.rule">
<field name="name">project rule for administrator</field>
<field name="model_id" ref="project.model_project_project"/>
<field name="domain_force">[(1,'=',1)]</field>
<field name="groups" eval="[(6, 0, [ref('cgscop_partner.group_cg_administrator')])]"/>
<field eval="True" name="global"/>
</record>
</data>
</odoo>
......@@ -10,23 +10,22 @@
<field name="arch" type="xml">
<tree editable='top'>
<field name="name" />
<field name="company_id" groups="base.group_no_one" />
</tree>
</field>
</record>
<record id="action_cgscop_timesheet_code_tree" model="ir.actions.act_window">
<field name="name">Codes activité CG</field>
<field name="name">Codes Activité National</field>
<field name="res_model">cgscop.timesheet.code</field>
<field name="view_mode">tree</field>
<field name="help">Affiche et gère les Codes activité CG</field>
<field name="help">Affiche et gère les Codes activité Nationaux</field>
</record>
<menuitem id="menu_cgscop_timesheet_code"
name="Codes activité National"
name="Codes Activité National"
parent="hr_timesheet.hr_timesheet_menu_configuration"
action="action_cgscop_timesheet_code_tree"
sequence="50"
sequence="40"
groups="cgscop_partner.group_cg_administrator"/>
</data>
......
......@@ -29,10 +29,11 @@
<group>
<group>
<field name="partner_id" string="Contact par défaut" help="Contact par défaut auquel est rattaché cette activité. Ce contact sera sélectionné automatiquement dans les feuilles de temps"/>
<field name="company_id" groups="base.group_multi_company" string="UR" />
<field name="ur_id" string="Union Régionale" />
<field name="company_id" groups="base.group_multi_company" string="Société" />
</group>
<group>
<field name="cgscop_timesheet_code_id" required="1" placeholder="Code activité CG"/>
<field name="cgscop_timesheet_code_id" required="1" placeholder="Code activité National"/>
<field name="privacy_visibility" invisible="1"/>
<field name="allow_timesheets" invisible="1"/>
</group>
......@@ -67,7 +68,7 @@
<field name="arch" type="xml">
<search string="Search Project">
<field name="name" string="Code activité UR"/>
<field name="cgscop_timesheet_code_id" string="Code activité CG"/>
<field name="cgscop_timesheet_code_id" string="Code activité National"/>
<field name="partner_id" string="Contact par défaut"/>
<filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
......
......@@ -10,6 +10,7 @@
<field name="arch" type="xml">
<tree editable='top'>
<field name="name" />
<field name="ur_id" />
<field name="company_id" groups="base.group_no_one" />
</tree>
</field>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter