diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 0bab362e578..0350fbf7379 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -142,16 +142,16 @@
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <pto_header><!-- Must be after setLang() -->
-	<blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
-	<tr>
-	    <td> <para style="terp_tblheader_Details">Description</para> </td>
-	    <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
-	    <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
-	    <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
-	    <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
-	    <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
-	</tr>
-	</blockTable>
+    <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
+    <tr>
+        <td> <para style="terp_tblheader_Details">Description</para> </td>
+        <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
+        <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
+        <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
+        <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
+        <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
+    </tr>
+    </blockTable>
     </pto_header>
     <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
       <tr>
@@ -194,7 +194,7 @@
         <td>
           <para style="terp_tblheader_General_Centre">Invoice Date</para>
         </td>
-	<td>
+    <td>
           <para style="terp_tblheader_General_Centre">Origin</para>
         </td>
         <td>
@@ -210,7 +210,7 @@
         <td>
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
-	<td>
+    <td>
           <para style="terp_default_Centre_9">[[ o.origin or '' ]]</para>
         </td>
         <td>
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 9c78406e5f4..65c16edf4ae 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -44,11 +44,11 @@
                                 <group col="3" colspan="2" attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
                                     <field name="trg_date_range" string="Delay After Trigger Date"/>
                                     <field name="trg_date_range_type" nolabel="1"/>
-	                            </group>
+                                </group>
                             </group>
                             <separator colspan="4" string="Note"/>
                             <label align="0.0" colspan="4" width="900"
-                            	string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
+                                string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
                         </page>
                         <page string="Actions">
                             <separator colspan="4" string="Fields to Change"/>
@@ -74,7 +74,7 @@
                                 <field colspan="4" name="act_email_cc"/>
                             <separator colspan="4" string="Email Body"/>
                             <field colspan="4" name="act_mail_body" height="250"
-                            	nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
+                                nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
                             <separator colspan="4" string="Special Keywords to Be Used in The Body"/>
                             <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
                             <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 4d96fee642e..10dfceeb867 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -87,9 +87,9 @@ class crm_lead_report(osv.osv):
             CREATE OR REPLACE VIEW crm_lead_report AS (
                 SELECT
                     id,
-                    to_char(c.create_date, 'YYYY') as name,
-                    to_char(c.create_date, 'MM') as month,
-                    to_char(c.create_date, 'YYYY-MM-DD') as day,
+                    to_char(c.date_deadline, 'YYYY') as name,
+                    to_char(c.date_deadline, 'MM') as month,
+                    to_char(c.date_deadline, 'YYYY-MM-DD') as day,
                     to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
@@ -107,7 +107,7 @@ class crm_lead_report(osv.osv):
                     c.partner_id,
                     c.country_id,
                     c.planned_revenue,
-                    c.planned_revenue*(c.probability/100) as probable_revenue, 
+                    c.planned_revenue*(c.probability/100) as probable_revenue,
                     1 as nbr,
                     (SELECT count(id) FROM mailgate_message WHERE model='crm.lead' AND res_id=c.id AND history=True) AS email,
                     date_trunc('day',c.create_date) as create_date,
diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml
index e3f3401217c..e16293f435d 100644
--- a/addons/email_template/security/email_template_security.xml
+++ b/addons/email_template/security/email_template_security.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="0">
+        <record id="base.res_groups_email_template_admin" model="res.groups">
+            <field name="name">Marketing / User</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 52a3dc6aca4..5b2c0194ac8 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -10,6 +10,7 @@
         <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
 
+
         <menuitem name="Master Data"
             id="menu_mrp_bom"
             parent="base.menu_mrp_root"