Merge lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-GL-fix into lp:~account-report-core-editor/account-financial-report/7.0

[Luc De Meyer (Noviat)]

General Ledger should include accounting move lines in close & opening periods.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Is there a bug report about this issue?
If it does can you link it?
If not can you create it?

l.64 + l.81 + l.104 + l.110 + l.114

Just a note about credits, your user name will be in the commit if someone really wants to know who wrote a specific line of code for exemple with bzr blame.

If you want to show you contributed to a module, please only add this in __openerp__.py under Contributors in description. It will even be better for your Company as it will be visible on apps.openerp.com and not only hidden somewhere in the code.

https://doc.openerp.com/contribute/05_developing_modules/#modules-description

Here is an exemple

http://bazaar.launchpad.net/~stock-logistic-core-editors/carriers-deliveries/7.0/view/head:/base_delivery_carrier_label/__openerp__.py

review: Needs Information

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Hello,

As there was no activity on this MP I'll set it as Work in progress.
Feel free to set it back to Need reviews

Cheers

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

There is no bug report since imho the 'Description of Change' is clear : "General Ledger should include accounting move lines in close & opening periods."
Without this fix, you don't get a complete history of all moves in a certain fiscal year.

Regards,
Luc

www.noviat.com
Rusatiralaan 1, 1083 Brussel
[phone]

-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Yannick Vaucher @ Camptocamp
Sent: vrijdag 31 januari 2014 10:48
To: <email address hidden>
Subject: Re: [Merge] lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-GL-fix into lp:account-financial-report

Review: Needs Information

Is there a bug report about this issue?
If it does can you link it?
If not can you create it?

l.64 + l.81 + l.104 + l.110 + l.114

Just a note about credits, your user name will be in the commit if someone really wants to know who wrote a specific line of code for exemple with bzr blame.

If you want to show you contributed to a module, please only add this in __openerp__.py under Contributors in description. It will even be better for your Company as it will be visible on apps.openerp.com and not only hidden somewhere in the code.

https://doc.openerp.com/contribute/05_developing_modules/#modules-description

Here is an exemple

http://bazaar.launchpad.net/~stock-logistic-core-editors/carriers-deliveries/7.0/view/head:/base_delivery_carrier_label/__openerp__.py

--
https://code.launchpad.net/~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-GL-fix/+merge/193709
You are the owner of lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-GL-fix.

[Stéphane Bidoul (Acsone) (sbi)]

Is this MP related to bug lp:1172779 ?

If yes, the discussion in the merge proposals linked to that bug might be of interest.

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

Stephane,

bug lp:1172779 indeed describes the same problem as the one for which I made the merge proposal.

I think the error description is clear. The patch is only a few lines of code and runs at all our customers hence it is tested and stable.

I hope someone at C2C finds to the time to review and merge so that we stop applying this patch every time we install this module.

Regards,
Luc

www.noviat.com
Rusatiralaan 1, 1083 Brussel
[phone]

-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Stéphane Bidoul (Acsone)
Sent: dinsdag 25 februari 2014 9:28
To: <email address hidden>
Subject: Re: [Merge] lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-GL-fix into lp:account-financial-report

Is this MP related to bug lp:1172779 ?

If yes, the discussion in the merge proposals linked to that bug might be of interest.

--
https://code.launchpad.net/~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-GL-fix/+merge/193709
You are the owner of lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-GL-fix.

[Stéphane Bidoul (Acsone) (sbi)]

At the time, there was debate about showing the detail or a summary of opening moves.

https://code.launchpad.net/~sbi/account-financial-report/account-financial-report-bug1172779/+merge/160949/comments/361722

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

I missed that debate but I believe we should show all lines and not the sum (except for the accounts configured as 'centralized').

www.noviat.com
Rusatiralaan 1, 1083 Brussel
[phone]

-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Stéphane Bidoul (Acsone)
Sent: vrijdag 28 februari 2014 19:24
To: <email address hidden>
Subject: Re: [Merge] lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-GL-fix into lp:account-financial-report

At the time, there was debate about showing the detail or a summary of opening moves.

https://code.launchpad.net/~sbi/account-financial-report/account-financial-report-bug1172779/+merge/160949/comments/361722

--
https://code.launchpad.net/~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-GL-fix/+merge/193709
You are the owner of lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-GL-fix.

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/account-financial-reporting. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting

Unmerged revisions

57. By Luc De Meyer on 2013-11-03

add open/close entries to GL

=== modified file 'account_financial_report_webkit/__init__.py'
--- account_financial_report_webkit/__init__.py	2012-03-06 09:13:59 +0000
+++ account_financial_report_webkit/__init__.py	2013-11-03 20:44:40 +0000
@@ -18,6 +18,7 @@
 #
 ##############################################################################
 import account
