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

[jftempo]

=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2018-08-14 13:03:26 +0000
+++ bin/addons/stock_override/stock.py	2018-10-03 10:08:57 +0000
@@ -1386,6 +1386,22 @@
                         'target': 'new',
                         'res_id': wiz_id,
                         'context': context}
+            if move.type == 'in' and move.purchase_line_id:
+                vals = {'move_id': ids[0]}
+
+                if not move.purchase_line_id.linked_sol_id:
+                    vals['cancel_only'] = True
+
+                wiz_id = self.pool.get('stock.move.cancel.wizard').create(cr, uid, vals, context=context)
+
+                return {'type': 'ir.actions.act_window',
+                        'res_model': 'stock.move.cancel.wizard',
+                        'view_type': 'form',
+                        'view_mode': 'form',
+                        'target': 'new',
+                        'res_id': wiz_id,
+                        'context': context}
+
 
         return self.unlink(cr, uid, ids, context=context)
 

=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2018-09-07 14:05:58 +0000
+++ bin/addons/stock_override/stock_view.xml	2018-10-03 10:08:57 +0000
@@ -610,7 +610,7 @@
                                     colors="grey:scrapped==True; red: inactive_product == True or to_correct_ok == True"
                                     string="Stock Moves"
                                     hide_new_button="context.get('from_wkf')"
-                                    hide_delete_button="context.get('from_wkf')"
+                                    hide_delete_button="context.get('purchase_id')"
                                     >
                                     <field name="line_number"/>
                                     <field name="product_id" context="{'available_for_restriction': 'consumption', 'search_default_not_restricted': 1}" />
@@ -640,7 +640,7 @@
                                     <field name="price_changed" invisible="1" />
                                     <button name="get_price_changed" type="object" string="Price changed" icon="terp-dolar_ok!" attrs="{'invisible': ['|', ('price_changed', '=', False), ('fake_state', '!=', 'done')]}" />
                                     <field name="from_wkf" invisible="1" />
-                                    <button name="call_cancel_wizard" type="object" string="Cancel" attrs="{'invisible': ['|', ('from_wkf', '=', False), ('fake_state', 'in', ('cancel', 'done'))]}" icon="gtk-del"  context="{'from_button': True}" />
+                                    <button name="call_cancel_wizard" type="object" string="Cancel" attrs="{'invisible': ['|', ('purchase_id', '=', False), ('fake_state', 'in', ('cancel', 'done'))]}" icon="gtk-del"  context="{'from_button': True}" />
                                 </tree>
                                 <form string="Stock Moves" hide_new_button="context.get('from_wkf')">
                                     <group colspan="2" col="4">