Browse Source

This update fixes a bug in the PDF report when using the 'Group Entries' option (this bug doesn't exist in the XLS variant of this report)

pull/7/merge
Luc De Meyer 11 years ago
committed by Guewen Baconnier
parent
commit
27ce6af6db
  1. 2
      account_journal_report_xls/__init__.py
  2. 11
      account_journal_report_xls/__openerp__.py
  3. 16
      account_journal_report_xls/report/nov_account_journal.py

2
account_journal_report_xls/__init__.py

@ -28,6 +28,4 @@ except ImportError:
import logging import logging
logging.getLogger('openerp.module').warning('report_xls not available in addons path. account_financial_report_webkit_xls will not be usable') logging.getLogger('openerp.module').warning('report_xls not available in addons path. account_financial_report_webkit_xls will not be usable')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

11
account_journal_report_xls/__openerp__.py

@ -3,7 +3,7 @@
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# #
# Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved.
# Copyright (c) 2014 Noviat nv/sa (www.noviat.com). All rights reserved.
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -12,11 +12,11 @@
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
@ -47,9 +47,8 @@ cf. https://launchpad.net/openerp-reporting-engines
'account_voucher', 'account_voucher',
'report_xls', 'report_xls',
], ],
'demo_xml': [],
'init_xml': [],
'update_xml': [
'demo': [],
'data': [
'wizard/print_journal_wizard.xml', 'wizard/print_journal_wizard.xml',
], ],
} }

16
account_journal_report_xls/report/nov_account_journal.py

@ -3,7 +3,7 @@
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# #
# Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved.
# Copyright (c) 2014 Noviat nv/sa (www.noviat.com). All rights reserved.
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -12,11 +12,11 @@
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
@ -165,6 +165,10 @@ class nov_journal_print(report_sxw.rml_parse):
#_logger.warn('code_string= %s', code_string) #_logger.warn('code_string= %s', code_string)
[x.update({'docname': eval(code_string) or '-'}) for x in lines] [x.update({'docname': eval(code_string) or '-'}) for x in lines]
# group lines
if self.group_entries:
lines = self._group_lines(lines)
# format debit, credit, amount_currency for pdf report # format debit, credit, amount_currency for pdf report
if self.display_currency and self.report_type == 'pdf': if self.display_currency and self.report_type == 'pdf':
curr_obj = self.pool.get('res.currency') curr_obj = self.pool.get('res.currency')
@ -175,10 +179,6 @@ class nov_journal_print(report_sxw.rml_parse):
else: else:
[x.update({'amount1': self.formatLang(x['debit']), 'amount2': self.formatLang(x['credit'])}) for x in lines] [x.update({'amount1': self.formatLang(x['debit']), 'amount2': self.formatLang(x['credit'])}) for x in lines]
# group lines
if self.group_entries:
lines = self._group_lines(lines)
# insert a flag in every move_line to indicate the end of a move # insert a flag in every move_line to indicate the end of a move
# this flag will be used to draw a full line between moves # this flag will be used to draw a full line between moves
for cnt in range(len(lines) - 1): for cnt in range(len(lines) - 1):
@ -215,7 +215,7 @@ class nov_journal_print(report_sxw.rml_parse):
grouped_lines = [lines_in[0]] grouped_lines = [lines_in[0]]
move_id = lines_in[0]['move_id'] move_id = lines_in[0]['move_id']
line_cnt = len(lines_in) line_cnt = len(lines_in)
for i in range(1,line_cnt):
for i in range(1, line_cnt):
line = lines_in[i] line = lines_in[i]
if line['move_id'] == move_id: if line['move_id'] == move_id:
grouped_lines.append(line) grouped_lines.append(line)

Loading…
Cancel
Save