+from . import account_period
 from . import wizard
 from . import report
 from . import account_move_line
 \ No newline at end of file
 
=== added file 'account_financial_report_webkit/account_period.py'
--- account_financial_report_webkit/account_period.py	1970-01-01 00:00:00 +0000
+++ account_financial_report_webkit/account_period.py	2013-11-03 20:44:40 +0000
@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2013 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
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    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
+#    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/>.
+#
+##############################################################################
+
+from openerp.osv import orm
+
+class account_period(orm.Model):
+    _inherit = 'account.period'
+
+    def build_ctx_periods(self, cr, uid, period_from_id, period_to_id):
+        """ add close periods """
+        period_ids = super(account_period, self).build_ctx_periods(cr, uid, period_from_id, period_to_id)
+        period_to = self.browse(cr, uid, period_to_id)
+        period_date_stop = period_to.date_stop
+        close_period_ids = self.search(cr, uid, [('date_stop', '=', period_date_stop), ('special', '=', True), ('company_id', '=', period_to.company_id.id)])
+        for p in close_period_ids:
+            if p not in period_ids:
+                period_ids.append(p)
+        return period_ids
 
=== modified file 'account_financial_report_webkit/report/common_reports.py'
--- account_financial_report_webkit/report/common_reports.py	2013-09-12 20:53:27 +0000
+++ account_financial_report_webkit/report/common_reports.py	2013-11-03 20:44:40 +0000
@@ -217,7 +217,15 @@
 
     def exclude_opening_periods(self, period_ids):
         period_obj = self.pool.get('account.period')
-        return period_obj.search(self.cr, self.uid, [['special', '=', False], ['id', 'in', period_ids]])
+        # FIX by Noviat: close periods should be included
+        self.cr.execute("SELECT p.id " \
+                    "FROM account_period p " \
+                    "INNER JOIN account_fiscalyear f ON p.fiscalyear_id = f.id " \
+                    "WHERE (special = FALSE or (special = TRUE AND p.date_stop = f.date_stop)) " \
+                    "AND p.id IN %s", (tuple(period_ids),))
+        period_ids = self.cr.fetchall()
+        period_ids = [x[0] for x in period_ids]
+        return period_ids
 
     def get_included_opening_period(self, period):
         """Return the opening included in normal period we use the assumption
@@ -384,7 +392,16 @@
                 if pnl_periods_ids and not opening_period_selected:
                     res[acc.id] = self._compute_init_balance(acc.id, pnl_periods_ids)
             else:
-                res[acc.id] = self._compute_init_balance(acc.id, bs_period_ids)
+                # FIX by Noviat
+                if not bs_period_ids:
+                    res[acc.id] = {
+                        'debit': 0.0,
+                        'credit': 0.0,
+                        'init_balance': 0.0,
+                        'init_balance_currency': 0.0,
+                        'state': 'computed'}
+                else:
+                    res[acc.id] = self._compute_init_balance(acc.id, bs_period_ids)
         return res
 
     ####################Account move retrieval helper ##########################
 
=== modified file 'account_financial_report_webkit/report/general_ledger.py'
--- account_financial_report_webkit/report/general_ledger.py	2013-05-08 14:03:48 +0000
+++ account_financial_report_webkit/report/general_ledger.py	2013-11-03 20:44:40 +0000
@@ -207,6 +207,27 @@
             line['counterparts'] = counter_parts.get(line.get('move_id'), '')
         return res
 
+    def _get_move_ids_from_periods(self, account_id, period_start, period_stop, target_move):
+        """
+        Change by Noviat: override this methods since we want to include the opening entries in the general ledger
+        """
+        move_line_obj = self.pool.get('account.move.line')
+        period_obj = self.pool.get('account.period')
+        periods = period_obj.build_ctx_periods(self.cursor, self.uid, period_start.id, period_stop.id)
+
+        #>>> change Noviat
+        special = period_obj.search(self.cursor, self.uid, [('date_start', '>=', period_start.date_start), ('date_stop', '<=', period_stop.date_stop), 
+            ('company_id', '=', period_start.company_id.id), ('special', '=', True)])
+        periods += special
+        #<<< change Noviat
+
+        if not periods:
+            return []
+        
+        search = [('period_id', 'in', periods), ('account_id', '=', account_id)]
+        if target_move == 'posted':
+            search += [('move_id.state', '=', 'posted')]
+        return move_line_obj.search(self.cursor, self.uid, search)
 
 HeaderFooterTextWebKitParser('report.account.account_report_general_ledger_webkit',
                              'account.account',