diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py index 04a81c13b47..fdb296eb7b1 100644 --- a/addons/account/__manifest__.py +++ b/addons/account/__manifest__.py @@ -15,7 +15,7 @@ You could use this simplified accounting in case you work with an (external) acc 'category': 'Accounting', 'website': 'https://www.odoo.com/page/billing', 'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'], - 'depends' : ['base_setup', 'product', 'analytic', 'report', 'web_planner'], + 'depends' : ['base_setup', 'product', 'analytic', 'web_planner'], 'data': [ 'security/account_security.xml', 'security/ir.model.access.csv', diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py index 8cfafcdc537..eb744bf5c11 100644 --- a/addons/account/models/account_invoice.py +++ b/addons/account/models/account_invoice.py @@ -411,7 +411,7 @@ class AccountInvoice(models.Model): """ self.ensure_one() self.sent = True - return self.env['report'].get_action(self, 'account.report_invoice') + return self.env.ref('account.account_invoices').report_action(self) @api.multi def action_invoice_sent(self): @@ -564,14 +564,14 @@ class AccountInvoice(models.Model): self.write({'state': 'draft', 'date': False}) # Delete former printed invoice try: - report_invoice = self.env['report']._get_report_from_name('account.report_invoice') + report_invoice = self.env['ir.actions.report']._get_report_from_name('account.report_invoice') except IndexError: report_invoice = False if report_invoice and report_invoice.attachment: for invoice in self: with invoice.env.do_in_draft(): invoice.number, invoice.state = invoice.move_name, 'open' - attachment = self.env['report']._attachment_stored(invoice, report_invoice)[invoice.id] + attachment = self.env['ir.actions.report'].retrieve_attachment(invoice.id) if attachment: attachment.unlink() return True diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py index 9dd76168621..125021a1628 100644 --- a/addons/account/report/account_aged_partner_balance.py +++ b/addons/account/report/account_aged_partner_balance.py @@ -195,7 +195,7 @@ class ReportAgedPartnerBalance(models.AbstractModel): return res, total, lines @api.model - def render_html(self, docids, data=None): + def get_report_values(self, docids, data=None): total = [] model = self.env.context.get('active_model') docs = self.env[model].browse(self.env.context.get('active_id')) @@ -211,7 +211,7 @@ class ReportAgedPartnerBalance(models.AbstractModel): account_type = ['payable', 'receivable'] movelines, total, dummy = self._get_partner_move_lines(account_type, date_from, target_move, data['form']['period_length']) - docargs = { + return { 'doc_ids': self.ids, 'doc_model': model, 'data': data['form'], @@ -220,4 +220,3 @@ class ReportAgedPartnerBalance(models.AbstractModel): 'get_partner_lines': movelines, 'get_direction': total, } - return self.env['report'].render('account.report_agedpartnerbalance', docargs) diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 81f5c30dedc..dc717c2829b 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -56,14 +56,14 @@ class ReportTrialBalance(models.AbstractModel): @api.model - def render_html(self, docids, data=None): + def get_report_values(self, docids, data=None): self.model = self.env.context.get('active_model') docs = self.env[self.model].browse(self.env.context.get('active_ids', [])) display_account = data['form'].get('display_account') accounts = docs if self.model == 'account.account' else self.env['account.account'].search([]) account_res = self.with_context(data['form'].get('used_context'))._get_accounts(accounts, display_account) - docargs = { + return { 'doc_ids': self.ids, 'doc_model': self.model, 'data': data['form'], @@ -71,4 +71,3 @@ class ReportTrialBalance(models.AbstractModel): 'time': time, 'Accounts': account_res, } - return self.env['report'].render('account.report_trialbalance', docargs) diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index d3b871f24b8..2dde8c979bc 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -108,7 +108,7 @@ class ReportGeneralLedger(models.AbstractModel): return account_res @api.model - def render_html(self, docids, data=None): + def get_report_values(self, docids, data=None): self.model = self.env.context.get('active_model') docs = self.env[self.model].browse(self.env.context.get('active_ids', [])) @@ -121,7 +121,7 @@ class ReportGeneralLedger(models.AbstractModel): accounts = docs if self.model == 'account.account' else self.env['account.account'].search([]) accounts_res = self.with_context(data['form'].get('used_context',{}))._get_account_move_entry(accounts, init_balance, sortby, display_account) - docargs = { + return { 'doc_ids': docids, 'doc_model': self.model, 'data': data['form'], @@ -130,4 +130,3 @@ class ReportGeneralLedger(models.AbstractModel): 'Accounts': accounts_res, 'print_journal': codes, } - return self.env['report'].render('account.report_generalledger', docargs) diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py index d134891eb75..401ce8856d5 100644 --- a/addons/account/report/account_journal.py +++ b/addons/account/report/account_journal.py @@ -94,14 +94,14 @@ class ReportJournal(models.AbstractModel): return self.env['account.move.line'].with_context(data['form'].get('used_context', {}))._query_get() @api.model - def render_html(self, docids, data=None): + def get_report_values(self, docids, data=None): target_move = data['form'].get('target_move', 'all') sort_selection = data['form'].get('sort_selection', 'date') res = {} for journal in data['form']['journal_ids']: res[journal] = self.with_context(data['form'].get('used_context', {})).lines(target_move, journal, sort_selection, data) - docargs = { + return { 'doc_ids': data['form']['journal_ids'], 'doc_model': self.env['account.journal'], 'data': data, @@ -112,4 +112,3 @@ class ReportJournal(models.AbstractModel): 'sum_debit': self._sum_debit, 'get_taxes': self._get_taxes, } - return self.env['report'].render('account.report_journal', docargs) diff --git a/addons/account/report/account_overdue_report.py b/addons/account/report/account_overdue_report.py index fd032197233..2fa1df2ff6c 100644 --- a/addons/account/report/account_overdue_report.py +++ b/addons/account/report/account_overdue_report.py @@ -31,7 +31,7 @@ class ReportOverdue(models.AbstractModel): return res @api.model - def render_html(self, docids, data=None): + def get_report_values(self, docids, data=None): totals = {} lines = self._get_account_move_lines(docids) lines_to_display = {} @@ -57,7 +57,7 @@ class ReportOverdue(models.AbstractModel): totals[partner_id][currency]['paid'] += line['credit'] totals[partner_id][currency]['mat'] += line['mat'] totals[partner_id][currency]['total'] += line['debit'] - line['credit'] - docargs = { + return { 'doc_ids': docids, 'doc_model': 'res.partner', 'docs': self.env['res.partner'].browse(docids), @@ -66,4 +66,3 @@ class ReportOverdue(models.AbstractModel): 'Totals': totals, 'Date': fields.date.today(), } - return self.env['report'].render('account.report_overdue', values=docargs) diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py index ba2503d41a9..0ba3bfc5afa 100644 --- a/addons/account/report/account_partner_ledger.py +++ b/addons/account/report/account_partner_ledger.py @@ -68,7 +68,7 @@ class ReportPartnerLedger(models.AbstractModel): return result @api.model - def render_html(self, docids, data=None): + def get_report_values(self, docids, data=None): data['computed'] = {} obj_partner = self.env['res.partner'] @@ -107,7 +107,7 @@ class ReportPartnerLedger(models.AbstractModel): partners = obj_partner.browse(partner_ids) partners = sorted(partners, key=lambda x: (x.ref, x.name)) - docargs = { + return { 'doc_ids': partner_ids, 'doc_model': self.env['res.partner'], 'data': data, @@ -116,4 +116,3 @@ class ReportPartnerLedger(models.AbstractModel): 'lines': self._lines, 'sum_partner': self._sum_partner, } - return self.env['report'].render('account.report_partnerledger', docargs) diff --git a/addons/account/report/account_report_financial.py b/addons/account/report/account_report_financial.py index abb50715ac5..53981c78364 100644 --- a/addons/account/report/account_report_financial.py +++ b/addons/account/report/account_report_financial.py @@ -143,11 +143,11 @@ class ReportFinancial(models.AbstractModel): return lines @api.model - def render_html(self, docids, data=None): + def get_report_values(self, docids, data=None): self.model = self.env.context.get('active_model') docs = self.env[self.model].browse(self.env.context.get('active_id')) report_lines = self.get_account_lines(data.get('form')) - docargs = { + return { 'doc_ids': self.ids, 'doc_model': self.model, 'data': data['form'], @@ -155,4 +155,3 @@ class ReportFinancial(models.AbstractModel): 'time': time, 'get_account_lines': report_lines, } - return self.env['report'].render('account.report_financial', docargs) diff --git a/addons/account/report/account_report_payment_receipt_templates.xml b/addons/account/report/account_report_payment_receipt_templates.xml index 1e6e44588bd..a08104c4595 100644 --- a/addons/account/report/account_report_payment_receipt_templates.xml +++ b/addons/account/report/account_report_payment_receipt_templates.xml @@ -1,9 +1,9 @@