diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py index 16889253a68..6d284ac08c8 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/timesheet_report.py @@ -95,7 +95,7 @@ class timesheet_report(osv.osv): htss.state from account_analytic_line as aal left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id) - left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id) + left join hr_timesheet_sheet_sheet as htss ON (hat.sheet_id=htss.id) group by aal.account_id, aal.date, diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.css b/addons/hr_timesheet_sheet/static/src/css/timesheet.css index 36ea9a34db9..887e8665a28 100644 --- a/addons/hr_timesheet_sheet/static/src/css/timesheet.css +++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.css @@ -33,7 +33,6 @@ min-width: 130px; } .openerp .oe_timesheet_weekly td input.oe_timesheet_weekly_input { - padding: 5px 2px !important; width: 40px; text-align: right; min-width: 0 !important; diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass index 5e04271037c..bd90deab122 100644 --- a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass +++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass @@ -28,7 +28,6 @@ .oe_timesheet_first_col min-width: 130px td input.oe_timesheet_weekly_input - padding: 5px 2px !important width: 40px text-align: right min-width: 0 !important diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index 829468e684f..69a01f90dbb 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -46,8 +46,8 @@ class crm_make_sale(osv.osv_memory): if not active_id: return False - lead = lead_obj.read(cr, uid, active_id, ['partner_id']) - return lead['partner_id'] + lead = lead_obj.read(cr, uid, active_id, ['partner_id'], context=context) + return lead['partner_id'][0] def view_init(self, cr, uid, fields_list, context=None): return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context)