Merge branch 'master' of https://gitlab.sunarctechnologies.com/prakash.jain/cor-odoo

cor_custom/models/__init__.py

@@ -9,4 +9,4 @@ from . import analytic
 from . import product
 from . import hr_employee
 from . import sale
-from . import res_users
+#from . import res_users

cor_custom/models/analytic.py

@@ -140,7 +140,7 @@ class AccountAnalyticLine(models.Model):
             user_ids = self.env['hr.employee'].search(
                 [('user_id', 'in', self.project_id.allowed_internal_user_ids.ids)]).ids
         project_all_emp_ids = cuser + manager_id + user_ids + consul_project_ids
-        if self.env.user.update_timesheet == True:
+        if self.env.user.user_has_groups('cor_custom.group_update_timesheet'):
             result = {
                 'domain': {'task_id': domain},
             }

cor_custom/models/res_users.py

@@ -6,6 +6,5 @@ class CorResUsers(models.Model):
     _inherit = "res.users"
     _description = "Custom Res Users"
 
-    update_timesheet = fields.Boolean()
 
 

cor_custom/views/res_users.xml

@@ -1,18 +1,7 @@
 <odoo>
     <data>
-        <!-- Form View -->
-
-        <record id="inherit_view_users_form" model="ir.ui.view">
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <!--<xpath expr="//notebook/page[1]/group[1]" position="after">-->
-                <xpath expr="//field[@name='login']" position="after">
-                    <group>
-                        <field name="update_timesheet" string="Update Timesheet" groups="base.group_no_one"/>
-                    </group>
-                </xpath>
-            </field>
+        <record id="group_update_timesheet" model="res.groups">
+            <field name="name">Update Timesheet</field>
         </record>
     </data>
 </odoo>