Merge lp:~openerp-dev/openobject-addons/trunk-bug-783994-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

Fix: account_move_line: uninitialized period_id

Thanks,
ara

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Hello,

Yes we are getting period_id in vals and we should use it.
so defining period_id at begining of the method seems ok but at the time of condition:

journal = journal_obj.browse(cr, uid, journal_id, context=context)
if journal.allow_date and period_id:

we should use period_id from vals.

thanks,
mra

review: Needs Fixing

[Ashvin Rathod (OpenERP) (ara-tinyerp)]

Hello,

I have made change as per suggestion.

Thanks,
ara

review: Needs Resubmitting

[qdp (OpenERP) (qdp)]

please put the _check_date constraint into the attribute _constraints of account.move.line.

review: Needs Fixing

[Ashvin Rathod (OpenERP) (ara-tinyerp)]

Hello,

I have made changes as per suggestion.

Thanks,
ara

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

- Remove if context is None .. condition as context is not used in the definition.
- + lines = self.browse(cr, uid, ids, context=context)
 + for l in lines:

you can merge above two lines

review: Needs Fixing

[Ashvin Rathod (OpenERP) (ara-tinyerp)]

Hello,

I have changed as per suggestion.

Thanks,
ara

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2011-07-11 22:23:50 +0000
+++ account/account_move_line.py	2011-07-13 11:03:39 +0000
@@ -588,10 +588,18 @@
                 return False
         return True
 
+    def _check_date(self, cr, uid, ids, context=None):
+        for l in self.browse(cr, uid, ids, context=context):
+            if l.journal_id.allow_date:
+                if not time.strptime(l.date[:10],'%Y-%m-%d') >= time.strptime(l.period_id.date_start, '%Y-%m-%d') or not time.strptime(l.date[:10], '%Y-%m-%d') <= time.strptime(l.period_id.date_stop, '%Y-%m-%d'):
+                    return False
+        return True
+
     _constraints = [
         (_check_no_view, 'You can not create move line on view account.', ['account_id']),
         (_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
         (_check_company_id, 'Company must be same for its related account and period.',['company_id'] ),
+        (_check_date, 'The date of your Journal Entry is not in the defined period!',['date'] ),
     ]
 
     #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
@@ -1098,35 +1106,6 @@
             move_obj.validate(cr, uid, move_ids, context=context)
         return result
 
-    def _check_date(self, cr, uid, vals, context=None, check=True):
-        if context is None:
-            context = {}
-        move_obj = self.pool.get('account.move')
-        journal_obj = self.pool.get('account.journal')
-        period_obj = self.pool.get('account.period')
-        journal_id = False
-        if 'date' in vals.keys():
-            if 'journal_id' in vals and 'journal_id' not in context:
-                journal_id = vals['journal_id']
-            if 'period_id' in vals and 'period_id' not in context:
-                period_id = vals['period_id']
-            elif 'journal_id' not in context and 'move_id' in vals:
-                if vals.get('move_id', False):
-                    m = move_obj.browse(cr, uid, vals['move_id'])
-                    journal_id = m.journal_id.id
-                    period_id = m.period_id.id
-            else:
-                journal_id = context.get('journal_id', False)
-                period_id = context.get('period_id', False)
-            if journal_id:
-                journal = journal_obj.browse(cr, uid, journal_id, context=context)
-                if journal.allow_date and period_id:
-                    period = period_obj.browse(cr, uid, period_id, context=context)
-                    if not time.strptime(vals['date'][:10],'%Y-%m-%d') >= time.strptime(period.date_start, '%Y-%m-%d') or not time.strptime(vals['date'][:10], '%Y-%m-%d') <= time.strptime(period.date_stop, '%Y-%m-%d'):
-                        raise osv.except_osv(_('Error'),_('The date of your Journal Entry is not in the defined period!'))
-        else:
-            return True
-
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         if context is None:
             context={}
@@ -1137,7 +1116,6 @@
             ids = [ids]
         if vals.get('account_tax_id', False):
             raise osv.except_osv(_('Unable to change tax !'), _('You can not change the tax, you should remove and recreate lines !'))
-        self._check_date(cr, uid, vals, context, check)
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
         if update_check:
@@ -1221,7 +1199,6 @@
             company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
             if company_id:
                 vals['company_id'] = company_id[0]
-        self._check_date(cr, uid, vals, context, check)
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
         if 'journal_id' in vals:
@@ -1232,7 +1209,6 @@
             m = move_obj.browse(cr, uid, vals['move_id'])
             context['journal_id'] = m.journal_id.id
             context['period_id'] = m.period_id.id
-
         self._update_journal_check(cr, uid, context['journal_id'], context['period_id'], context)
         move_id = vals.get('move_id', False)
         journal = journal_obj.browse(cr, uid, context['journal_id'], context=context)