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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-01-02 08:52:42 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-01-16 10:08:15 +0000
@@ -75758,6 +75758,7 @@
 msgid "There is no stopped products to report"
 msgstr "Il n'y a aucun produit stoppé à afficher"
 
+<<<<<<< TREE
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/check_line.py:626
 #: code:addons/msf_doc_import/check_line.py:628
@@ -75854,3 +75855,17 @@
 #, python-format
 msgid "Wrong total: %.2f, instead of: %.2f"
 msgstr "Total erroné : %.2f, au lieu de : %.2f"
+=======
+#. module: product_attributes
+#: code:addons/product_attributes/product_attributes.py:918
+#: field:product.product,uf_write_date:0
+#, python-format
+msgid "Write date"
+msgstr "Date de modification"
+
+#. module: product_attributes
+#: code:addons/product_attributes/product_attributes.py:919
+#: field:product.product,uf_create_date:0
+#, python-format
+msgid "Creation date"
+msgstr "Date de création">>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/product/product.py'
--- bin/addons/product/product.py	2016-07-05 14:35:38 +0000
+++ bin/addons/product/product.py	2017-01-16 10:08:15 +0000
@@ -497,6 +497,7 @@
                     (data['name'] or '') + (data['variants'] and (' - '+data['variants']) or '')
         return res
 
+
     _defaults = {
         'active': lambda *a: 1,
         'price_extra': lambda *a: 0.0,
@@ -528,6 +529,7 @@
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
         'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True, write_relate=False),
     }
+
     
     def unlink(self, cr, uid, ids, context=None):
         unlink_ids = []

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2016-11-21 14:21:55 +0000
+++ bin/addons/product_attributes/product_attributes.py	2017-01-16 10:08:15 +0000
@@ -26,6 +26,7 @@
 import logging
 import tools
 from os import path
+from datetime import datetime
 
 class product_section_code(osv.osv):
     _name = "product.section.code"
@@ -914,6 +915,8 @@
         'soq_volume': fields.float(digits=(16,5), string='SoQ Volume'),
         'soq_quantity': fields.float(digits=(16,2), string='SoQ Quantity'),
         'vat_ok': fields.function(_get_vat_ok, method=True, type='boolean', string='VAT OK', store=False, readonly=True),
+        'uf_write_date': fields.datetime(_('Write date')),
+        'uf_create_date': fields.datetime(_('Creation date')),
     }
 
     # US-43: Remove the default_get that set value on Product Creator field. By removing the required = True value
@@ -1265,6 +1268,8 @@
             if f in vals and not vals.get(f):
                 vals[f] = 'no'
 
+        vals['uf_create_date'] = vals.get('uf_create_date', datetime.now())
+
         res = super(product_attributes, self).create(cr, uid, vals,
                                                      context=context)
 
@@ -1371,6 +1376,8 @@
             if f in vals and not vals.get(f):
                 vals[f] = 'no'
 
+        vals['uf_write_date'] = vals.get('uf_write_date', datetime.now())
+
         res = super(product_attributes, self).write(cr, uid, ids, vals, context=context)
 
         if product_uom_categ:

=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
--- bin/addons/product_attributes/product_attributes_view.xml	2016-09-28 08:24:48 +0000
+++ bin/addons/product_attributes/product_attributes_view.xml	2017-01-16 10:08:15 +0000
@@ -25,6 +25,8 @@
                         <field name="standard_price" invisible="context.get('pricelist', False)"/>
                         <field name="state" />
                         <field name="international_status"/>
+                        <field name="uf_create_date" string="Creation"/>
+                        <field name="uf_write_date" string="Modification"/>
                        </tree>
                     </xpath>
                 </data>
@@ -452,6 +454,8 @@
                    <field name="default_code" string="Code"/>
                    <field name="name" string="Description"/>
                    <field name="list_ids" widget="many2one" context="{'list': self}" />
+                   <field name="uf_create_date" string="Creation" widget="date" />
+                   <field name="uf_write_date" string="Modification" widget="date" />
                    <newline/>
                    <filter string="Single Item" icon="terp-accessories-archiver" domain="[('subtype','=','single')]"/>
                    <filter string="Kit/Module" icon="terp-accessories-archiver" domain="[('subtype','=','kit')]"/>