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

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2016-12-06 16:47:10 +0000
+++ bin/addons/msf_profile/data/patches.xml	2017-01-18 15:49:53 +0000
@@ -142,9 +142,16 @@
         <record id="us_1671_stopped_products" model="patch.scripts">
             <field name="method">us_1671_stopped_products</field>
         </record>
+<<<<<<< TREE
 
         <record id="us_2075_partner_locally_created" model="patch.scripts">
             <field name="method">us_2075_partner_locally_created</field>
         </record>
+=======
+
+        <record id="us_1721_dates_on_products" model="patch.scripts">
+            <field name="method">us_1721_dates_on_products</field>
+        </record>
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2016-12-06 16:47:10 +0000
+++ bin/addons/msf_profile/msf_profile.py	2017-01-18 15:49:53 +0000
@@ -1072,6 +1072,13 @@
             smrl_obj.write(cr, uid, smrl.id, {'product_state': smrl.product_id.state.code}, context=context)
         return True
 
+    def us_1721_dates_on_products(self, cr, uid, *a, **b):
+        """
+        Fill the uf_create_date and uf_write_date for existing products
+        """
+        cr.execute("""UPDATE product_product SET uf_write_date = write_date, uf_create_date = create_date""")
+        return True
+
 
 patch_scripts()