Merge lp:~unifield-team/unifield-wm/UF_2014 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/UF_2014]

1727. By Matthieu Dietrich <mdietrich@chloups211> on 2013-10-29

UF-2014: [FIX] fixed the analytic line write()

Unmerged revisions

1727. By Matthieu Dietrich <mdietrich@chloups211> on 2013-10-29

UF-2014: [FIX] fixed the analytic line write()

1726. By Matthieu Dietrich @ camptocamp on 2013-07-17

UF-2014: [FIX] added period checks for account.move and account.analytic.line

=== modified file 'account_override/account.py'
--- account_override/account.py	2013-10-24 15:08:46 +0000
+++ account_override/account.py	2013-10-29 16:58:11 +0000
@@ -214,6 +214,13 @@
         instance = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.instance_id
         journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'])
         sequence_number = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
+        
+        # UF-2014: add checks for sync creation on moves, move lines and analytic lines
+        if vals.get('period_id', False):
+            period  = self.pool.get('account.period').browse(cr, uid, vals['period_id'], context=context)
+            if period and period.state != 'draft':
+                raise osv.except_osv(_('Error'), _('Period \'%s\' is not open!') % period.name)
+        
         if instance and journal and sequence_number and ('name' not in vals or vals['name'] == '/'):
             if not instance.move_prefix:
                 raise osv.except_osv(_('Warning'), _('No move prefix found for this instance! Please configure it on Company view.'))
@@ -245,6 +252,13 @@
         """
         if not context:
             context = {}
+        
+        # UF-2014: add checks for sync creation on moves, move lines and analytic lines
+        if vals.get('period_id', False):
+            period  = self.pool.get('account.period').browse(cr, uid, vals['period_id'], context=context)
+            if period and period.state != 'draft':
+                raise osv.except_osv(_('Error'), _('Period \'%s\' is not open!') % period.name)
+            
         if context.get('from_web_menu', False) or context.get('sync_update_execution', False):
             # by default, from synchro, we just need to update period_id and journal_id
             fields = ['journal_id', 'period_id']

=== modified file 'account_override/account_analytic_line.py'
--- account_override/account_analytic_line.py	2013-07-18 13:43:58 +0000
+++ account_override/account_analytic_line.py	2013-10-29 16:58:11 +0000
@@ -110,6 +110,17 @@
         """
         if not context:
             context = {}
+        
+        # UF-2014: add checks for sync creation on moves, move lines and analytic lines
+        if vals.get('date', False):
+            period_ids = self.pool.get('account.period').search(cr, uid, [('date_start','<=',vals['date']),
+                                                                          ('date_stop','>=',vals['date']),
+                                                                          ('special', '=', False)], context=context)
+            if len(period_ids) > 0:
+                period = self.pool.get('account.period').browse(cr, uid, period_ids[0], context=context)
+                if period and period.state != 'draft':
+                    raise osv.except_osv(_('Error'), _('Period \'%s\' is not open!') % period.name)
+            
         # SP-50: If data is synchronized from another instance, just create it with the given document_date 
         if context.get('update_mode') in ['init', 'update']:
             if not context.get('sync_update_execution', False) or not vals.get('document_date', False):
@@ -125,6 +136,17 @@
         """
         if not context:
             context = {}
+        
+        # UF-2014: add checks for sync creation on moves, move lines and analytic lines
+        if vals.get('date', False):
+            period_ids = self.pool.get('account.period').search(cr, uid, [('date_start','<=',vals['date']),
+                                                                          ('date_stop','>=',vals['date']),
+                                                                          ('special', '=', False)], context=context)
+            if len(period_ids) > 0:
+                period = self.pool.get('account.period').browse(cr, uid, period_ids[0], context=context)
+                if period and period.state != 'draft':
+                    raise osv.except_osv(_('Error'), _('Period \'%s\' is not open!') % period.name)
+            
         res = super(account_analytic_line, self).write(cr, uid, ids, vals, context=context)
         self._check_document_date(cr, uid, ids)
         return res