diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index c68a9f1ceb5..284dad5e6a9 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -2,40 +2,6 @@
 <openerp>
     <data noupdate="1">
         
-        <!--  crm categories -->
-        <record model="crm.lead.tag" id="categ_oppor1">
-            <field name="name">Product</field>
-            <field name="team_id" ref="sales_team.team_sales_department"/>
-        </record>
-        <record model="crm.lead.tag" id="categ_oppor2">
-            <field name="name">Software</field>
-            <field name="team_id" ref="sales_team.team_sales_department"/>
-        </record>
-        <record model="crm.lead.tag" id="categ_oppor3">
-            <field name="name">Services</field>
-            <field name="team_id" ref="sales_team.team_sales_department"/>
-        </record>
-        <record model="crm.lead.tag" id="categ_oppor4">
-            <field name="name">Information</field>
-            <field name="team_id" ref="sales_team.team_sales_department"/>
-        </record>
-        <record model="crm.lead.tag" id="categ_oppor5">
-            <field name="name">Design</field>
-            <field name="team_id" ref="sales_team.team_sales_department"/>
-        </record>
-        <record model="crm.lead.tag" id="categ_oppor6">
-            <field name="name">Training</field>
-            <field name="team_id" ref="sales_team.team_sales_department"/>
-        </record>
-        <record model="crm.lead.tag" id="categ_oppor7">
-            <field name="name">Consulting</field>
-            <field name="team_id" ref="sales_team.team_sales_department"/>
-        </record>
-        <record model="crm.lead.tag" id="categ_oppor8">
-            <field name="name">Other</field>
-            <field name="team_id" ref="sales_team.team_sales_department"/>
-        </record>
-
         <!-- CRM-related subtypes for messaging / Chatter -->
         <record id="mt_lead_create" model="mail.message.subtype">
             <field name="name">Lead Created</field>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index b49081563a8..1f337a82142 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -2,6 +2,40 @@
 <openerp>
     <data noupdate="1">
 
+        <!--  crm categories -->
+        <record model="crm.lead.tag" id="categ_oppor1">
+            <field name="name">Product</field>
+            <field name="team_id" ref="sales_team.team_sales_department"/>
+        </record>
+        <record model="crm.lead.tag" id="categ_oppor2">
+            <field name="name">Software</field>
+            <field name="team_id" ref="sales_team.team_sales_department"/>
+        </record>
+        <record model="crm.lead.tag" id="categ_oppor3">
+            <field name="name">Services</field>
+            <field name="team_id" ref="sales_team.team_sales_department"/>
+        </record>
+        <record model="crm.lead.tag" id="categ_oppor4">
+            <field name="name">Information</field>
+            <field name="team_id" ref="sales_team.team_sales_department"/>
+        </record>
+        <record model="crm.lead.tag" id="categ_oppor5">
+            <field name="name">Design</field>
+            <field name="team_id" ref="sales_team.team_sales_department"/>
+        </record>
+        <record model="crm.lead.tag" id="categ_oppor6">
+            <field name="name">Training</field>
+            <field name="team_id" ref="sales_team.team_sales_department"/>
+        </record>
+        <record model="crm.lead.tag" id="categ_oppor7">
+            <field name="name">Consulting</field>
+            <field name="team_id" ref="sales_team.team_sales_department"/>
+        </record>
+        <record model="crm.lead.tag" id="categ_oppor8">
+            <field name="name">Other</field>
+            <field name="team_id" ref="sales_team.team_sales_department"/>
+        </record>
+
         <!--  Demo Leads -->
         <record id="crm_case_1" model="crm.lead">
             <field name="type">lead</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d9320bb97f4..0395ab5298c 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -447,7 +447,7 @@
 
                             <h2 class="o_row">
                                 <div>
-                                    <label for="planned_revenue" class="oe_edit_only"/>
+                                    <label for="planned_revenue" class="oe_edit_only" />
                                     <div class="o_row">
                                         <field name="company_currency" invisible="1"/>
                                         <field name="planned_revenue" widget='monetary' options="{'currency_field': 'company_currency'}"/>
diff --git a/addons/crm/crm_stage.py b/addons/crm/crm_stage.py
index 321ef270da0..92fb1efa05d 100644
--- a/addons/crm/crm_stage.py
+++ b/addons/crm/crm_stage.py
@@ -36,7 +36,7 @@ class crm_stage(osv.Model):
         'legend_priority': fields.text(
             'Priority Management Explanation', translate=True,
             help='Explanation text to help users using the star and priority mechanism on stages or issues that are in this stage.'),
