diff --git a/cor_custom/models/project.py b/cor_custom/models/project.py index 02172ce..3143f15 100755 --- a/cor_custom/models/project.py +++ b/cor_custom/models/project.py @@ -37,17 +37,20 @@ class Project(models.Model): "- Invited portal and all internal users: employees may see everything." " Portal users may see project and tasks followed by\n" " them or by someone of their company.") + allow_billable = fields.Boolean("Billable", default=True, help="Invoice your time and material from tasks.") class InheritProjectProductEmployeeMap(models.Model): _inherit = 'project.sale.line.employee.map' employee_price = fields.Monetary(string="Consultant Price", related="employee_id.timesheet_cost", readonly=True) - budgeted_qty = fields.Float(string='Budgeted Qty', related='sale_line_id.product_uom_qty', readonly=True, store=True) + budgeted_qty = fields.Float(string='Budgeted Hours', related='sale_line_id.product_uom_qty', readonly=True, store=True) budgeted_uom = fields.Many2one('uom.uom', string='Budgeted UOM', related='sale_line_id.product_uom', readonly=True) #budgeted_uom = fields.Many2one('uom.uom', string='Budgeted UOM', related='timesheet_product_id.uom_id', readonly=True) timesheet_hour = fields.Float("Timesheet Hour", compute='_compute_timesheet_hour', default=0.0) - budgeted_hour_week = fields.Float("Budgeted Hours per week", compute='_compute_budgeted_hour_week') + budgeted_hour_week = fields.Float("Budgeted Hours per week ", compute='_compute_budgeted_hour_week') + price_unit = fields.Float("Hourly rate", compute='_compute_price_unit', store=True, readonly=True) + sale_line_id = fields.Many2one('sale.order.line', "Service", domain=[('is_service', '=', True)]) def _compute_timesheet_hour(self): for val in self: diff --git a/cor_custom/views/project_view.xml b/cor_custom/views/project_view.xml index 913dc92..f5cadfc 100755 --- a/cor_custom/views/project_view.xml +++ b/cor_custom/views/project_view.xml @@ -57,22 +57,22 @@ - - + - - + + - + - -