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 development

This commit is contained in:
projectsodoo 2021-01-07 16:38:35 +05:30
parent ea2202fa23 c036e34bc6
commit 3fb05f04e0
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cor_custom/views/hr_employee_views.xml
View File

@ -9,6 +9,9 @@
<xpath expr="//field[@name='resource_calendar_id']" position="after">
<field name="budgeted_hour_week"/>
</xpath>
<xpath expr="//field[@name='user_id']" position="replace">
<field name="user_id" string="Related User" domain="[('share', '=', False)]" required="1"/>
</xpath>
</field>
</record>

7
cor_custom/views/project_view.xml
View File

@ -29,6 +29,10 @@
<field name="model">project.project</field>
<field name="inherit_id" ref="sale_timesheet.project_project_view_form"/>
<field name="arch" type="xml">
<xpath expr="//button[@name='action_view_timesheet']" position="replace">
<button string="Project Overview" class="oe_stat_button" type="object" name="action_view_timesheet"
icon="fa-puzzle-piece" attrs="{'invisible': [('allow_billable', '=', False)]}" invisible="1"/>
</xpath>
<xpath expr="//page[@name='billing_employee_rate']" position="replace">
<page name="billing_employee_rate" string="Invoicing"
attrs="{'invisible': [('allow_billable', '=', False)]}">
@ -107,7 +111,8 @@
<field name="profit_per"/>
</group>
<group>
<field name="budgeted_hours" attrs="{'invisible': [('project_type','!=','hours_in_consultant')]}"/>
<field name="budgeted_hours"
attrs="{'invisible': [('project_type','!=','hours_in_consultant')]}"/>
<field name="budgeted_hours2" attrs="{'invisible': [('project_type','!=','hours_no_limit')],
'required': [('project_type','=','hours_no_limit')]}"/>
<field name="hourly_rate" readonly="1"/>

2
project_report/__manifest__.py
View File

@ -15,7 +15,7 @@
'data': [
'security/ir.model.access.csv',
'wizard/project_create_expenses_views.xml',
'views/project_view.xml',
#'views/project_view.xml',
'report/project_budget_hrs_analysis_views.xml',
'report/project_budget_amt_analysis_views.xml',
],