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

[jftempo]

=== modified file 'bin/addons/account_hq_entries/hq_entries.py'
--- bin/addons/account_hq_entries/hq_entries.py	2016-03-11 14:16:29 +0000
+++ bin/addons/account_hq_entries/hq_entries.py	2016-03-16 17:11:25 +0000
@@ -480,11 +480,31 @@
             raise osv.except_osv(_("Warning"),
                 _("No HQ Entry selected for transaction"))
 
-        domain = [('id', 'in', ids), ('user_validated', '=', True)]
+        # BKLG-77
+        domain = [
+            ('id', 'in', ids),
+            ('user_validated', '=', True),
+        ]
         if self.search(cr, uid, domain, context=context, count=True):
             raise osv.except_osv(_("Warning"),
                 _("You can not perform this action on a validated HQ Entry" \
                     " (please use the 'To Validate' filter in the HQ Entries list)"))
 
+        # US-306: forbid to validate mission closed or + entries
+        # => at coordo level you can not validate entries since field closed
+        # period; but they can come from HQ mission opened via SYNC)
+        period_ids = list(set([ he.period_id.id \
+            for he in self.browse(cr, uid, ids, context=context) ]))
+        if period_ids:
+            domain = [
+                ('id', 'in', period_ids),
+                ('state', 'in', ['mission-closed', 'done', ]),
+            ]
+            if self.pool.get('account.period').search(cr, uid, domain,
+                context=context, count=True):
+                raise osv.except_osv(_("Warning"),
+                    _("You can not validate HQ Entry in a mission-closed" \
+                      " period"))
+
 hq_entries()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_validation.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2015-08-28 12:56:45 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2016-03-16 17:11:25 +0000
@@ -40,14 +40,17 @@
     _defaults = {
         'running': False,
     }
-    def create(self, cr, uid, vals, context=None):
-        # BKLG-77: check transation before showing wizard
+
+    def default_get(self, cr, uid, fields, context=None):
+        # check transaction before showing wizard
         line_ids = context and context.get('active_ids', []) or []
         if isinstance(line_ids, (int, long)):
             line_ids = [line_ids]
+
         self.pool.get('hq.entries').check_hq_entry_transaction(cr, uid,
             line_ids, self._name, context=context)
-        return super(hq_entries_validation, self).create(cr, uid, vals,
+
+        return super(hq_entries_validation, self).default_get(cr, uid, fields,
             context=context)
 
     # UTP-1101: Extract the method to create AD for being called also for the REV move