Merge lp:~mallorymarcot/unifield-server/us-4708 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/sale/sale_workflow.py'
--- bin/addons/sale/sale_workflow.py	2018-06-08 14:22:21 +0000
+++ bin/addons/sale/sale_workflow.py	2018-07-09 08:35:53 +0000
@@ -555,6 +555,10 @@
                 )
             if not sol.stock_take_date and sol.order_id.stock_take_date:
                 to_write['stock_take_date'] = sol.order_id.stock_take_date
+            if sol.order_id.order_type == 'loan':
+                to_write['supplier'] = False
+                to_write['type'] = 'make_to_stock'
+                to_write['po_cft'] = False
             if not sol.order_id.procurement_request:  # in case of FO
                 # check unit price:
                 if not sol.price_unit or sol.price_unit <= 0:

=== modified file 'bin/addons/sourcing/wizard/multiple_sourcing.py'
--- bin/addons/sourcing/wizard/multiple_sourcing.py	2018-04-11 09:09:40 +0000
+++ bin/addons/sourcing/wizard/multiple_sourcing.py	2018-07-09 08:35:53 +0000
@@ -282,6 +282,9 @@
                         raise osv.except_osv(_('Error'), _('You cannot choose Direct Purchase Order as method to source Internal Request lines.'))
                     lines_to_confirm.append(sol.id)
 
+                if wiz.type == 'make_to_order' and sol.order_id.order_type == 'loan':
+                    raise osv.except_osv(_('Error'), _('Line #%s of %s You cannot cannot source a loan on order') % (sol.line_number, sol.order_id.name))
+
         line_obj.confirmLine(cr, uid, lines_to_confirm, context=context)
 
         return {'type': 'ir.actions.act_window_close'}