diff --git a/addons/account/account.py b/addons/account/account.py
index 5de913c45a7..bdd6b37b988 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1605,7 +1605,7 @@ class account_tax_code(osv.osv):
         if isinstance(ids, (int, long)):
             ids = [ids]
         reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
-        return [(x['id'], (x['code'] and x['code'] + ' - ' or '') + x['name']) \
+        return [(x['id'], (x['code'] and (x['code'] + ' - ') or '') + x['name']) \
                 for x in reads]
 
     def _default_company(self, cr, uid, context={}):
diff --git a/addons/account/installer.py b/addons/account/installer.py
index b85b2dc21e2..b689697d7a8 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -604,8 +604,7 @@ class account_installer(osv.osv_memory):
                     new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
 
                     sales_tax = obj_tax.create(cr, uid,
-                                           {'name':'TAX%s%%'%(s_tax*100),
-                                            'description':'TAX%s%%'%(s_tax*100),
+                                           {'name':'TAX %s%%'%(s_tax*100),
                                             'amount':s_tax,
                                             'base_code_id':new_tax_code,
                                             'tax_code_id':new_paid_tax_code,
@@ -640,8 +639,7 @@ class account_installer(osv.osv_memory):
                     new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
 
                     purchase_tax = obj_tax.create(cr, uid,
-                                            {'name':'TAX%s%%'%(p_tax*100),
-                                             'description':'TAX%s%%'%(p_tax*100),
+                                            {'name':'TAX %s%%'%(p_tax*100),
                                              'amount':p_tax,
                                              'base_code_id':new_tax_code,
                                             'tax_code_id':new_paid_tax_code,
diff --git a/addons/delivery/delivery_data.xml b/addons/delivery/delivery_data.xml
index 97e841ead45..ff0c90ad193 100644
--- a/addons/delivery/delivery_data.xml
+++ b/addons/delivery/delivery_data.xml
@@ -5,5 +5,54 @@
             <field name="name">property_delivery_carrier</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>
         </record>
+
+        <!-- Create a transporter -->
+        
+        <record id="delivery_partner" model="res.partner">
+            <field name="name">The Poste</field>
+        </record>
+        <record id="delivery_partner_address" model="res.partner.address">
+            <field name="type">default</field>
+            <field name="partner_id" ref="delivery_partner"/>
+        </record>
+        
+        <!-- Create a partner -->
+        
+        <record id="delivery_product" model="product.product">
+            <field name="name">Delivery by Poste</field>
+            <field name="type">service</field>
+            <field model="product.category" name="categ_id" search="[]"/>
+        </record>
+
+        <!-- Carrier -->
+        
+        <record id="delivery_carrier" model="delivery.carrier">
+            <field name="name">The Poste</field>
+            <field name="partner_id" ref="delivery_partner"/>
+            <field name="product_id" ref="delivery_product"/>
+        </record>
+        
+        <!-- Carrier Grids -->
+        
+        <record id="delivery_grid" model="delivery.grid">
+            <field name="name">The Poste - Pricelist</field>
+            <field name="carrier_id" ref="delivery_carrier"/>
+        </record>
+        <record id="delivery_grid_line1" model="delivery.grid.line">
+            <field name="name">Weight &lt;= 5kg</field>
+            <field name="grid_id" ref="delivery_grid"/>
+            <field eval="5" name="max_value"/>
+            <field eval="20" name="list_price"/>
+            <field eval="10" name="standard_price"/>
+        </record>
+        <record id="delivery_grid_line2" model="delivery.grid.line">
+            <field name="name">Weight &gt; 5kg</field>
+            <field name="grid_id" ref="delivery_grid"/>
+            <field name="operator">&gt;=</field>
+            <field eval="5" name="max_value"/>
+            <field eval="50" name="list_price"/>
+            <field eval="30" name="standard_price"/>
+        </record>
+        
     </data>
 </openerp>
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index 2c05d4567a5..f247c53ed82 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -1,64 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <!-- Create a transporter -->
-        
-        <record id="delivery_partner" model="res.partner">
-            <field name="name">The Poste</field>
-            <field name="website">http://www.openerp.com</field>
-        </record>
-        <record id="delivery_partner_address" model="res.partner.address">
-            <field name="name">Fabien Pinckaers</field>
-            <field name="type">default</field>
-            <field name="partner_id" ref="delivery_partner"/>
-        </record>
-        
-        <!-- Create a partner -->
-        
-        <record id="delivery_product" model="product.product">
-            <field name="name">Delivery by Poste</field>
-            <field name="type">service</field>
-            <field model="product.category" name="categ_id" search="[]"/>
-        </record>
-        
-        <!-- Carrier -->
-        
-        <record id="delivery_carrier" model="delivery.carrier">
-            <field name="name">The Poste - Express</field>
-            <field name="partner_id" ref="delivery_partner"/>
-            <field name="product_id" ref="delivery_product"/>
-        </record>
-        
-        <!-- Carrier Grids -->
-        
-        <record id="delivery_grid" model="delivery.grid">
-            <field name="name">The Poste Express - Pricelist</field>
-            <field name="carrier_id" ref="delivery_carrier"/>
-        </record>
         <record id="delivery_grid_line3" model="delivery.grid.line">
-            <field name="name">Franco, price &gt;= 300</field>
-            <field name="grid_id" ref="delivery_grid"/>
+            <field name="name">Free if price &gt;= 300</field>
+            <field name="grid_id" ref="delivery.delivery_grid"/>
             <field eval="300" name="max_value"/>
             <field name="operator">&gt;=</field>
             <field name="type">price</field>
             <field eval="0" name="list_price"/>
             <field eval="20" name="standard_price"/>
         </record>
-        <record id="delivery_grid_line1" model="delivery.grid.line">
-            <field name="name">Weight &lt;= 250</field>
-            <field name="grid_id" ref="delivery_grid"/>
-            <field eval="250" name="max_value"/>
-            <field eval="100" name="list_price"/>
-            <field eval="80" name="standard_price"/>
-        </record>
-        <record id="delivery_grid_line2" model="delivery.grid.line">
-            <field name="name">Weight &gt; 250</field>
-            <field name="grid_id" ref="delivery_grid"/>
-            <field name="operator">&gt;=</field>
-            <field eval="250" name="max_value"/>
-            <field eval="120" name="list_price"/>
-            <field eval="100" name="standard_price"/>
-        </record>
-        
     </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 08fdd8cafcd..e5357ee0e04 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -198,7 +198,7 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                <button name="%(action_view_sale_advance_payment_inv)d" string="Deposit" type="action" icon="gtk-execute" attrs="{'invisible':[('state','!=','draft')]}"/>
+                                <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
                             </group>
                             <group col="13" colspan="4">
                                 <field name="state"/>
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index d0d38cc3d94..ca7506fe518 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -25,6 +25,7 @@
             </field>
         </record>
         
+        <!--
         <act_window
             domain="[('sale_id', '=', active_id)]"
             id="act_sale_order_2_stock_picking"
@@ -32,6 +33,7 @@
             res_model="stock.picking"
             src_model="sale.order"
             context="{'contact_display': 'partner'}" />
+        -->
        
        <record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 0eac0308acc..27c19065652 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -168,7 +168,7 @@ class sale_open_invoice(osv.osv_memory):
             tree_id = mod_obj._get_id(cr, uid, 'account', 'invoice_tree')
             tree_res = mod_obj.browse(cr, uid, tree_id, context=context).res_id
         return {
-            'name': 'Invoices',
+            'name': _('Deposit Invoice'),
             'view_type': 'form',
             'view_mode': 'form,tree',
             'res_model': 'account.invoice',
@@ -181,4 +181,4 @@ class sale_open_invoice(osv.osv_memory):
 
 sale_open_invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 6e192d31108..33262a5cdd7 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -2,26 +2,26 @@
 <openerp>
     <data>
         <record id="view_sale_advance_payment_inv" model="ir.ui.view">
-            <field name="name">Deposit Invoice</field>
+            <field name="name">Advance Invoice</field>
             <field name="model">sale.advance.payment.inv</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partial Invoice">
+                <form string="Advance Invoice">
                     <field name="product_id"/>
                     <newline />
-                    <field name="qtty"/>
+                    <field name="qtty" invisible="1"/>
                     <field name="amount"/>
                     <newline />
                     <separator string="" colspan="4"/>
                     <label string=""  colspan="2" />
-					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-					<button name="create_invoices" string="Create Partial Invoice" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward"/>
                 </form>
             </field>
         </record>
 
         <record id="action_view_sale_advance_payment_inv" model="ir.actions.act_window">
-            <field name="name">Deposit</field>
+            <field name="name">Advance Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.advance.payment.inv</field>
             <field name="view_type">form</field>
@@ -34,15 +34,15 @@
             <field name="model">sale.open.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Invoices">
-		            <label string="You invoice has been successfully created!" />
+                <form string="Invoices">
+                    <label string="You invoice has been successfully created!" />
                     <newline />
                     <separator string="" colspan="4"/>
-		            <group colspan="4">
-		                <button special="cancel" string="Close" icon="gtk-cancel"/>
-		                <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
-		            </group>
-	             </form>
+                    <group colspan="4">
+                        <button special="cancel" string="Close" icon="gtk-cancel"/>
+                        <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
+                    </group>
+                 </form>
             </field>
         </record>