From 1da1c69d82adc46454541ba5237b77167901ed4e Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 29 Feb 2012 14:09:04 +0530 Subject: [PATCH] [IMP] improved code bzr revid: tpa@tinyerp.com-20120229083904-24eb46zd3elzb66u --- addons/sale/sale.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 0a7b2c2a47e..343bdcbfdcd 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1332,7 +1332,7 @@ class sale_order_line(osv.osv): sale_order_line() sale_config.MODULE_LIST += [ - 'project_timesheet', 'account_analytic_analysis', 'project_mrp', 'delivery', + 'account_analytic_analysis','project_timesheet', 'project_mrp', 'delivery', 'sale_margin', 'sale_journal' ] @@ -1480,20 +1480,18 @@ class sale_configuration(osv.osv_memory): else: self.apply_groups(cr, uid, ids, 'group_sale_disc_per_sale_order_line', False, context=context) - if wizard.task_work: - vals['project_timesheet'] = True - vals['project_mrp'] = True - vals['account_analytic_analysis'] = True - else: - vals['project_timesheet'] = False - vals['project_mrp'] = False - vals['account_analytic_analysis'] = False - if wizard.timesheet: vals['account_analytic_analysis'] = True else: vals['account_analytic_analysis'] = False + if wizard.task_work: + vals['project_timesheet'] = True + vals['project_mrp'] = True + else: + vals['project_timesheet'] = False + vals['project_mrp'] = False + if wizard.charge_delivery: vals['delivery'] = True else: