Merge lp:~unifield-team/unifield-server/us-937 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account_override/period.py'
--- bin/addons/account_override/period.py	2014-03-19 10:26:27 +0000
+++ bin/addons/account_override/period.py	2016-08-05 13:42:21 +0000
@@ -26,19 +26,25 @@
 def get_period_from_date(self, cr, uid, date=False, context=None):
     """
     Get period in which this date could go into, otherwise return last open period.
-    Do not select special periods (Period 13, 14 and 15).
+    By default: Do not select special periods (Period 13, 14 and 15).
+    except if extend_december to True in context
     """
-    # Some verifications
-    if not context:
+    if context is None:
         context = {}
     if not date:
         return False
+        
+    limit = 1
+    if context.get('extend_december', False) and date[5:7] == '12':
+        # extend search to periods 12, 13, 14, 15 for december date
+        limit = 4
+        
     # Search period in which this date come from
-    period_ids = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date), ('number', '!=', 16)], limit=1,
+    period_ids = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', date), ('date_stop', '>=', date), ('number', '!=', 16)], limit=limit,
         order='date_start asc, name asc', context=context) or []
     # Get last period if no period found
     if not period_ids:
-        period_ids = self.pool.get('account.period').search(cr, uid, [('state', '=', 'open'), ('number', '!=', 16)], limit=1,
+        period_ids = self.pool.get('account.period').search(cr, uid, [('state', '=', 'open'), ('number', '!=', 16)], limit=limit,
             order='date_stop desc, name desc', context=context) or []
     if isinstance(period_ids, (int, long)):
         period_ids = [period_ids]
@@ -50,7 +56,7 @@
      - if given date is included in period, return the given date
      - else return the date_stop of given period
     """
-    if not context:
+    if context is None:
         context = {}
     if not date or not period_id:
         return False

=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2016-05-24 08:44:23 +0000
+++ bin/addons/msf_doc_import/account.py	2016-08-05 13:42:21 +0000
@@ -156,7 +156,7 @@
         - check integrity of data in files
         """
         # Some checks
-        if not context:
+        if context is None:
             context = {}
         # Prepare some values
         from_yml = False
@@ -184,16 +184,17 @@
             self.pool.get('msf.doc.import.accounting.lines').unlink(cr, uid, old_lines_ids)
 
             # Check wizard data
+            period_obj = self.pool.get('account.period')
+            period_ctx = context.copy()
+            period_ctx['extend_december'] = True
             for wiz in self.browse(cr, uid, ids):
                 # Update wizard
                 self.write(cr, uid, [wiz.id], {'message': _('Checking file…'), 'progression': 2.00})
                 # UF-2045: Check that the given date is in an open period
-                wiz_period_ids = self.pool.get('account.period').get_period_from_date(cr, uid, wiz.date, context)
+                wiz_period_ids = period_obj.get_period_from_date(
+                    cr, uid, wiz.date, period_ctx)
                 if not wiz_period_ids:
                     raise osv.except_osv(_('Warning'), _('No period found!'))
-                period = self.pool.get('account.period').browse(cr, uid, wiz_period_ids[0], context)
-                if not period or period.state in ['created', 'done']:
-                    raise osv.except_osv(_('Warning'), _('Period is not open!'))
                 date = wiz.date or False
 
                 # Check that a file was given
@@ -215,7 +216,7 @@
                 self.write(cr, uid, [wiz.id], {'message': _('Reading headers…'), 'progression': 5.00})
                 # Use the first row to find which column to use
                 cols = {}
-                col_names = ['Journal Code', 'Description', 'Reference', 'Document Date', 'Posting Date', 'G/L Account', 'Partner', 'Employee', 'Journal', 'Destination', 'Cost Centre', 'Funding Pool', 'Booking Debit', 'Booking Credit', 'Booking Currency']
+                col_names = ['Journal Code', 'Description', 'Reference', 'Document Date', 'Posting Date', 'Period', 'G/L Account', 'Partner', 'Employee', 'Journal', 'Destination', 'Cost Centre', 'Funding Pool', 'Booking Debit', 'Booking Credit', 'Booking Currency']
                 for num, r in enumerate(rows):
                     header = [x and x.data for x in r.iter_cells()]
                     for el in col_names:
@@ -427,6 +428,22 @@
                                 errors.append(_('Line %s. Funding Pool %s not found!') % (current_line_num, line[cols['Funding Pool']]))
                                 continue
                             r_fp = fp_ids[0]
+                    # US-937: use period of import file
+                    if line[cols['Period']] == 'Period 16':
+                        raise osv.except_osv(_('Warning'), _("You can't import entries in Period 16."))
+                    period_ids = period_obj.search(
+                        cr, uid, [
+                            ('id', 'in', wiz_period_ids),
+                            ('name', '=', line[cols['Period']]),
+                        ], limit=1, context=context)
+                    if not period_ids:
+                        raise osv.except_osv(_('Warning'),
+                            _('The date chosen in the wizard is not in the same period as the imported entries.'))
+                    period = period_obj.browse(
+                        cr, uid, period_ids[0], context=context)
+                    if period.state in ('created', 'done', ):
+                        raise osv.except_osv(_('Warning'), _('%s is not open!') % (period.name, ))
+                            
                     # NOTE: There is no need to check G/L account, Cost Center and Destination regarding document/posting date because this check is already done at Journal Entries validation.
 
                     # Registering data regarding these "keys":