Merge lp:~camptocamp/banking-addons/bank-statement-reconcile-70-restore_default_value into lp:banking-addons/bank-statement-reconcile-70

[Nicolas Bessi - Camptocamp]

Restore default period in bank statement by taking context in account

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

invisible="True" at l.36 is weird, shouldn't it be a boolean instead of a str?

Before l.21 you should ensure that context is a dict.

review: Needs Fixing (code review, no test)

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

It is a typo. Right you are.

[lp:~camptocamp/banking-addons/bank-statement-reconcile-70-restore_default_value]

90. By Alexandre Fayolle - camptocamp on 2013-05-24

[FIX] value of 'invisible' argument, ensured context is a dict

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Fixed issues noted by guewen

review: Approve (code review, no test, code fix)

=== modified file 'account_statement_ext/statement.py'
--- account_statement_ext/statement.py	2013-04-25 11:30:23 +0000
+++ account_statement_ext/statement.py	2013-05-24 09:28:26 +0000
@@ -18,7 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+<<<<<<< TREE
 import openerp.addons.account.account_bank_statement as stat_mod
+=======
+>>>>>>> MERGE-SOURCE
 from openerp.osv.orm import Model
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
@@ -125,6 +128,16 @@
 
     _inherit = "account.bank.statement"
 
+    def _default_period(self, cr, uid, context=None):
+        """
+        Statement default period
+        """
+        if context is None:
+            context = {}
+        period_obj = self.pool.get('account.period')
+        periods = period_obj.find(cr, uid, dt=context.get('date'), context=context)
+        return periods and periods[0] or False
+
     _columns = {
         'profile_id': fields.many2one(
             'account.statement.profile',
@@ -156,11 +169,15 @@
                         store=True,
                         readonly=True),
         'period_id': fields.many2one(
-            'account.period', 'Period', required=False, readonly=True),
+                        'account.period',
+                        'Period',
+                        required=False,
+                        readonly=False,
+                        invisible=True),
     }
 
     _defaults = {
-        'period_id': False,
+        'period_id': _default_period,
     }
 
     def create(self, cr, uid, vals, context=None):
@@ -536,7 +553,9 @@
         """
         Return a period from a given date in the context.
         """
-        date = context.get('date', None)
+        if context is None:
+            context = {}
+        date = context.get('date')
         periods = self.pool.get('account.period').find(cr, uid, dt=date)
         return periods and periods[0] or False