[IMP] sale_timesheet: remove create sale order from task form view
task-2424382
This commit is contained in:
committed by
Xavier BOL (xbo)
parent
de426654a9
commit
6c041c8d1f
@@ -225,7 +225,6 @@ class ProjectTask(models.Model):
|
||||
is_project_map_empty = fields.Boolean("Is Project map empty", compute='_compute_is_project_map_empty')
|
||||
has_multi_sol = fields.Boolean(compute='_compute_has_multi_sol', compute_sudo=True)
|
||||
allow_billable = fields.Boolean(related="project_id.allow_billable")
|
||||
display_create_order = fields.Boolean(compute='_compute_display_create_order')
|
||||
timesheet_product_id = fields.Many2one(
|
||||
'product.product', string='Service',
|
||||
domain="""[
|
||||
@@ -257,17 +256,6 @@ class ProjectTask(models.Model):
|
||||
for task in self:
|
||||
task.remaining_hours_so = mapped_remaining_hours[task._origin.id]
|
||||
|
||||
@api.depends(
|
||||
'allow_billable', 'allow_timesheets', 'sale_order_id')
|
||||
def _compute_display_create_order(self):
|
||||
for task in self:
|
||||
show = True
|
||||
if not task.allow_billable or not task.allow_timesheets or \
|
||||
(task.bill_type != 'customer_task' and not task.timesheet_product_id) or (not task.partner_id and task.bill_type != 'customer_task') or \
|
||||
task.sale_order_id or (task.bill_type != 'customer_task' and task.pricing_type != 'employee_rate'):
|
||||
show = False
|
||||
task.display_create_order = show
|
||||
|
||||
@api.onchange('sale_line_id')
|
||||
def _onchange_sale_line_id(self):
|
||||
# TODO: remove me in master
|
||||
|
||||
@@ -122,8 +122,6 @@
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//header" position='inside'>
|
||||
<field name="allow_billable" invisible="1"/>
|
||||
<field name="display_create_order" invisible="1"/>
|
||||
<button name="action_make_billable" string="Create Sales Order" type="object" attrs="{'invisible': [('display_create_order', '=', False)]}" groups="sales_team.group_sale_salesman" invisible="1"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='email_cc']" position="after">
|
||||
<field name="analytic_account_id" groups="base.group_no_one"/>
|
||||
|
||||
Reference in New Issue
Block a user