subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into development

This commit is contained in:
projectsodoo 2021-01-19 16:04:15 +05:30
parent fb1420cf5b 195735f45a
commit 2b1f7b4443
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cor_custom/models/project.py
View File

@ -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.')

10
cor_custom/views/project_view.xml
View File

@ -60,7 +60,7 @@
widget="radio"/>
<field name="project_type" attrs="{'invisible': [('pricing_type', '=', 'fixed_rate')]}"
widget="radio"/>
<field name="budgeted_revenue" required="1" />
<field name="budgeted_revenue" attrs="{'invisible': [('pricing_type', '=', 'fixed_rate')], 'required': [('pricing_type','!=','fixed_rate')]}" />
<field name="comment"/>
<!-- attrs="{'invisible': [('pricing_type','=','fixed_rate')], 'required': [('pricing_type','!=','fixed_rate')]}"-->
@ -107,7 +107,7 @@
domain="[('order_id','=',parent.sale_order_id), ('is_service', '=', True)]"/>
<field name="price_unit" widget="monetary" options="{'currency_field': 'currency_id'}"
attrs="{'readonly': [('parent.sale_order_id', '!=', False)]}"/>-->
<field name="price_unit" readonly="0"/>
<field name="price_unit" attrs="{'readonly': [('parent.project_type', '=', 'hours_no_limit')]}"/>
<field name="currency_id" invisible="1"/>
<field name="budgeted_qty"
attrs="{'readonly': [('parent.project_type', '=', 'hours_no_limit')]}"/>
@ -121,7 +121,7 @@
<field name="timesheet_hour"/>
<field name="employee_price" widget="monetary" options="{'currency_field': 'currency_id'}"/>
<field name="consultant_cost"/>
<field name="budgeted_hour_week"/>
<field name="budgeted_hour_week" invisible="1"/>
</tree>
</field>
<!--<field name="consultant_timesheet_hrs" readonly="1" attrs="{'invisible': [('pricing_type','!=','fixed_rate')]}">-->
@ -148,8 +148,8 @@
attrs="{'invisible': [('project_type','!=','hours_in_consultant')]}"/>
<field name="budgeted_hours2" attrs="{'invisible': [('project_type','!=','hours_no_limit')],
'required': [('project_type','=','hours_no_limit')]}"/>
<field name="hourly_rate" readonly="1"/>
<field name="budgeted_hour_week"/>
<field name="hourly_rate" attrs="{'readonly': [('project_type','!=','hours_no_limit')]}"/>
<field name="budgeted_hour_week" invisible="1"/>
</group>
</group>