Merge lp:~julie-w/unifield-server/US-3610 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_instance/account.py'
--- bin/addons/msf_instance/account.py	2016-09-09 13:19:09 +0000
+++ bin/addons/msf_instance/account.py	2017-10-19 09:52:15 +0000
@@ -26,7 +26,7 @@
     _name = 'account.period'
     _inherit = 'account.period'
 
-    def _get_child_mission_closed(self, cr, uid, ids, name, args, context=None):
+    def _get_child_state(self, cr, uid, ids, name, args, context=None):
         """
         Fake method / always returns False
         """
@@ -39,12 +39,14 @@
             res[id] = False
         return res
 
-    def _search_child_mission_closed(self, cr, uid, obj, name, args, context=None):
-        '''
-        Returns a domain corresponding to mission-closed periods for the selected fiscal year
-        - if in HQ: the periods must be "mission-closed" in the selected coordo (the status in HQ doesn't matter)
-        - else: the periods must be "mission-closed" in the current instance
-        '''
+    def _search_child_states(self, cr, uid, obj, name, args, period_states=None, context=None):
+        """
+        Returns a domain corresponding to periods having specific states for the selected fiscal year.
+        The period states:
+        - correspond to: the tuple of period_states given in parameter, or mission-closed by default
+        - if in HQ: are those from the selected coordo
+        - else: are those from the current instance
+        """
         res = []
         period_ids = []
         user_obj = self.pool.get('res.users')
@@ -56,12 +58,14 @@
         if args[0][1] != '=':
             msg = _("Operator %s not supported") % (args[0][1], )
             raise osv.except_osv(_('Error'), msg)
-        if args[0][0] != 'child_mission_closed' or not args[0][2]:
+        if not args[0][2]:
             return res
         # if no fiscal year selected: don't display any periods
         fy = args[0][2][1]
         if not fy:
             return [('id', 'in', [])]
+        if not period_states:
+            period_states = ('mission-closed',)
         # if the current instance is an HQ
         instance_id = user_obj.browse(cr, uid, uid, context=context).company_id.instance_id
         if instance_id and instance_id.level == 'section':
@@ -69,30 +73,48 @@
             prop_inst = args[0][2][0]
             if not prop_inst:
                 return [('id', 'in', [])]
-            # else get the mission-closed periods
+            # else get the periods having the required state(s)
             sql_get_periods = """
                   SELECT ps.period_id
                   FROM account_period_state ps
                   INNER JOIN account_period p
                   ON ps.period_id = p.id
-                  WHERE ps.state = 'mission-closed'
+                  WHERE ps.state in %s
                   AND ps.instance_id = %s
                   AND p.fiscalyear_id = %s;"""
-            cr.execute(sql_get_periods, (prop_inst, fy))
+            cr.execute(sql_get_periods, (period_states, prop_inst, fy))
             for line in cr.fetchall():
                 period_ids.append(line[0])
             res.append(('id', 'in', period_ids))
         else:
             # if not in HQ
-            res.extend([('state', '=', 'mission-closed'), ('fiscalyear_id', '=', fy)])
+            res.extend([('state', 'in', period_states), ('fiscalyear_id', '=', fy)])
         return res
 
