Merge lp:~dorian-kemps/unifield-server/US-2725 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-08-04 08:00:56 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-08-07 07:53:40 +0000
@@ -577,9 +577,17 @@
             <field name="method">us_7412_set_fy_closure_settings</field>
         </record>
 
+<<<<<<< TREE
         <record id="us_6453_set_ref_on_in" model="patch.scripts">
             <field name="method">us_6453_set_ref_on_in</field>
         </record>
 
+=======
+        <!-- UF19.0 -->
+        <record id="us_2725_uf_write_date_on_products" model="patch.scripts">
+            <field name="method">us_2725_uf_write_date_on_products</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-08-04 08:00:56 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-08-07 07:53:40 +0000
@@ -52,6 +52,20 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    # UF19.0
+    def us_2725_uf_write_date_on_products(self, cr, uid, *a, **b):
+        '''
+        Set the uf_write_date of products which don't have one to the date of creation
+        '''
+        prod_obj = self.pool.get('product.product')
+
+        cr.execute('''
+            UPDATE product_product SET uf_write_date = uf_create_date WHERE uf_write_date is NULL
+        ''')
+        self._logger.warn('The uf_write_date has been modified on %s products' % (cr.rowcount,))
+
+        return True
+
     # UF18.0
     def us_7412_set_fy_closure_settings(self, cr, uid, *a, **b):
         """

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2020-05-04 16:40:38 +0000
+++ bin/addons/product_attributes/product_attributes.py	2020-08-07 07:53:40 +0000
@@ -1419,7 +1419,10 @@
             if f in vals and not vals.get(f):
                 vals[f] = 'no'
 
-        vals['uf_create_date'] = vals.get('uf_create_date') or datetime.now()
+        vals.update({
+            'uf_create_date': vals.get('uf_create_date') or datetime.now(),
+            'uf_write_date': vals.get('uf_write_date') or datetime.now(),
+        })
 
         self.convert_price(cr, uid, vals, context)