From 17a94512667c4216fa1e408543135b437b3e1b99 Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Tue, 19 Jan 2021 15:15:04 +0530 Subject: [PATCH 1/2] update hourly rate and budgeted hour per week --- cor_custom/models/project.py | 2 +- cor_custom/views/project_view.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cor_custom/models/project.py b/cor_custom/models/project.py index e913824..5ccee2d 100755 --- a/cor_custom/models/project.py +++ b/cor_custom/models/project.py @@ -14,7 +14,7 @@ class Project(models.Model): help='When billing tasks individually, a Sales Order will be created from each task. It is perfect if you would like to bill different services to different clients at different rates. \n When billing the whole project, a Sales Order will be created from the project instead. This option is better if you would like to bill all the tasks of a given project to a specific client either at a fixed rate, or at an employee rate.') pricing_type = fields.Selection([ - ('fixed_rate', 'Fixed rate'), + ('fixed_rate', 'Project that have no time limit'), ('employee_rate', 'Consultant rate') ], string="Pricing", default="fixed_rate", help='The fixed rate is perfect if you bill a service at a fixed rate per hour or day worked regardless of the consultant who performed it. The consultant rate is preferable if your employees deliver the same service at a different rate. For instance, junior and senior consultants would deliver the same service (= consultancy), but at a different rate because of their level of seniority.') diff --git a/cor_custom/views/project_view.xml b/cor_custom/views/project_view.xml index e507b7b..7cd6d22 100755 --- a/cor_custom/views/project_view.xml +++ b/cor_custom/views/project_view.xml @@ -60,7 +60,7 @@ widget="radio"/> - + @@ -107,7 +107,7 @@ domain="[('order_id','=',parent.sale_order_id), ('is_service', '=', True)]"/> --> - + @@ -121,7 +121,7 @@ - + @@ -149,7 +149,7 @@ - + From 2b8a10b469584d67038effc795aefd7c5ed789f7 Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Tue, 19 Jan 2021 15:33:00 +0530 Subject: [PATCH 2/2] make readonly false for hourly rate field --- cor_custom/views/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cor_custom/views/project_view.xml b/cor_custom/views/project_view.xml index 7cd6d22..0f68c30 100755 --- a/cor_custom/views/project_view.xml +++ b/cor_custom/views/project_view.xml @@ -148,7 +148,7 @@ attrs="{'invisible': [('project_type','!=','hours_in_consultant')]}"/> - +