From f97c97d672b4acd8945f5cd0ae97cc4fe68948f6 Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Wed, 13 Mar 2013 12:30:29 +0530 Subject: [PATCH 1/2] [IMP]account_followup,hr_timesheet_sheet:in analysis report create button is there but no need of it bzr revid: pna@tinyerp.com-20130313070029-9ojiilbnl2tn7f3g --- addons/account_followup/report/account_followup_report.xml | 2 +- addons/hr_timesheet_sheet/report/timesheet_report_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml index 6fee6a77ac1..b7c38e89f5e 100644 --- a/addons/account_followup/report/account_followup_report.xml +++ b/addons/account_followup/report/account_followup_report.xml @@ -6,7 +6,7 @@ account_followup.stat.tree account_followup.stat - + diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index aee07fc23b6..ddc66260cf0 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -16,7 +16,7 @@ timesheet.report.tree timesheet.report - + From 7daa6807eee4835ab892206d4dcf4b5a80e8061f Mon Sep 17 00:00:00 2001 From: "Somesh Khare (OpenERP)" Date: Fri, 15 Mar 2013 14:35:17 +0530 Subject: [PATCH 2/2] [FIX]account_move_line:due to boolean value for journal_id and period_id error occurred (Case: ref 589954) bzr revid: skh@tinyerp.com-20130315090517-84g17n9ax2iijh0j --- addons/account/account_move_line.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index a96ed889aae..06f597768b3 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1070,12 +1070,12 @@ class account_move_line(osv.osv): for line in self.browse(cr, uid, ids, context=context): ctx = context.copy() - if ('journal_id' not in ctx): + if not ctx.get('journal_id'): if line.move_id: ctx['journal_id'] = line.move_id.journal_id.id else: ctx['journal_id'] = line.journal_id.id - if ('period_id' not in ctx): + if not ctx.get('period_id'): if line.move_id: ctx['period_id'] = line.move_id.period_id.id else: