Merge branch 'pawan_branch' into 'development'

add done button in task list view

See merge request prakash.jain/cor-odoo!108
This commit is contained in:
pawan.sharma 2021-02-15 09:20:24 -08:00
commit fc70c1139b
4 changed files with 94 additions and 12 deletions

0
cor_custom/data/mail_data.xml Normal file → Executable file
View File

View File

@ -330,3 +330,6 @@ class InheritProjectTask(models.Model):
start_date = fields.Date(string='Start Date')
def action_done_task(self):
print('9999999999999999')

View File

@ -21,8 +21,8 @@
<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="after">
<field name="start_time" widget="float_time"/>
<field name="end_time" widget="float_time"/>
<field name="start_time" widget="float_time"/>
<field name="end_time" widget="float_time"/>
</xpath>
<!--<xpath expr="//field[@name='timesheet_ids']//tree//field[@name='unit_amount']" position="after">
<field name="parent_project"/>
@ -56,16 +56,83 @@
</field>
</record>
<!--<record id="timesheet_view_tree_user_inherit1" model="ir.ui.view">
<field name="name">account.analytic.line.tree.hr_timesheet_user_inherit1</field>
<field name="model">account.analytic.line</field>
<field name="inherit_id" ref="hr_timesheet.timesheet_view_tree_user"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='name']" position="after">
<field name="start_time"/>
<field name="end_time"/>
</xpath>
<!-- Overide all timesheet action -->
<record id="hr_timesheet.timesheet_action_all" model="ir.actions.act_window">
<field name="name">All Timesheets</field>
<field name="res_model">account.analytic.line</field>
<field name="view_mode">tree,form,pivot,kanban,calendar</field>
<field name="search_view_id" ref="hr_timesheet.hr_timesheet_line_search"/>
<field name="domain">[('project_id', '!=', False)]</field>
<field name="context">{
'search_default_week':1,
}
</field>
</record>-->
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
No activities found. Let's start a new one!
</p>
<p>
Track your working hours by projects every day and invoice this time to your customers.
</p>
</field>
</record>
<record id="view_hr_timesheet_line_calendar" model="ir.ui.view">
<field name="name">account.analytic.line.calendar</field>
<field name="model">account.analytic.line</field>
<field name="arch" type="xml">
<calendar string="Timesheet" date_start="date" date_delay="unit_amount">
<field name="project_id"/>
<field name="name"/>
</calendar>
</field>
</record>
<record id="timesheet_action_view_all_calendar" model="ir.actions.act_window.view">
<field name="sequence" eval="6"/>
<field name="view_mode">calendar</field>
<field name="view_id" ref="view_hr_timesheet_line_calendar"/>
<field name="act_window_id" ref="hr_timesheet.timesheet_action_all"/>
</record>
<!-- Overide my timesheet action -->
<record id="hr_timesheet.act_hr_timesheet_line" model="ir.actions.act_window">
<field name="name">My Timesheets</field>
<field name="res_model">account.analytic.line</field>
<field name="view_mode">tree,form,kanban,calendar</field>
<field name="domain">[('project_id', '!=', False), ('user_id', '=', uid)]</field>
<field name="context">{
"search_default_week":1,
}
</field>
<field name="search_view_id" ref="hr_timesheet.hr_timesheet_line_my_timesheet_search"/>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
No activities found. Let's start a new one!
</p>
<p>
Track your working hours by projects every day and invoice this time to your customers.
</p>
</field>
</record>
<record id="view_hr_my_timesheet_line_calendar" model="ir.ui.view">
<field name="name">account.analytic.line.calendar</field>
<field name="model">account.analytic.line</field>
<field name="arch" type="xml">
<calendar string="Timesheet" date_start="date" date_delay="unit_amount">
<field name="project_id"/>
<field name="name"/>
</calendar>
</field>
</record>
<record id="timesheet_action_view_my_calendar" model="ir.actions.act_window.view">
<field name="sequence" eval="6"/>
<field name="view_mode">calendar</field>
<field name="view_id" ref="view_hr_my_timesheet_line_calendar"/>
<field name="act_window_id" ref="hr_timesheet.act_hr_timesheet_line"/>
</record>
</odoo>

View File

@ -218,6 +218,18 @@
</field>
</record>
<!-- Done Task action -->
<record id="project_task_server_action_batch_done" model="ir.actions.server">
<field name="name">Done</field>
<field name="model_id" ref="project.model_project_task"/>
<field name="binding_model_id" ref="project.model_project_task"/>
<field name="state">code</field>
<field name="code">
if records:
action = records.action_done_task()
</field>
</record>
<!-- Tags -->
<record model="ir.ui.view" id="custom_project_tags_search_view">
<field name="name">Tags</field>