Merge branch '8.0-stage' into '8.0-fix_multicurrency'

# Conflicts:
#   .gitignore

.gitignore

@@ -4,3 +4,4 @@
 TODO
 *.mo
 *~
+*.jasper
\ No newline at end of file

views/purchase_view.xml

 <openerp>
     <data>
-    
+
         <!-- Purchase Order / Form -->
         <record id="view_purchase_order_clearance_form" model="ir.ui.view">
             <field name="name">purchase.order.clearance.form.inherit</field>
@@ -11,7 +11,7 @@
                 <field name="shipped" position="after">
                     <field name="local" invisible="1"/>
                 </field>
-                <button name="purchase_confirm" position="after">
+                <button id="draft_confirm" position="after">
                     <button name="create_import_clearance" attrs="{'invisible': ['|', ('state', 'not in', ('ready_to_embark', 'approved')), ('local', '=', True)]}" groups="purchase.group_purchase_user" string="Create Clearance" type="object"/>
                 </button>
                 <xpath expr="//page[@string='Deliveries &amp; Invoices']" position="after">