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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wiz_common_import_view.xml'
--- bin/addons/msf_doc_import/wizard/wiz_common_import_view.xml	2016-03-04 11:27:47 +0000
+++ bin/addons/msf_doc_import/wizard/wiz_common_import_view.xml	2017-01-18 10:56:17 +0000
@@ -16,7 +16,7 @@
                         <tree string="Products" editable="top">
                             <field name="default_code" readonly="True" />
                             <field name="name" readonly="True" />
-                            <field name="import_product_qty" on_change="on_change_import_product_qty(import_product_qty, context)"/>
+                            <field name="import_product_qty" on_change="on_change_import_product_qty(import_product_qty, context)" readonly="False" />
                         </tree>
                     </field>
                     <separator colspan="4" string="Actions" />
 
=== modified file 'bin/addons/order_nomenclature/order_nomenclature.py'
--- bin/addons/order_nomenclature/order_nomenclature.py	2016-08-18 08:32:03 +0000
+++ bin/addons/order_nomenclature/order_nomenclature.py	2017-01-18 10:56:17 +0000
@@ -485,10 +485,12 @@
         ids = map(lambda x: values['nomen_sub_%i'%x], ids)
         subNomenclatures = self.pool.get('product.nomenclature').read(cr, uid, ids, ['name'], context=context)
 
-        for n in subNomenclatures:
-            description.append(n['name'])
+        if subNomenclatures:
+            for n in subNomenclatures:
+                description.append(n['name'])
 
-        values.update({'nomenclature_description': ':'.join(description)})
+            if description:
+                values.update({'nomenclature_description': ':'.join(description)})
 
     def _productDomain(self, cr, uid, id, context=None):
         '''
 
=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2017-01-17 13:31:02 +0000
+++ bin/osv/orm.py	2017-01-18 10:56:17 +0000
@@ -3882,8 +3882,23 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
+        check_to_do = False
+        for fld in vals.copy():
+            fobj = None
+            if fld in self._columns:
+                fobj = self._columns[fld]
+            elif fld in self._inherit_fields:
+                fobj = self._inherit_fields[fld][2]
+            if not fobj:
+                continue
+
+            if not (isinstance(fobj, fields.function) and fobj._fnct_inv):
+                check_to_do = True
+                break
+
         self._check_concurrency(cr, ids, context)
-        self.pool.get('ir.model.access').check(cr, user, self._name, 'write', context=context)
+        if check_to_do:
+            self.pool.get('ir.model.access').check(cr, user, self._name, 'write', context=context)
 
         #result = self._store_get_values(cr, user, ids, vals.keys(), context) or []
         result = []