Merge lp:~acsone-openerp/account-financial-report/7.0-bug-1281579-sbi2 into lp:~account-report-core-editor/account-financial-report/7.0

[Stéphane Bidoul (Acsone)]

[Leonardo Pistone (lepistone)]

Stéphane,

Maybe you could refactor a bit with:

cur_year = time.strftime('%Y')
and then use it later?

being that a small change, I approve anyway

review: Approve

[Laurent Mignon (Acsone) (lmi)]

LGTM with the same remark as Leonardo

lmi

review: Approve (code)

[lp:~acsone-openerp/account-financial-report/7.0-bug-1281579-sbi2]

95. By Stéphane Bidoul (Acsone) on 2014-07-11

[IMP] account_financial_report_webkit test: test for presence of opening period

The opening period is part of the demo data in 7.0 OCB and 8.0 offical and
the workaround is necessary only for 7.0 official.

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

I factored out cur_year and made the workaround compatible with OCB 7.0.

[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: Resubmit

Unmerged revisions

95. By Stéphane Bidoul (Acsone) on 2014-07-11

[IMP] account_financial_report_webkit test: test for presence of opening period

The opening period is part of the demo data in 7.0 OCB and 8.0 offical and
the workaround is necessary only for 7.0 official.

94. By Stéphane Bidoul (Acsone) on 2014-07-04

[FIX] workaround to 7.0 demo data weirdness in account_financial_report_webkit test suite

Do not forward port to 8.0, as this has been fixed in odoo master.

=== modified file 'account_financial_report_webkit/tests/general_ledger.yml'
--- account_financial_report_webkit/tests/general_ledger.yml	2012-03-06 09:13:59 +0000
+++ account_financial_report_webkit/tests/general_ledger.yml	2014-07-11 15:03:17 +0000
@@ -1,4 +1,37 @@
 -
+  I first fix the demo periods (7.0 only)
+  see https://code.launchpad.net/~acsone-openerp/openobject-addons/7.0-bug-1281579-sbi/+merge/207311
+  which was merged in 8.0
+-
+    !python  {model: account.period}: |
+        import time
+        if not self.search(cr, uid, [('special', '=', False),
+                                     ('fiscalyear_id', '=', ref('account.data_fiscalyear')),
+                                     ('company_id', '=', ref('base.main_company'))]):
+            cur_year = time.strftime('%Y')
+            self.create(cr, uid, {
+              'code': '00/' + cur_year,
+              'name': 'X 00/' + cur_year,
+              'special': True,
+              'fiscalyear_id': ref('account.data_fiscalyear'),
+              'date_start': cur_year + '-01-01',
+              'date_stop': cur_year + '-01-01',
+              'company_id': ref('base.main_company'),
+            })
+        self.write(cr, uid, ref('account.period_1'), {'special': False})
+        self.write(cr, uid, ref('account.period_2'), {'special': False})
+        self.write(cr, uid, ref('account.period_3'), {'special': False})
+        self.write(cr, uid, ref('account.period_4'), {'special': False})
+        self.write(cr, uid, ref('account.period_5'), {'special': False})
+        self.write(cr, uid, ref('account.period_6'), {'special': False})
+        self.write(cr, uid, ref('account.period_7'), {'special': False})
+        self.write(cr, uid, ref('account.period_8'), {'special': False})
+        self.write(cr, uid, ref('account.period_9'), {'special': False})
+        self.write(cr, uid, ref('account.period_10'), {'special': False})
+        self.write(cr, uid, ref('account.period_11'), {'special': False})
+        self.write(cr, uid, ref('account.period_12'), {'special': False})
+
+-
   In order to test the PDF General Ledger webkit wizard I will print report with default setting
 -
     !python {model: account.account}: |