Merge lp:~luc-demeyer/account-financial-report/bugfix-account_journal_report_xls into lp:~account-report-core-editor/account-financial-report/7.0

[Luc De Meyer (Noviat)]

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).

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Luc,

Can you please update your branch before making the MP? You have missed last revision.

Regards.

review: Needs Fixing

[Luc De Meyer (Noviat) (luc-demeyer)]

I effectively missed the try/except addition in the module __init__.py
I have added this and resubmitted the merge.

Regards,
Luc

-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Pedro Manuel Baeza
Sent: maandag 13 januari 2014 23:48
To: <email address hidden>
Subject: Re: [Merge] lp:~luc-demeyer/account-financial-report/bugfix-account_journal_report_xls into lp:account-financial-report

Review: Needs Fixing

Hi, Luc,

Can you please update your branch before making the MP? You have missed last revision.

Regards.
--
https://code.launchpad.net/~luc-demeyer/account-financial-report/bugfix-account_journal_report_xls/+merge/201511
You are the owner of lp:~luc-demeyer/account-financial-report/bugfix-account_journal_report_xls.

[Pedro Manuel Baeza (pedro.baeza)]

OK, now it looks good. Thank you.

Regards.

review: Approve (code review)

[Alexis de Lattre (alexis-via)]

LGTM

review: Approve (code review)

[Alexis de Lattre (alexis-via)]

By the way (but it is not the topic of this merge proposal), I think that we need to have the "Analytic account" field available in the module account_journal_report_xls (it is now available in the module account_move_line_report_xls)... I looked into the code, and this field doesn't seem to be available for the moment.

[Luc De Meyer (Noviat) (luc-demeyer)]

It's a 5 minutes job to add this field.
I haven't received this concrete question yet from our customer base, hence if we add this field, we probably should keep it out of the defaults list.

Regards,
Luc

-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Alexis de Lattre
Sent: woensdag 15 januari 2014 10:57
To: <email address hidden>
Subject: Re: [Merge] lp:~luc-demeyer/account-financial-report/bugfix-account_journal_report_xls into lp:account-financial-report

By the way (but it is not the topic of this merge proposal), I think that we need to have the "Analytic account" field available in the module account_journal_report_xls (it is now available in the module account_move_line_report_xls)... I looked into the code, and this field doesn't seem to be available for the moment.
--
https://code.launchpad.net/~luc-demeyer/account-financial-report/bugfix-account_journal_report_xls/+merge/201660
You are the owner of lp:~luc-demeyer/account-financial-report/bugfix-account_journal_report_xls.

[Alexis de Lattre (alexis-via)]

@Luc

I am surprised that your customer base never asked for analytic account in the journal export. Most of my customers use analytic accounting and your module account_journal_report_xls export is quite convenient to export journals to another accounting software (for the customers who have an external accountant).

If it's a 5 minutes job to add analytic account, let's do it :) It's not a problem if it's not in the default list, as it's easy to modify via inheritance. A second field would be convenient for me : the journal code (no need to put it in the default list, because we already have a tab per journal).

[Luc De Meyer (Noviat) (luc-demeyer)]

I have added following fields via new merge proposal:

'acc_name', # account.account,name
'journal', # account.journal,name
'journal_code', # account.journal,code
'analytic_account', # account.analytic.account,name
'analytic_account_code', # account.analytic.account,code

Regards,
Luc

-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Alexis de Lattre
Sent: vrijdag 17 januari 2014 11:41
To: <email address hidden>
Subject: Re: [Merge] lp:~luc-demeyer/account-financial-report/bugfix-account_journal_report_xls into lp:account-financial-report

@Luc

I am surprised that your customer base never asked for analytic account in the journal export. Most of my customers use analytic accounting and your module account_journal_report_xls export is quite convenient to export journals to another accounting software (for the customers who have an external accountant).

If it's a 5 minutes job to add analytic account, let's do it :) It's not a problem if it's not in the default list, as it's easy to modify via inheritance. A second field would be convenient for me : the journal code (no need to put it in the default list, because we already have a tab per journal).
--
https://code.launchpad.net/~luc-demeyer/account-financial-report/bugfix-account_journal_report_xls/+merge/201660
You are the owner of lp:~luc-demeyer/account-financial-report/bugfix-account_journal_report_xls.

=== modified file 'account_journal_report_xls/__init__.py'
--- account_journal_report_xls/__init__.py	2014-01-08 11:49:48 +0000
+++ account_journal_report_xls/__init__.py	2014-01-14 19:42:45 +0000
@@ -28,6 +28,4 @@
     import logging
     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:

=== modified file 'account_journal_report_xls/__openerp__.py'
--- account_journal_report_xls/__openerp__.py	2013-12-19 17:08:40 +0000
+++ account_journal_report_xls/__openerp__.py	2014-01-14 19:42:45 +0000
@@ -3,7 +3,7 @@
 #
 #    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
 #    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,
 #    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.
 #
 #    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 @@
         'account_voucher',
         'report_xls',
     ],
-    'demo_xml': [],
-    'init_xml': [],
-    'update_xml': [
+    'demo': [],
+    'data': [
         'wizard/print_journal_wizard.xml',
     ],
 }

=== modified file 'account_journal_report_xls/report/nov_account_journal.py'
--- account_journal_report_xls/report/nov_account_journal.py	2013-12-23 21:36:43 +0000
+++ account_journal_report_xls/report/nov_account_journal.py	2014-01-14 19:42:45 +0000
@@ -3,7 +3,7 @@
 #
 #    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
 #    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,
 #    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.
 #
 #    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 @@
             #_logger.warn('code_string= %s', code_string)
             [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
         if self.display_currency and self.report_type == 'pdf':
             curr_obj = self.pool.get('res.currency')
@@ -175,10 +179,6 @@
         else:
             [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
         # this flag will be used to draw a full line between moves
         for cnt in range(len(lines) - 1):
@@ -215,7 +215,7 @@
         grouped_lines = [lines_in[0]]
         move_id = lines_in[0]['move_id']
         line_cnt = len(lines_in)
-        for i in range(1,line_cnt):
+        for i in range(1, line_cnt):
             line = lines_in[i]
             if line['move_id'] == move_id:
                 grouped_lines.append(line)