Merge lp:~jfb-tempo-consulting/unifield-server/us-1191 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/analytic_distribution/analytic_line.py'
--- bin/addons/analytic_distribution/analytic_line.py	2016-03-15 16:35:21 +0000
+++ bin/addons/analytic_distribution/analytic_line.py	2016-04-12 15:35:58 +0000
@@ -338,7 +338,7 @@
                 self.pool.get('account.move.line').corrected_upstream_marker(cr, uid, [aline.move_id.id], context=context)
         return True
 
-    def check_analytic_account(self, cr, uid, ids, account_id, context=None):
+    def check_analytic_account(self, cr, uid, ids, account_id, wiz_date, context=None):
         """
         Analytic distribution validity verification with given account for given ids.
         Return all valid ids.
@@ -372,6 +372,14 @@
             # since US-711 date_stop is to be excluded itself as a frontier
             # => >= date_stop vs > date_stop
             # => http://jira.unifield.org/browse/US-711?focusedCommentId=45744&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-45744
+            if account_type in ['OC', 'DEST']:
+                if aline.journal_id.type == 'hq' or aline.period_id and aline.period_id.state in ['done', 'mission-closed']:
+                    aline_cmp_date = wiz_date
+                    # these lines will be reverted, check if the reverted line is active
+                    oc_dest_date_start = max(aline.cost_center_id.date_start, aline.destination_id.date_start)
+                    oc_dest_date_stop = min(aline.cost_center_id.date or '9999-01-01', aline.destination_id.date or '9999-01-01')
+                    if (oc_dest_date_start and wiz_date < oc_dest_date_start) or (oc_dest_date_stop and wiz_date >= oc_dest_date_stop):
+                        expired_date_ids.append(aline.id)
             if (date_start and aline_cmp_date < date_start) or (date_stop and aline_cmp_date >= date_stop):
                 expired_date_ids.append(aline.id)
         # Process regarding account_type

=== modified file 'bin/addons/analytic_distribution/wizard/mass_reallocation_wizard.py'
--- bin/addons/analytic_distribution/wizard/mass_reallocation_wizard.py	2016-02-05 13:28:03 +0000
+++ bin/addons/analytic_distribution/wizard/mass_reallocation_wizard.py	2016-04-12 15:35:58 +0000
@@ -327,6 +327,7 @@
         for wiz in self.browse(cr, uid, ids, context=context):
             to_process = [x.id for x in wiz.line_ids] or []
             account_id = wiz.account_id.id
+            
             date = wiz.date or strftime('%Y-%m-%d')
             # Don't process lines:
             # - that have same account (or cost_center_id)
@@ -366,7 +367,7 @@
             # Delete non_supported element from to_process and write them to tmp_process_ids
             tmp_to_process = [x for x in to_process if x not in non_supported_ids]
             if tmp_to_process:
-                valid_ids = self.pool.get('account.analytic.line').check_analytic_account(cr, uid, tmp_to_process, account_id, context=context)
+                valid_ids = self.pool.get('account.analytic.line').check_analytic_account(cr, uid, tmp_to_process, account_id, date, context=context)
                 process_ids.extend(valid_ids)
                 error_ids.extend([x for x in tmp_to_process if x not in valid_ids])
         vals = {'account_id': account_id, 'date': date,}

=== modified file 'bin/addons/analytic_override/analytic_line.py'
--- bin/addons/analytic_override/analytic_line.py	2016-02-24 10:22:18 +0000
+++ bin/addons/analytic_override/analytic_line.py	2016-04-12 15:35:58 +0000
@@ -135,24 +135,27 @@
         if not 'account_id' in vals:
             raise osv.except_osv(_('Error'), _('No account_id found in given values!'))
 
+        account_obj = self.pool.get('account.analytic.account')
+
         #US-419: Use the document date and not posting date when checking the validity of analytic account
         # tech: replaced all date by document_date
         if 'document_date' in vals and vals['document_date'] is not False:
-            account_obj = self.pool.get('account.analytic.account')
             document_date = vals['document_date']
             account = account_obj.browse(cr, uid, vals['account_id'], context=context)
             # FIXME: refactoring of next code
             if document_date < account.date_start or (account.date != False and document_date >= account.date):
                 if 'from' not in context or context.get('from') != 'mass_reallocation':
                     raise osv.except_osv(_('Error'), _("The analytic account selected '%s' is not active.") % (account.name or '',))
+        if 'date' in vals and vals['date'] is not False:
+            date = vals['date']
             if vals.get('cost_center_id', False):
                 cc = account_obj.browse(cr, uid, vals['cost_center_id'], context=context)
-                if document_date < cc.date_start or (cc.date != False and document_date >= cc.date):
+                if date < cc.date_start or (cc.date != False and date >= cc.date):
                     if 'from' not in context or context.get('from') != 'mass_reallocation':
                         raise osv.except_osv(_('Error'), _("The analytic account selected '%s' is not active.") % (cc.name or '',))
             if vals.get('destination_id', False):
                 dest = account_obj.browse(cr, uid, vals['destination_id'], context=context)
-                if document_date < dest.date_start or (dest.date != False and document_date >= dest.date):
+                if date < dest.date_start or (dest.date != False and date >= dest.date):
                     if 'from' not in context or context.get('from') != 'mass_reallocation':
                         raise osv.except_osv(_('Error'), _("The analytic account selected '%s' is not active.") % (dest.name or '',))
         return True