Merge lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-first-special-fix2 into lp:~account-report-core-editor/account-financial-report/7.0

[Luc De Meyer (Noviat)]

add company parameter for first special period

[Omar (Pexego) (omar7r)]

LGTM

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Luc,

I see your solution very restricted, because you can have an special period for each fiscal year. Setting it at company level doesn't seem the best approach. Why don't you put it at fiscal year level?

Regards.

review: Needs Information (code review)

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

The account_financial_report_webkit module needs to know only the very first special period from where accounting is being done in OpenERP (with accounting I mean full accounting, not just payables/receivables).
From that first special period, the opening balances for all the fiscal years on which we need to financial reports are calculated correctly.
Hence only one parameter at the company level is required.

Regards,
Luc

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

-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Pedro Manuel Baeza
Sent: zaterdag 7 juni 2014 12:16
To: <email address hidden>
Subject: Re: [Merge] lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-first-special-fix2 into lp:account-financial-report

Review: Needs Information code review

Hi, Luc,

I see your solution very restricted, because you can have an special period for each fiscal year. Setting it at company level doesn't seem the best approach. Why don't you put it at fiscal year level?

Regards.
--
https://code.launchpad.net/~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-first-special-fix2/+merge/216380
You are the owner of lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-first-special-fix2.

[Pedro Manuel Baeza (pedro.baeza)]

OK, now I see. Sorry for the misunderstanding.

Regards.

review: Approve (code review)

[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

87. By Luc De Meyer on 2014-04-17

add company parameter for first special period

=== 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	2014-04-17 18:30:38 +0000
@@ -20,4 +20,5 @@
 import account
 from . import wizard
 from . import report
-from . import account_move_line
\ No newline at end of file
+from . import account_move_line
+from . import res_company
\ No newline at end of file

=== modified file 'account_financial_report_webkit/__openerp__.py'
--- account_financial_report_webkit/__openerp__.py	2014-03-18 15:55:12 +0000
+++ account_financial_report_webkit/__openerp__.py	2014-04-17 18:30:38 +0000
@@ -167,7 +167,7 @@
 the header and footer are created as text with arguments passed to
 wkhtmltopdf. The texts are defined inside the report classes.
 """,
-    'version': '1.1.0',
+    'version': '1.2.0',
     'author': 'Camptocamp',
     'license': 'AGPL-3',
     'category': 'Finance',
@@ -179,6 +179,7 @@
     'init_xml': [],
     'demo_xml' : [],
     'update_xml': ['account_view.xml',
+                   'res_company_view.xml',
                    'data/financial_webkit_header.xml',
                    'report/report.xml',
                    'wizard/wizard.xml',

=== modified file 'account_financial_report_webkit/report/common_partner_reports.py'
--- account_financial_report_webkit/report/common_partner_reports.py	2013-05-07 06:56:51 +0000
+++ account_financial_report_webkit/report/common_partner_reports.py	2014-04-17 18:30:38 +0000
@@ -64,6 +64,9 @@
 
         :return: browse record of the first special period.
         """
+        first_special_period = self.localcontext['company'].first_special_period_id
+        if first_special_period:
+            return first_special_period
         move_line_obj = self.pool.get('account.move.line')
         first_entry_id = move_line_obj.search(
             self.cr, self.uid, [], order='date ASC', limit=1)

=== added file 'account_financial_report_webkit/res_company.py'
--- account_financial_report_webkit/res_company.py	1970-01-01 00:00:00 +0000
+++ account_financial_report_webkit/res_company.py	2014-04-17 18:30:38 +0000
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#
+#    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
+#    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 fields, orm
+
+class res_company(orm.Model):
+    _inherit = 'res.company'
+
+    def _get_first_special_period(self, cr, uid, context=None):
+        first_special = self.pool.get('account.period').search(cr, uid,
+              [('special', '=', True)], order='date_start ASC', limit=1)
+        return first_special and first_special[0] or False
+
+    _columns = {
+        'first_special_period_id': fields.many2one('account.period', 'First Special Period',
+            domain=[('special', '=', True)], 
+            help="When specified, the accounting reports will consider this "
+                 "period as the start period for the calculation of opening balances.")
+    }
+
+    _defaults = {
+        'first_special_period_id': _get_first_special_period,
+    }
\ No newline at end of file

=== added file 'account_financial_report_webkit/res_company_view.xml'
--- account_financial_report_webkit/res_company_view.xml	1970-01-01 00:00:00 +0000
+++ account_financial_report_webkit/res_company_view.xml	2014-04-17 18:30:38 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+
+    <record id="company_form_inherit" model="ir.ui.view">
+      <field name="name">company.form.inherit</field>
+      <field name="model">res.company</field>
+      <field name="inherit_id" ref="base.view_company_form"/>
+      <field name="arch" type="xml">
+        <field name="currency_id" position="after">
+          <field name="first_special_period_id"/>
+        </field>
+      </field>
+    </record>
+
+  </data>
+</openerp>
+