diff --git a/addons/account/account.py b/addons/account/account.py
index 6d074beb646..6c11bd2439a 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2541,8 +2541,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True),
         'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
         'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
-        "sale_tax": fields.many2one("account.tax.template", "Sale Tax"),
-        "purchase_tax": fields.many2one("account.tax.template", "Purchase Tax"),
+        "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"),
+        "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"),
     }
     def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None):
         res = {}
@@ -2550,12 +2550,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         res['value']["sale_tax"] = False
         res['value']["purchase_tax"] = False
         if chart_template_id:
-            ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
-                                          , "=", chart_template_id)], order="sequence")
-            if len(ids) > 0:
-                id=ids[0]
-                res['value']["sale_tax"] = id
-                res['value']["purchase_tax"] = id
+            sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
+            purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
+            res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False
+            res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False
         return res
 
     def _get_chart(self, cr, uid, context={}):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a92ca3b3bb9..acbe5071088 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2419,8 +2419,8 @@
                     <field name ="code_digits" groups="base.group_extended"/>
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
                     <field name ="seq_journal" groups="base.group_extended"/>
-                  <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/>
-                  <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/>
+                  <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
+                  <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
                     <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
                         <form string="Bank Information">
                             <field name="acc_name"/>
@@ -2467,7 +2467,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
             <field name="name">New Company Financial Setting</field>
             <field eval="1" name="sequence"/>
             <field name="parent_id" ref="account.menu_finance_accounting"/>
-            <field name="icon">STOCK_JUSTIFY_FILL</field>
+            <field name="icon">STOCK_EXECUTE</field>
             <field name="action" ref="ir_actions_server_action_wizard_multi_chart"/>
         </record>
 
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 1d0cf21be08..7f751f7c5a2 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -128,8 +128,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="mailgate_message_tree_view"/>
-            <field name="context">{'type':'imap'}</field>
-            <field name="domain">[('type','=','imap')]</field>
+            <field name="context">{'server_type':'imap'}</field>
+            <field name="domain">[('server_type','=','imap')]</field>
         </record>
         
         <menuitem 
@@ -143,8 +143,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="mailgate_message_tree_view"/>
-            <field name="context">{'type':'pop'}</field>
-            <field name="domain">[('type','=','pop')]</field>
+            <field name="context">{'server_type':'pop'}</field>
+            <field name="domain">[('server_type','=','pop')]</field>
         </record>
         
         <menuitem 
diff --git a/addons/html_view/html_view.xml b/addons/html_view/html_view.xml
index 7babda37c46..a279b408300 100644
--- a/addons/html_view/html_view.xml
+++ b/addons/html_view/html_view.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="html_view_form" model="ir.ui.view">
-            <field name="name">htmlform</field>
-            <field name="model">html.view</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Html Example">
-                    <html>
-						<h2>This is Test Html Page </h2>
-						<table>
-					    <tr>
-					        <td>
-					            Name :
-					        </td>
-					        <td>
-					            <field name="name"/>
-					        </td>
-					        <td>
-					            Company :
-					        </td>
-					        <td>
-					            <field name="comp_id"/>
-					        </td>
-					    </tr>
-					</table>						
-						<field name="bank_ids"/>
-					</html>
-                </form>
-            </field>
-        </record>
-        <record id="action_html_view_form" model="ir.actions.act_window">
-            <field name="name">Html Test</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">html.view</field>
-            <field name="view_type">form</field>
-        </record>
-        <menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="40"/>
-	</data>
+  <data>
+    <record id="html_view_form" model="ir.ui.view">
+      <field name="name">htmlform</field>
+      <field name="model">html.view</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Html Example">
+          <html>
+            <h2>This is Test Html Page </h2>
+            <table>
+              <tr>
+                <td>
+                  Name :
+                </td>
+                <td>
+                  <field name="name"/>
+                </td>
+                <td>
+                  Company :
+                </td>
+                <td>
+                  <field name="comp_id"/>
+                </td>
+              </tr>
+            </table>
+            <field name="bank_ids"/>
+          </html>
+        </form>
+      </field>
+    </record>
+    <record id="action_html_view_form" model="ir.actions.act_window">
+      <field name="name">Html Test</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">html.view</field>
+      <field name="view_type">form</field>
+    </record>
+    <menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="40"/>
+  </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index 4b5e3ca959e..01d2e3f0c1c 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -11,7 +11,7 @@ company customize which Pad installation should be used to link to new pads
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['base'],
-    'update_xml': [
+    'data': [
         'company_pad.xml'
     ],
     'installable': True,
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 3145979d7b0..5291df7d258 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -297,10 +297,10 @@ class purchase_order(osv.osv):
                     managers.append(manager.id)
             for manager_id in managers:
                 request.create(cr, uid,{
-                       'name' : "Purchase amount over the limit",
+                       'name' : _("Purchase amount over the limit"),
                        'act_from' : uid,
                        'act_to' : manager_id,
-                       'body': 'Somebody has just confirmed a purchase with an amount over the defined limit',
+                       'body': _('Somebody has just confirmed a purchase with an amount over the defined limit'),
                        'ref_partner_id': po.partner_id.id,
                        'ref_doc1': 'purchase.order,%d' % (po.id,),
                 })
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 18317f2cff1..fbb05024c29 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -41,7 +41,7 @@
             parent="base.menu_purchase_root" sequence="4"/>
       <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
             name="Incoming Shipments" sequence="9"
-      groups="base.group_extended"/>
+            groups="base.group_extended"/>
       <menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move"
             parent="menu_procurement_management_inventory" sequence="11"/>
 
@@ -147,8 +147,7 @@
                                 <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
-								<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
-
+                                <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
                             </group>
                         </page>
                         <page string="Delivery &amp; Invoices" groups="base.group_extended">
@@ -199,7 +198,7 @@
                 </group>
                 <newline/>
                   <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
-                    <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                      <separator orientation="vertical"/>
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -377,10 +376,11 @@
                         </group> 
                         <newline/>
                         <group expand="0" string="Group By...">
+                        <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
+                        <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />
-                        <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by' : 'partner_id'}" />
                         <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
-                         <separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                         </group>
                </search>