summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqdp-odoo <qdp@odoo.com>2016-05-18 11:45:55 +0200
committerqdp-odoo <qdp@odoo.com>2016-06-06 13:06:27 +0200
commit9699dac8182df087ecdfb893ebc85f30031b471d (patch)
tree9da1cc30eabdd009fb9db864f967a04baa47d204
parent7853d0da26057b224d7cce829b8c18b1487a9656 (diff)
[FIX] account: fixed old references to account_extra_report module forgotten during the merge into account
-rw-r--r--addons/account/report/account_journal.py4
-rw-r--r--addons/account/report/account_partner_ledger.py4
-rw-r--r--addons/account/views/account_report.xml12
-rw-r--r--addons/account/wizard/account_report_partner_ledger.py2
-rw-r--r--addons/account/wizard/account_report_print_journal.py2
5 files changed, 12 insertions, 12 deletions
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 90bfba7cba0..55ef6635172 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -5,7 +5,7 @@ from openerp import api, models
class ReportJournal(models.AbstractModel):
- _name = 'report.account_extra_reports.report_journal'
+ _name = 'report.account.report_journal'
def lines(self, target_move, journal_ids, sort_selection, data):
if isinstance(journal_ids, int):
@@ -112,4 +112,4 @@ class ReportJournal(models.AbstractModel):
'sum_debit': self._sum_debit,
'get_taxes': self._get_taxes,
}
- return self.env['report'].render('account_extra_reports.report_journal', docargs)
+ return self.env['report'].render('account.report_journal', docargs)
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 2bf1c0ca8ca..9c5eee46151 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -5,7 +5,7 @@ from openerp import api, models
class ReportPartnerLedger(models.AbstractModel):
- _name = 'report.account_extra_reports.report_partnerledger'
+ _name = 'report.account.report_partnerledger'
def _lines(self, data, partner):
full_account = []
@@ -107,4 +107,4 @@ class ReportPartnerLedger(models.AbstractModel):
'lines': self._lines,
'sum_partner': self._sum_partner,
}
- return self.env['report'].render('account_extra_reports.report_partnerledger', docargs)
+ return self.env['report'].render('account.report_partnerledger', docargs)
diff --git a/addons/account/views/account_report.xml b/addons/account/views/account_report.xml
index 32d5a2745f3..6285e1f6224 100644
--- a/addons/account/views/account_report.xml
+++ b/addons/account/views/account_report.xml
@@ -71,20 +71,20 @@
<report
id="action_report_journal"
- model="account_extra_reports.report.journal"
+ model="account.report.journal"
string="Sale/Purchase Journal"
report_type="qweb-pdf"
- name="account_extra_reports.report_journal"
- file="account_extra_reports.report_journal"
+ name="account.report_journal"
+ file="account.report_journal"
/>
<report
id="action_report_partnerledger"
- model="account_extra_reports.report_partnerledger"
+ model="account.report_partnerledger"
string="Partner Ledger"
report_type="qweb-pdf"
- name="account_extra_reports.report_partnerledger"
- file="account_extra_reports.report_partnerledger"
+ name="account.report_partnerledger"
+ file="account.report_partnerledger"
/>
</data>
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 0a92f43eca7..08edc3c4056 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -15,4 +15,4 @@ class AccountPartnerLedger(models.TransientModel):
def _print_report(self, data):
data = self.pre_print_report(data)
data['form'].update({'reconciled': self.reconciled, 'amount_currency': self.amount_currency})
- return self.env['report'].get_action(self, 'account_extra_reports.report_partnerledger', data=data)
+ return self.env['report'].get_action(self, 'account.report_partnerledger', data=data)
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index d8b465b2a96..e4ca225c0cc 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -14,4 +14,4 @@ class AccountPrintJournal(models.TransientModel):
def _print_report(self, data):
data = self.pre_print_report(data)
data['form'].update({'sort_selection': self.sort_selection})
- return self.env['report'].with_context(landscape=True).get_action(self, 'account_extra_reports.report_journal', data=data)
+ return self.env['report'].with_context(landscape=True).get_action(self, 'account.report_journal', data=data)