diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index f49ae945cca..d7327638669 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -271,7 +271,7 @@ class account_followup_print_all(osv.osv_memory): data['followup_id'] = 'followup_id' in context and context['followup_id'] or False date = 'date' in context and context['date'] or data['date'] for id in to_update.keys(): - if to_update[id]['partner_id'] in data['partner_ids'][0][2]: + if to_update[id]['partner_id'] in data['partner_ids']: cr.execute( "UPDATE account_move_line "\ "SET followup_line_id=%s, followup_date=%s "\ diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py index 2124b59b5c3..23fb780f334 100644 --- a/addons/project_planning/project_planning.py +++ b/addons/project_planning/project_planning.py @@ -383,7 +383,7 @@ class report_account_analytic_planning_account(osv.osv): FROM report_account_analytic_planning_line WHERE planning_id = %s AND account_id=%s )""", (line.planning_id.id,line.account_id.id )) - result[line.id] = cr.fetchall()[0][0] / div *div2 + result[line.id] = cr.fetchall()[0][0] / div * div2 return result def _get_timesheets(self, cr, uid, ids, name, args, context): @@ -493,13 +493,13 @@ where user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i for line in self.browse(cr, uid, ids, context): where = '' if line.user_id: - where='user_id='+str(line.user_id.id)+' and ' + where = 'user_id=' + str(line.user_id.id) + ' and ' cr.execute('''select sum(planned_hours) from project_task where - '''+where+''' + ''' + where + ''' project_id in (select id from project_project where category_id=%s) and date_close>=%s and date_close<=%s''', ( diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index c89b90ecb65..2f290ce5dd8 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -30,11 +30,11 @@
- - + + - + diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index e2fd3ae54e8..c9aee627857 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -213,7 +213,7 @@ sale.report form graph,tree - [('state','in',('manual','progress')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] + [('state','in',('manual','progress','done')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] @@ -252,54 +252,72 @@ - + Sold product and Total Price sale.report form graph,tree - [('state','in',('manual','progress')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] + [('state','in',('manual','progress','done')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] graph - + tree - + - - sales.category.product.price.tree + + view.sales.by.month.tree sale.report tree - - - + + + - - Total Price By Product Category + + Sales By Month sale.report form tree - [('state','in',('manual','progress')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] - - + [('state','in',('manual','progress','done')),('year','=', time.strftime('%Y'))] + {'group_by_no_leaf':1,'group_by':['month']} + + + + + + sale.top.quotations.tree + sale.order + tree + + + + + + + + + + + - Quotation For Sale + Top Quotations sale.order form tree,form - [('state','=','draft'),('date_order','<=', time.strftime('%Y-%m-%d')),('date_order','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] - + [('state','=','draft')] +