diff --git a/addons/account/invoice.py b/addons/account/invoice.py index e4fad3faa4a..706b357465f 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -1312,6 +1312,7 @@ class account_invoice_line(osv.osv): if context is None: context = {} company_id = context.get('company_id',False) + tax_obj = self.pool.get('account.tax') if not partner_id: raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") ) if not product: @@ -1399,21 +1400,21 @@ class account_invoice_line(osv.osv): a = fpos_obj.map_account(cr, uid, fpos, a) if a: result['account_id'] = a - - tax_ids = self.pool.get('account.tax').search(cr, uid, [('company_id', '=', company_id)]) + + tax_ids = tax_obj.search(cr, uid, [('company_id', '=', company_id)]) if type in ('out_invoice', 'out_refund'): sale_taxes_def = map(lambda x: x.id, res.taxes_id) sale_tax_ids = [tax for tax in tax_ids if tax in sale_taxes_def] - sale_taxes = self.pool.get('account.tax').browse(cr, uid, sale_tax_ids) + sale_taxes = tax_obj.browse(cr, uid, sale_tax_ids) sale_taxes_all = sale_taxes and sale_taxes or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False) tax_id = fpos_obj.map_tax(cr, uid, fpos, sale_taxes_all) else: pur_taxes_def = map(lambda x: x.id, res.supplier_taxes_id) pur_tax_ids = [tax for tax in tax_ids if tax in pur_taxes_def] - pur_taxes = self.pool.get('account.tax').browse(cr, uid, pur_tax_ids) + pur_taxes = tax_obj.browse(cr, uid, pur_tax_ids) pur_taxes_all = pur_taxes and pur_taxes or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False) tax_id = fpos_obj.map_tax(cr, uid, fpos, pur_taxes_all) - + if type in ('in_invoice', 'in_refund'): result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} ) else: @@ -1427,7 +1428,7 @@ class account_invoice_line(osv.osv): res2 = res.uom_id.category_id.id if res2: domain = {'uos_id':[('category_id','=',res2 )]} - + result['categ_id'] = res.categ_id.id res_final = {'value':result, 'domain':domain} diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index 80065880ad9..a6936c74210 100644 --- a/addons/account/report/account_entries_report.py +++ b/addons/account/report/account_entries_report.py @@ -94,7 +94,7 @@ class account_entries_report(osv.osv): return super(account_entries_report, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order, context=context, count=count) - def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None): + def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False): todel=[] fiscalyear_obj = self.pool.get('account.fiscalyear') period_obj = self.pool.get('account.period') @@ -112,7 +112,7 @@ class account_entries_report(osv.osv): for a in [['period_id','in','current_year'], ['period_id','in','current_period']]: if a in domain: domain.remove(a) - return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context) + return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby) def init(self, cr): tools.drop_view_if_exists(cr, 'account_entries_report')