-        'fold': fields.boolean('Folded in Kanban View',
+        'fold': fields.boolean('Folded in Pipeline',
                                help='This stage is folded in the kanban view when'
                                'there are no records in that stage to display.'),
         'type': fields.selection([('lead', 'Lead'), ('opportunity', 'Opportunity'), ('both', 'Both')],
diff --git a/addons/hr_equipment/models/hr_equipment.py b/addons/hr_equipment/models/hr_equipment.py
index 8fa3ac54958..d0fecf75d55 100644
--- a/addons/hr_equipment/models/hr_equipment.py
+++ b/addons/hr_equipment/models/hr_equipment.py
@@ -14,7 +14,7 @@ class HrEquipmentStage(models.Model):
 
     name = fields.Char('Name', required=True, translate=True)
     sequence = fields.Integer('Sequence', default=20)
-    fold = fields.Boolean('Folded in Kanban View')
+    fold = fields.Boolean('Folded in Recruitment Pipe')
 
 
 class HrEquipmentCategory(models.Model):
@@ -40,7 +40,7 @@ class HrEquipmentCategory(models.Model):
         'mail.alias', 'Alias', ondelete='cascade', required=True,
         help="Email alias for this equipment category. New emails will automatically "
         "create new maintenance request for this equipment category.")
-    fold = fields.Boolean(string='Folded in Kanban View', compute='_compute_fold', store=True)
+    fold = fields.Boolean(string='Folded in Maintenance Pipe', compute='_compute_fold', store=True)
 
     @api.multi
     def _compute_equipment_count(self):
diff --git a/addons/hr_recruitment/models/hr_recruitment.py b/addons/hr_recruitment/models/hr_recruitment.py
index ca41b5bfda6..ef6bf9ca446 100644
--- a/addons/hr_recruitment/models/hr_recruitment.py
+++ b/addons/hr_recruitment/models/hr_recruitment.py
@@ -63,7 +63,7 @@ class RecruitmentStage(models.Model):
         'mail.template', "Use template",
         help="If set, a message is posted on the applicant using the template when the applicant is set to the stage.")
     fold = fields.Boolean(
-        "Folded in Kanban View",
+        "Folded in Recruitment Pipe",
         help="This stage is folded in the kanban view when there are no records in that stage to display.")
 
 
diff --git a/addons/l10n_gr/account_full_chart.xml b/addons/l10n_gr/account_full_chart.xml
index df9d694d4c9..8aebf83d00a 100644
--- a/addons/l10n_gr/account_full_chart.xml
+++ b/addons/l10n_gr/account_full_chart.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+    <data noupdate="1">
+        <record id="action_client_l10n_gr_menu" model="ir.actions.client">
+            <field name="name">Open Account Dashboard Menu</field>
+            <field name="tag">reload</field>
+            <field name="params" eval="{'menu_id': ref('account.menu_board_journal_1')}"/>
+        </record>
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_client_l10n_gr_menu"/>
+            <field name="state">open</field>
+        </record>
+    </data>
+
     <data noupdate="False">
         <record id="chartgr_38_07" model="account.account.template">
             <field name="code">38.07</field>
diff --git a/addons/project/project.py b/addons/project/project.py
index 11524251a65..a954de936a1 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -34,7 +34,7 @@ class project_task_type(osv.osv):
         'legend_normal': fields.char(
             'Kanban Ongoing Explanation', translate=True,
             help='Override the default value displayed for the normal state for kanban selection, when the task or issue is in that stage.'),
-        'fold': fields.boolean('Folded in Kanban View',
+        'fold': fields.boolean('Folded in Tasks Pipeline',
                                help='This stage is folded in the kanban view when '
                                'there are no records in that stage to display.'),
     }
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 7854088c31a..5f9c723e402 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -25,9 +25,13 @@
                 <data>
                     <xpath expr="//field[@name='stage_id']" position="before">
                         <button attrs="{'invisible': [('probability', '=', 0)]}" string="New Quotation" name="%(sale_action_quotations_new)d" type="action" class="oe_highlight"
-                            context="{'search_default_partner_id': partner_id, 'default_partner_id': partner_id}"/>
+                            context="{'search_default_partner_id': partner_id, 
+                                      'default_partner_id': partner_id,
+                                      'default_team_id': team_id}"/>
                         <button attrs="{'invisible': [('probability', '>', 0)]}" string="New Quotation" name="%(sale_action_quotations_new)d" type="action"
-                            context="{'search_default_partner_id': partner_id, 'default_partner_id': partner_id}"/>
+                            context="{'search_default_partner_id': partner_id, 
+                                      'default_partner_id': partner_id, 
+                                      'default_team_id': team_id}"/>
                     </xpath>
                     <div name="button_box" position="inside">
                         <button class="oe_stat_button" type="action"
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 02fa554242b..b8d11f6a35a 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -158,7 +158,6 @@
                                 domain="[('is_company', '=', True)]" context="{'default_is_company': True, 'default_supplier': supplier, 'default_customer': customer}"
                                 attrs="{'invisible': [('is_company','=', True),('parent_id', '=', False)]}"
                                 on_change="onchange_parent_id(parent_id)"/>
-                            <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                         </div>
                     </div>
 
@@ -198,6 +197,7 @@
                             <field name="title" options='{"no_open": True}'
                                 attrs="{'invisible': [('is_company', '=', True)]}"/>
                             <field name="lang"/>
+                            <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                         </group>
                     </group>