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

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2017-11-28 17:41:34 +0000
+++ bin/addons/msf_profile/data/patches.xml	2017-12-13 16:51:22 +0000
@@ -30,6 +30,10 @@
             <field name="method">us_3516_change_damage_reason_type_incoming_ok</field>
         </record>
 
+        <record id="us_3879_set_pricelist_id_for_ir" model="patch.scripts">
+            <field name="method">us_3879_set_pricelist_id_for_ir</field>
+        </record>
+
         <!-- OLD -->
 
         <record id="us_3048_patch" model="patch.scripts">
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2017-12-06 13:59:39 +0000
+++ bin/addons/msf_profile/msf_profile.py	2017-12-13 16:51:22 +0000
@@ -335,6 +335,14 @@
         cr.execute("UPDATE stock_reason_type SET incoming_ok = 't' WHERE name = 'Damage'")
         return True
 
+    def us_3879_set_pricelist_id_for_ir(self, cr, uid, *a, **b):
+        currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
+        pricelist_id = self.pool.get('product.pricelist').search(cr, uid, [('type', '=', 'sale'),
+                                                                           ('currency_id', '=', currency_id)], limit=1)[0]
+
+        cr.execute("UPDATE sale_order SET pricelist_id = %s WHERE procurement_request = 't'" % (pricelist_id,))
+        return True
+
     # OLD patches
     def us_3048_patch(self, cr, uid, *a, **b):
         '''
 
=== modified file 'bin/addons/procurement_request/procurement_request.py'
--- bin/addons/procurement_request/procurement_request.py	2017-12-01 09:08:44 +0000
+++ bin/addons/procurement_request/procurement_request.py	2017-12-13 16:51:22 +0000
@@ -368,6 +368,8 @@
         if not context:
             context = {}
 
+        pricelist_obj = self.pool.get('product.pricelist')
+
         if context.get('procurement_request') or vals.get('procurement_request', False):
             # Get the ISR number
             if not vals.get('name', False):
@@ -382,7 +384,8 @@
             vals['partner_order_id'] = address_id
             vals['partner_invoice_id'] = address_id
             vals['partner_shipping_id'] = address_id
-            pl = self.pool.get('product.pricelist').search(cr, uid, [], limit=1)[0]
+            pl = pricelist_obj.search(cr, uid, [('type', '=', 'sale'),
+                                                ('currency_id', '=', company.currency_id.id)], limit=1)[0]
             vals['pricelist_id'] = pl
             if 'delivery_requested_date' in vals:
                 vals['ready_to_ship_date'] = compute_rts(self, cr, uid, vals['delivery_requested_date'], 0, 'so', context=context)