From 257bf539d55f1a6322a060bb143dbbd0f8b124c1 Mon Sep 17 00:00:00 2001 From: Mehul Patel Date: Thu, 9 Nov 2017 19:04:21 +0530 Subject: [PATCH] [IMP] sale_timesheet: add demo data This commit adds demo data to populate the project overview with billable timesheet on sold projects and tasks. This will ease the testing and reinforce the wow effect during demonstration. Note: those demo data should never be involved in python test cases. Closes #21132 --- addons/hr_expense/data/hr_expense_data.xml | 10 +- addons/hr_expense/data/hr_expense_demo.xml | 16 +- addons/product/data/product_data.xml | 12 +- addons/product/data/product_demo.xml | 29 +- addons/sale/data/product_product_demo.xml | 12 + addons/sale_expense/sale_expense_demo.xml | 5 - .../sale_timesheet/data/sale_service_demo.xml | 424 +++++++++++++++++- 7 files changed, 465 insertions(+), 43 deletions(-) diff --git a/addons/hr_expense/data/hr_expense_data.xml b/addons/hr_expense/data/hr_expense_data.xml index e6a8337204a..b0c358d8511 100644 --- a/addons/hr_expense/data/hr_expense_data.xml +++ b/addons/hr_expense/data/hr_expense_data.xml @@ -10,20 +10,14 @@ employees - - - - - Expenses - - + Expenses 0.0 1.0 service EXP - + diff --git a/addons/hr_expense/data/hr_expense_demo.xml b/addons/hr_expense/data/hr_expense_demo.xml index 6c5b47c12b3..85f8d875a4e 100644 --- a/addons/hr_expense/data/hr_expense_demo.xml +++ b/addons/hr_expense/data/hr_expense_demo.xml @@ -28,7 +28,7 @@ CarTRA - + @@ -39,20 +39,12 @@ service Air Flight AT - + - - 400.0 - 400.0 - service - Hotel Accommodation - HA0 - - - + @@ -69,7 +61,7 @@ Hotel Expenses - + diff --git a/addons/product/data/product_data.xml b/addons/product/data/product_data.xml index 858b3944bfa..59f5cfb406f 100644 --- a/addons/product/data/product_data.xml +++ b/addons/product/data/product_data.xml @@ -1,9 +1,6 @@ - All @@ -11,7 +8,14 @@ Saleable - + + + Expenses + + + Unit diff --git a/addons/product/data/product_demo.xml b/addons/product/data/product_demo.xml index 2a8e9305b19..f21644a9ded 100644 --- a/addons/product/data/product_demo.xml +++ b/addons/product/data/product_demo.xml @@ -19,6 +19,28 @@ Physical + + + General Expense + 14.0 + 8.0 + service + EXP + + + + + Hotel Accommodation + 400.0 + 400.0 + service + EXP + + + + + + Prepaid Consulting @@ -109,7 +131,6 @@ Example of product to invoice based on delivery. - Computer SC234 @@ -203,11 +224,11 @@ - + - + @@ -343,7 +364,7 @@ - + diff --git a/addons/sale/data/product_product_demo.xml b/addons/sale/data/product_product_demo.xml index 3a2368966cc..a409e0d244a 100644 --- a/addons/sale/data/product_product_demo.xml +++ b/addons/sale/data/product_product_demo.xml @@ -135,6 +135,7 @@ delivery + cost @@ -153,5 +154,16 @@ order + + + order + sales_price + + + + delivery + cost + + diff --git a/addons/sale_expense/sale_expense_demo.xml b/addons/sale_expense/sale_expense_demo.xml index 21b329c657a..dbeb2f12f36 100644 --- a/addons/sale_expense/sale_expense_demo.xml +++ b/addons/sale_expense/sale_expense_demo.xml @@ -12,10 +12,5 @@ cost - - delivery - cost - - diff --git a/addons/sale_timesheet/data/sale_service_demo.xml b/addons/sale_timesheet/data/sale_service_demo.xml index 96aadd83975..a38c493e691 100644 --- a/addons/sale_timesheet/data/sale_service_demo.xml +++ b/addons/sale_timesheet/data/sale_service_demo.xml @@ -1,17 +1,8 @@ - - timesheet - project_only - - - Support Contract (on timesheet) - timesheet - project_only - - + Advance @@ -20,6 +11,14 @@ 5.0 + + + 30 + Fixed + Need functional or technical help + Done + + Internal - GAP Analysis @@ -28,10 +27,415 @@ + + + Support + + + + + + Internal training + + + + + + + timesheet + project_only + + + + Support Contract (on timesheet) + timesheet + project_only + + timesheet task_global_project + + + timesheet + + + + timesheet + + + + Support (Prepaid Hours) + + service + 250.00 + 190.00 + + + ordered_timesheet + task_global_project + + + + + Senior Developer (Invoice on Timesheets) + + 200.00 + 150.00 + service + + + delivered_timesheet + task_new_project + + + + Junior Developer (Invoice on Timesheets) + + 100.00 + 85.00 + service + + + delivered_timesheet + task_new_project + + + + Milestones + + 500 + 420.00 + service + + + delivered_manual + no + + + + + 100 + + + + 75 + + + + + + + AGR + + + + + + + 20 + + + + + + 4 + + + + + + 10 + 50 + + + + + + DPC + + + + + + + 50 + + + + + + 110 + + + + + + + + + Uploading data + + + 5.00 + + + + + Improve Code + + + 5.00 + + + + + Add New Module + + + 5.00 + + + + + Delivery and maintenance + + + 5.00 + + + + + + Data Analysis with Team + + + 1.00 + + + + + Client Metting + + + 1.00 + + + + + Check Requirements + + + 1.00 + + + + + Analysis data + + + 1.00 + + + + + Code Migrate + + + 1.00 + + + + + Research + + + 1.00 + + + + + Development + + + 1.00 + + + + + Quality check + + + 1.00 + + + + + Migrate data + + + 1.00 + + + + + Code improved + + + 1.00 + + + + + + + Research and Development + + + 8.00 + + + + + Quality Analyst + + + 8.00 + + + + + Delivery and maintenance + + + 8.00 + + + + + Code Improve + + + 8.00 + + + + + + Discussion new Group + + + 4.00 + + + + + Analysis Document + + + 4.00 + + + + + Write specifications + + + 4.00 + + + + + Requirements metting with client + + + 4.00 + + + + + + + Update Docs + + + 8.00 + + + + + Discussion Agreement + + + 8.00 + + + + + Internal Discussion + + + 8.00 + + + + + Improvement the Details + + + 8.00 + + + + + + + [PCSC234] Computer SC234 + + + + 300.00 + + + 10.00 + + + + + [EXP] General Expenses + + + + 100.00 + + + 1.00 + + + + + [PCSC234] Computer SC234 + + + + 400.00 + + + 15.00 + + + + + [HA0] Hotel Accommodation + + + + 75.00 + + + 1.00 +