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

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2016-05-12 12:09:25 +0000
+++ bin/addons/msf_profile/data/patches.xml	2016-05-19 07:05:42 +0000
@@ -36,9 +36,16 @@
         <record id="us_1061_patch" model="patch.scripts">
             <field name="method">us_1061_patch</field>
         </record>
+<<<<<<< TREE
 
         <record id="us_1263_patch" model="patch.scripts">
             <field name="method">us_1263_patch</field>
         </record>
+=======
+
+        <record id="us-1273_patch" model="patch.scripts">
+            <field name="method">us_1273_patch</field>
+        </record>
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2016-05-12 12:09:25 +0000
+++ bin/addons/msf_profile/msf_profile.py	2016-05-19 07:05:42 +0000
@@ -503,6 +503,7 @@
                     'display_in_reports': False,
                 })
 
+<<<<<<< TREE
     def us_1263_patch(self, cr, uid, *a, **b):
         ms_obj = self.pool.get('stock.mission.report')
         msl_obj = self.pool.get('stock.mission.report.line')
@@ -538,6 +539,17 @@
                                        OR l.in_pipe_coor_qty != 0.00))''', (msl_touched, tuple(ms_ids)))
         return True
 
+=======
+    def us_1273_patch(self, cr, uid, *a, **b):
+        # Put all internal requests import_in_progress field to False
+        ir_obj = self.pool.get('sale.order')
+        context = {'procurement_request': True}
+        ir_ids = ir_obj.search(cr, uid, [('import_in_progress', '=', True)], context=context)
+        if ir_ids:
+            ir_obj.write(cr, uid, ir_ids, {'import_in_progress': False})
+        return True
+
+>>>>>>> MERGE-SOURCE
 patch_scripts()