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

[jftempo]

=== modified file 'bin/addons/delete_button/view/picking_view.xml'
--- bin/addons/delete_button/view/picking_view.xml	2014-12-02 10:58:38 +0000
+++ bin/addons/delete_button/view/picking_view.xml	2016-04-27 12:09:41 +0000
@@ -133,10 +133,6 @@
                     <xpath expr="/tree" position="attributes">
                         <attribute name='hide_delete_button'>1</attribute>
                     </xpath>
-                    <xpath expr="/tree/button[@name='validate_picking']" position="after">
-                        <button name="delete_button" type="object" icon="gtk-del" string="Delete" 
-                        states='draft' confirm='Do you really want to delete selected record(s) ?'/>
-                    </xpath>
                 </data>
             </field>
         </record>