From f7a9b6ed0f50da8239b8bc7592b13607ce9612a9 Mon Sep 17 00:00:00 2001
From: Adrien Peiffer <adrien.peiffer@acsone.eu>
Date: Thu, 4 Sep 2014 09:28:28 +0200
Subject: [PATCH 1/5] [IMP] Prevent to re-open account journal after closing
 period and add a button with allow to add all journals in a period in one
 single time

---
 .../model/account_period.py                   | 20 +++++++++++++++++++
 .../view/account_period_view.xml              |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/account_journal_period_close/model/account_period.py b/account_journal_period_close/model/account_period.py
index 72902209e..191d63b8b 100644
--- a/account_journal_period_close/model/account_period.py
+++ b/account_journal_period_close/model/account_period.py
@@ -36,3 +36,23 @@ class AccountPeriod(orm.Model):
         'journal_period_ids': fields.one2many('account.journal.period',
                                               'period_id', 'Journal states'),
     }
+
+    def add_all_journals(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids, context=context)[0]
+        journal_period_obj = self.pool.get('account.journal.period')
+        journal_period_ids = journal_period_obj\
+            .search(cr, uid, [('period_id', '=', this.id)], context=context)
+        journal_list = []
+        for journal_period in journal_period_obj.browse(cr,
+                                                        uid,
+                                                        journal_period_ids,
+                                                        context=context):
+            journal_list.append(journal_period.journal_id.id)
+        journal_ids = self.pool.get('account.journal')\
+            .search(cr, uid, [('id', 'not in', journal_list)], context=context)
+        for journal_id in journal_ids:
+            journal_period_obj.create(cr,
+                                      uid,
+                                      {'period_id': this.id,
+                                       'journal_id': journal_id,
+                                       'state': this.state})
diff --git a/account_journal_period_close/view/account_period_view.xml b/account_journal_period_close/view/account_period_view.xml
index 199ed0f4f..8e4b8ea69 100644
--- a/account_journal_period_close/view/account_period_view.xml
+++ b/account_journal_period_close/view/account_period_view.xml
@@ -9,7 +9,8 @@
             <field name="arch" type="xml">
                 <xpath expr="//sheet/group" position="after">
                     <notebook>
-                        <page string="Journals">
+                        <page string="Journals" attrs="{'invisible': [('state', '=', 'done')]}">
+                            <button name="add_all_journals" string="Add all journals" type="object" states="draft"/>
                             <field name="journal_period_ids">
                                 <tree editable="bottom">
                                     <field name="journal_id" attrs="{'readonly': [('type', '!=', False)]}"/>

From f957a0ffb1c02957f292a00a04ee63642f2a6f58 Mon Sep 17 00:00:00 2001
From: Adrien Peiffer <adrien.peiffer@acsone.eu>
Date: Thu, 30 Oct 2014 09:29:13 +0100
Subject: [PATCH 2/5] [FIX] Change name of tests class

---
 .../tests/test_account_journal_period_close.py                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/account_journal_period_close/tests/test_account_journal_period_close.py b/account_journal_period_close/tests/test_account_journal_period_close.py
index 0e3a6dd05..dc48db5d4 100644
--- a/account_journal_period_close/tests/test_account_journal_period_close.py
+++ b/account_journal_period_close/tests/test_account_journal_period_close.py
@@ -99,10 +99,10 @@ def journal_period_draft(self, journal_period_id, context):
                               context=context)
 
 
-class TestAccountConstraintChronology(common.TransactionCase):
+class TestAccountJournalPeriodClose(common.TransactionCase):
 
     def setUp(self):
-        super(TestAccountConstraintChronology, self).setUp()
+        super(TestAccountJournalPeriodClose, self).setUp()
 
     def test_close_period_open_journal(self):
         context = {}

From 41e29433da8f7db803ddd76ac7c7d543c69ad41c Mon Sep 17 00:00:00 2001
From: Adrien Peiffer <adrien.peiffer@acsone.eu>
Date: Thu, 30 Oct 2014 10:07:17 +0100
Subject: [PATCH 3/5] [ADD] Add checks list on tests init file

---
 account_journal_period_close/tests/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/account_journal_period_close/tests/__init__.py b/account_journal_period_close/tests/__init__.py
index d503a5aa8..1d4899c26 100644
--- a/account_journal_period_close/tests/__init__.py
+++ b/account_journal_period_close/tests/__init__.py
@@ -28,3 +28,8 @@
 #
 
 from . import test_account_journal_period_close
+
+
+checks = [
+    test_account_journal_period_close,
+]

From 679f708efd0663754647f67d92cc805e91959093 Mon Sep 17 00:00:00 2001
From: Adrien Peiffer <adrien.peiffer@acsone.eu>
Date: Thu, 30 Oct 2014 10:42:03 +0100
Subject: [PATCH 4/5] [ADD] disable default_log_exception before assertraises

---
 .../tests/test_account_journal_period_close.py                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/account_journal_period_close/tests/test_account_journal_period_close.py b/account_journal_period_close/tests/test_account_journal_period_close.py
index dc48db5d4..8b48bac27 100644
--- a/account_journal_period_close/tests/test_account_journal_period_close.py
+++ b/account_journal_period_close/tests/test_account_journal_period_close.py
@@ -203,6 +203,7 @@ class TestAccountJournalPeriodClose(common.TransactionCase):
         create_journal_period(self, period_id, journal_id, context)
         # I check if the exception is correctly raised at adding both same
         # journal on a period
+        self.cr._default_log_exceptions = False
         self.assertRaises(IntegrityError,
                           create_journal_period,
                           self, period_id, journal_id, context)

From 102031798e2a4035319adde02d6e393d7ee759fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Thu, 30 Oct 2014 11:06:05 +0100
Subject: [PATCH 5/5] [FIX] account_journal_period_close: fix the test suite
 for 7.0

---
 .../tests/test_account_journal_period_close.py      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/account_journal_period_close/tests/test_account_journal_period_close.py b/account_journal_period_close/tests/test_account_journal_period_close.py
index 8b48bac27..fe93d013e 100644
--- a/account_journal_period_close/tests/test_account_journal_period_close.py
+++ b/account_journal_period_close/tests/test_account_journal_period_close.py
@@ -28,7 +28,7 @@
 #
 
 import openerp.tests.common as common
-from openerp.osv import orm
+from openerp.osv import orm, osv
 from datetime import datetime
 from psycopg2 import IntegrityError
 
@@ -138,7 +138,7 @@ class TestAccountJournalPeriodClose(common.TransactionCase):
                                                      journal_id)
         # I check if the exception is correctly raised at create of an account
         # move which is linked with a closed journal
-        self.assertRaises(orm.except_orm,
+        self.assertRaises(osv.except_osv,
                           self.registry('account.move').create,
                           self.cr, self.uid, move_values, context=context)
 
@@ -204,6 +204,9 @@ class TestAccountJournalPeriodClose(common.TransactionCase):
         # I check if the exception is correctly raised at adding both same
         # journal on a period
         self.cr._default_log_exceptions = False
-        self.assertRaises(IntegrityError,
-                          create_journal_period,
-                          self, period_id, journal_id, context)
+        try:
+            self.assertRaises(IntegrityError,
+                              create_journal_period,
+                              self, period_id, journal_id, context)
+        finally:
+            self.cr._default_log_exceptions = True