diff options
| author | Barad Mahendra <mba@openerp.com> | 2020-03-13 06:32:42 +0000 |
|---|---|---|
| committer | Barad Mahendra <mba@openerp.com> | 2020-03-19 05:30:35 +0000 |
| commit | 38fab0afcf1f59ea880735db8bdc94cd3080893a (patch) | |
| tree | 55f6d19f98c39fb80a86cd642facc40810612b7c | |
| parent | 1d0b5072f83f765ff2443d752b98dacb7e8be2bb (diff) | |
[IMP] project, sale_timesheet: Make demo data compatible with timesheet app
Currently when the timesheet is filled by the timesheet syncronization
app then it was not going to display the demo projects to project
selection dropdown due to restricted domain and demo data of timesheet
was not properly appear in timesheet app
So updated the demo project in such way that it should display the demo
project's and task to the timesheet app.
Added the demo project to the favourite list of the admin so it should
appear on the selection of the timesheet App and modify the sale's order
project and task so it should display the proper data to app.
closes odoo/odoo#47570
Taskid: 2194361
Closes: #47570
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
| -rw-r--r-- | addons/project/data/project_demo.xml | 2 | ||||
| -rw-r--r-- | addons/sale_timesheet/data/sale_service_demo.xml | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/addons/project/data/project_demo.xml b/addons/project/data/project_demo.xml index 4451ad198eb..280321e67c5 100644 --- a/addons/project/data/project_demo.xml +++ b/addons/project/data/project_demo.xml @@ -54,6 +54,7 @@ <field name="type_ids" eval="[(4, ref('project_stage_0')), (4, ref('project_stage_1')), (4, ref('project_stage_2')), (4, ref('project_stage_3'))]"/> <field name="partner_id" ref="base.partner_demo_portal"/> <field name="privacy_visibility">portal</field> + <field name="favorite_user_ids" eval="[(4, ref('base.user_admin'))]"/> </record> <record id="project_project_2" model="project.project"> @@ -61,6 +62,7 @@ <field name="privacy_visibility">followers</field> <field name="user_id" ref="base.user_demo"/> <field name="type_ids" eval="[(4, ref('project_stage_0')), (4, ref('project_stage_1')), (4, ref('project_stage_2')), (4, ref('project_stage_3'))]"/> + <field name="favorite_user_ids" eval="[(4, ref('base.user_admin'))]"/> </record> <!-- Channel --> diff --git a/addons/sale_timesheet/data/sale_service_demo.xml b/addons/sale_timesheet/data/sale_service_demo.xml index 19e0127b79f..9ae7d65c0b2 100644 --- a/addons/sale_timesheet/data/sale_service_demo.xml +++ b/addons/sale_timesheet/data/sale_service_demo.xml @@ -147,6 +147,18 @@ <function model="sale.order" name="action_confirm" eval="[[ref('sale_order_1')]]"/> <function model="sale.order" name="action_confirm" eval="[[ref('sale_order_2')]]"/> + <!-- Add project to favorite list of admin --> + <function model="project.project" name="write"> + <value model="project.project" eval="obj().search([('sale_line_id', '=', ref('sale_line_13'))]).ids"/> + <value eval="{'favorite_user_ids': [(4, ref('base.user_admin'))]}"/> + </function> + + <!-- Assign sale order's task to admin --> + <function model="project.task" name="write"> + <value model="project.task" eval="obj().search([('sale_line_id', '=', ref('sale_line_13'))]).ids"/> + <value eval="{'user_id': ref('base.user_admin')}"/> + </function> + <!-- Timesheets on sale_order_1 --> <record id="timesheet_1" model="account.analytic.line"> <field name="name">Design</field> @@ -459,6 +471,7 @@ <field name="sale_line_id" ref="sale_timesheet.sale_line_13" /> <field name="sale_order_id" ref="sale_timesheet.sale_order_1" /> <field name="partner_id" ref="base.res_partner_2" /> + <field name="user_id" ref="base.user_admin"/> </record> <!-- Timesheet for those tasks --> |