subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch

This commit is contained in:
Pawan Kumar 2021-02-22 10:12:38 +05:30
parent 050d49d105 fab3b4cac2
commit c27cabec58
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cor_custom/report/project_hours_report.py
View File

@ -28,7 +28,7 @@ class BudgetHrsAnalysis(models.Model):
for record in self:
name = record.project_id and record.project_id.name or ''
if record.employee_id.name:
name = record.employee_id.name + '/' + name
name = record.employee_id.name + '/' + name + '/' + record.hours_type
res.append((record.id, name))
return res

6
cor_custom/report/project_hours_report_view.xml
View File

@ -75,6 +75,10 @@
mode="month">
<field name="project_id"/>
<field name="employee_id"/>
<field name="start_date"/>
<field name="end_date"/>
<field name="hours"/>
<field name="percentage"/>
</calendar>
</field>
</record>
@ -105,7 +109,7 @@
<field name="inherit_id" ref="project.edit_project"/>
<field name="arch" type="xml">
<div name="button_box" position="inside">
<button class="oe_stat_button" type="action" name="cor_custom.action_project_consultant_hrs_report"
<button class="oe_stat_button" type="object" name="action_view_custom_project_consultant_hrs_report"
icon="fa-tasks"
attrs="{'invisible':['|',('pricing_type','!=','employee_rate'),('project_type','!=','hours_in_consultant')]}"
string="View Allocation" widget="statinfo">

23
cor_custom/security/cor_custom_security.xml
View File

@ -20,19 +20,19 @@
<field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
</record>-->
<record id="project.group_project_manager" model="res.groups">
<!--<record id="project.group_project_manager" model="res.groups">
<field name="name">Manager</field>
<field name="category_id" ref="base.module_category_services_project"/>
<field name="implied_ids" eval="[(4, ref('project.group_project_user'))]"/>
<field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
</record>
</record>-->
<record id="group_project_cor_admin" model="res.groups">
<field name="name">Administrator</field>
<!-- <record id="group_project_cor_admin" model="res.groups">
<field name="name">Cor Custom</field>
<field name="category_id" ref="base.module_category_services_project"/>
<field name="implied_ids" eval="[(4, ref('project.group_project_manager'))]"/>
<field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
</record>
</record> -->
<function name="write" model="ir.model.data">
@ -80,7 +80,7 @@
<field name="groups" eval="[(4, ref('hr_timesheet.group_hr_timesheet_approver'))]" />
</record>
<function name="write" model="ir.model.data">
<!-- <function name="write" model="ir.model.data">
<function name="search" model="ir.model.data">
<value eval="[('module','=','project'),('name','=','project_project_manager_rule')]"/>
</function>
@ -107,9 +107,9 @@
<field name="model_id" ref="project.model_project_task"/>
<field name="domain_force">[('project_id.user_id','=',user.id)]</field>
<field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
</record>
</record> -->
<record model="ir.rule" id="project_project_all_admin_rule">
<!-- <record model="ir.rule" id="project_project_all_admin_rule">
<field name="name">Project: project manager: see all</field>
<field name="model_id" ref="model_project_project"/>
<field name="domain_force">[(1, '=', 1)]</field>
@ -121,7 +121,7 @@
<field name="model_id" ref="model_project_task"/>
<field name="domain_force">[(1, '=', 1)]</field>
<field name="groups" eval="[(4,ref('group_project_cor_admin'))]"/>
</record>
</record> -->
<record model="ir.rule" id="project_view_consultant_user_own_rule">
<field name="name">Project: view Consultant: Own User</field>
@ -133,15 +133,16 @@
<record model="ir.rule" id="project_view_consultant_manager_rrule">
<field name="name">Project: view Consultant: Manager User</field>
<field name="model_id" ref="model_project_consultant_hrs_report"/>
<field name="domain_force">[('project_id.user_id','=',user.id)]</field>
<field name="domain_force">[(1,'=',1)]</field>
<field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
</record>
<!-- [('project_id.user_id','=',user.id)]
<record model="ir.rule" id="project_view_consultant_admin_rrule">
<field name="name">Project: view Consultant: all User</field>
<field name="model_id" ref="model_project_consultant_hrs_report"/>
<field name="domain_force">[(1,'=',1)]</field>
<field name="groups" eval="[(4,ref('group_project_cor_admin'))]"/>
</record>
</record>-->
</odoo>