Merge lp:~unifield-team/unifield-wm/us-649 into lp:unifield-wm

[jftempo]

=== modified file 'account_mcdb/account_period_state.py' (properties changed: -x to +x)
--- account_mcdb/account_period_state.py	2015-10-12 14:58:29 +0000
+++ account_mcdb/account_period_state.py	2016-01-20 14:09:57 +0000
@@ -30,34 +30,23 @@
 class account_period_state(osv.osv):
     _name = "account.period.state"
 
-    def _get_instance_name(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        if not ids:
-            return res
-        obj_ids = self.browse(cr, uid, ids, context=context)
-        for obj in obj_ids:
-            res[obj.id] = obj.instance_id and obj.instance_id.name or ""
-
-        return res
-
-    def _get_search_by_instance(self, cr, uid, obj, name, args,
-                                context=None):
-        inst_obj = self.pool.get('msf.instance')
-        args = [('name', args[0][1], args[0][2])]
-        inst_ids = inst_obj.search(cr, uid, args, context=context)
-        return [('instance_id', 'in', inst_ids)]
-
     _columns = {
         'period_id': fields.many2one('account.period', 'Period', required=1, ondelete='cascade'),
         'instance_id': fields.many2one('msf.instance', 'Proprietary Instance'),
         'state': fields.selection(ACCOUNT_PERIOD_STATE_SELECTION, 'State',
                                   readonly=True),
-        'instance_name': fields.function(_get_instance_name, type='char',
-                                         fnct_search=_get_search_by_instance,
-                                         method=True,
-                                         string="Proprietary Instance"),
     }
 
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if context.get('sync_update_execution') and not vals.get('period_id'):
+            # US-841: period is required but we got
+            # an update related to non existant period: ignore it
+            return False
+
+        return super(account_period_state, self).create(cr, uid, vals, context=context)
+
     def get_period(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         view_id = mod_obj.get_object_reference(cr, uid, 'account_mcdb',
@@ -87,10 +76,12 @@
         if isinstance(period_ids, (int, long)):
             period_ids = [period_ids]
 
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        model_data = self.pool.get('ir.model.data')
+        period_state = self.pool.get('account.period.state')
+        parent = user.company_id.instance_id.id
+        ids_to_write = []
         for period_id in period_ids:
-            user = self.pool.get('res.users').browse(cr, uid, uid,
-                                                     context=context)
-            parent = user.company_id.instance_id.id
             period = self.pool.get('account.period').read(cr, uid, period_id,
                                                           ['id', 'state'],
                                                           context=context)
@@ -105,11 +96,23 @@
                         'state': period['state']
                     }
                     self.write(cr, uid, ids, vals, context=context)
+                    for period_state_id in ids:
+                        period_state_xml_id = period_state.get_sd_ref(cr, uid, period_state_id)
+                        ids_to_write.append(model_data._get_id(cr, uid, 'sd',
+                            period_state_xml_id))
+
                 else:
                     vals = {
                         'period_id': period['id'],
                         'instance_id': parent,
                         'state': period['state']}
                     self.create(cr, uid, vals, context=context)
+
+        # US-649 : in context of synchro last_modification date must be updated
+        # on account.period.state because they are created with synchro and
+        # they need to be sync down to other instances
+        if ids_to_write:
+            model_data.write(cr, uid, ids_to_write, {'last_modification':fields.datetime.now()})
+
         return True
 account_period_state()

=== modified file 'account_mcdb/account_period_state_view.xml' (properties changed: -x to +x)
--- account_mcdb/account_period_state_view.xml	2015-08-28 14:16:07 +0000
+++ account_mcdb/account_period_state_view.xml	2016-01-20 14:09:57 +0000
@@ -25,7 +25,6 @@
             <field name="arch" type="xml">
                 <data >
                     <field name="instance_id" />
-                    <field name="instance_name" invisible="True" />
                     <field name="period_id" />
                     <field name="state" />
                 </data>
@@ -39,7 +38,7 @@
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <search string="Register Lines">
-                    <field name="instance_name"/>
+                    <field name="instance_id"/>
                     <field name="period_id" />
                     <field name="state" />
                 </search>

=== modified file 'msf_profile/data/patches.xml'
--- msf_profile/data/patches.xml	2015-11-30 13:53:32 +0000
+++ msf_profile/data/patches.xml	2016-01-20 14:09:57 +0000
@@ -24,6 +24,10 @@
             <field name="method">us_332_patch</field>
         </record>
 
+        <record id="us_841_patch" model="patch.scripts">
+            <field name="method">us_841_patch</field>
+        </record>
+
         <record id="bar_action_patch" model="patch.scripts">
             <field name="method">bar_action_patch</field>
         </record>

=== modified file 'msf_profile/msf_profile.py'
--- msf_profile/msf_profile.py	2015-12-01 16:28:43 +0000
+++ msf_profile/msf_profile.py	2016-01-20 14:09:57 +0000
@@ -51,6 +51,16 @@
             getattr(model_obj, method)(cr, uid, *a, **b)
             self.write(cr, uid, [ps['id']], {'run': True})
 
+    def us_841_patch(self, cr, uid, *a, **b):
+        # fix incorrect period state on upper level by re-sending state
+        p_ids = self.pool.get('account.period').search(cr, uid, [])
+        if p_ids:
+            cr.execute("""update ir_model_data
+                set last_modification=NOW(),
+                touched='[''state'']'
+                where model='account.period.state' and res_id in %s
+                """, (tuple(p_ids), ))
+
     def us_332_patch(self, cr, uid, *a, **b):
         context = {}
         user_obj = self.pool.get('res.users')