From e80238042c9d93d492ea8b06b0041aced0d81dcd Mon Sep 17 00:00:00 2001 From: Laurent Smet Date: Wed, 26 Apr 2017 09:31:55 +0200 Subject: [PATCH] [REF] report: remove the report module The content of the report module is now dispatched in the 'base' and the 'web' modules. --- addons/account/__manifest__.py | 2 +- addons/account/models/account_invoice.py | 6 +- .../report/account_aged_partner_balance.py | 5 +- addons/account/report/account_balance.py | 5 +- .../account/report/account_general_ledger.py | 5 +- addons/account/report/account_journal.py | 5 +- .../account/report/account_overdue_report.py | 5 +- .../account/report/account_partner_ledger.py | 5 +- .../report/account_report_financial.py | 5 +- ...count_report_payment_receipt_templates.xml | 4 +- .../views/report_agedpartnerbalance.xml | 4 +- addons/account/views/report_financial.xml | 4 +- addons/account/views/report_generalledger.xml | 4 +- addons/account/views/report_invoice.xml | 6 +- addons/account/views/report_journal.xml | 4 +- addons/account/views/report_overdue.xml | 4 +- addons/account/views/report_partnerledger.xml | 4 +- addons/account/views/report_trialbalance.xml | 4 +- .../wizard/account_financial_report.py | 2 +- .../account_report_aged_partner_balance.py | 2 +- .../wizard/account_report_general_ledger.py | 2 +- .../wizard/account_report_partner_ledger.py | 2 +- .../wizard/account_report_print_journal.py | 2 +- .../wizard/account_report_trial_balance.py | 2 +- .../report/report_account_test.py | 8 +- .../report/report_account_test_templates.xml | 4 +- addons/analytic/__manifest__.py | 2 +- addons/base_setup/models/res_config.py | 34 +- addons/base_setup/views/res_config_views.xml | 41 +- addons/event/__manifest__.py | 2 +- addons/event/report/event_event_templates.xml | 4 +- addons/hr_attendance/__manifest__.py | 2 +- .../report/hr_employee_badge.xml | 2 +- addons/hr_expense/__manifest__.py | 2 +- .../report/report_expense_sheet.xml | 4 +- addons/hr_expense/views/report_expense.xml | 4 +- addons/hr_holidays/__manifest__.py | 2 +- .../report/holidays_summary_report.py | 8 +- .../report/hr_holidays_reports.xml | 4 +- .../report/hr_holidays_templates.xml | 4 +- .../wizard/hr_holidays_summary_department.py | 2 +- .../wizard/hr_holidays_summary_employees.py | 2 +- addons/hr_payroll/__manifest__.py | 1 - .../report/report_contribution_register.py | 5 +- .../report/report_payslip_details.py | 5 +- .../report_contributionregister_templates.xml | 4 +- .../views/report_payslip_templates.xml | 4 +- .../views/report_payslipdetails_templates.xml | 4 +- ...hr_payroll_contribution_register_report.py | 2 +- .../report/report_timesheet_templates.xml | 4 +- addons/l10n_ca/data/res_company_data.xml | 2 +- addons/l10n_ch/models/account_invoice.py | 2 +- addons/l10n_ch/models/mail_template.py | 2 +- addons/l10n_ch/report/isr_report.xml | 6 +- addons/l10n_fr/views/report_l10nfrbilan.xml | 4 +- .../l10n_fr/views/report_l10nfrresultat.xml | 4 +- .../l10n_fr_hr_payroll/report/fiche_paye.py | 5 +- .../report/report_l10n_fr_fiche_paye.xml | 4 +- .../report_hr_salary_employee_bymonth.py | 5 +- .../report/report_hr_yearly_salary_detail.py | 5 +- .../report/report_payroll_advice.py | 5 +- .../report/report_payslip_details.py | 5 +- .../views/l10n_in_hr_payroll_report.xml | 8 +- ...rt_hr_salary_employee_bymonth_template.xml | 4 +- ...eport_hr_yearly_salary_detail_template.xml | 4 +- .../views/report_payroll_advice_template.xml | 4 +- .../views/report_payslip_details_template.xml | 4 +- .../wizard/hr_salary_employee_bymonth.py | 2 +- .../wizard/hr_yearly_salary_detail.py | 2 +- addons/l10n_us/__manifest__.py | 2 +- addons/l10n_us/data/res_company_data.xml | 2 +- addons/lunch/report/lunch_order_templates.xml | 4 +- addons/mail/models/mail_template.py | 2 +- addons/mrp/report/mrp_bom_cost_report.py | 4 +- .../report/mrp_bom_cost_report_templates.xml | 4 +- addons/mrp/report/mrp_bom_structure_report.py | 5 +- .../mrp_bom_structure_report_templates.xml | 4 +- .../mrp/report/mrp_production_templates.xml | 4 +- addons/mrp_repair/models/mrp_repair.py | 2 +- .../mrp_repair_templates_repair_order.xml | 4 +- addons/point_of_sale/controllers/main.py | 2 +- addons/point_of_sale/models/pos_order.py | 4 +- addons/point_of_sale/report/pos_invoice.py | 5 +- .../views/report_saledetails.xml | 4 +- .../point_of_sale/views/report_statement.xml | 4 +- .../point_of_sale/views/report_userlabel.xml | 2 +- addons/point_of_sale/wizard/pos_details.py | 3 +- addons/product/__manifest__.py | 2 +- addons/product/report/product_pricelist.py | 5 +- .../report/product_pricelist_templates.xml | 4 +- .../report/product_product_templates.xml | 2 +- .../report/product_template_templates.xml | 2 +- addons/product/wizard/product_price_list.py | 2 +- addons/purchase/__manifest__.py | 2 +- addons/purchase/models/purchase.py | 2 +- .../report/purchase_order_templates.xml | 4 +- .../report/purchase_quotation_templates.xml | 4 +- .../report/report_purchaserequisition.xml | 4 +- addons/report/__init__.py | 6 - addons/report/__manifest__.py | 28 - addons/report/controllers/__init__.py | 4 - addons/report/controllers/main.py | 126 --- addons/report/data/report_demo.xml | 8 - .../report/data/report_paperformat_data.xml | 52 -- addons/report/i18n/af.po | 528 ------------- addons/report/i18n/ar.po | 515 ------------ addons/report/i18n/bg.po | 518 ------------ addons/report/i18n/bs.po | 514 ------------ addons/report/i18n/ca.po | 529 ------------- addons/report/i18n/cs.po | 517 ------------ addons/report/i18n/da.po | 514 ------------ addons/report/i18n/de.po | 530 ------------- addons/report/i18n/el.po | 523 ------------- addons/report/i18n/en_GB.po | 515 ------------ addons/report/i18n/es.po | 738 ------------------ addons/report/i18n/es_AR.po | 518 ------------ addons/report/i18n/es_BO.po | 514 ------------ addons/report/i18n/es_CL.po | 518 ------------ addons/report/i18n/es_CO.po | 532 ------------- addons/report/i18n/es_CR.po | 514 ------------ addons/report/i18n/es_DO.po | 531 ------------- addons/report/i18n/es_EC.po | 531 ------------- addons/report/i18n/es_PE.po | 518 ------------ addons/report/i18n/es_PY.po | 514 ------------ addons/report/i18n/es_VE.po | 514 ------------ addons/report/i18n/et.po | 513 ------------ addons/report/i18n/eu.po | 513 ------------ addons/report/i18n/fa.po | 513 ------------ addons/report/i18n/fi.po | 520 ------------ addons/report/i18n/fo.po | 513 ------------ addons/report/i18n/fr.po | 732 ----------------- addons/report/i18n/fr_CA.po | 514 ------------ addons/report/i18n/gl.po | 513 ------------ addons/report/i18n/he.po | 513 ------------ addons/report/i18n/hr.po | 530 ------------- addons/report/i18n/hu.po | 730 ----------------- addons/report/i18n/id.po | 523 ------------- addons/report/i18n/it.po | 533 ------------- addons/report/i18n/ja.po | 514 ------------ addons/report/i18n/ka.po | 513 ------------ addons/report/i18n/kab.po | 513 ------------ addons/report/i18n/ko.po | 519 ------------ addons/report/i18n/lt.po | 529 ------------- addons/report/i18n/lv.po | 514 ------------ addons/report/i18n/mk.po | 522 ------------- addons/report/i18n/mn.po | 523 ------------- addons/report/i18n/nb.po | 515 ------------ addons/report/i18n/nl.po | 736 ----------------- addons/report/i18n/nl_BE.po | 514 ------------ addons/report/i18n/pl.po | 525 ------------- addons/report/i18n/pt.po | 530 ------------- addons/report/i18n/pt_BR.po | 736 ----------------- addons/report/i18n/report.pot | 709 ----------------- addons/report/i18n/ro.po | 525 ------------- addons/report/i18n/ru.po | 530 ------------- addons/report/i18n/sk.po | 527 ------------- addons/report/i18n/sl.po | 523 ------------- addons/report/i18n/sq.po | 513 ------------ addons/report/i18n/sr.po | 514 ------------ addons/report/i18n/sr@latin.po | 520 ------------ addons/report/i18n/sv.po | 513 ------------ addons/report/i18n/ta.po | 515 ------------ addons/report/i18n/th.po | 524 ------------- addons/report/i18n/tr.po | 535 ------------- addons/report/i18n/uk.po | 530 ------------- addons/report/i18n/vi.po | 514 ------------ addons/report/i18n/zh_CN.po | 731 ----------------- addons/report/i18n/zh_TW.po | 514 ------------ addons/report/models/__init__.py | 11 - addons/report/models/abstract_report.py | 49 -- addons/report/models/base_config_settings.py | 40 - addons/report/models/ir_actions_report.py | 24 - addons/report/models/ir_http.py | 13 - addons/report/models/ir_qweb.py | 27 - addons/report/models/report.py | 608 --------------- addons/report/models/res_company.py | 41 - addons/report/security/ir.model.access.csv | 4 - .../static/src/pdf/preview_background.pdf | Bin 197777 -> 0 bytes .../report/static/src/pdf/preview_boxed.pdf | Bin 42109 -> 0 bytes .../report/static/src/pdf/preview_clean.pdf | Bin 35495 -> 0 bytes .../static/src/pdf/preview_standard.pdf | Bin 27399 -> 0 bytes addons/report/tests/__init__.py | 1 - .../views/base_config_settings_views.xml | 50 -- .../report/views/ir_actions_report_views.xml | 34 - addons/report/views/res_company_view.xml | 50 -- addons/report/views/templates.xml | 373 --------- .../report_intrastat_invoice_template.xml | 4 +- addons/sale/__manifest__.py | 2 +- addons/sale/data/mail_template_data.xml | 2 +- addons/sale/models/sale.py | 2 +- addons/sale/report/sale_report.py | 5 +- addons/sale/report/sale_report.xml | 4 +- addons/sale/report/sale_report_templates.xml | 4 +- addons/stock/models/stock_picking.py | 2 +- addons/stock/report/report_deliveryslip.xml | 4 +- .../stock/report/report_location_barcode.xml | 4 +- addons/stock/report/report_lot_barcode.xml | 2 +- .../stock/report/report_package_barcode.xml | 4 +- addons/stock/report/report_stockinventory.xml | 4 +- .../report/report_stockpicking_operations.xml | 4 +- .../models/stock_picking_wave.py | 2 +- addons/web/__manifest__.py | 1 + addons/web/controllers/main.py | 117 ++- addons/web/models/ir_http.py | 1 + .../static/src/css/reset.min.css | 0 .../static/src/js/report}/client_action.js | 0 .../src/js/report}/qwebactionmanager.js | 0 .../static/src/js/report}/report.editor.js | 0 .../js => web/static/src/js/report}/subst.js | 0 .../js => web/static/src/js/report}/utils.js | 0 .../static/src/less/layout_background.less | 0 .../static/src/less/layout_boxed.less | 0 .../static/src/less/layout_clean.less | 0 .../static/src/less/report.editor.less | 0 .../static/src/less/report.less | 0 .../static/src/less/report_backend.less | 0 .../{report => web}/static/src/xml/report.xml | 0 addons/web/views/report_templates.xml | 361 +++++++++ addons/web/views/webclient_templates.xml | 5 + .../website_portal_sale/controllers/main.py | 2 +- addons/website_quote/controllers/main.py | 2 +- .../report/website_quote_templates.xml | 4 +- addons/website_sale/controllers/main.py | 2 +- odoo/addons/base/__init__.py | 1 - odoo/addons/base/__manifest__.py | 1 + odoo/addons/base/base_data.xml | 48 ++ odoo/addons/base/base_demo.xml | 2 +- odoo/addons/base/ir/__init__.py | 1 + odoo/addons/base/ir/ir_actions.py | 94 +-- odoo/addons/base/ir/ir_actions.xml | 6 + odoo/addons/base/ir/ir_actions_report.py | 711 +++++++++++++++++ odoo/addons/base/ir/ir_model_report.xml | 1 - odoo/addons/base/ir/ir_qweb/fields.py | 22 + odoo/addons/base/ir/report_ir_model.xml | 2 +- odoo/addons/base/module/module_report.xml | 1 - .../report/ir_module_reference_print.py | 8 +- .../report/report_ir_module_reference.xml | 4 +- odoo/addons/base/res/__init__.py | 1 + .../addons/base/res}/report_paperformat.py | 0 .../base/res}/report_paperformat_views.xml | 21 +- odoo/addons/base/res/res_company.py | 34 + odoo/addons/base/res/res_company_view.xml | 46 ++ odoo/addons/base/security/ir.model.access.csv | 2 + .../static}/img/bg_background_template.jpg | Bin .../addons/base/static}/img/logo_sample.png | Bin .../base/static}/img/preview_background.png | Bin .../addons/base/static}/img/preview_boxed.png | Bin .../addons/base/static}/img/preview_clean.png | Bin .../base/static}/img/preview_standard.png | Bin .../base/static/pdf/preview_background.pdf | 0 odoo/addons/base/static/pdf/preview_boxed.pdf | 0 odoo/addons/base/static/pdf/preview_clean.pdf | 0 .../base/static/pdf/preview_standard.pdf | 0 odoo/addons/base/tests/__init__.py | 1 + .../addons/base}/tests/test_reports.py | 2 +- odoo/tools/yaml_import.py | 4 - 256 files changed, 1644 insertions(+), 36631 deletions(-) delete mode 100644 addons/report/__init__.py delete mode 100644 addons/report/__manifest__.py delete mode 100644 addons/report/controllers/__init__.py delete mode 100644 addons/report/controllers/main.py delete mode 100644 addons/report/data/report_demo.xml delete mode 100644 addons/report/data/report_paperformat_data.xml delete mode 100644 addons/report/i18n/af.po delete mode 100644 addons/report/i18n/ar.po delete mode 100644 addons/report/i18n/bg.po delete mode 100644 addons/report/i18n/bs.po delete mode 100644 addons/report/i18n/ca.po delete mode 100644 addons/report/i18n/cs.po delete mode 100644 addons/report/i18n/da.po delete mode 100644 addons/report/i18n/de.po delete mode 100644 addons/report/i18n/el.po delete mode 100644 addons/report/i18n/en_GB.po delete mode 100644 addons/report/i18n/es.po delete mode 100644 addons/report/i18n/es_AR.po delete mode 100644 addons/report/i18n/es_BO.po delete mode 100644 addons/report/i18n/es_CL.po delete mode 100644 addons/report/i18n/es_CO.po delete mode 100644 addons/report/i18n/es_CR.po delete mode 100644 addons/report/i18n/es_DO.po delete mode 100644 addons/report/i18n/es_EC.po delete mode 100644 addons/report/i18n/es_PE.po delete mode 100644 addons/report/i18n/es_PY.po delete mode 100644 addons/report/i18n/es_VE.po delete mode 100644 addons/report/i18n/et.po delete mode 100644 addons/report/i18n/eu.po delete mode 100644 addons/report/i18n/fa.po delete mode 100644 addons/report/i18n/fi.po delete mode 100644 addons/report/i18n/fo.po delete mode 100644 addons/report/i18n/fr.po delete mode 100644 addons/report/i18n/fr_CA.po delete mode 100644 addons/report/i18n/gl.po delete mode 100644 addons/report/i18n/he.po delete mode 100644 addons/report/i18n/hr.po delete mode 100644 addons/report/i18n/hu.po delete mode 100644 addons/report/i18n/id.po delete mode 100644 addons/report/i18n/it.po delete mode 100644 addons/report/i18n/ja.po delete mode 100644 addons/report/i18n/ka.po delete mode 100644 addons/report/i18n/kab.po delete mode 100644 addons/report/i18n/ko.po delete mode 100644 addons/report/i18n/lt.po delete mode 100644 addons/report/i18n/lv.po delete mode 100644 addons/report/i18n/mk.po delete mode 100644 addons/report/i18n/mn.po delete mode 100644 addons/report/i18n/nb.po delete mode 100644 addons/report/i18n/nl.po delete mode 100644 addons/report/i18n/nl_BE.po delete mode 100644 addons/report/i18n/pl.po delete mode 100644 addons/report/i18n/pt.po delete mode 100644 addons/report/i18n/pt_BR.po delete mode 100644 addons/report/i18n/report.pot delete mode 100644 addons/report/i18n/ro.po delete mode 100644 addons/report/i18n/ru.po delete mode 100644 addons/report/i18n/sk.po delete mode 100644 addons/report/i18n/sl.po delete mode 100644 addons/report/i18n/sq.po delete mode 100644 addons/report/i18n/sr.po delete mode 100644 addons/report/i18n/sr@latin.po delete mode 100644 addons/report/i18n/sv.po delete mode 100644 addons/report/i18n/ta.po delete mode 100644 addons/report/i18n/th.po delete mode 100644 addons/report/i18n/tr.po delete mode 100644 addons/report/i18n/uk.po delete mode 100644 addons/report/i18n/vi.po delete mode 100644 addons/report/i18n/zh_CN.po delete mode 100644 addons/report/i18n/zh_TW.po delete mode 100644 addons/report/models/__init__.py delete mode 100644 addons/report/models/abstract_report.py delete mode 100644 addons/report/models/base_config_settings.py delete mode 100644 addons/report/models/ir_actions_report.py delete mode 100644 addons/report/models/ir_http.py delete mode 100644 addons/report/models/ir_qweb.py delete mode 100644 addons/report/models/report.py delete mode 100644 addons/report/models/res_company.py delete mode 100644 addons/report/security/ir.model.access.csv delete mode 100644 addons/report/static/src/pdf/preview_background.pdf delete mode 100644 addons/report/static/src/pdf/preview_boxed.pdf delete mode 100644 addons/report/static/src/pdf/preview_clean.pdf delete mode 100644 addons/report/static/src/pdf/preview_standard.pdf delete mode 100644 addons/report/tests/__init__.py delete mode 100644 addons/report/views/base_config_settings_views.xml delete mode 100644 addons/report/views/ir_actions_report_views.xml delete mode 100644 addons/report/views/res_company_view.xml delete mode 100644 addons/report/views/templates.xml rename addons/{report => web}/static/src/css/reset.min.css (100%) rename addons/{report/static/src/js => web/static/src/js/report}/client_action.js (100%) rename addons/{report/static/src/js => web/static/src/js/report}/qwebactionmanager.js (100%) rename addons/{report/static/src/js => web/static/src/js/report}/report.editor.js (100%) rename addons/{report/static/src/js => web/static/src/js/report}/subst.js (100%) rename addons/{report/static/src/js => web/static/src/js/report}/utils.js (100%) rename addons/{report => web}/static/src/less/layout_background.less (100%) rename addons/{report => web}/static/src/less/layout_boxed.less (100%) rename addons/{report => web}/static/src/less/layout_clean.less (100%) rename addons/{report => web}/static/src/less/report.editor.less (100%) rename addons/{report => web}/static/src/less/report.less (100%) rename addons/{report => web}/static/src/less/report_backend.less (100%) rename addons/{report => web}/static/src/xml/report.xml (100%) create mode 100644 addons/web/views/report_templates.xml create mode 100644 odoo/addons/base/ir/ir_actions_report.py rename {addons/report/models => odoo/addons/base/res}/report_paperformat.py (100%) rename {addons/report/views => odoo/addons/base/res}/report_paperformat_views.xml (90%) rename {addons/report/static/src => odoo/addons/base/static}/img/bg_background_template.jpg (100%) rename {addons/report/static/src => odoo/addons/base/static}/img/logo_sample.png (100%) rename {addons/report/static/src => odoo/addons/base/static}/img/preview_background.png (100%) rename {addons/report/static/src => odoo/addons/base/static}/img/preview_boxed.png (100%) rename {addons/report/static/src => odoo/addons/base/static}/img/preview_clean.png (100%) rename {addons/report/static/src => odoo/addons/base/static}/img/preview_standard.png (100%) create mode 100644 odoo/addons/base/static/pdf/preview_background.pdf create mode 100644 odoo/addons/base/static/pdf/preview_boxed.pdf create mode 100644 odoo/addons/base/static/pdf/preview_clean.pdf create mode 100644 odoo/addons/base/static/pdf/preview_standard.pdf rename {addons/report => odoo/addons/base}/tests/test_reports.py (93%) 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 @@