Merge branch 'new/14.0/sale_timesheet_work_entry_rate' into '14.0-test'

new/14.0/sale_timesheet_work_entry_rate into 14.0-test

See merge request hibou-io/hibou-odoo/suite!967
This commit is contained in:
Hibou Bot
2021-08-30 18:54:59 +00:00
4 changed files with 44 additions and 2 deletions

View File

@@ -7,10 +7,14 @@
<field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='timesheet_ids']/tree/field[@name='name']" position="before">
<field name="work_type_id"/>
<field name="work_type_id"
domain="[('allow_timesheet', '=', True)]"
context="{'default_allow_timesheet': True}" />
</xpath>
<xpath expr="//field[@name='timesheet_ids']/form//field[@name='name']" position="before">
<field name="work_type_id"/>
<field name="work_type_id"
domain="[('allow_timesheet', '=', True)]"
context="{'default_allow_timesheet': True}" />
</xpath>
</field>
</record>

View File

View File

@@ -0,0 +1,21 @@
{
'name': 'Timesheet Grid Work Entry',
'description': 'bridge',
'version': '14.0.1.0.0',
'website': 'https://hibou.io/',
'author': 'Hibou Corp. <hello@hibou.io>',
'license': 'AGPL-3',
'category': 'Human Resources',
'depends': [
'hr_timesheet_work_entry',
'timesheet_grid',
],
'data': [
'views/timesheet_views.xml',
],
'demo': [
],
'installable': True,
'auto_install': True,
'application': False,
}

View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="timesheet_view_form_inherit" model="ir.ui.view">
<field name="name">account.analytic.line.form.inherit</field>
<field name="model">account.analytic.line</field>
<field name="inherit_id" ref="timesheet_grid.timesheet_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='task_id']" position="after">
<field name="work_type_id"
domain="[('allow_timesheet', '=', True)]"
context="{'default_allow_timesheet': True}" />
</xpath>
</field>
</record>
</odoo>