diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml
index 7b55c6ad212..47775ea9253 100644
--- a/addons/account/project/report/analytic_journal.rml
+++ b/addons/account/project/report/analytic_journal.rml
@@ -280,7 +280,7 @@
               <para style="terp_default_9">[[ move_a.code ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ move_a.name ]] asgfas</para>
+              <para style="terp_default_9">[[ move_a.name ]] </para>
             </td>
             <td>
               <para style="terp_default_9">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para>
diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml
index 9daabddfef8..4aceb12d266 100644
--- a/addons/account_accountant/security/account_security.xml
+++ b/addons/account_accountant/security/account_security.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record id="base.user_admin" model="res.users">
-            <field name="groups_ids" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
+            <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
         </record>
 
     </data>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3d996b990e7..722a17d2931 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -97,7 +97,7 @@
                         <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
                         <button
                             name="%(action_crm_lead2partner)d"
-                            icon="gtk-index" type="action"
+                            icon="terp-partner" type="action"
                             string="Create"
                             attrs="{'invisible':[('partner_id','!=',False)]}"/>
                     </group>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 7726280a05f..bc4f9ba948c 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -92,7 +92,7 @@
         sequence="1" />
 
     <record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
-        <field name="name">Calendar</field>
+        <field name="name">Meetings</field>
         <field name="resource">ir.ui.menu</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index aa8b6cc4820..978b6e1a889 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -268,7 +268,7 @@
         <field name="type">calendar</field>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
-            <calendar string="Meetings" date_start="date" color="user_id" date_delay="duration">
+            <calendar string="Meetings" date_start="date" color="user_id" date_stop="date_deadline">
                 <field name="name"/>
                 <field name="partner_id"/>
                 <field name="section_id" widget="selection"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 315cd206687..cc95e9e3a4e 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -49,7 +49,7 @@
                                         on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
                                         colspan="2" />
                                     <button name="%(action_crm_lead2partner)d"
-                                        icon="gtk-index" type="action"
+                                        icon="terp-partner" type="action"
                                         string="Create"
                                         attrs="{'invisible':[('partner_id','!=',False)]}"/>
                                 </group>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index afc6edd5295..595da873115 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -82,7 +82,7 @@
                     <field name="partner_id"
                         on_change="onchange_partner_id(partner_id, email_from)" />
                     <button string="Create a Partner"
-                        icon="gtk-index"
+                        icon="terp-partner"
                         name="%(action_crm_phonecall2partner)d"
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
@@ -160,7 +160,7 @@
                     <field name="partner_id"
                         on_change="onchange_partner_id(partner_id, email_from)" />
                     <button string="Create a Partner"
-                        icon="gtk-index"
+                        icon="terp-partner"
                         name="%(action_crm_phonecall2partner)d"
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 8cdfe0593e4..5dec5dc4fb8 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Human Resources',
     'description': """Generic Payroll system Integrated with Accountings
-    * Expanse Encoding
+    * Expense Encoding
     * Payment Encoding
     * Company Contribution Management
     """,
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index f5a6897bf1d..87b76895e1a 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -162,7 +162,7 @@ class hr_payslip(osv.osv):
             for line in slip.line_ids:
                 if line.type == 'otherpay' and line.expanse_id.invoice_id:
                     if not line.expanse_id.invoice_id.move_id:
-                        raise osv.except_osv(_('Warning !'), _('Please Confirm all Expanse Invoice appear for Reimbursement'))
+                        raise osv.except_osv(_('Warning !'), _('Please Confirm all Expense Invoice appear for Reimbursement'))
                     invids = [line.expanse_id.invoice_id.id]
                     amount = line.total
                     acc_id = slip.bank_journal_id.default_credit_account_id and slip.bank_journal_id.default_credit_account_id.id
@@ -487,7 +487,7 @@ class account_move_link_slip(osv.osv):
     _description = 'Account Move Link to Pay Slip'
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=False),
-        'move_id':fields.many2one('account.move', 'Expanse Entries', required=False, readonly=True),
+        'move_id':fields.many2one('account.move', 'Expense Entries', required=False, readonly=True),
         'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=False),
         'sequence': fields.integer('Sequence'),
     }
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8f2e5efe649..5872e325715 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -632,5 +632,12 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_template_tree_view"/>
         </record>
+        <record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
+            <field name="name">Products</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="res_id" ref="product.menu_products"/>
+        </record>
+
     </data>
 </openerp>