+    def _search_child_mission_closed(self, cr, uid, obj, name, args, context=None):
+        """
+        Returns a domain with mission-closed periods for the selected FY & coordo (or for the current inst. if not in HQ)
+        """
+        return self._search_child_states(cr, uid, obj, name, args, context=context)
+
+    def _search_child_mission_hq_closed(self, cr, uid, obj, name, args, context=None):
+        """
+        Returns a domain with mission-closed or HQ-closed periods for the selected FY & coordo (or for the current inst. if not in HQ)
+        """
+        states = ('mission-closed', 'done',)
+        return self._search_child_states(cr, uid, obj, name, args, period_states=states, context=context)
+
     _columns = {
-        'child_mission_closed': fields.function(_get_child_mission_closed, method=True, store=False,
+        'child_mission_closed': fields.function(_get_child_state, method=True, store=False,
                                               string='Child Mission Closed',
                                               help='In HQ, check the periods being mission-closed in the selected coordo',
                                               type='boolean',
                                               fnct_search=_search_child_mission_closed),
+        'child_mission_hq_closed': fields.function(_get_child_state, method=True, store=False,
+                                                   string='Child Mission or HQ Closed',
+                                                   help='In HQ, checks the periods being mission or HQ-closed in the selected coordo',
+                                                   type='boolean',
+                                                   fnct_search=_search_child_mission_hq_closed),
     }
 
     def action_set_state(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-10-09 16:01:14 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-10-19 09:52:15 +0000
@@ -99629,3 +99629,13 @@
 #, python-format
 msgid "You can't delete this FX rate as the period \"%s\" isn't in Draft state."
 msgstr "Vous ne pouvez pas supprimer ce taux de change car la période \"%s\" n'est pas en statut Brouillon."
+
+#. module: msf_instance
+#: field:account.period,child_mission_hq_closed:0
+msgid "Child Mission or HQ Closed"
+msgstr "Fermé en mission ou en HQ dans l'instance enfant"
+
+#. module: msf_instance
+#: help:account.period,child_mission_hq_closed:0
+msgid "In HQ, checks the periods being mission or HQ-closed in the selected coordo"
+msgstr "En HQ, vérifie les périodes fermées en mission ou en HQ dans la coordo sélectionnée"

=== modified file 'bin/addons/vertical_integration/vertical_integration_wizard.xml'
--- bin/addons/vertical_integration/vertical_integration_wizard.xml	2016-11-16 14:12:40 +0000
+++ bin/addons/vertical_integration/vertical_integration_wizard.xml	2017-10-19 09:52:15 +0000
@@ -10,9 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Export to HQ system">
-                <field name="instance_id" domain="['&amp;', ('level', '=', 'coordo'), ('instance_to_display_ids','=',True)]"/>
+                <field name="instance_id"
+                       domain="['&amp;', ('level', '=', 'coordo'), ('instance_to_display_ids', '=', True)]"
+                       on_change="onchange_instance_id()"/>
                 <field name="fiscalyear_id"/>
-                <field name="period_id" domain="[('fiscalyear_id', '=', fiscalyear_id), ('state', '&lt;&gt;', 'created'), ('number', '&lt;', 16)]"/>
+                <field name="period_id" domain="[('fiscalyear_id', '=', fiscalyear_id),
+                                                 ('state', '&lt;&gt;', 'created'),
+                                                 ('number', '&lt;', 16),
+                                                 ('child_mission_hq_closed', '=', [instance_id, fiscalyear_id])]"/>
                 <newline/>
                 <button icon="terp-camera_test" string="Export" name="button_create_report" type="object" default_focus="1"/>
             </form>

=== modified file 'bin/addons/vertical_integration/wizard/wizard_hq_report_ocg.py'
--- bin/addons/vertical_integration/wizard/wizard_hq_report_ocg.py	2017-02-13 16:32:30 +0000
+++ bin/addons/vertical_integration/wizard/wizard_hq_report_ocg.py	2017-10-19 09:52:15 +0000
@@ -38,6 +38,16 @@
         'fiscalyear_id': lambda self, cr, uid, c: self.pool.get('account.fiscalyear').find(cr, uid, time.strftime('%Y-%m-%d'), context=c)
     }
 
+    def onchange_instance_id(self, cr, uid, ids, context=None):
+        """
+        Resets the period field when another prop. instance is selected.
+        Covers the case when in HQ the user selects a period closed in a coordo,
+        and then select another coordo in which the period previously selected is not closed
+        """
+        res = {}
+        res['value'] = {'period_id': False}
+        return res
+
     def button_create_report(self, cr, uid, ids, context=None):
         if context is None:
             context = {}