Merge lp:~jfb-tempo-consulting/unifield-server/US-7815 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wiz_common_import.py'
--- bin/addons/msf_doc_import/wizard/wiz_common_import.py	2020-02-10 17:16:32 +0000
+++ bin/addons/msf_doc_import/wizard/wiz_common_import.py	2020-08-25 15:55:46 +0000
@@ -389,23 +389,28 @@
                       'product_qty': p_data['import_product_qty'],
                       'old_price_unit': p_data['standard_price'],}
 
-            values.update(self.product_id_on_change(cr, uid, False,
-                                                    po_data['pricelist_id'][0], # Pricelist
-                                                    values['product_id'], # Product
-                                                    p_data['import_product_qty'], # Product Qty - Use 1.00 to compute the price according to supplier catalogue
-                                                    values['product_uom'], # UoM
-                                                    po_data['partner_id'][0], # Supplier
-                                                    po_data['date_order'], # Date order
-                                                    po_data['fiscal_position'], # Fiscal position
-                                                    po_data['date_order'], # Date planned
-                                                    '', # Name
-                                                    values['price_unit'], # Price unit
-                                                    '', # Notes
-                                                    po_data['state'], # State
-                                                    values['old_price_unit'], # Old price unit
-                                                    False, # Nomen_manda_0
-                                                    '', # Comment
-                                                    context=context).get('value', {}))
+            product_id_on_change = self.product_id_on_change(cr, uid, False,
+                                                             po_data['pricelist_id'][0], # Pricelist
+                                                             values['product_id'], # Product
+                                                             p_data['import_product_qty'], # Product Qty - Use 1.00 to compute the price according to supplier catalogue
+                                                             values['product_uom'], # UoM
+                                                             po_data['partner_id'][0], # Supplier
+                                                             po_data['date_order'], # Date order
+                                                             po_data['fiscal_position'], # Fiscal position
+                                                             po_data['date_order'], # Date planned
+                                                             '', # Name
+                                                             values['price_unit'], # Price unit
+                                                             '', # Notes
+                                                             po_data['state'], # State
+                                                             values['old_price_unit'], # Old price unit
+                                                             False, # Nomen_manda_0
+                                                             '', # Comment
+                                                             context=context)
+            if product_id_on_change.get('warning', {}).get('message') and 'product_id' in product_id_on_change.get('value', {}) and not product_id_on_change['value']['product_id']:
+                # warning is raised and product_id is removed
+                raise osv.except_osv(_('Warning'), product_id_on_change['warning']['message'])
+
+            values.update(product_id_on_change.get('value', {}))
             # Set the quantity to 0.00
             values.update({'product_qty': p_data['import_product_qty']})
 
@@ -532,9 +537,11 @@
                       'product_uom': p_data['uom_id'][0]}
 
             if order_data['procurement_request']:
-                values.update(self.requested_product_id_change(cr, uid, False,
-                                                               p_data['id'],
-                                                               '').get('value', {}))
+                product_id_change = self.requested_product_id_change(cr, uid, False, p_data['id'], '')
+                if product_id_change.get('warning', {}).get('message') and 'product_id' in product_id_change.get('value', {}) and not product_id_change['value']['product_id']:
+                    # warning is raised and product_id is removed
+                    raise osv.except_osv(_('Warning'), product_id_change['warning']['message'])
+                values.update(product_id_change.get('value', {}))
             else:
                 values.update(self.product_id_on_change(cr, uid, False, order_data['pricelist_id'][0],
                                                         p_data['id'],
@@ -596,6 +603,7 @@
                 'pricelist': order.pricelist_id.id,
                 'warehouse': order.warehouse_id.id,
                 'categ': order.categ,
+                'sale_id': order.id,
             }
         context.update(context_update)
 

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py	2019-12-05 09:11:26 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py	2020-08-25 15:55:46 +0000
@@ -260,7 +260,7 @@
 
                             # Check product restrictions
                             if p_value.get('default_code') and fo_browse.partner_id:
-                                product_obj._get_restriction_error(cr, uid, [p_value['default_code']], {'partner_id': fo_browse.partner_id.id}, context=dict(context, noraise=False))
+                                product_obj._get_restriction_error(cr, uid, [p_value['default_code']], {'partner_id': fo_browse.partner_id.id, 'obj_type': 'sale.order'}, context=dict(context, noraise=False))
 
                             # write order line on FO
                             vals['order_line'].append((0, 0, to_write))

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_fo_line.xml'
--- bin/addons/msf_doc_import/wizard/wizard_import_fo_line.xml	2013-03-13 16:24:00 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_fo_line.xml	2020-08-25 15:55:46 +0000
@@ -17,7 +17,7 @@
                     attrs="{'invisible':[('import_error_ok', '!=', False), ('state', '!=', 'done')]}"/>
                     
                     <separator colspan="12" string="Information" />
-                    <field name="message" colspan="4" nolabel="1" />
+                    <field name="message" colspan="4" nolabel="1" widget="full_text"/>
                     <group name="buttons" string="" colspan="24" col="6">
                         <button name="cancel" string="Cancel" icon="gtk-cancel" type="object" 
                         attrs="{'invisible':[('state', '!=', 'draft')]}"/>
@@ -35,4 +35,4 @@
         </record>
         
     </data>
-</openerp>
\ No newline at end of file
+</openerp>