From 7d3a5b51bac195b23e594f5d1c39c3f74252ee1c Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Thu, 24 Sep 2009 16:16:21 +0530
Subject: [PATCH] [Merged] stable and trunk addons

bzr revid: hda@tinyerp.com-20090924104621-7p53erkfs9xa0bev
---
 addons/account/__terp__.py                    |   2 -
 addons/account/account.py                     |   2 +-
 addons/account/account_bank_statement.py      |   6 +-
 addons/account/account_invoice_view.xml       |  78 ++-
 addons/account/account_move_line.py           |   4 +-
 addons/account/account_view.xml               |  40 +-
 addons/account/product.py                     |   4 +-
 addons/account/project/project_view.xml       |   2 +-
 .../account_analytic_analysis_menu.xml        |  12 +-
 .../account_analytic_plans.py                 |   4 +-
 addons/account_budget/crossovered_budget.py   |   5 +-
 .../crossovered_budget_view.xml               |  12 +-
 addons/account_payment/payment_view.xml       |  18 +-
 addons/account_report/account.py              |   4 +-
 addons/account_voucher/account.py             |   2 +-
 addons/account_voucher/report/rml_parse.py    |   3 +-
 addons/account_voucher/voucher.py             |   3 +-
 addons/auction/auction_view.xml               |  44 +-
 .../wizard/wizard_auction_invoice_buyer.py    |   8 +-
 .../auction/wizard/wizard_auction_journal.py  |   9 +-
 addons/audittrail/audittrail.py               |   4 +-
 addons/base_contact/base_contact.py           |  24 +-
 addons/base_contact/base_contact_demo.xml     |   2 +-
 addons/base_contact/base_contact_view.xml     |  96 ++--
 addons/base_module_record/__terp__.py         |   8 +-
 .../base_module_record/base_module_record.py  |   4 +-
 .../base_module_record_wizard.xml             |  42 +-
 addons/base_module_record/wizard/__init__.py  |   1 -
 .../wizard/base_module_record.py              | 110 ----
 .../base_report_creator.py                    |   4 +-
 .../base_report_creator_view.xml              |   4 +-
 addons/base_report_designer/__terp__.py       |   4 +-
 .../base_report_designer/base_report_data.xml |   9 +
 .../tiny_sxw2rml/normalized_odt2rml.xsl       |  10 +-
 .../wizard/tiny_sxw2rml/normalized_oo2rml.xsl |  10 +-
 addons/board/board.py                         |   4 +-
 addons/board/board_view.xml                   |   2 +-
 .../board_auction_manager_view.xml            |   2 +-
 addons/board_auction/board_auction_view.xml   |   2 +-
 addons/board_crm_configuration/__terp__.py    |   4 +-
 .../board_crm_statistical_view.xml            |  14 +-
 .../board_crm_view.xml                        |   8 +-
 .../board_project_manager_view.xml            |   2 +-
 addons/board_sale/board_sale_view.xml         |   2 +-
 addons/crm/__terp__.py                        |   2 +-
 addons/crm/crm.py                             | 185 ++++++-
 addons/crm/crm_data.xml                       |  13 +-
 addons/crm/crm_view.xml                       | 211 ++++++--
 addons/crm/crm_wizard.xml                     |   6 +
 .../openerp-mailgate/openerp-mailgate.py      |  11 +-
 addons/crm/wizard/__init__.py                 |   3 +
 .../crm/wizard/wizard_crm_new_send_email.py   | 101 ++++
 addons/crm/wizard/wizard_crm_send_email.py    | 103 ++++
 addons/crm/wizard/wizard_fetch_mail.py        |  53 ++
 addons/crm_configuration/__terp__.py          |   2 +-
 addons/crm_configuration/crm_bugs_menu.xml    | 107 +++-
 addons/crm_configuration/crm_bugs_view.xml    | 132 +++--
 addons/crm_configuration/crm_claims_menu.xml  |  26 +-
 addons/crm_configuration/crm_claims_view.xml  | 120 +++--
 addons/crm_configuration/crm_config.py        |   4 +-
 addons/crm_configuration/crm_config_view.xml  |  14 +
 .../crm_configuration_wizard.xml              |  13 +
 addons/crm_configuration/crm_fund_menu.xml    |  32 +-
 addons/crm_configuration/crm_fund_view.xml    | 105 ++--
 .../crm_configuration/crm_helpdesk_menu.xml   |  58 +-
 addons/crm_configuration/crm_jobs_menu.xml    |  54 +-
 addons/crm_configuration/crm_jobs_view.xml    | 144 ++---
 addons/crm_configuration/crm_lead_data.xml    |   4 +-
 addons/crm_configuration/crm_lead_menu.xml    |  89 +++-
 addons/crm_configuration/crm_lead_view.xml    | 163 +++---
 addons/crm_configuration/crm_meeting_demo.xml |   4 +-
 addons/crm_configuration/crm_meeting_menu.xml |  43 +-
 addons/crm_configuration/crm_meeting_view.xml | 198 ++++---
 .../crm_opportunity_menu.xml                  |  91 ++--
 .../crm_opportunity_view.xml                  | 131 +++--
 .../crm_configuration/crm_phonecall_menu.xml  |  26 +-
 .../crm_configuration/crm_phonecall_view.xml  | 167 ++++--
 .../process/crm_configuration_process.xml     |   8 +-
 addons/crm_configuration/report/crm_report.py |   2 +-
 addons/crm_configuration/wizard/__init__.py   |   2 +
 .../wizard/meeting_planify.py                 |  46 +-
 .../wizard/schedule_phone_call.py             | 128 +++++
 .../wizard/wizard_history_event.py            |  55 ++
 .../wizard/wizard_opportunity_set.py          | 113 +++-
 .../wizard/wizard_partner_create.py           |  14 +-
 addons/crm_profiling/crm_profiling_view.xml   |  14 +-
 .../crm_vertical/crm_lead_vertical_view.xml   |   4 +-
 addons/delivery/delivery_view.xml             |   9 +-
 addons/event/event.py                         |   2 +-
 addons/event/event_view.xml                   |  65 ++-
 .../wizard/event_registrations_partner.py     |   6 +-
 addons/event_project/event_view.xml           |   2 +-
 addons/event_project/wizard/event_task.py     |   7 +-
 addons/google_map/google_map_view.xml         |   6 +-
 addons/hr/hr.py                               |   2 +-
 addons/hr/hr_department.py                    |  62 ++-
 addons/hr/hr_department_view.xml              |  21 +-
 addons/hr_attendance/hr_attendance_view.xml   |   4 +-
 addons/hr_contract/hr_contract.py             |   3 +-
 addons/hr_contract/hr_contract_view.xml       |  13 +-
 addons/hr_expense/hr_expense_view.xml         |  63 ++-
 addons/hr_holidays/__terp__.py                |  16 +-
 addons/hr_holidays/hr.py                      | 384 +++++++-------
 addons/hr_holidays/hr_holidays_report.xml     |   2 +-
 addons/hr_holidays/hr_view.xml                | 342 +++++++-----
 addons/hr_holidays/hr_workflow.xml            |   8 +-
 .../1.5/post-00-change-requests-signs.py      |   5 +
 .../post-01-convert-limits-into-requests.py   |  14 +
 .../report/holidays_summary_report.py         |  57 +-
 .../hr_holidays/security/ir.model.access.csv  |   1 -
 addons/hr_timesheet/hr_timesheet_demo.xml     |  18 +-
 addons/hr_timesheet/hr_timesheet_view.xml     |   8 +-
 .../hr_timesheet_final_invoice_create.py      |   6 +-
 .../wizard/hr_timesheet_invoice_create.py     |  32 +-
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  |  33 +-
 .../hr_timesheet_sheet_view.xml               | 126 +++--
 .../process/hr_timesheet_sheet_process.xml    |  21 +-
 addons/idea/idea.py                           |  22 +-
 addons/idea/idea_view.xml                     |  21 +-
 addons/mrp/mrp.py                             |  17 +-
 addons/mrp/mrp_view.xml                       |  69 ++-
 addons/mrp/schedulers.py                      |   2 +-
 addons/mrp_operations/mrp_operations.py       |   4 +-
 addons/mrp_operations/mrp_operations_view.xml |   6 +-
 addons/product/product.py                     |  36 +-
 addons/product/product_data.xml               |  19 +
 addons/product/product_view.xml               |  36 +-
 .../wizard/wizard_product_margin.py           |   7 +-
 .../profile_manufacturing.py                  |   2 +-
 addons/profile_service/profile_service.py     |   2 +-
 addons/project/company.py                     |   8 +-
 addons/project/process/task_process.xml       |   2 +-
 addons/project/project.py                     |  33 +-
 addons/project/project_demo.xml               |   3 +
 addons/project/project_view.xml               | 277 ++++++++--
 addons/project_gtd/project_gtd.py             |  41 +-
 addons/project_gtd/project_gtd_view.xml       |  43 +-
 addons/project_timesheet/__terp__.py          |   2 +-
 .../process/project_timesheet_process.xml     |  53 ++
 addons/purchase/purchase.py                   |  10 +-
 addons/purchase/purchase_view.xml             |  37 +-
 addons/purchase/wizard/wizard_group.py        |  11 +-
 addons/report_account/report_receivable.py    |  10 +-
 addons/report_analytic_planning/__terp__.py   |  28 +-
 .../report_account_analytic.planning.csv      |  20 +-
 .../report_analytic_planning.py               | 421 +++++++++++----
 .../report_analytic_planning_demo.xml         |  12 +
 .../report_analytic_planning_view.xml         | 500 +++++++++++-------
 .../security/ir.model.access.csv              |   6 +-
 addons/report_crm/report_crm.py               |   2 +-
 addons/report_sale/report_sale_view.xml       |  31 +-
 addons/report_timesheet/report_timesheet.py   |   4 +-
 addons/sale/__init__.py                       |   1 +
 addons/sale/mrp.py                            |  68 +++
 addons/sale/sale.py                           |  26 +-
 addons/sale/sale_view.xml                     |  90 +++-
 addons/sale/unit_test/__init__.py             |  24 +
 addons/sale/unit_test/test.py                 | 139 +++++
 addons/sale/wizard/make_invoice.py            |  18 +-
 addons/sale/wizard/make_invoice_advance.py    |   6 +-
 addons/sale_crm/wizard/makesale.py            |   4 +
 addons/sale_journal/picking_journal_view.xml  |  14 +-
 addons/sale_journal/sale_journal_view.xml     |  16 +-
 addons/scrum/scrum_view.xml                   |  54 +-
 addons/scrum/wizard/backlog_to_task.py        |   9 +-
 addons/stock/product.py                       |  13 +-
 addons/stock/product_view.xml                 |  12 +
 addons/stock/report_stock.py                  |  80 +++
 addons/stock/report_stock_view.xml            | 100 ++--
 addons/stock/stock.py                         | 100 ++--
 addons/stock/stock_view.xml                   | 180 ++++---
 addons/stock/stock_workflow.xml               |  14 +
 .../stock/wizard/wizard_invoice_onshipping.py |  30 +-
 .../stock/wizard/wizard_location_product.py   |   9 +-
 addons/subscription/subscription_view.xml     |   6 +-
 addons/wiki/wiki.py                           |  15 +-
 addons/wiki/wiki_view.xml                     |  98 +++-
 addons/wiki/wizard/__init__.py                |   1 +
 addons/wiki/wizard/create_menu.py             |   2 +-
 addons/wiki/wizard/open_page.py               |  28 +-
 addons/wiki/wizard/wizard_view.xml            |   7 +-
 181 files changed, 5364 insertions(+), 2370 deletions(-)
 delete mode 100644 addons/base_module_record/wizard/base_module_record.py
 create mode 100644 addons/crm/wizard/wizard_crm_new_send_email.py
 create mode 100644 addons/crm/wizard/wizard_crm_send_email.py
 create mode 100644 addons/crm/wizard/wizard_fetch_mail.py
 create mode 100644 addons/crm_configuration/wizard/schedule_phone_call.py
 create mode 100644 addons/crm_configuration/wizard/wizard_history_event.py
 create mode 100644 addons/hr_holidays/migrations/1.5/post-00-change-requests-signs.py
 create mode 100644 addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
 create mode 100644 addons/project_timesheet/process/project_timesheet_process.xml
 create mode 100644 addons/report_analytic_planning/report_analytic_planning_demo.xml
 create mode 100644 addons/sale/mrp.py
 create mode 100644 addons/sale/unit_test/__init__.py
 create mode 100644 addons/sale/unit_test/test.py

diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 3930b9b3e11..94f023e0cab 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -35,9 +35,7 @@
     Customer and Supplier Invoices
     Bank statements
     """,
-    'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['product', 'base', 'process'],
     'init_xml': [],
     'update_xml': [
         'security/account_security.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index b6dd4bfb11b..bfd48d55b00 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2152,7 +2152,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         for key,value in todo_dict.items():
             if value['account_collected_id'] or value['account_paid_id']:
-                obj_acc_tax.write(cr, uid, [key], vals={
+                obj_acc_tax.write(cr, uid, [key], {
                     'account_collected_id': acc_template_ref[value['account_collected_id']],
                     'account_paid_id': acc_template_ref[value['account_paid_id']],
                 })
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 56c4ddba96e..63baf5165e4 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -124,7 +124,7 @@ class account_bank_statement(osv.osv):
             states={'confirm':[('readonly', True)]}),
         'move_line_ids': fields.one2many('account.move.line', 'statement_id',
             'Entry lines', states={'confirm':[('readonly',True)]}),
-        'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm')],
+        'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],
             'State', required=True,
             states={'confirm': [('readonly', True)]}, readonly="1"),
         'currency': fields.function(_currency, method=True, string='Currency',
@@ -157,7 +157,7 @@ class account_bank_statement(osv.osv):
             if not st.state=='draft':
                 continue
 
-            if not (abs(st.balance_end - st.balance_end_real) < 0.0001):
+            if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
                 raise osv.except_osv(_('Error !'),
                         _('The statement balance is incorrect !\n') +
                         _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
@@ -578,11 +578,13 @@ class account_bank_statement_line(osv.osv):
         'note': fields.text('Notes'),
         'reconcile_amount': fields.function(_reconcile_amount,
             string='Amount reconciled', method=True, type='float'),
+        'sequence': fields.integer('Sequence'),            
     }
     _defaults = {
         'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'type': lambda *a: 'general',
+        'sequence': lambda *a: 10,        
     }
 
 account_bank_statement_line()
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6d14f25427c..d7ca374a64c 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -179,7 +179,7 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object"/>
+                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="gtk-execite"/>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>
@@ -188,7 +188,7 @@
                                 <field name="state" select="2"/>
                                 <field name="residual"/>
                                 <group col="3" colspan="4">
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-execute"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                     <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
@@ -269,7 +269,7 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user"/>
+                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="gtk-apply"/>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>
@@ -318,6 +318,29 @@
             </field>
         </record>
 
+        <record id="view_account_invoice_filter" model="ir.ui.view">
+            <field name="name">account.invoice.select</field>
+            <field name="model">account.invoice</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Invoice">
+                   <group col='6' colspan='4'>
+                       <field name="type">
+                           <filter icon="terp-account" domain="[('type','=','out_invoice')]" help="Customer Invoices"/>
+                           <filter icon="terp-account" domain="[('type','=','in_invoice')]" help="Supplier Invoices"/>
+                       </field>
+                       <separator orientation="vertical"/>
+                       <field name="state">
+                           <filter icon="terp-account" domain="[('state','=','open')]" help="Open Invoices"/>
+                           <filter icon="terp-account" domain="[('state','=','paid')]" help="Paid Invoices"/>
+                       </field>
+                       <separator orientation="vertical"/>
+                       <field name="name" select='1'/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_invoice_tree" model="ir.actions.act_window">
             <field name="name">Invoices</field>
             <field name="res_model">account.invoice</field>
@@ -325,6 +348,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="view_id" ref="invoice_tree"/>
             <field name="context">{'type':'out_invoice'}</field>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <record id="action_invoice_tree_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -347,6 +371,7 @@
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -369,7 +394,7 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
         </record>
-        <menuitem action="action_invoice_tree1_new" id="menu_action_invoice_tree1_new" parent="menu_action_invoice_tree1"/>
+        <menuitem action="action_invoice_tree1_new" sequence="50" id="menu_action_invoice_tree1_new" parent="menu_action_invoice_tree1"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
             <field name="name">Supplier Invoices</field>
@@ -379,6 +404,7 @@
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="account.menu_finance_invoice"/>
         <record id="action_invoice_tree2_new" model="ir.actions.act_window">
@@ -390,7 +416,7 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
         </record>
-        <menuitem action="action_invoice_tree2_new" id="menu_action_invoice_tree2_new" parent="menu_action_invoice_tree2"/>
+        <menuitem action="action_invoice_tree2_new" sequence="50" id="menu_action_invoice_tree2_new" parent="menu_action_invoice_tree2"/>
 
         <record id="action_invoice_tree3" model="ir.actions.act_window">
             <field name="name">Customer Refunds</field>
@@ -400,6 +426,7 @@
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="account.menu_finance_invoice"/>
 
@@ -412,7 +439,7 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
         </record>
-        <menuitem action="action_invoice_tree3_new" id="menu_action_invoice_tree3_new" parent="menu_action_invoice_tree3"/>
+        <menuitem action="action_invoice_tree3_new" sequence="50" id="menu_action_invoice_tree3_new" parent="menu_action_invoice_tree3"/>
 
         <record id="action_invoice_tree4" model="ir.actions.act_window">
             <field name="name">Supplier Refunds</field>
@@ -422,6 +449,7 @@
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="account.menu_finance_invoice"/>
 
@@ -434,7 +462,7 @@
             <field name="domain">[('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
         </record>
-        <menuitem action="action_invoice_tree4_new" id="menu_action_invoice_tree4_new" parent="menu_action_invoice_tree4"/>
+        <menuitem action="action_invoice_tree4_new" sequence="50" id="menu_action_invoice_tree4_new" parent="menu_action_invoice_tree4"/>
 
 
         <record id="action_invoice_tree5" model="ir.actions.act_window">
@@ -444,6 +472,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -457,7 +487,7 @@
             <field name="act_window_id" ref="action_invoice_tree5"/>
         </record>
 
-        <menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1"/>
+        <menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/>
 
         <record id="action_invoice_tree6" model="ir.actions.act_window">
             <field name="name">PRO-FORMA Customer Invoices</field>
@@ -466,6 +496,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','proforma2'),('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <record id="action_invoice_tree6_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -479,7 +511,7 @@
             <field name="act_window_id" ref="action_invoice_tree6"/>
         </record>
 
-        <menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1"/>
+        <menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/>
 
         <record id="action_invoice_tree7" model="ir.actions.act_window">
             <field name="name">Unpaid Customer Invoices</field>
@@ -488,6 +520,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <record id="action_invoice_tree7_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -501,7 +535,7 @@
             <field name="act_window_id" ref="action_invoice_tree7"/>
         </record>
 
-        <menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1"/>
+        <menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/>
 
         <record id="action_invoice_tree8" model="ir.actions.act_window">
             <field name="name">Draft Supplier Invoices</field>
@@ -510,6 +544,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','draft'),('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <record id="action_invoice_tree8_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -523,7 +559,7 @@
             <field name="act_window_id" ref="action_invoice_tree8"/>
         </record>
 
-        <menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2"/>
+        <menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2" groups="base.group_extended_menu"/>
 
         <record id="action_invoice_tree9" model="ir.actions.act_window">
             <field name="name">Unpaid Supplier Invoices</field>
@@ -532,6 +568,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <record id="action_invoice_tree9_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -545,7 +583,7 @@
             <field name="act_window_id" ref="action_invoice_tree9"/>
         </record>
 
-        <menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2"/>
+        <menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2" groups="base.group_extended_menu"/>
 
         <record id="action_invoice_tree10" model="ir.actions.act_window">
             <field name="name">Draft Customer Refunds</field>
@@ -554,6 +592,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','draft'),('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <record id="action_invoice_tree10_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -567,7 +607,7 @@
             <field name="act_window_id" ref="action_invoice_tree10"/>
         </record>
 
-        <menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3"/>
+        <menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3" groups="base.group_extended_menu"/>
 
         <record id="action_invoice_tree11" model="ir.actions.act_window">
             <field name="name">Unpaid Customer Refunds</field>
@@ -576,6 +616,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <record id="action_invoice_tree11_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -589,7 +631,7 @@
             <field name="act_window_id" ref="action_invoice_tree11"/>
         </record>
 
-        <menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3"/>
+        <menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3" groups="base.group_extended_menu"/>
 
         <record id="action_invoice_tree12" model="ir.actions.act_window">
             <field name="name">Draft Supplier Refunds</field>
@@ -598,6 +640,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','draft'),('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <record id="action_invoice_tree12_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -611,7 +655,7 @@
             <field name="act_window_id" ref="action_invoice_tree12"/>
         </record>
 
-        <menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4"/>
+        <menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4" groups="base.group_extended_menu"/>
 
         <record id="action_invoice_tree13" model="ir.actions.act_window">
             <field name="name">Unpaid Supplier Refunds</field>
@@ -620,6 +664,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>            
         </record>
         <record id="action_invoice_tree13_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -633,7 +679,7 @@
             <field name="act_window_id" ref="action_invoice_tree13"/>
         </record>
 
-        <menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4"/>
+        <menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4" groups="base.group_extended_menu"/>
 
         <act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
 
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 1ed28ff2588..49ebdd8ea11 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -659,8 +659,8 @@ class account_move_line(osv.osv):
             return j+(p and (':'+p) or '')
         return False
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False):
-        result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar)
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
+        result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar, submenu=submenu)
         if view_type=='tree' and 'journal_id' in context:
             title = self.view_header_get(cr, uid, view_id, view_type, context)
             journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id'])
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8353695f76e..2be40d868d9 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -30,8 +30,8 @@
                     <separator colspan="4" string="States"/>
                     <field name="state" select="1" readonly="1"/>
                     <group col="2" colspan="2">
-                        <button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
-                        <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
+                        <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="gtk-dnd"/>
+                        <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="gtk-dnd"/>
                     </group>
                 </form>
             </field>
@@ -78,7 +78,7 @@
                     <field name="special"/>
                     <separator colspan="4" string="States"/>
                     <field name="state" select="1"/>
-                    <button name="action_draft" states="done" string="Set to Draft" type="object"/>
+                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
                 </form>
             </field>
         </record>
@@ -323,7 +323,7 @@
                     <field name="period_id" select="2"/>
                     <group colspan="2" col="3">
                         <button name="%(wizard_populate_statement_from_inv)d"
-                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}"/>
+                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>
                     </group>
                     <newline/>
                     <field name="balance_start"/>
@@ -332,6 +332,7 @@
                         <page string="Entry encoding">
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <tree editable="bottom" string="Statement lines">
+                                    <field name="sequence"/>                                
                                     <field name="date"/>
                                     <field name="ref"/>
                                     <field name="name"/>
@@ -351,6 +352,7 @@
                                     <field name="amount"/>
                                     <field context="{'partner_id':partner_id,'amount':amount,'account_id':account_id,'currency_id': parent.currency,'journal_id':parent.journal_id, 'date':date}" name="reconcile_id"/>
                                     <field name="ref"/>
+                                    <field name="sequence"/>                                    
                                     <separator colspan="4" string="Notes"/>
                                     <field colspan="4" name="note" nolabel="1"/>
                                 </form>
@@ -363,9 +365,9 @@
                     <group col="7" colspan="4">
                         <field name="state" select="2"/>
                         <field name="balance_end"/>
-                        <button name="button_dummy" states="draft" string="Compute"/>
-                        <button name="button_confirm" states="draft" string="Confirm" type="object"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
+                        <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object"  icon="gtk-apply"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -384,8 +386,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree"/>
+        <menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree" groups="base.group_extended_menu"/>
 
         <record id="action_bank_statement_tree2" model="ir.actions.act_window">
             <field name="name">New Statement</field>
@@ -422,7 +425,7 @@
                         <field name="total_entry"/>
                         <field name="total_new"/>
                         <field name="total_balance"/>
-                        <button colspan="2" name="dummy" string="Compute"/>
+                        <button colspan="2" name="dummy" string="Compute" icon="gtk-execute"/>
                     </group>
                 </form>
             </field>
@@ -884,8 +887,8 @@
                     <separator colspan="4" string="State"/>
                     <field name="state" select="1"/>
                     <group col="2" colspan="2">
-                        <button name="button_validate" states="draft" string="Validate" type="object"/>
-                        <button name="button_cancel" states="posted" string="Cancel" type="object"/>
+                        <button name="button_validate" states="draft" string="Validate" type="object" icon="gtk-execute"/>
+                        <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -984,8 +987,8 @@
                     <group col="7" colspan="4">
                         <field name="state" select="2"/>
                         <field name="balance_end"/>
-                        <button name="button_dummy" states="draft" string="Compute"/>
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-execute"/>
+                        <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                         <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
@@ -1110,7 +1113,7 @@
                     <separator string="Legend" colspan="4"/>
                     <field name="legend" colspan="4" nolabel="1"/>
                     <group col="1" colspan="4">
-                        <button name="%(wizard_account_use_model)d" string="Create entries" type="action" />
+                        <button name="%(wizard_account_use_model)d" string="Create entries" type="action" icon="gtk-execute"/>
                     </group>
                 </form>
             </field>
@@ -1255,8 +1258,8 @@
                     <field name="period_type"/>
                     <field name="model_id"/>
                     <group col="2" colspan="2">
-                        <button name="compute" states="draft,running" string="Compute" type="object"/>
-                        <button name="remove_line" states="running" string="Remove Lines" type="object"/>
+                        <button name="compute" states="draft,running" string="Compute" type="object" icon="gtk-execute"/>
+                        <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
                     </group>
                     <separator colspan="4" string="Subscription Lines"/>
                     <field colspan="4" name="lines_id" widget="one2many_list"/>
@@ -1264,7 +1267,7 @@
                     <separator colspan="4" string="State"/>
                     <field name="state" select="2"/>
                     <group col="1" colspan="2">
-                        <button name="state_draft" states="done" string="Set to Draft" type="object"/>
+                        <button name="state_draft" states="done" string="Set to Draft" type="object"  icon="gtk-convert" />
                     </group>
                 </form>
             </field>
@@ -1283,8 +1286,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','running')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form"/>
+        <menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form" groups="base.group_extended_menu"/>
 
         <record id="action_subscription_form_new" model="ir.actions.act_window">
             <field name="name">New Subscription</field>
diff --git a/addons/account/product.py b/addons/account/product.py
index f061e22cb14..f9ae9598e69 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -34,7 +34,7 @@ class product_category(osv.osv):
             string="Income Account",
             method=True,
             view_load=True,
-            help="This account will be used to value incoming stock for the current product category"),
+            help="This account will be used to value incoming stock(i.e. credit of incoming goods) for the current product category"),
         'property_account_expense_categ': fields.property(
             'account.account',
             type='many2one',
@@ -42,7 +42,7 @@ class product_category(osv.osv):
             string="Expense Account",
             method=True,
             view_load=True,
-            help="This account will be used to value outgoing stock for the current product category"),
+            help="This account will be used to value outgoing stock(i.e. debit of outgoing goods) for the current product category"),
     }
 product_category()
 
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 02842c47333..94e311db9c5 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -24,7 +24,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree colors="red:date and (date&lt;=current_date)" string="Analytic account">
+                <tree toolbar="True" colors="red:date and (date&lt;=current_date)" string="Analytic account">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date"/>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 8d9ffff97f9..cd2148c7255 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -43,9 +43,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
+            <field name="filter" eval="True"/>            
         </record>
 
-        <menuitem action="action_account_analytic_managed_open" id="menu_analytic_account_to_valid_open" parent="account_analytic_analysis.menu_analytic_account_managed"/>
+        <menuitem action="action_account_analytic_managed_open" id="menu_analytic_account_to_valid_open" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_extended_menu"/>
 
         <record id="action_account_analytic_managed_pending" model="ir.actions.act_window">
             <field name="name">My Pending Accounts</field>
@@ -53,9 +54,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
+            <field name="filter" eval="True"/>            
         </record>
 
-        <menuitem action="action_account_analytic_managed_pending" id="menu_analytic_account_to_valid_pending" parent="account_analytic_analysis.menu_analytic_account_managed"/>
+        <menuitem action="action_account_analytic_managed_pending" id="menu_analytic_account_to_valid_pending" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_extended_menu"/>
 
         <record id="action_account_analytic_new" model="ir.actions.act_window">
             <field name="name">New Analytic Account</field>
@@ -101,8 +103,9 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="account.view_account_analytic_account_list"/>
             <field name="domain">[('state','=','open')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="menu_action_account_analytic_all"/>
+        <menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="menu_action_account_analytic_all" groups="base.group_extended_menu"/>
 
         <record id="action_account_analytic_all_pending" model="ir.actions.act_window">
             <field name="name">Pending Analytic Accounts</field>
@@ -111,8 +114,9 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="account.view_account_analytic_account_list"/>
             <field name="domain">[('state','=','pending')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="menu_action_account_analytic_all"/>
+        <menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="menu_action_account_analytic_all" groups="base.group_extended_menu"/>
 
     </data>
 </openerp>
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 393c681dc01..6132baee654 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -133,9 +133,9 @@ class account_analytic_plan_instance(osv.osv):
             ids = self.search(cr, uid, args, limit=limit, context=context or {})
         return self.name_get(cr, uid, ids, context or {})
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         wiz_id = self.pool.get('ir.actions.wizard').search(cr, uid, [("wiz_name","=","create.model")])
-        res = super(account_analytic_plan_instance,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+        res = super(account_analytic_plan_instance,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
 
         if (res['type']=='form'):
             plan_id = False
diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py
index 93cf7c9bd93..54b6de41648 100644
--- a/addons/account_budget/crossovered_budget.py
+++ b/addons/account_budget/crossovered_budget.py
@@ -44,9 +44,12 @@ class account_budget_post(osv.osv):
         'dotation_ids': fields.one2many('account.budget.post.dotation', 'post_id', 'Spreading'),
         'account_ids': fields.many2many('account.account', 'account_budget_rel', 'budget_id', 'account_id', 'Accounts'),
         'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'),
+        'sequence': fields.integer('Sequence'),        
     }
     _defaults = {
+        'sequence': lambda *a: 1,                 
     }
+    _order = "sequence, name"    
 
     def spread(self, cr, uid, ids, fiscalyear_id=False, amount=0.0):
         dobj = self.pool.get('account.budget.post.dotation')
@@ -228,7 +231,7 @@ class crossovered_budget_lines(osv.osv):
         res = {}
         for line in self.browse(cr, uid, ids):
             if line.theoritical_amount<>0.00:
-                res[line.id]=float(line.practical_amount / line.theoritical_amount)*100
+                res[line.id]=float(line.practical_amount or 0.0 / line.theoritical_amount)*100
             else:
                 res[line.id]=0.00
         return res
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 6e30323c39d..5c6c527543e 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -19,6 +19,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Budgetary Position">
+                    <field name="sequence"/>                
                     <field name="code"/>
                     <field name="name"/>
                 </tree>
@@ -67,12 +68,13 @@
 				<form string="Budgetary Position">
 					<field name="name" select="1"/>
 					<field name="code" select="1"/>
+                    <field name="sequence" select="2"/>					
 					<notebook colspan="4">
 						<page string="Accounts">
 							<field name="account_ids" colspan="4" nolabel="1"/>
 						</page>
 						<page string="Dotations">
-							<button string="Spread" name="%(wizard_budget_spread)d" type="action"/>
+							<button string="Spread" name="%(wizard_budget_spread)d" type="action" icon="gtk-fullscreen"/>
 							<field name="dotation_ids" colspan="4" nolabel="1"/>
 						</page>
 
@@ -148,10 +150,10 @@
 							</field>
 							<field name="state" select="1"/>
 							<group col="4" colspan="2">
-								<button string="Confirm" name="confirm" states="draft" type="workflow" />
-								<button string="Validate" name="validate" states="confirm" type="workflow"/>
-								<button string="Done" name="done" states="validate" type="workflow"/>
-								<button string="Cancel" name="cancel" states="confirm,validate" type="workflow" />
+                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
+                                <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
+                                <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
+                                <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
 								<!--<button string="Set to Draft" name="action_set_to_draft" states="cancel" type="object"/>-->
 							</group>
 
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index 36009a105bd..b1ad3d54f53 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -96,7 +96,7 @@
                     <field name="date_prefered"/>
                     <field name="date_planned" select="1"/>
                     <field name="user_id" select="2"/>
-                    <button colspan="2" name="%(wizard_populate_payment)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}"/>
+                    <button colspan="2" name="%(wizard_populate_payment)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                     <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1">
                         <form string="Payment Line">
                             <notebook>
@@ -149,10 +149,10 @@
                     <field name="date_done" select="2"/>
                     <field name="state" readonly="1" select="1"/>
                     <group col="4" colspan="2">
-                        <button name="cancel" states="draft,open" string="Cancel"/>
-                        <button name="open" states="draft" string="Confirm Payments"/>
-                        <button name="%(wizard_pay_payment)d" states="open" string="Make Payments" type="action"/>
-                        <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
+                         <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
+                         <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
+                         <button name="%(wizard_pay_payment)d" states="open" string="Make Payments" type="action" icon="gtk-execute"/>
+                         <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
                     </group>
                 </form>
             </field>
@@ -190,8 +190,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_payment_order_draft" id="menu_action_payment_order_draft" parent="account_payment.menu_action_payment_order_form" sequence="2"/>
+        <menuitem action="action_payment_order_draft" id="menu_action_payment_order_draft" parent="account_payment.menu_action_payment_order_form" sequence="2" groups="base.group_extended_menu"/>
 
         <record id="action_payment_order_open" model="ir.actions.act_window">
             <field name="name">Payment Orders to Validate</field>
@@ -199,8 +200,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','open')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_payment_order_open" id="menu_action_payment_order_open" parent="account_payment.menu_action_payment_order_form" sequence="3"/>
+        <menuitem action="action_payment_order_open" id="menu_action_payment_order_open" parent="account_payment.menu_action_payment_order_form" sequence="3" groups="base.group_extended_menu"/>
 
         <record id="action_payment_order_tree_new" model="ir.actions.act_window">
             <field name="name">New Payment Order</field>
@@ -291,7 +293,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <group colspan="2" col="3" position="inside">
-                    <button name="%(wizard_populate_statement)d" string="Import payment lines" type="action"/>
+                    <button name="%(wizard_populate_statement)d" string="Import payment lines" type="action" icon="gtk-open"/>
                 </group>
             </field>
         </record>
diff --git a/addons/account_report/account.py b/addons/account_report/account.py
index 29a2fe08f0f..4a7b1efd05b 100644
--- a/addons/account_report/account.py
+++ b/addons/account_report/account.py
@@ -59,9 +59,9 @@ class account_report(osv.osv):
 
         def _calc_context(key,obj):
             if key==0:
-                return obj.find(cr,uid,exception=False)
+                return obj.find(cr, uid, exception=False)
             else:
-                obj_key=obj.browse(cr,uid,obj.find(cr,uid,exception=False))
+                obj_key=obj.browse(cr,uid,obj.find(cr, uid, exception=False))
                 if isinstance(obj_key,list):
                     obj_key=obj_key[0]
                 key_ids=obj.search(cr,uid,[('date_stop','<',obj_key.date_start)])
diff --git a/addons/account_voucher/account.py b/addons/account_voucher/account.py
index 4006cde9863..33ebecbc08a 100644
--- a/addons/account_voucher/account.py
+++ b/addons/account_voucher/account.py
@@ -256,4 +256,4 @@ class account_account_template(osv.osv):
 
 account_account_template()
 
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
index 31bd26617cd..66362754457 100644
--- a/addons/account_voucher/report/rml_parse.py
+++ b/addons/account_voucher/report/rml_parse.py
@@ -162,5 +162,4 @@ class rml_parse(report_sxw.rml_parse):
         rml_head =  rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
         return True
 
-
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index d1dc30c6b67..69709f8bc23 100755
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -248,7 +248,8 @@ class account_voucher(osv.osv):
                 ref = inv.reference
             else:
                 ref = self._convert_ref(cr, uid, inv.number)
-                
+
+            acc_id = None                    
             date = inv.date
             total_currency = 0
             acc_id = None
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index bbaa12a3601..39217968ef7 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -76,7 +76,7 @@
 	</record>
 	<menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" id="menu_auction_object_cat"/>
 	=======================================================
-Auction Management/Auction Dates/New Auction Dates
+    Auction Management/Auction Dates/New Auction Dates
 	=======================================================
 	<record model="ir.ui.view" id="view_auction_dates_tree">
 		<field name="name">Auction dates</field>
@@ -114,7 +114,7 @@ Auction Management/Auction Dates/New Auction Dates
 				<field name="account_analytic_id"/>
 				<separator string="State" colspan="4"/>
 				<field name="state"/>
-				<button name="close" states="draft" string="Close + Create all invoices" type="object" colspan="2"/>
+				<button name="close" states="draft" string="Close + Create all invoices" type="object" colspan="2" icon="gtk-print"/>
 			</form>
 		</field>
 	</record>
@@ -150,8 +150,8 @@ Auction Management/Auction Dates/New Auction Dates
 
 
 
-=======================================================
-Auction Management/Auction Dates/Reporting
+    =======================================================
+    Auction Management/Auction Dates/Reporting
 	=======================================================
 	<!-- tree1 form1 for NEW object in the deposit border -->
 	<record model="ir.ui.view" id="v5">
@@ -287,11 +287,11 @@ Auction Management/Auction Dates/Reporting
 					<field name="obj_desc" colspan="4" nolabel="1" select="2"/>
 					<field name="state" colspan="1" select="2"/>
 				 	<group col="4" colspan="2">
-						<button name="button_bought" string="Sold" states="draft" type="object"/>
-						<button name="button_not_bought" string="Not sold" states="draft" type="object"/>
-						<button name="button_taken_away" string="Taken away" states="sold" type="object"/>
-						<button name="button_draft" string="Set to draft" states="sold,unsold" type="object"/>
-						<button name="button_unpaid" string="Set to draft" states="paid" type="object"/>
+				 	   <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
+                       <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
+                       <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
+                       <button name="button_draft" string="Set to draft" states="sold,unsold" type="object" icon="gtk-convert"/>
+                       <button name="button_unpaid" string="Set to draft" states="paid" type="object" icon="gtk-convert"/>
 					</group>
 				</page>
 
@@ -369,28 +369,31 @@ Auction Management/Auction Dates/Reporting
 		<field name="res_model">auction.lots</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','sold')]</field>
+        <field name="filter" eval="True"/>		
 	</record>
 
 	<menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu"/>
 	<menuitem name="All objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
 
-	<menuitem name="Sold Objects" parent="auction_all_objects_menu" action="action_all_objects_sold" id="menu_all_objects_sold1"/>
+	<menuitem name="Sold Objects" parent="auction_all_objects_menu" action="action_all_objects_sold" id="menu_all_objects_sold1" groups="base.group_extended_menu"/>
 
 	<record model="ir.actions.act_window" id="action_all_objects_to_sell">
 		<field name="res_model">auction.lots</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','&lt;&gt;','sold')]</field>
+        <field name="filter" eval="True"/>		
 	</record>
-	<menuitem name="Objects to sell" parent="auction_all_objects_menu" action="action_all_objects_to_sell" id="menu_all_objects_to_sell"/>
+	<menuitem name="Objects to sell" parent="auction_all_objects_menu" action="action_all_objects_to_sell" id="menu_all_objects_to_sell" groups="base.group_extended_menu"/>
 
 	<record model="ir.actions.act_window" id="action_all_objects_unplanned">
 		<field name="res_model">auction.lots</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('auction_id','=', False),('state','=','draft')]</field>
+        <field name="filter" eval="True"/>		
 	</record>
-	<menuitem name="Unplanned objects" parent="auction_all_objects_menu" action="action_all_objects_unplanned" id="menu_all_objects_unplanned1"/>
+	<menuitem name="Unplanned objects" parent="auction_all_objects_menu" action="action_all_objects_unplanned" id="menu_all_objects_unplanned1" groups="base.group_extended_menu"/>
 
 
 	<!--		for the sold object  start-->
@@ -400,12 +403,14 @@ Auction Management/Auction Dates/Reporting
 		<field name="res_model">auction.lots</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','unsold')]</field>
+        <field name="filter" eval="True"/>		
 	</record>
 	<menuitem
 		name="Unsold Objects"
 		parent="auction_all_objects_menu"
 		action="action_all_objects_unsold"
-		id="menu_all_objects_unsold"/>
+		id="menu_all_objects_unsold"
+		groups="base.group_extended_menu"/>
 
 
 
@@ -449,11 +454,11 @@ Auction Management/Auction Dates/Reporting
 					</field>
 					<field name="state" readonly="1"/>
 					<group colspan="2" col="4">
-					<button name="button_bought" string="Sold" states="draft" type="object"/>
-					<button name="button_not_bought" string="Not sold" states="draft" type="object"/>
-					<button name="button_draft" string="Set to draft" states="sold,unsold" type="object"/>
-					<button name="button_taken_away" string="Taken away" states="sold" type="object"/>
-					</group>
+	                    <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to" />
+	                    <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
+	                    <button name="button_draft" string="Set to draft" states="sold,unsold" type="object" icon="gtk-convert"/>
+	                    <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
+                    </group> 
 				</page>
 				<page string="Statements">
 					<field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
@@ -479,8 +484,9 @@ Auction Management/Auction Dates/Reporting
 		<field name="res_model">report.unclassified.objects</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
+        <field name="filter" eval="True"/>		
 	 </record>
-	<menuitem name="Unclassified objects" parent="auction_all_objects_menu" action="action_unclassified_objects" id="menu_all_objects_unclassified"/>
+	 <menuitem name="Unclassified objects" parent="auction_all_objects_menu" action="action_unclassified_objects" id="menu_all_objects_unclassified" groups="base.group_extended_menu"/>
 
 	<record model="ir.ui.view" id="v12">
 		<field name="name">Auction.deposit.tree</field>
diff --git a/addons/auction/wizard/wizard_auction_invoice_buyer.py b/addons/auction/wizard/wizard_auction_invoice_buyer.py
index 2cf68656d8c..3de71962774 100644
--- a/addons/auction/wizard/wizard_auction_invoice_buyer.py
+++ b/addons/auction/wizard/wizard_auction_invoice_buyer.py
@@ -66,9 +66,12 @@ def _values(self,cr,uid, datas,context={}):
 
 
 def _makeInvoices(self, cr, uid, data, context):
-    order_obj = pooler.get_pool(cr.dbname).get('auction.lots')
     newinv = []
     pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('auction.lots')
+    mod_obj = pool.get('ir.model.data') 
+    result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+    id = mod_obj.read(cr, uid, result, ['res_id'])
     lots= order_obj.browse(cr,uid,data['ids'])
     invoice_number=data['form']['number']
     for lot in lots:
@@ -84,7 +87,8 @@ def _makeInvoices(self, cr, uid, data, context):
         'res_model': 'account.invoice',
         'view_id': False,
         'context': "{'type':'in_refund'}",
-        'type': 'ir.actions.act_window'
+        'type': 'ir.actions.act_window',
+        'search_view_id': id['res_id']         
     }
     return {}
 
diff --git a/addons/auction/wizard/wizard_auction_journal.py b/addons/auction/wizard/wizard_auction_journal.py
index 93e742cfc62..0ce0a14ae5c 100644
--- a/addons/auction/wizard/wizard_auction_journal.py
+++ b/addons/auction/wizard/wizard_auction_journal.py
@@ -64,7 +64,11 @@ def _values(self,cr,uid, datas,context={}):
 
 def _makeInvoices(self, cr, uid, data, context):
 
-    order_obj = pooler.get_pool(cr.dbname).get('auction.lots')
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('auction.lots')
+    mod_obj = pool.get('ir.model.data') 
+    result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+    id = mod_obj.read(cr, uid, result, ['res_id'])
     newinv = []
     ids = order_obj.seller_trans_create(cr, uid, data['ids'],context)
     cr.commit()
@@ -76,7 +80,8 @@ def _makeInvoices(self, cr, uid, data, context):
         'res_model': 'account.invoice',
         'view_id': False,
         'context': "{'type':'out_refund'}",
-        'type': 'ir.actions.act_window'
+        'type': 'ir.actions.act_window',
+        'search_view_id': id['res_id']        
     }
     return {}
 
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index ee23e790e7b..a7ae0f59075 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -22,11 +22,11 @@
 
 
 import ir
-from osv import fields,osv
+from osv import fields, osv
 import netsvc
 import pooler
 import string
-import time,copy
+import time, copy
 from tools.translate import _
 
 class audittrail_rule(osv.osv):
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index b00a5745935..b29bff9c5ac 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -49,10 +49,16 @@ class res_partner_contact(osv.osv):
         'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Function'),
         'job_id':fields.related('job_ids',type='many2one', relation='res.partner.job', string='Main Job'),
         'email': fields.char('E-Mail', size=240),
+        'comment' : fields.text('Notes', translate=True),
+        'photo' : fields.binary('Image'),
+        
     }
     _defaults = {
         'active' : lambda *a: True,
     }
+    
+    _order = "name,first_name"
+        
     def name_get(self, cr, user, ids, context={}):
         #will return name and first_name.......
         if not len(ids):
@@ -117,20 +123,20 @@ class res_partner_job(osv.osv):
     _description ='Contact Partner Function'
     _order = 'sequence_contact'
     _columns = {
-        'name': fields.related('address_id','partner_id', type='many2one', relation='res.partner', string='Partner'),
-        'address_id':fields.many2one('res.partner.address','Address'),
+        'name': fields.related('address_id','partner_id', type='many2one', relation='res.partner', string='Partner', help="You may enter Address first,Partner will be linked automatically if any."),
+        'address_id':fields.many2one('res.partner.address','Address', help='Address which is linked to the Partner'),
         'contact_id':fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
-        'function_id': fields.many2one('res.partner.function','Partner Function'),
+        'function_id': fields.many2one('res.partner.function','Partner Function', help="Function of this contact with this partner"),
         'sequence_contact':fields.integer('Contact Seq.',help='Order of importance of this address in the list of addresses of the linked contact'),
         'sequence_partner':fields.integer('Partner Seq.',help='Order of importance of this job title in the list of job title of the linked partner'),
-        'email': fields.char('E-Mail', size=240),
-        'phone': fields.char('Phone', size=64),
-        'fax': fields.char('Fax', size=64),
+        'email': fields.char('E-Mail', size=240, help="Job E-Mail"),
+        'phone': fields.char('Phone', size=64, help="Job Phone no."),
+        'fax': fields.char('Fax', size=64, help="Job FAX no."),
         'extension': fields.char('Extension', size=64, help='Internal/External extension phone number'),
         'other': fields.char('Other', size=64, help='Additional phone field'),
-        'date_start' : fields.date('Date Start'),
-        'date_stop' : fields.date('Date Stop'),
-        'state' : fields.selection([('past', 'Past'),('current', 'Current')], 'State', required=True),
+        'date_start' : fields.date('Date Start',help="Start date of job(Joining Date)"),
+        'date_stop' : fields.date('Date Stop', help="Last date of job"),
+        'state' : fields.selection([('past', 'Past'),('current', 'Current')], 'State', required=True, help="Status of Address"),
     }
 
     _defaults = {
diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
index 9dbac13dcf0..1945e1dd899 100644
--- a/addons/base_contact/base_contact_demo.xml
+++ b/addons/base_contact/base_contact_demo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
         <!-- Create the functions -->
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 9b2a9c179fc..58650e3eed7 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
 
@@ -32,29 +32,36 @@
                     <page string="General">
                         <newline/>
                         <separator string="General Information" colspan="4"/>
-                        <field name="mobile" select="2"/>
-                        <field name="title" select="1" />
-                        <field name="website"/>
-                        <field name="email"/>
-                        <field name="lang_id"/>
-                        <field name="active"/>
-                        <field name="partner_id" invisible="1" select="2"/>
-                        <field name="function_id" invisible="1" select="2"/>
-                        <field name="job_id" invisible="1" select="2" />
-                        <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
+                       <group string="Partner" colspan="2" col="2">
+                           <field name="partner_id" invisible="1" select="2"/>
+                           <field name="title" select="1" />
+                           <field name="function_id" invisible="1" select="2"/>
+                           <field name="lang_id"/>
+                           <field name="active"/>
+                       </group>
+                       <group string="Communication" colspan="2" col="2">
+                           <field name="mobile" select="2"/>
+                           <field name="email"  widget="email"/>
+                           <field name="website"/>
+                       </group>
+                       <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
                             <form string="Functions and Addresses">
-                                <field name="function_id"/>
-                                <field name="address_id"/>
-                                <field name="name"/>
-                                <field name="sequence_contact"/>
-                                <field name="phone"/>
-                                <field name="fax"/>
-                                <field name="extension"/>
-                                <field name="other"/>
-                                <field name="email" widget="email"/>
-                                <field name="date_start" />
-                                <field name="date_stop" />
-                                <field name="state" />
+                               <group string="Partner" colspan="2" col="4">
+                                   <field name="name"  colspan="4"/>
+                                   <field name="address_id" colspan="4"/>
+                                   <field name="function_id" colspan="4"/>
+                                   <field name="date_start" />
+                                   <field name="date_stop" />
+                                   <field name="state" />
+                                   <field name="sequence_contact" />
+                               </group>
+                               <group string="Communication" colspan="2" col="2">
+                                   <field name="phone"/>
+                                   <field name="fax"/>
+                                   <field name="email" widget="email"/>
+                                   <field name="extension"/>
+                                   <field name="other"/>
+                               </group>                                    
                             </form>
                             <tree string="Functions and Addresses">
                                 <field name="sequence_contact" string="Seq."/>
@@ -74,6 +81,12 @@
                         <field name="country_id"/>
                         <field name="birthdate" select="1" />
                     </page>
+                    <page string="Notes">
+                        <field name="comment" nolabel="1"/>
+                    </page>
+                    <page string="Picture">
+                        <field name="photo" nolabel="1" colspan="2" widget="image"/>
+                    </page>                    
                 </notebook>
             </form>
         </field>
@@ -101,21 +114,20 @@
             <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1" position="replace">
                 <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1">
                     <form string="Address">
-                        <field name="type" select="2" colspan="4"/>
-                        <newline/>
-                        <field name="street" select="2"/>
-                        <field name="street2"/>
-                        <newline/>
-                        <field name="zip" select="2"/>
-                        <field name="city" select="2"/>
-                        <newline/>
-                        <field name="country_id" select="2" completion="1"/>
-                        <field name="state_id" select="2"/>
-                        <newline/>
-                        <field name="phone"/>
-                        <field name="fax"/>
-                        <field name="email" widget="email"/>
-                        <newline/>
+                       <group string="Postal Address" colspan="2" col="2">
+                           <field name="type" select="2" />
+                           <field name="street" select="2"/>
+                           <field name="street2"/>
+                           <field name="zip" select="2"/>
+                           <field name="city" select="2"/>
+                           <field name="country_id" select="2" completion="1"/>
+                           <field name="state_id" select="2"/>
+                        </group>
+                        <group string="Communication" colspan="2" col="2"> 
+                           <field name="phone"/>
+                           <field name="fax"/>
+                           <field name="email" widget="email"/>
+                        </group>
                         <field name="job_ids" mode="tree,form" nolabel="1" colspan="4">
                             <tree string="Contacts" editable="top">
                                 <field name="sequence_partner"/>
@@ -128,15 +140,19 @@
                                 <field name="email"/>
                             </tree>
                             <form string="Contacts">
+                            <group string="Partner" colspan="2" col="2">
+                                <field name="sequence_partner"/>                            
                                 <field name="name"/>
-                                <field name="sequence_partner"/>
                                 <field name="contact_id"/>
                                 <field name="function_id"/>
+                            </group>
+                            <group string="Communication" colspan="2" col="2">    
                                 <field name="phone"/>
                                 <field name="fax"/>
+                                <field name="email" widget="email"/>                                
                                 <field name="extension"/>
                                 <field name="other"/>
-                                <field name="email" widget="email"/>
+                            </group>
                             </form>
                         </field>
                     </form>
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__terp__.py
index 8c6edb399a3..9b9cbca2bf0 100644
--- a/addons/base_module_record/__terp__.py
+++ b/addons/base_module_record/__terp__.py
@@ -22,7 +22,7 @@
 
 
 {
-    'name': 'Module Recorder',
+    'name': 'Module Record',
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """
@@ -39,10 +39,8 @@ This should help you to easily create reusable and publishable modules
 for custom configurations and demo/testing data.
 
 How to use it:
-1. Start the recording
-2. Do stuff in your Open ERP client
-3. Stop the recording session
-4. Export to a reusable module
+Run Administration/Customization/Module Creation/Export Customizations As a Module wizard.
+Select datetime critearea of recording and objects to be recorded and Record module.
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index d9cf8368528..144c7f2c80e 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -39,7 +39,7 @@ class recording_objects_proxy(objects_proxy):
         pool = pooler.get_pool(args[0])
         mod = pool.get('ir.module.record')
         if mod and mod.recording:
-            if args[4] not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc'):
+            if args[4] in ('copy','write','unlink','create'):
                 if _old_args is not None:
                     args[5].update(_old_args)
                     if args[5]:
@@ -198,6 +198,8 @@ class base_module_record(osv.osv):
             if mod_fields[key]['type'] == 'many2one':
                 if type(data[key])==type(True) or type(data[key])==type(1):
                     result[key]=data[key]
+                elif not data[key]:
+                    result[key] = False                    
                 else:
                     result[key]=data[key][0]
 
diff --git a/addons/base_module_record/base_module_record_wizard.xml b/addons/base_module_record/base_module_record_wizard.xml
index abced76678a..8eb9c48fac9 100644
--- a/addons/base_module_record/base_module_record_wizard.xml
+++ b/addons/base_module_record/base_module_record_wizard.xml
@@ -1,57 +1,19 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <wizard
-            id="wizard_base_module_record"
-            string="Record module"
-            model="ir.module.module"
-            multi="True"
-            name="base_module_record.module_record"/>
 
         <menuitem
             parent="base.menu_custom"
             name="Module Creation"
             id="menu_wizard_base_mod_rec"/>
-        <menuitem
-            parent="menu_wizard_base_mod_rec"
-            name="Module Recorder"
-            id="menu_wizard_base_mod_rec_rec"/>
-
-        <menuitem
-            parent="menu_wizard_base_mod_rec_rec"
-            name="Start Recording"
-            type="wizard"
-            action="wizard_base_module_record"
-            id="menu_wizard_base_module_record"/>
-
-        <menuitem
-            parent="menu_wizard_base_mod_rec_rec"
-            name="Stop Recording"
-            type="wizard"
-            action="wizard_base_module_record"
-            id="menu_wizard_base_module_record_stop"/>
-
-
-        <wizard
-            id="wizard_base_module_save"
-            string="Save Recorded Module"
-            model="ir.module.module"
-            multi="True"
-            name="base_module_record.module_save"/>
-
-        <menuitem
-            parent="menu_wizard_base_mod_rec_rec"
-            name="Save Recorded Module"
-            type="wizard"
-            action="wizard_base_module_save"
-            id="menu_wizard_base_module_save"/>
-
+        
         <wizard
             id="wizard_base_module_record_objects"
             string="Export Customizations As a Module"
             model="ir.module.module"
             multi="True"
             name="base_module_record.module_record_objects"/>
+        
         <menuitem
             parent="menu_wizard_base_mod_rec"
             name="Export Customizations As a Module"
diff --git a/addons/base_module_record/wizard/__init__.py b/addons/base_module_record/wizard/__init__.py
index 021a7019f3e..1e94d096c53 100644
--- a/addons/base_module_record/wizard/__init__.py
+++ b/addons/base_module_record/wizard/__init__.py
@@ -20,7 +20,6 @@
 #
 ##############################################################################
 
-import base_module_record
 import base_module_save
 import base_module_record_objects
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_record/wizard/base_module_record.py b/addons/base_module_record/wizard/base_module_record.py
deleted file mode 100644
index a9108aaf8b3..00000000000
--- a/addons/base_module_record/wizard/base_module_record.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import osv
-import pooler
-
-intro_stop_form = '''<?xml version="1.0"?>
-<form string="Module Recording">
-    <separator string="Recording Information" colspan="4"/>
-    <label string="Open ERP recording is stopped. Don't forget to save the recorded module." colspan="4" align="0.0"/>
-    <label string="You can continue the recording session by relauching the 'start recording' wizard." colspan="4" align="0.0"/>
-</form>'''
-
-intro_start_form = '''<?xml version="1.0"?>
-<form string="Recording Stopped">
-    <separator string="Recording information" colspan="4"/>
-    <label string="The module recorder allows you to record every operation made in the Open ERP client and save them as a module. You will be able to install this module on any database to reuse and/or publish it." colspan="4" align="0.0"/>
-    <field name="continue"/>
-</form>'''
-
-intro_start_fields = {
-    'continue': {'string':'Continue Previous Session', 'type':'boolean'}
-}
-
-def _stop_recording(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    mod = pool.get('ir.module.record')
-    mod.recording = 0
-    return {}
-
-def _start_recording(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    mod = pool.get('ir.module.record')
-    mod.recording = 1
-    if not data['form']['continue']:
-        mod.recording_data = []
-        mod.depends = {}
-    return {}
-
-def _check_recording(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    mod = pool.get('ir.module.record')
-    if mod.recording:
-        return 'stop'
-    return 'start'
-
-class base_module_publish(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type':'choice',
-                'next_state':_check_recording,
-            }
-        },
-        'start': {
-            'actions': [],
-            'result': {
-                'type':'form',
-                'arch':intro_start_form,
-                'fields': intro_start_fields,
-                'state':[
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('start_confirm', 'Start Recording', 'gtk-ok'),
-                ]
-            }
-        },
-        'start_confirm': {
-            'actions': [_start_recording],
-            'result': {
-                'type':'state',
-                'state': 'end'
-            }
-        },
-        'stop': {
-            'actions': [_stop_recording],
-            'result': {
-                'type':'form',
-                'arch':intro_stop_form,
-                'fields': {},
-                'state':[
-                    ('end', 'Continue', 'gtk-ok'),
-                ]
-            }
-        }
-    }
-base_module_publish('base_module_record.module_record')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 9959c3638db..419cbc90465 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -72,9 +72,9 @@ class report_creator(osv.osv):
     #
     # Should Call self.fields_get !
     #
-    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False):
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if (not context) or 'report_id' not in context:
-            return super(report_creator, self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
+            return super(report_creator, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         report = self.browse(cr, user, context['report_id'])
         models = {}
         for model in report.model_ids:
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 7ae858012ed..ecb65dd2f5b 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -41,7 +41,7 @@
                     <field name="model_ids" colspan="4" context="{'model_ids':model_ids}"/>
                     <separator string="State"  colspan="4"/>
                     <field name="state"/>
-                    <button string="Create Menu" name="%(wizard_menu_create)d" type="action" colspan="2"/>
+                    <button string="Create Menu" name="%(wizard_menu_create)d" type="action" colspan="2" icon="gtk-justify-fill"/>
                 </page><page string="View parameters">
                     <separator string="Used View" colspan="4"/>
                     <field name="view_type1"/>
@@ -74,7 +74,7 @@
                         </tree>
                     </field>
                 </page><page string="Filters on Fields">
-                    <button string="Add filter" name="%(wizard_set_filter_fields)d" type="action"/>
+                    <button string="Add filter" name="%(wizard_set_filter_fields)d" type="action" icon="gtk-add"/>
                     <field name="filter_ids" nolabel="1" colspan="4">
                         <tree string="Filters">
                             <field name="name"/>
diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__terp__.py
index c66be0ec379..9782fba2786 100644
--- a/addons/base_report_designer/__terp__.py
+++ b/addons/base_report_designer/__terp__.py
@@ -32,9 +32,9 @@ OpenOffice.
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
+    'init_xml': ['base_report_data.xml'],
     'update_xml': ['base_report_designer_wizard.xml'],
-    'demo_xml': ['base_report_data.xml'],
+    'demo_xml': [],
     'installable': True,
     'active': False,
     'certificate': '0056379010493',
diff --git a/addons/base_report_designer/base_report_data.xml b/addons/base_report_designer/base_report_data.xml
index 865a1181a22..f709e6c7be7 100644
--- a/addons/base_report_designer/base_report_data.xml
+++ b/addons/base_report_designer/base_report_data.xml
@@ -7,5 +7,14 @@
 			<field eval="[(6,0,[ref('base.user_root')])]" name="users"/>
 			<field eval="&quot;&quot;&quot;OpenOfficeReportDesigner&quot;&quot;&quot;" name="name"/>
 		</record>
+       <record id="ir_model_access_openofficereportdesigner0" model="ir.model.access">
+           <field name="model_id" ref="base.model_ir_actions_report_xml"/>
+           <field eval="1" name="perm_read"/>
+           <field eval="&quot;&quot;&quot;OpenOfficeReportDesigner&quot;&quot;&quot;" name="name"/>
+           <field eval="1" name="perm_unlink"/>
+           <field eval="1" name="perm_write"/>
+           <field eval="1" name="perm_create"/>
+           <field name="group_id" ref="res_groups_openofficereportdesigner0"/>
+       </record>		
 	</data>
 </openerp>
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
index 644f9209968..50ffb3d81be 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
@@ -649,16 +649,16 @@
     <xsl:otherwise>
       <xsl:choose>
         <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
-          <xsl:text>Times-BoldItalic</xsl:text>
+          <xsl:text>Helvetica-BoldOblique</xsl:text>
         </xsl:when>
         <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
-          <xsl:text>Times-Bold</xsl:text>
+          <xsl:text>Helvetica-Bold</xsl:text>
         </xsl:when>
         <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
-          <xsl:text>Times-Italic</xsl:text>
+          <xsl:text>Helvetica-Oblique</xsl:text>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:text>Times-Roman</xsl:text>
+          <xsl:text>Helvetica</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:otherwise>
@@ -666,7 +666,7 @@
 </xsl:when>
 <xsl:otherwise>
   <!--Use this as default -->
-  <xsl:text>Times-Roman</xsl:text>
+  <xsl:text>Helvetica</xsl:text>
 </xsl:otherwise>
 </xsl:choose>
 </xsl:template>
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
index 097564eaccc..66ef0b5b53c 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
@@ -650,16 +650,16 @@
     <xsl:otherwise>
       <xsl:choose>
         <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
-          <xsl:text>Times-BoldItalic</xsl:text>
+          <xsl:text>Helvetica-BoldOblique</xsl:text>
         </xsl:when>
         <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
-          <xsl:text>Times-Bold</xsl:text>
+          <xsl:text>Helvetica-Bold</xsl:text>
         </xsl:when>
         <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
-          <xsl:text>Times-Italic</xsl:text>
+          <xsl:text>Helvetica-Oblique</xsl:text>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:text>Times-Roman</xsl:text>
+          <xsl:text>Helvetica</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:otherwise>
@@ -667,7 +667,7 @@
 </xsl:when>
 <xsl:otherwise>
   <!--Use this as default -->
-  <xsl:text>Times-Roman</xsl:text>
+  <xsl:text>Helvetica</xsl:text>
 </xsl:otherwise>
 </xsl:choose>
 </xsl:template>
diff --git a/addons/board/board.py b/addons/board/board.py
index c6bb5d158aa..120ebbf5600 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -86,9 +86,9 @@ class board_board(osv.osv):
 
         return id
     
-    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False):
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = {}
-        res = super(board_board, self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
+        res = super(board_board, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         
         vids = self.pool.get('ir.ui.view.custom').search(cr, user, [('user_id','=',user), ('ref_id','=',view_id)])
         if vids:
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index e196f5cc682..5904607223a 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -57,7 +57,7 @@
             <field name="arch" type="xml">
                 <form string="Dashboard">
                     <field name="name" select="1"/>
-                    <button colspan="2" name="%(wizard_board_create_menu)d" string="Create Menu" type="action"/>
+                    <button colspan="2" name="%(wizard_board_create_menu)d" string="Create Menu" type="action" icon="gtk-justify-fill"/>
                     <field colspan="4" name="line_ids">
                         <tree string="Dashboard View">
                             <field name="name"/>
diff --git a/addons/board_auction/board_auction_manager_view.xml b/addons/board_auction/board_auction_manager_view.xml
index b4d863c1c41..d132c8f619b 100644
--- a/addons/board_auction/board_auction_manager_view.xml
+++ b/addons/board_auction/board_auction_manager_view.xml
@@ -36,7 +36,7 @@
 							<button
 								string="My board"
 								name="%(open_board_auction)d"
-								icon="gtk-ok"
+								icon="terp-partner"
 								type="action"
 								colspan="4"
 								/>
diff --git a/addons/board_auction/board_auction_view.xml b/addons/board_auction/board_auction_view.xml
index 6e1c49965b5..0c5feecea12 100644
--- a/addons/board_auction/board_auction_view.xml
+++ b/addons/board_auction/board_auction_view.xml
@@ -30,7 +30,7 @@
 							<button
 								string="Menu"
 								name="%(base.action_menu_admin)d"
-								icon="gtk-ok"
+								icon="gtk-justify-fill"
 								type="action"
 								colspan="4"/>
 
diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm_configuration/__terp__.py
index a00a88a5048..5c869a997d3 100644
--- a/addons/board_crm_configuration/__terp__.py
+++ b/addons/board_crm_configuration/__terp__.py
@@ -27,8 +27,8 @@
     'category': 'Board/CRM',
     'description': """
 This module implements a dashboard for CRM that includes:
-    * My Leads (list)
-    * Leads by Stage (graph)
+    * My Prospects (list)
+    * Prospects by Stage (graph)
     * My Meetings (list)
     * Sales Pipeline by Stage (graph)
     * My Cases (list)
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm_configuration/board_crm_statistical_view.xml
index f5e9015a66b..9b9c34334d9 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm_configuration/board_crm_statistical_view.xml
@@ -5,11 +5,11 @@
          Board for statistical view of the sections
          -->
         <record model="ir.ui.view" id="view_crm_lead_stage_graph1">
-            <field name="name">Leads By Stage - Graph</field>
+            <field name="name">Prospects By Stage - Graph</field>
             <field name="model">report.crm.case.section.stage</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Leads By Stage" type="pie">
+                <graph string="Prospects By Stage" type="pie">
                     <field name="stage_id"/>
                     <field name="nbr" operator="+"/>
                     <field name="state" group="True"/>
@@ -43,7 +43,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_lead_stage_graph1"/>
-            <field name="domain">[('section_id', '=', 'Leads'),('state','!=','done'),('state','!=','cancel')]</field>
+            <field name="domain">[('section_id', '=', 'Prospects'),('state','!=','done'),('state','!=','cancel')]</field>
         </record>    
         
         <act_window name="Jobs Requests Of The Month by Applied Job"
@@ -54,8 +54,8 @@
             view_id="view_crm_case_categ_graph"
             id="act_jobs_categ"/>
             
-        <act_window name="Leads Of The Month By User"
-            domain="[('section_id', '=', 'Leads'),('name','=',time.strftime('%Y-%m-01')),('state','!=','cancel')]"
+        <act_window name="Prospects Of The Month By User"
+            domain="[('section_id', '=', 'Prospects'),('name','=',time.strftime('%Y-%m-01')),('state','!=','cancel')]"
             res_model="report.crm.case.user"
             view_type="form"
             view_mode="graph,tree,form"
@@ -77,7 +77,7 @@
                                 width="250"/>
 
                             <action
-                                string="Leads By Stage"
+                                string="Prospects By Stage"
                                 name="%(act_leads_state)d"
                                 height="200"
                                 colspan="4"/>
@@ -91,7 +91,7 @@
 
 
                             <action
-                                string="Leads Of The Month By User"
+                                string="Prospects Of The Month By User"
                                 name="%(act_leads_month_user)d"
                                 colspan="4"/>
 
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml
index 0606665bb74..d5600eff893 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm_configuration/board_crm_view.xml
@@ -22,7 +22,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="view_id" ref="crm_configuration.crm_case_tree_view_leads"/>
-			<field name="domain">[('section_id.name', '=', 'Leads'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+            <field name="domain">[('section_id.name', '=', 'Prospects'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
 
 		<record model="ir.actions.act_window" id="act_my_meetings">
@@ -45,7 +45,7 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree,form</field>
 			<field name="view_id" ref="view_crm_lead_stage_graph1"/>
-			<field name="domain">[('section_id.name', '=', 'Leads'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+            <field name="domain">[('section_id.name', '=', 'Prospects'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
 					
 		<record model="ir.actions.act_window" id="act_sales_pipeline">
@@ -75,7 +75,7 @@
 						<child1>
 
 							<action
-								string="My Leads"
+                                string="My Prospects"
 								name="%(act_my_leads)d"
 								colspan="4"
 								height="150"
@@ -97,7 +97,7 @@
 
 						<child2>
 							<action
-								string="My Leads By Stage"
+                                string="My Prospects By Stage"
 								name="%(act_my_leads_stage)d"
 								colspan="4"/>
 
diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml
index a0cadfaa58e..79f627af24f 100644
--- a/addons/board_project/board_project_manager_view.xml
+++ b/addons/board_project/board_project_manager_view.xml
@@ -61,7 +61,7 @@
                             
                         </child1>
                         <child2>
-                            <button colspan="4" icon="gtk-ok" name="%(open_board_project)d" string="My tasks board" type="action"/>
+                            <button colspan="4" icon="terp-partner" name="%(open_board_project)d" string="My tasks board" type="action"/>
                             
                             
                             <action colspan="4" name="%(report_analytic_planning.action_account_analytic_planning_stat_my_manager_form)d" string="My project's planning"/>
diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index 6770638c1cd..a457f58a04a 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -19,7 +19,7 @@
                         </child1>
                         
                         <child2>
-                            <action colspan="4" name="%(report_sale.action_order_category_tree_all)d" string="Sales of the month" view_mode="graph,tree"/>
+                            <action colspan="4" name="%(report_sale.action_order_category_tree_all)d" string="Average Sales by Category of Products(this month)" view_mode="graph,tree"/>
                             <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree_month)d" string="Cases of the month" view_mode="graph,tree"/>
                         </child2>
                     </hpaned>
diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 29450cc9e71..045bcfa85fe 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -27,7 +27,7 @@
     'category': 'Generic Modules/CRM & SRM',
     'description': """The generic Open ERP Customer Relationship Management
 system enables a group of people to intelligently and efficiently manage
-leads, opportunities, tasks, issues, requests, bugs, campaign, claims, etc.
+prospects, opportunities, tasks, issues, requests, bugs, campaign, claims, etc.
 It manages key tasks such as communication, identification, prioritization,
 assignment, resolution and notification.
 
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index a4cab48b1c5..09b0d4d25c6 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -21,13 +21,19 @@
 ##############################################################################
 
 import time
-import tools
-from osv import fields,osv,orm
+import re
+import os
 
 import mx.DateTime
 import base64
+
 from tools.translate import _
 
+import tools
+from osv import fields,osv,orm
+from osv.orm import except_orm
+
+
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
     ('draft','Draft'),
@@ -64,6 +70,7 @@ class crm_case_section(osv.osv):
         'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this section"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Section'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'),
+        "gateway_ids" : fields.one2many("crm.email.gateway",'section_id',"Email Gateway")        
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -197,6 +204,101 @@ class crm_case_section(osv.osv):
         return res
 crm_case_section()
 
+class crm_email_gateway(osv.osv):
+    _name = "crm.email.gateway"
+    _description = "Email Gateway"
+    _rec_name="login"
+    _columns = {
+        'pop': fields.char('POP Server Name',size=64,required=True ,help="POP Server Name Of Email gateway"),
+        'login': fields.char('User',size=64,required=True,help="User Login Id of Email gateway"),
+        'password': fields.char('Password',size=64,required=True,help="User Password Of Email gateway"),
+        'email': fields.char('Email Id',size=64,help="Default eMail in case of any trouble."),
+        'mailgateway':fields.selection([("fetchmail","Using Fetchmail"),("postfix","Using Postfix")],"EMail gateway", readonly=True),
+        'section_id':fields.many2one('crm.case.section',"Section"),
+        'path':fields.char("Path ",size=255,required= True,help ="Path of script file of Email gateway"),          
+        'port':fields.integer("Port" , help="Port Number "),
+        'ssl':fields.boolean('Use Secure Authentication',help ="Use Secure Authentication"),        
+    }
+    _defaults = {
+        'path': lambda *a: tools.config['addons_path']+"/crm/scripts/openerp-mailgate/openerp-mailgate.py",
+        'port':lambda * a:110,
+        'mailgateway':lambda * a:'fetchmail',
+        }
+
+    def _get_fetchmail_path(self, cr):
+        return os.path.join(tools.config['root_path'], '.fetchmail', cr.dbname)
+
+    def fetch_mail(self, cr, uid, section_ids=[], context={}):        
+        path = self._get_fetchmail_path(cr)
+        sect_obj = self.pool.get("crm.case.section")        
+        if not len(section_ids):
+            section_ids = sect_obj.search(cr, uid, [])
+        for section in sect_obj.browse(cr, uid, section_ids):
+            fetch_file = path + "/" +section.name            
+            if os.path.isfile(fetch_file):                   
+                try :                                                            
+                    os.system("fetchmail -f %s" %(fetch_file))
+                except Exception, e:
+                    import netsvc
+                    netsvc.Logger().notifyChannel('fetchmail', netsvc.LOG_ERROR, "%s" % e)
+        return True
+
+    def make_fetchmail(self, cr, uid, section_ids=[], context={}):
+        sect_obj = self.pool.get("crm.case.section")
+        user_obj = self.pool.get("res.users")        
+        for section in sect_obj.browse(cr, uid, section_ids, context):
+            user = user_obj.browse(cr,uid,uid)
+            path = self._get_fetchmail_path(cr)
+            if not os.path.isdir(path):            
+                try:
+                    os.makedirs(path)                    
+                except:
+                    raise except_orm(_('Permission Denied !'), _('You do not permissions to write on the server side.'))
+                         
+            fmail_path =  path + "/" +section.name
+            fmail = open(fmail_path , 'w')
+            os.chmod(fmail_path,0710)
+            for mailgateway in section.gateway_ids: 
+                mdatext = '%s  -u %d -p %s -s %d  -d %s '%(mailgateway.path,uid,user.password,mailgateway.section_id.id,cr.dbname)        
+                if mailgateway.email:
+                    mdatext += ' -m %s'%(mailgateway.email)
+                if section.reply_to:
+                    mdatext += ' -e %s'%(section.reply_to) 
+                text = "\npoll %s  user '%s' password '%s'"%(mailgateway.pop,mailgateway.login,mailgateway.password)
+                if mailgateway.port:
+                    text += ' port %d' % (mailgateway.port)
+                if mailgateway.ssl:
+                    text += ' ssl'   
+                text += " mda '%s'"%(mdatext)
+                fmail.write(text)
+            fmail.close() 
+    
+    def create(self, cr, uid, vals, context=None):
+        res = super(crm_email_gateway, self).create(cr, uid, vals, context=context)        
+        self.make_fetchmail(cr, uid, [vals['section_id']])
+        return res
+    
+    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        res = super(crm_email_gateway, self).write(cr, uid, ids, vals, context)
+        section_ids = [] 
+        for gateway in self.browse(cr, uid, ids, context):  
+           if gateway.section_id.id not in section_ids:
+                section_ids.append(gateway.section_id.id)
+        self.make_fetchmail(cr, uid, section_ids)
+        return res
+    
+    def unlink(self, cr, uid, ids, context={}, check=True):
+        section_ids = []
+        for gateway in self.browse(cr, uid, ids, context):  
+           if gateway.section_id.id not in section_ids:
+                section_ids.append(gateway.section_id.id)
+        res = super(crm_email_gateway, self).unlink(cr, uid,ids, context=context)
+        
+        self.make_fetchmail(cr, uid, section_ids)        
+        return res
+
+crm_email_gateway()
+
 class crm_case_categ(osv.osv):
     _name = "crm.case.categ"
     _description = "Category of case"
@@ -228,7 +330,8 @@ class crm_case_rule(osv.osv):
             ('deadline','Deadline'),
             ('date','Date'),
             ], 'Trigger Date', size=16),
-        'trg_date_range': fields.integer('Delay after trigger date'),
+        'trg_date_range': fields.integer('Delay after trigger date',help="Delay After Trigger Date, specifies you can put a negative number " \
+                                                             "if you need a delay before the trigger date, like sending a reminder 15 minutes before a meeting."),
         'trg_date_range_type': fields.selection([('minutes', 'Minutes'),('hour','Hours'),('day','Days'),('month','Months')], 'Delay type'),
 
         'trg_section_id': fields.many2one('crm.case.section', 'Section'),
@@ -247,17 +350,21 @@ class crm_case_rule(osv.osv):
         'act_section_id': fields.many2one('crm.case.section', 'Set section to'),
         'act_user_id': fields.many2one('res.users', 'Set responsible to'),
         'act_priority': fields.selection([('','')] + AVAILABLE_PRIORITIES, 'Set priority to'),
-        'act_email_cc': fields.char('Add watchers (Cc)', size=250, help="These people will receive a copy of the futur communication between partner and users by email"),
+        'act_email_cc': fields.char('Add watchers (Cc)', size=250, help="These people will receive a copy of the future communication between partner and users by email"),
 
         'act_remind_partner': fields.boolean('Remind Partner', help="Check this if you want the rule to send a reminder by email to the partner."),
         'act_remind_user': fields.boolean('Remind responsible', help="Check this if you want the rule to send a reminder by email to the user."),
         'act_remind_attach': fields.boolean('Remind with attachment', help="Check this if you want that all documents attached to the case be attached to the reminder email sent."),
 
-        'act_mail_to_user': fields.boolean('Mail to responsible'),
-        'act_mail_to_partner': fields.boolean('Mail to partner'),
-        'act_mail_to_watchers': fields.boolean('Mail to watchers (Cc)'),
-        'act_mail_to_email': fields.char('Mail to these emails', size=128),
-        'act_mail_body': fields.text('Mail body')
+        'act_mail_to_user': fields.boolean('Mail to responsible',help="Check this if you want the rule to send an email to the responsible person."),
+        'act_mail_to_partner': fields.boolean('Mail to partner',help="Check this if you want the rule to send an email to the partner."),
+        'act_mail_to_watchers': fields.boolean('Mail to watchers (CC)',help="Check this if you want the rule to mark CC(mail to any other person defined in actions)."),
+        'act_mail_to_email': fields.char('Mail to these emails', size=128,help="Email-id of the persons whom mail is to be sent"),
+        'act_mail_body': fields.text('Mail body',help="Content of mail"),
+        'regex_name' : fields.char('Regular Expression on Case Name', size=128),
+        'regex_history' : fields.char('Regular Expression on Case History', size=128),
+        'server_action_id' : fields.many2one('ir.actions.server','Server Action',help="Describes the action name." \
+                                                    "eg:on which object which ation to be taken on basis of which condition"),
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -334,23 +441,27 @@ class crm_case(osv.osv):
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'active': fields.boolean('Active'),
         'description': fields.text('Your action'),
-        'section_id': fields.many2one('crm.case.section', 'Section', required=True, select=True),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id)]"),
+        'section_id': fields.many2one('crm.case.section', 'Section', required=True, select=True, help='Section to which Case belongs to. Define Responsible user and Email account for mail gateway.'),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id)]", help='Category related to the section.Subdivide the CRM cases independently or section-wise.'),
         'planned_revenue': fields.float('Planned Revenue'),
         'planned_cost': fields.float('Planned Costs'),
         'probability': fields.float('Probability (%)'),
-        'email_from': fields.char('Partner Email', size=128),
-        'email_cc': fields.char('Watchers Emails', size=252),
+        'email_from': fields.char('Partner Email', size=128, help="These people will receive email."),
+        'email_cc': fields.char('Watchers Emails', size=252 , help="These people will receive a copy of the future" \
+                                                                    " communication between partner and users by email"),
         'email_last': fields.function(_email_last, method=True,
             string='Latest E-Mail', type='text'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
-        'som': fields.many2one('res.partner.som', 'State of Mind'),
+        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                       "the partner mentality in relation to our services.The scale has" \
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
         'date': fields.datetime('Date'),
         'create_date': fields.datetime('Created' ,readonly=True),
         'date_deadline': fields.datetime('Deadline'),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel'),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."), 
         'user_id': fields.many2one('res.users', 'Responsible'),
         'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication', readonly=1),
         'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History', readonly=1),
@@ -429,6 +540,28 @@ class crm_case(osv.osv):
                     )
                     ok = ok and (not action.trg_priority_from or action.trg_priority_from>=case.priority)
                     ok = ok and (not action.trg_priority_to or action.trg_priority_to<=case.priority)
+
+                    reg_name = action.regex_name
+                    result_name = True
+                    if reg_name:
+                        ptrn = re.compile(str(reg_name))
+                        _result = ptrn.search(str(case.name))
+                        if not _result:
+                            result_name = False
+                    regex_n = not reg_name or result_name     
+                    ok = ok and regex_n
+                    
+                    reg_history = action.regex_history
+                    result_history = True
+                    if reg_history:
+                        ptrn = re.compile(str(reg_history))
+                        if case.history_line:
+                            _result = ptrn.search(str(case.history_line[0].description))
+                            if not _result:
+                                result_history = False
+                    regex_h = not reg_history or result_history        
+                    ok = ok and regex_h
+                                            
                     if not ok:
                         continue
 
@@ -466,6 +599,9 @@ class crm_case(osv.osv):
                         ok = action.trg_date_type=='none'
 
                     if ok:
+                        if action.server_action_id:
+                            context.update({'active_id':case.id,'active_ids':[case.id]})
+                            self.pool.get('ir.actions.server').run(cr, uid, [action.server_action_id.id], context)                        
                         write = {}
                         if action.act_state:
                             case.state = action.act_state
@@ -515,7 +651,7 @@ class crm_case(osv.osv):
         return True
 
     def format_body(self, body):
-        return (body or u'').encode('utf8', 'replace')
+        return body and tools.ustr(body.encode('ascii', 'replace')) or ''
 
     def format_mail(self, case, body):
         data = {
@@ -610,13 +746,13 @@ class crm_case(osv.osv):
     def remind_user(self, cr, uid, ids, context={}, attach=False,
             destination=True):
         for case in self.browse(cr, uid, ids):
+            if not case.section_id.reply_to:
+                raise osv.except_osv(_('Error!'),("Reply TO is not specified in Section"))
+            if not case.email_from:
+                raise osv.except_osv(_('Error!'),("Partner Email is not specified in Case"))            
             if case.section_id.reply_to and case.email_from:
                 src = case.email_from
                 
-                if not src:
-                    raise osv.except_osv(_('Error!'),
-                        _("No E-Mail ID Found for the Responsible Partner or missing reply address in section!"))
-                    
                 dest = case.section_id.reply_to
                 body = case.email_last or case.description
                 if not destination:
@@ -633,7 +769,7 @@ class crm_case(osv.osv):
                     attach_to_send = map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send)
                 
                 # Send an email
-                tools.email_send(
+                flag = tools.email_send(
                     src,
                     dest,
                     "Reminder: [%s] %s" % (str(case.id), case.name, ),
@@ -642,7 +778,10 @@ class crm_case(osv.osv):
                     tinycrm=str(case.id),
                     attach=attach_to_send
                 )
-
+                if flag:
+                    raise osv.except_osv(_('Email!'),("Email Successfully Sent"))   
+                else:                    
+                    raise osv.except_osv(_('Email Fail!'),("Email is not sent successfully"))
         return True
 
     def add_reply(self, cursor, user, ids, context=None):
@@ -802,7 +941,7 @@ class crm_case_log(osv.osv):
     _description = "Case Communication History"
     _order = "id desc"
     _columns = {
-        'name': fields.char('Action', size=64),
+        'name': fields.char('Status', size=64),
         'som': fields.many2one('res.partner.som', 'State of Mind'),
         'date': fields.datetime('Date'),
         'canal_id': fields.many2one('res.partner.canal', 'Channel'),
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 7ba270d268f..5cef12fa45a 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -66,6 +66,17 @@
             <field eval="'_check'" name="function"/>
             <field eval="'()'" name="args"/>
         </record>
-        
+
+        <record id="ir_cron_crm_email_gateway_action" model="ir.cron">
+            <field name="name">Check Email (Fetchmail)</field>
+            <field name="interval_number">5</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+            <field eval="'crm.email.gateway'" name="model"/>
+            <field eval="'fetch_mail'" name="function"/>
+            <field eval="'()'" name="args"/>
+        </record>
+                
     </data>
 </openerp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 3b425ba0f3c..161795a89cb 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -3,6 +3,8 @@
     <data>
         <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>
         <menuitem id="menu_crm_configuration" name="Configuration" parent="crm.menu_crm" sequence="0"/>
+        <wizard id="wizard_crm_send_mail" model="crm.case.history" name="crm.send.mail" string="Send Mail" menu="False"/>
+        <wizard id="wizard_crm_new_send_mail" model="crm.case" name="crm.new.send.mail" string="Send New Mail" menu="False"/>        
 
         <record id="res_partner_events-wopartner-view" model="ir.ui.view">
             <field name="name">res.partner.events.form</field>
@@ -37,7 +39,32 @@
                             <field name="parent_id" select="2"/>
                             <field name="allow_unlink" select="2"/>
                             <field name="reply_to" select="2"/>
-                            <label colspan="2" string="Complete this if you use the mail gateway."/>
+                            <field name="gateway_ids" widget="one2many_list" nolabel="1" colspan="4">
+                                <tree string="Email Gateway">
+                                   <field name="pop" />
+                                   <field name="login"/>
+                                   <field name="email" />
+                                   <field name="mailgateway"/>                                 
+                                </tree>
+                                <form string="Email Gateway">                                                      
+                                    <field name="mailgateway"/>  
+                                    <notebook colspan="4">
+                                           <page string="Server Setting">                            
+                                               <field name="pop" />
+                                               <field name="port" />
+                                               <field name="login" />
+                                               <field name="password" password="True"/>                                                                                                
+                                           </page>
+                                           <page string="Security Setting">    
+                                               <field name="ssl" />                                                
+                                           </page>
+                                           <page string="Email Gateway">                            
+                                               <field name="email" />
+                                               <field name="path" />
+                                           </page>
+                                    </notebook>
+                                </form>
+                            </field>
                         </page>
                     </notebook>
                 </form>
@@ -125,6 +152,7 @@
                             <field name="trg_state_to" select="2"/>
 
                             <separator colspan="4" string="Conditions on Case Fields"/>
+                            <field name="regex_name" string="Regex on Case Name" colspan="2"/>                            
                             <field name="trg_section_id" select="1"/>
                             <field name="trg_categ_id"/>
                             <field name="trg_user_id" select="2"/>
@@ -142,6 +170,7 @@
                                 <field name="trg_date_range_type" nolabel="1"/>
                             </group>
                             <separator colspan="4" string="Condition on Communication History"/>
+                            <field name="regex_history" string="Regex on Communication History"/>                            
                             <field name="trg_max_history"/>
                             <separator colspan="4" string="Note"/>
                             <label align="0.0" string="The rule use a AND operator. The case must match all non empty fields so that the rule execute the action described in the 'Actions' tab." colspan="4"/>
@@ -157,6 +186,8 @@
                             <field name="act_remind_partner"/>
                             <field name="act_remind_attach"/>
                             <field colspan="4" name="act_email_cc"/>
+                            <separator colspan="4" string="Server Action to be Triggered"/>
+                            <field name="server_action_id"/>                            
                             <!--
 					<field name="act_method" colspan="4" readonly="1"/>
 					-->
@@ -180,6 +211,7 @@
                             <label align="0.0" string="%%(case_user)s = Responsible name" colspan="2"/>
                             <label align="0.0" string="%%(case_user_email)s = Responsible email" colspan="2"/>
                             <label align="0.0" string="%%(case_user_phone)s = Responsible phone" colspan="2"/>
+                            <label align="0.0" string="%% = The &apos;%%&apos; Character" colspan="2"/>                            
                         </page>
                     </notebook>
                 </form>
@@ -204,7 +236,6 @@
         </record>
         <menuitem action="crm_case_rule-act" id="menu_crm_case_rule-act" parent="crm.next_id_51"/>
 
-
         <!-- Cases -->
         <record id="crm_case_log_tree-view" model="ir.ui.view">
             <field name="name">crm.case.log.tree</field>
@@ -268,6 +299,12 @@
                     <field name="planned_revenue" sum="Planned revenue"/>
                     <field name="planned_cost" sum="Planned costs"/>
                     <field name="state"/>
+                    <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-close"/>
+                    <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward"/>
+                    <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause"/>
+                    <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up"/>
+                    <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>                    
                 </tree>
             </field>
         </record>
@@ -291,49 +328,27 @@
                                 <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
                                 <newline/>
                                 <field colspan="3" name="email_from" select="2"/>
-                                <button name="remind_partner" states="open,pending" string="Send Reminder" type="object"/>
+                                <button name="remind_partner" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
                                 <field name="user_id" select="1"/>
-                                <button name="remind_user" states="open,pending" string="Send Reminder" type="object"/>
-                            </group>
-
-                            <separator colspan="4"/>
-                            <field colspan="2" mode="tree,form" name="history_line" nolabel="1">
-                                <form string="Communication history">
-                                    <group col="6" colspan="4">
-                                        <field name="date" select="1"/>
-                                        <field name="email" select="1"/>
-                                        <field name="canal_id" select="2"/>
-                                    </group>
-                                    <newline/>
-                                    <field colspan="4" name="description" nolabel="1" select="2"/>
-                                </form>
-                                <tree string="Communication history">
-                                    <field name="note"/>
-                                </tree>
-                            </field>
-                            <group col="2" colspan="2" expand="1">
-                                <field name="canal_id"/>
-                                <button colspan="2" name="add_reply" states="open" string="Add Last Mail for Replying" type="object"/>
-                                <field colspan="2" name="description" nolabel="1" select="2"/>
-                                <button name="case_log_reply" states="open" string="Send Partner &amp; Historize" type="object"/>
-                                <button name="case_log" states="open" string="Historize" type="object"/>
+                                <button name="remind_user" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
                             </group>
 
+                            <separator colspan="4" string="Description"/>
+                            <field name="description" colspan="4" nolabel="1"/>
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
                                 <field name="state" select="1"/>
-                                <button name="case_close" states="open,draft,pending" string="Close" type="object"/>
-                                <button name="case_open" states="draft,pending" string="Open" type="object"/>
-                                <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object"/>
-                                <button name="case_pending" states="draft,open" string="Pending" type="object"/>
-                                <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object"/>
-                                <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object"/>
+                                <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-close"/>
+                                <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward"/>
+                                <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+                                <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause"/>
+                                <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up"/>
+                                <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
-                        <page string="Extra Info">
+                        <page string="History">
                             <field name="id" select="1"/>
                             <field name="active" select="2"/>
-                            <field colspan="4" name="email_cc"/>
                             <field name="categ_id" on_change="onchange_categ_id(categ_id)" select="2"/>
                             <field name="som" select="2"/>
                             <separator colspan="4" string="Dates"/>
@@ -348,8 +363,6 @@
                             <separator colspan="4" string="References"/>
                             <field colspan="4" name="ref"/>
                             <field colspan="4" name="ref2"/>
-                        </page>
-                        <page string="History">
                             <field colspan="4" name="log_ids" nolabel="1">
                                 <form string="Actions">
                                     <separator colspan="4" string="Action Information"/>
@@ -361,16 +374,61 @@
                                 </form>
                             </field>
                         </page>
+                        <page string="Emails">
+                           <group colspan="4">
+                               <field colspan="4" name="email_cc" string="CC"/>
+                           </group>
+                           <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                               <form string="Communication history">
+                                   <group col="6" colspan="4">
+                                       <field name="date"/>
+                                       <field name="email"/>
+                                       <field name="canal_id"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4" string="Reply to Last Email" name="%(wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email" name="%(wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                        </page>                        
                     </notebook>
                 </form>
             </field>
         </record>
 
+        <record id="view_crm_case_filter" model="ir.ui.view">
+            <field name="name">crm.case.select</field>
+            <field name="model">crm.case</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Case">
+                   <group col='6' colspan='4'>
+                       <filter icon="gtk-execute" string="My Cases" domain="[('user_id','=',uid)]" separator="1" help="Cases Related to Current User"/>
+                       <field name="state" select="1">
+                           <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Cases"/>
+                           <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Cases"/>
+                           <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Cases"/>
+                       </field>
+                       <separator orientation="vertical"/>
+                       <field name="name" select='1'/>
+                       <field name="user_id" select="1" widget="selection"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record id="crm_case_categ0-act" model="ir.actions.act_window">
             <field name="name">All Cases</field>
             <field name="res_model">crm.case</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_tree-view"/>
+            <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
         <menuitem action="crm_case_categ0-act" id="menu_crm_case_categ0-act" parent="crm.next_id_52"/>
 
@@ -379,9 +437,10 @@
             <field name="res_model">crm.case</field>
             <field name="view_type">form</field>
             <field name="domain">[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
-        <menuitem action="crm_case_categ0-act_open" id="menu_crm_case_categ0-act_open" parent="crm.menu_crm_case_categ0-act"/>
-
+        <menuitem action="crm_case_categ0-act_open" id="menu_crm_case_categ0-act_open" parent="crm.menu_crm_case_categ0-act" groups="base.group_extended_menu"/>
 
         <record id="crm_case_categ0-act_my" model="ir.actions.act_window">
             <field name="name">My cases</field>
@@ -389,19 +448,20 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('user_id','=',uid)]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
-        <menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52"/>
+        <menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52" groups="base.group_extended_menu"/>
         <record id="crm_case_categ0-act_my_open" model="ir.actions.act_window">
             <field name="name">My Open Cases</field>
             <field name="res_model">crm.case</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('user_id','=',uid),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
-        <menuitem action="crm_case_categ0-act_my_open" id="menu_crm_case_categ0-act_my_open" parent="crm.menu_crm_case_categ0-act_my"/>
-
-
-
+        <menuitem action="crm_case_categ0-act_my_open" id="menu_crm_case_categ0-act_my_open" parent="crm.menu_crm_case_categ0-act_my" groups="base.group_extended_menu"/>
 
         <record id="crm_case_section_open_act" model="ir.actions.act_window">
             <field name="name">crm.case.section.open</field>
@@ -418,7 +478,6 @@
             <field eval="True" name="object"/>
         </record>
 
-
         <record id="crm_case_history-view" model="ir.ui.view">
             <field name="name">crm.case.history.form</field>
             <field name="model">crm.case.history</field>
@@ -492,8 +551,10 @@
             <field name="model">crm.segmentation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partner Segmentation">
-                    <notebook>
+                <form string="Partner Segmentation">                    
+                    <field name="name" select="1"/>
+                    <field name="exclusif"/>                   
+                    <notebook colspan="4">
                         <page string="Segmentation">
                             <separator colspan="4" string="Segmentation Description"/>
                             <field name="name" select="1"/>
@@ -504,9 +565,9 @@
                             <field colspan="4" name="description" select="2"/>
                             <field name="state"/>
                             <group col="3" colspan="2">
-                                <button name="process_start" states="not running" string="Compute Segmentation" type="object"/>
-                                <button name="process_stop" states="running" string="Stop Process" type="object"/>
-                                <button name="process_continue" states="running" string="Continue Process" type="object"/>
+                                <button name="process_start" states="not running" string="Compute Segmentation" type="object" icon="gtk-execute"/>
+                                <button name="process_stop" states="running" string="Stop Process" type="object" icon="gtk-cancel"/>
+                                <button name="process_continue" states="running" string="Continue Process" type="object" icon="gtk-go-forward"/>
                             </group>
                         </page>
                         <page string="Sales Purchase">
@@ -561,6 +622,56 @@
 
         <act_window domain="[('user_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_users_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.users" view_mode="tree,form,calendar" view_type="form"/>
 
+        <record id="crm_email_gateway_form" model="ir.ui.view">
+            <field name="name">crm.email.gateway.form</field>
+            <field name="model">crm.email.gateway</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Email Gateway">                  
+                     <field name="section_id"/>
+                      <field name="mailgateway"/>  
+                     <notebook colspan="4">
+                        <page string="Server Setting">                            
+                            <field name="pop" />
+                            <field name="port" />
+                           <field name="login" />
+                           <field name="password" password="True"/>                                                        
+                        </page>
+                        <page string="Security Setting">    
+                            <field name="ssl" />                            
+                        </page>
+                        <page string="Email Gateway">                            
+                           <field name="email" />
+                           <field name="path" />
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <record id="crm_email_gateway_tree" model="ir.ui.view">
+            <field name="name">crm.email.gateway.tree</field>
+            <field name="model">crm.email.gateway</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Gateway">
+                    <field name="section_id"/>
+                    <field name="mailgateway"/>  
+                    <field name="pop" />
+                    <field name="login"/>
+                    <field name="email" />                    
+                    <field name="path" />
+                </tree>
+            </field>
+        </record>
+        <record id="crm_email_gateway_act" model="ir.actions.act_window">
+            <field name="name">Email Gateway</field>
+            <field name="res_model">crm.email.gateway</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="crm_email_gateway_tree"/>
+        </record>
+        <menuitem id="crm_email_gateway_menu" name="Email Gateway" parent="next_id_51" action="crm_email_gateway_act" />
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_wizard.xml b/addons/crm/crm_wizard.xml
index 079dd3191c1..9e96530a782 100644
--- a/addons/crm/crm_wizard.xml
+++ b/addons/crm/crm_wizard.xml
@@ -2,6 +2,12 @@
 <openerp>
     <data>
         <wizard id="wizard_case_section_menu" model="crm.case.section" name="crm.case.section.menu" string="Create menus for a case section"/>
+
+        <wizard string="Fetch mail"
+           model="crm.case.section"
+           name="crm.case.section.fetchmail"
+           id="wizard_crm_case_section_fetchmail"/>        
+
         <menuitem action="wizard_case_section_menu" id="menu_wizard_case_section_menu" parent="crm.menu_crm_configuration" type="wizard"/>
         
     </data>
diff --git a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
index 6901fde7a14..e3a10d1a5c8 100755
--- a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
+++ b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
@@ -101,7 +101,8 @@ class email_parser(object):
             'email_cc': self._decode_header(msg['Cc'] or ''),
             'canal_id': self.canal_id,
             'user_id': False,
-            'history_line': [(0, 0, {'name': 'Create','section_id': self.section_id,'canal_id': self.canal_id,'description': message['body'], 'email': msg['From'] })],
+            'description': message['body'],
+            'history_line': [(0, 0, {'description': message['body'], 'email': msg['From'] })],
         }
         try:
             data.update(self.partner_get(self._decode_header(msg['From'])))
@@ -154,7 +155,7 @@ class email_parser(object):
             if part.get_content_maintype() == 'multipart':
                 continue
 
-            if part.get_content_maintype()=='text' and part.get_content_subtype() == 'plain':
+            if part.get_content_maintype()=='text' and part.get_content_subtype() in ('plain','html'):
                 buf = part.get_payload(decode=True)
                 if buf:
                     txt = buf.decode(part.get_charsets()[0] or 'ascii', 'replace')
@@ -191,7 +192,8 @@ class email_parser(object):
         body['body'] = body_data
 
         data = {
-            'history_line': [(0, 0, {'name': 'Close','section_id': self.section_id,'canal_id': self.canal_id,'description': body['body'], 'email': msg['From']})],
+            'description': body['body'],
+            'history_line': [(0, 0, {'description': body['body'], 'email': msg['From']})],
         }
         act = 'case_close'
         if 'state' in actions:
@@ -246,7 +248,8 @@ class email_parser(object):
         self.rpc('crm.case', act, [id])
         body2 = '\n'.join(map(lambda l: '> '+l, (body or '').split('\n')))
         data = {
-                'history_line': [(0, 0, {'name': 'Open','section_id': self.section_id,'canal_id': self.canal_id,'description': body, 'email': msg['From'][:84]})],
+            'description':body,
+            'history_line': [(0, 0, {'description': body, 'email': msg['From'][:84]})],
         }
         self.rpc('crm.case', 'write', [id], data)
         return id
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index aef0ed3d143..0ee363ca04e 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -21,6 +21,9 @@
 ##############################################################################
 
 import crm_wizard
+import wizard_crm_send_email
+import wizard_crm_new_send_email
+import wizard_fetch_mail
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
new file mode 100644
index 00000000000..5375676bf79
--- /dev/null
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -0,0 +1,101 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from mx.DateTime import now
+
+import wizard
+import netsvc
+import ir
+import pooler
+import tools
+from tools.translate import _
+
+
+email_send_form = '''<?xml version="1.0"?>
+<form string="Mass Mailing">
+    <field name="to"/>
+    <newline/>
+    <field name="cc"/>
+    <newline/>
+    <field name="subject"/>
+    <newline/>
+    <field name="text" />
+</form>'''
+
+email_send_fields = {
+    'to': {'string':"To", 'type':'char', 'size':64, 'required':True},
+    'cc': {'string':"CC", 'type':'char', 'size':128,},
+    'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
+    'text': {'string':'Message', 'type':'text_tag', 'required':True}
+}
+
+# this sends an email to ALL the addresses of the selected partners.
+def _mass_mail_send(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    case_pool=pool.get('crm.case')
+
+    case = case_pool.browse(cr,uid,data['ids'])[0]
+    case_pool._history(cr, uid, [case], _('Send'), history=True, email=False)
+    case_pool.write(cr, uid, [case.id], {
+                'som': False,
+                'canal_id': False,
+                })
+    emails = [data['form']['to']] + (data['form']['cc'] or '').split(',')
+    emails = filter(None, emails)
+    body = data['form']['text']
+    if case.user_id.signature:
+        body += '\n\n%s' % (case.user_id.signature)
+    tools.email_send(
+        case.user_id.address_id.email,
+        emails,
+        data['form']['subject'],
+        case_pool.format_body(body),
+        reply_to=case.section_id.reply_to,
+        tinycrm=str(case.id)
+    )
+    return {}
+
+def _get_info(self, cr, uid, data, context):
+    if not data['id']:
+        return {}
+    pool = pooler.get_pool(cr.dbname)
+    case = pool.get('crm.case').browse(cr,uid,data['ids'])[0]
+    if not case.email_from:
+        raise wizard.except_wizard(_('Error'),_('You must put a Partner eMail to use this action!'))
+    if not case.user_id:
+        raise wizard.except_wizard(_('Error'),_('You must define a responsible user for this case in order to use this action!'))
+    return {'to': case.email_from,'subject': '['+str(case.id)+'] '+case.name,'cc': case.email_cc or ''}
+    
+class wizard_send_mail(wizard.interface):
+    states = {
+        'init': {
+            'actions': [_get_info],
+            'result': {'type': 'form', 'arch': email_send_form, 'fields': email_send_fields, 'state':[('end','Cancel','gtk-cancel'), ('send','Send Email','gtk-go-forward')]}
+        },
+        'send': {
+            'actions': [_mass_mail_send],
+            'result': {'type': 'state', 'state':'end'}
+        }
+    }
+wizard_send_mail('crm.new.send.mail')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm/wizard/wizard_crm_send_email.py b/addons/crm/wizard/wizard_crm_send_email.py
new file mode 100644
index 00000000000..669aa885c6a
--- /dev/null
+++ b/addons/crm/wizard/wizard_crm_send_email.py
@@ -0,0 +1,103 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from mx.DateTime import now
+
+import wizard
+import netsvc
+import ir
+import pooler
+import tools
+from tools.translate import _
+
+
+email_send_form = '''<?xml version="1.0"?>
+<form string="Mass Mailing">
+    <field name="to"/>
+    <newline/>
+    <field name="cc"/>
+    <newline/>
+    <field name="subject"/>
+    <newline/>
+    <field name="text" />
+</form>'''
+
+email_send_fields = {
+    'to': {'string':"To", 'type':'char', 'size':64, 'required':True},
+    'cc': {'string':"CC", 'type':'char', 'size':128,},
+    'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
+    'text': {'string':'Message', 'type':'text_tag', 'required':True}
+}
+
+# this sends an email to ALL the addresses of the selected partners.
+def _mass_mail_send(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    case_pool=pool.get('crm.case')
+
+    hist_obj = pool.get('crm.case.history').browse(cr,uid,data['ids'])[0]
+    case = hist_obj.log_id.case_id
+    case_pool._history(cr, uid, [case], _('Send'), history=True, email=False)
+    case_pool.write(cr, uid, [case.id], {
+                'som': False,
+                'canal_id': False,
+                })
+    emails = [data['form']['to']] + (data['form']['cc'] or '').split(',')
+    emails = filter(None, emails)
+    body = data['form']['text']
+    if case.user_id.signature:
+        body += '\n\n%s' % (case.user_id.signature)
+    tools.email_send(
+        case.user_id.address_id.email,
+        emails,
+        data['form']['subject'],
+        case_pool.format_body(body),
+        reply_to=case.section_id.reply_to,
+        tinycrm=str(case.id)
+    )
+    return {}
+
+def _get_info(self, cr, uid, data, context):
+    if not data['id']:
+        raise wizard.except_wizard(_('Error'),_('There is no mail to reply!'))
+    pool = pooler.get_pool(cr.dbname)
+    hist_obj = pool.get('crm.case.history').browse(cr,uid,data['ids'])[0]
+    case = hist_obj.log_id.case_id
+    if not case.email_from:
+        raise wizard.except_wizard(_('Error'),_('You must put a Partner eMail to use this action!'))
+    if not case.user_id:
+        raise wizard.except_wizard(_('Error'),_('You must define a responsible user for this case in order to use this action!'))
+    return {'to': case.email_from,'subject': '['+str(case.id)+'] '+case.name,'cc': case.email_cc or '', 'text': '> ' + case.description.replace('\n','\n> ')}
+    
+class wizard_send_mail(wizard.interface):
+    states = {
+        'init': {
+            'actions': [_get_info],
+            'result': {'type': 'form', 'arch': email_send_form, 'fields': email_send_fields, 'state':[('end','Cancel','gtk-cancel'), ('send','Send Email','gtk-go-forward')]}
+        },
+        'send': {
+            'actions': [_mass_mail_send],
+            'result': {'type': 'state', 'state':'end'}
+        }
+    }
+wizard_send_mail('crm.send.mail')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm/wizard/wizard_fetch_mail.py b/addons/crm/wizard/wizard_fetch_mail.py
new file mode 100644
index 00000000000..54206dad0db
--- /dev/null
+++ b/addons/crm/wizard/wizard_fetch_mail.py
@@ -0,0 +1,53 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import wizard
+import time
+import pooler
+import tools
+import os
+_email_form = '''<?xml version="1.0"?>
+<form string="Email Gateway">
+    <label string="Fetch Email from Email Gate Way" />
+ </form>'''
+
+_email_fields = {
+       }
+
+def fetch_mail(self , cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    gateway_pool=pool.get('crm.email.gateway')
+    gateway_pool.fetch_mail(cr, uid, data['ids'], context=context)
+    return {}
+
+class wiz_fetch_mail(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':_email_form, 'fields':_email_fields, 'state':[('run','Run','gtk-execute'),('end','Cancel','gtk-cancel')]}
+                },
+        'run': {
+            'actions': [fetch_mail],
+            'result': {'type': 'state', 'state': 'end'}
+                },
+    }
+wiz_fetch_mail('crm.case.section.fetchmail')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
index 6d0cd665546..0964b63b369 100644
--- a/addons/crm_configuration/__terp__.py
+++ b/addons/crm_configuration/__terp__.py
@@ -31,7 +31,7 @@ people to intelligently and efficiently manage tasks, issues,
 and requests. It manages key tasks such as communication, 
 identification, prioritization, assignment, resolution and notification.
 
-This module provide screens like: jobs hiring process, leads, business
+This module provide screens like: jobs hiring process, prospects, business
 opportunities, fund raising tracking, support & helpdesk, calendar of
 meetings, eso.
 """,
diff --git a/addons/crm_configuration/crm_bugs_menu.xml b/addons/crm_configuration/crm_bugs_menu.xml
index 810b46e4d43..218acd0e420 100644
--- a/addons/crm_configuration/crm_bugs_menu.xml
+++ b/addons/crm_configuration/crm_bugs_menu.xml
@@ -40,6 +40,8 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
         <field name="sequence" eval="1"/>
@@ -69,6 +71,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'=\',\'draft\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all1">
         <field name="sequence" eval="1"/>
@@ -88,7 +93,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all1"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all1" action="crm_case_category_act_all1" parent="menu_crm_case_categ_act0"/>
+    <menuitem  id="menu_crm_case_categ0_act_all1" action="crm_case_category_act_all1" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all2">
         <field name="name">Open Bugs</field>
@@ -97,6 +102,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'&lt;&gt;\','+str(stage7)+'),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all2">
         <field name="sequence" eval="1"/>
@@ -116,7 +124,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all2"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all2" action="crm_case_category_act_all2" parent="menu_crm_case_categ_act0"/>
+    <menuitem  id="menu_crm_case_categ0_act_all2" action="crm_case_category_act_all2" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all3">
         <field name="name">Bugs With Patches Waiting Approval</field>
@@ -125,6 +133,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'categ_id\',\'=\','+str(categ2)+'), (\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all3">
         <field name="sequence" eval="1"/>
@@ -144,7 +155,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all3"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all3" action="crm_case_category_act_all3" parent="menu_crm_case_categ0_act_all2"/>
+    <menuitem  id="menu_crm_case_categ0_act_all3" action="crm_case_category_act_all3" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all4">
         <field name="name">Bugs Not Fixed</field>
@@ -153,6 +164,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'), (\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'categ_id\',\'=\','+str(categ1)+'), (\'stage_id\',\'&lt;&gt;\','+str(stage2)+'),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all4">
         <field name="sequence" eval="1"/>
@@ -172,7 +186,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all4"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all4" action="crm_case_category_act_all4" parent="menu_crm_case_categ0_act_all2"/>
+    <menuitem  id="menu_crm_case_categ0_act_all4" action="crm_case_category_act_all4" parent="menu_crm_case_categ0_act_all2" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all5">
         <field name="name">Pending Bugs</field>
@@ -181,6 +195,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'=\',\'pending\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all5">
         <field name="sequence" eval="1"/>
@@ -200,7 +217,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all5"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all5" action="crm_case_category_act_all5" parent="menu_crm_case_categ_act0"/>
+    <menuitem  id="menu_crm_case_categ0_act_all5" action="crm_case_category_act_all5" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all6">
         <field name="name">Planned For Future Release</field>
@@ -209,6 +226,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'=\','+str(stage7)+'),(\'state\',\'=\',\'pending\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all6">
         <field name="sequence" eval="1"/>
@@ -228,8 +248,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all6"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all6" action="crm_case_category_act_all6" parent="menu_crm_case_categ0_act_all5"/>
-
+    <menuitem  id="menu_crm_case_categ0_act_all6" action="crm_case_category_act_all6" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all7">
         <field name="name">Waiting For Reporter Response</field>
@@ -238,6 +257,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'pending\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all7">
         <field name="sequence" eval="1"/>
@@ -257,8 +279,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all7"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all7" action="crm_case_category_act_all7" parent="menu_crm_case_categ0_act_all5"/>
-
+    <menuitem  id="menu_crm_case_categ0_act_all7" action="crm_case_category_act_all7" parent="menu_crm_case_categ0_act_all5" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_all8">
         <field name="name">Old Bugs</field>
@@ -267,6 +288,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'&lt;&gt;\','+str(categ3)+'),(\'state\',\'&lt;&gt;\',\'draft\'),(\'state\',\'&lt;&gt;\',\'open\'),(\'state\',\'&lt;&gt;\',\'pending\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_all8">
         <field name="sequence" eval="1"/>
@@ -286,7 +310,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_all8"/>
     </record>
-    <menuitem  id="menu_crm_case_categ0_act_all8" action="crm_case_category_act_all8" parent="menu_crm_case_categ_act0"/>    <!-- 
+    <menuitem  id="menu_crm_case_categ0_act_all8" action="crm_case_category_act_all8" parent="menu_crm_case_categ_act0" groups="base.group_extended_menu"/>    <!-- 
         MY BUGS
     -->
     <record model="ir.actions.act_window" id="crm_case_category_act_my0">
@@ -296,6 +320,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid)]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my0">
         <field name="sequence" eval="1"/>
@@ -315,15 +342,16 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my0"/>
     </record>
-    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_categ0_act_my0" action="crm_case_category_act_my0"/>
+    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_categ0_act_my0" action="crm_case_category_act_my0" groups="base.group_extended_menu"/>
     
-        <record model="ir.actions.act_window" id="crm_case_categ_act_new">
+    <record model="ir.actions.act_window" id="crm_case_categ_act_new">
         <field name="name">New Bug</field>
         <field name="res_model">crm.case</field>
         <field name="view_type">form</field>
         <field name="view_mode">form,tree</field>
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view1_new">
         <field name="sequence" eval="1"/>
@@ -337,7 +365,7 @@
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_act_new"/>
     </record>    
-    <menuitem  id="menu_crm_case_categ_act_new" action="crm_case_categ_act_new" parent="menu_crm_case_bug_track"/>
+    <menuitem  id="menu_crm_case_categ_act_new" action="crm_case_categ_act_new" parent="menu_crm_case_bug_track" sequence="50"/>
     
     <record model="ir.actions.act_window" id="crm_case_category_act_my1">
         <field name="name">My Open Bugs</field>
@@ -346,6 +374,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my1">
         <field name="sequence" eval="1"/>
@@ -365,7 +396,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_my0" id="menu_crm_case_categ0_act_my1" action="crm_case_category_act_my1"/>
+    <menuitem parent="menu_crm_case_categ0_act_my0" id="menu_crm_case_categ0_act_my1" action="crm_case_category_act_my1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_my2">
         <field name="name">My Bugs With Patches</field>
@@ -374,6 +405,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'categ_id\',\'=\','+str(categ2)+'), (\'stage_id\',\'=\','+str(stage5)+'),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my2">
         <field name="sequence" eval="1"/>
@@ -393,7 +427,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my2"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my2" action="crm_case_category_act_my2"/>
+    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my2" action="crm_case_category_act_my2" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_my3">
         <field name="name">My Bugs Not Fixed</field>
@@ -402,6 +436,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'user_id\',\'=\',uid),(\'categ_id\',\'=\','+str(categ1)+'), (\'stage_id\',\'&lt;&gt;\','+str(stage2)+'),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_bugs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_my3">
         <field name="sequence" eval="1"/>
@@ -421,18 +458,20 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_my3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my3" action="crm_case_category_act_my3"/>
+    <menuitem parent="menu_crm_case_categ0_act_my1" id="menu_crm_case_categ0_act_my3" action="crm_case_category_act_my3" groups="base.group_extended_menu"/>
 
     <!-- 
         ALL FEATURE REQUESTS 
     -->
     <record model="ir.actions.act_window" id="crm_case_category_act_f0">
-        <field name="name">All Feature Request</field>
+        <field name="name">All Feature Requests</field>
         <field name="res_model">crm.case</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f0">
         <field name="sequence" eval="1"/>
@@ -461,6 +500,7 @@
         <field name="view_mode">form,tree</field>
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_f1">
         <field name="sequence" eval="1"/>
@@ -474,8 +514,7 @@
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f1"/>
     </record>
-    <menuitem parent="menu_crm_case_bug_track" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1"/>
-
+    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_category_act_f1" action="crm_case_category_act_f1" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f2">
         <field name="name">Feature Requests Waiting Approval</field>
@@ -484,6 +523,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'), (\'categ_id\',\'=\','+str(categ3)+'), (\'state\',\'=\',\'draft\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f2">
         <field name="sequence" eval="1"/>
@@ -503,7 +545,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f2"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f2" action="crm_case_category_act_f2"/>
+    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f2" action="crm_case_category_act_f2" groups="base.group_extended_menu"/>
     <record model="ir.actions.act_window" id="crm_case_category_act_f3">
         <field name="name">Open Feature Requests</field>
         <field name="res_model">crm.case</field>
@@ -511,6 +553,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'stage_id\',\'&lt;&gt;\','+str(stage7)+'),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f3">
         <field name="sequence" eval="1"/>
@@ -530,7 +575,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f3"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f3" action="crm_case_category_act_f3"/>
+    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f3" action="crm_case_category_act_f3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f4">
         <field name="name">Pending Feature Requests</field>
@@ -539,6 +584,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f4">
         <field name="sequence" eval="1"/>
@@ -558,7 +606,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f4"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f4" action="crm_case_category_act_f4"/>
+    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f4" action="crm_case_category_act_f4" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f5">
         <field name="name">Planned For Future Release</field>
@@ -567,6 +615,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\'),(\'stage_id\',\'=\','+str(stage7)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f5">
         <field name="sequence" eval="1"/>
@@ -586,7 +637,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f5"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f5" action="crm_case_category_act_f5"/>
+    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f5" action="crm_case_category_act_f5" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f6">
         <field name="name">Waiting For Reporter Response</field>
@@ -595,6 +646,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'=\',\'pending\'),(\'stage_id\',\'=\','+str(stage5)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f6">
         <field name="sequence" eval="1"/>
@@ -614,7 +668,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f6"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f6" action="crm_case_category_act_f6"/>
+    <menuitem parent="menu_crm_case_categ0_act_f4" id="menu_crm_case_categ0_act_f6" action="crm_case_category_act_f6" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_f7">
         <field name="name">Old Feature Requests</field>
@@ -623,6 +677,9 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support)+'),(\'categ_id\',\'=\','+str(categ3)+'),(\'state\',\'&lt;&gt;\',\'draft\'),(\'state\',\'&lt;&gt;\',\'open\'),(\'state\',\'&lt;&gt;\',\'pending\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_feature_request_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_f7">
         <field name="sequence" eval="1"/>
@@ -642,7 +699,7 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_f7"/>
     </record>
-    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7"/>
+    <menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7" groups="base.group_extended_menu"/>
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index c06909de707..a1908c0689e 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -36,53 +36,23 @@
                     <field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
                     <field name="priority" string="Severity"/>
 
-                    <separator colspan="4"/>
-                    <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-                    <form string="Resolution history">
-                        <group col="6" colspan="4">
-                            <field name="date"/>
-                            <field name="email" />
-                            <field name="canal_id" />
-                        </group>
-                        <newline/>
-                        <field name="description" colspan="4" nolabel="1" />
-                    </form>
-                    <tree string="Resolution history">
-                        <field name="description"/>
-                        <field name="email"/>
-                        <field name="date"/>
-                    </tree>
-                    </field>
-                    <group col="2" colspan="2" expand="1">
-                        <button name="add_reply" string="Add Last Mail for Replying"
-                            states="open" type="object" colspan="2"/>
-                        <field name="description" colspan="2" nolabel="1"/>
-                        <button name="case_log_reply"
-                            string="Send Partner &amp; Historize" states="open"
-                            type="object"/>
-                        <button name="case_log" string="Historize" states="open"
-                            type="object"/>
-                    </group>
-
+                    <newline/>
+                    <separator string= "Description" colspan="4"/>
+                    <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" />
-                         <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                        <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="Internal Notes">
-                    <separator string= "Notes" colspan="4"/>
-                    <field name="note" nolabel="1"/>
-                </page>
-                <page string="Extra Info">
-                    <field name="id" select="2"/>
+                <page string="History">
+                    <field name="id" select="1"/>
                     <field name="active" />
-                    <field name="email_cc" colspan="4"/>
                     <separator colspan="4" string="Dates"/>
                     <field name="create_date"/>
                     <field name="date_closed"/>
@@ -95,8 +65,6 @@
                     <separator colspan="4" string="References"/>
                     <field name="ref" colspan="4"/>
                     <field name="ref2" colspan="4"/>
-                </page>
-                <page string="History">
                     <field name="log_ids" nolabel="1" colspan="4">
                         <form string="Actions">
                             <separator string="Action Information" colspan="4"/>
@@ -108,6 +76,29 @@
                         </form>
                     </field>
                 </page>
+                <page string="Emails">
+                   <group colspan="4">
+                       <field colspan="4" name="email_cc" string="CC"/>
+                   </group>
+                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                        <form string="Communication history">
+                            <group col="6" colspan="4">
+                                <field name="date"/>
+                                <field name="email"/>
+                                <field name="canal_id"/>
+                            </group>
+                            <newline/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                           <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                           </form>
+                           <tree string="Communication history">
+                               <field name="description"/>
+                               <field name="email"/>
+                               <field name="date"/>
+                           </tree>
+                       </field>
+                       <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                 </page>                
                 </notebook>
             </form>
         </field>
@@ -127,10 +118,63 @@
                 <field name="category2_id" string="Version"/>
                 <field name="user_id"/>
                 <field name="state"/>
+                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
             </tree>
         </field>
     </record>
-    <record model="ir.ui.view" id="crm_case_calendar_view">
+
+    <record id="view_crm_case_bugs_filter" model="ir.ui.view">
+        <field name="name">crm.case.bugs.select</field>
+        <field name="model">crm.case</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Bugs">
+               <group col="5" colspan="1">
+                   <filter icon="gtk-execute" string="My Bugs" domain="[('user_id','=',uid)]" separator="1" help="Bugs Related to Current User"/>
+                   <filter icon="gtk-execute" string="Fixed Bugs" domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Fixed')]" separator="1" help="All Fixed Bugs"/>
+                   <filter icon="gtk-execute" string="Waiting Bugs" domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Awaiting Response')]" separator="1" help="All Waiting Bugs"/>
+                   <filter icon="gtk-execute" string="Future Bugs" domain="[('section_id.name','=','Bug Tracking'),('stage_id.name','=','Future')]" separator="1" help="All Future Bugs"/>
+               </group>
+               <group col="4" colspan="4">
+                   <field name="state" select="1">
+                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Bugs"/>
+                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Bugs"/>
+                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Bugs"/>
+                   </field>
+                   <field name="name" select='1'/>
+                   <field name="user_id" select="1" widget="selection"/>
+               </group>
+            </search>
+         </field>
+    </record>
+    
+    <record id="view_crm_case_feature_request_filter" model="ir.ui.view">
+        <field name="name">crm.case.feature.request.select</field>
+        <field name="model">crm.case</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Feature Request">
+               <group col='6' colspan='4'>
+                   <filter icon="gtk-execute" string="My Feature Request" domain="[('user_id','=',uid)]" separator="1" help="Feature Requests Related to Current User"/>
+                   <field name="state" select="1">
+                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Feature Request"/>
+                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Feature Request"/>
+                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Feature Request"/>
+                   </field>
+                   <separator orientation="vertical"/>
+                   <field name="name" select='1'/>
+                   <field name="user_id" select="1" widget="selection"/>
+               </group>
+           </search>
+        </field>
+     </record>        
+    
+     <record model="ir.ui.view" id="crm_case_calendar_view">
         <field name="name">CRM - Bug Tracker Calendar</field>
         <field name="model">crm.case</field>
         <field name="type">calendar</field>
diff --git a/addons/crm_configuration/crm_claims_menu.xml b/addons/crm_configuration/crm_claims_menu.xml
index 6dab67767e9..9f98aaeffcd 100644
--- a/addons/crm_configuration/crm_claims_menu.xml
+++ b/addons/crm_configuration/crm_claims_menu.xml
@@ -11,6 +11,8 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_claims_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_claims_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
         <field name="sequence" eval="1"/>
@@ -39,6 +41,9 @@
         <field name="view_mode">tree,form,calendar</field>
         <field name="view_id" ref="crm_case_claims_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid)]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_claims_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my1">
         <field name="sequence" eval="1"/>
@@ -58,7 +63,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my1"/>
     </record>
-    <menuitem name="My Claims" id="menu_crm_case_category_act_claim_my1" action="crm_case_category_act_claim_my1"  parent="menu_crm_case_claims"/>
+    <menuitem name="My Claims" id="menu_crm_case_category_act_claim_my1" action="crm_case_category_act_claim_my1"  parent="menu_crm_case_claims" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim1">
         <field name="name">Claims</field>
@@ -66,6 +71,7 @@
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_claim1">
         <field name="sequence" eval="1"/>
@@ -73,7 +79,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim1"/>
     </record>
-    <menuitem name="New Claim" id="menu_crm_case_categ0_act_claim" action="crm_case_category_act_claim1" parent="menu_crm_case_claims"/>
+    <menuitem name="New Claim" id="menu_crm_case_categ0_act_claim" action="crm_case_category_act_claim1" parent="menu_crm_case_claims" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2">
         <field name="name">My Unclosed Claims</field>
@@ -81,6 +87,9 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm_case_claims_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_claims_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my2">
         <field name="sequence" eval="1"/>
@@ -100,13 +109,15 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my2"/>
     </record>
-    <menuitem name="My Unclosed Claims" id="menu_crm_case_categ0_act_claim_my2" action="crm_case_category_act_claim_my2" parent="menu_crm_case_category_act_claim_my1"/>
+    <menuitem name="My Unclosed Claims" id="menu_crm_case_categ0_act_claim_my2" action="crm_case_category_act_claim_my2" parent="menu_crm_case_category_act_claim_my1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_my2_open">
         <field name="name">My Open Claims</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form</field>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_claims_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_my2_open">
         <field name="sequence" eval="1"/>
@@ -126,10 +137,10 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_my2_open"/>
     </record>
-    <menuitem name="My Open Claims" id="menu_crm_case_categ0_act_claim_my2_open" action="crm_case_category_act_claim_my2" parent="menu_crm_case_categ0_act_claim_my2"/>
+    <menuitem name="My Open Claims" id="menu_crm_case_categ0_act_claim_my2_open" action="crm_case_category_act_claim_my2_open" parent="menu_crm_case_categ0_act_claim_my2" groups="base.group_extended_menu"/>
 
     <!-- All Claims -->
-    <menuitem  name="All Claims" id="menu_crm_case_categ_claim0" action="crm_case_categ_claim0" parent="menu_crm_case_claims"/>
+    <menuitem  name="All Claims" id="menu_crm_case_categ_claim0" action="crm_case_categ_claim0" parent="menu_crm_case_claims" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_claim_all2">
         <field name="name">All Unclosed Claims</field>
@@ -137,6 +148,9 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm_case_claims_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_claims'))+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_claims_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_claim_all2">
         <field name="sequence" eval="1"/>
@@ -156,7 +170,7 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_category_act_claim_all2"/>
     </record>
-    <menuitem name="All Unclosed Claims" id="menu_crm_case_categ0_act_claim_all2" action="crm_case_category_act_claim_all2" parent="menu_crm_case_categ_claim0"/>
+    <menuitem name="All Unclosed Claims" id="menu_crm_case_categ0_act_claim_all2" action="crm_case_category_act_claim_all2" parent="menu_crm_case_categ_claim0" groups="base.group_extended_menu"/>
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index 525122140ab..b1464baad79 100644
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -18,6 +18,11 @@
                 <field name="date_closed"/>
                 <field name="planned_cost" string="Claim Cost"/>
                 <field name="state"/>
+                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
             </tree>
         </field>
     </record>
@@ -41,6 +46,7 @@
                             <field name="stage_id" select="1" nolabel="1"/>
                             <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
+                    <field name="case_id"/>                        
                 </group>
                 <notebook>
                 <page string="Claims Info">
@@ -50,63 +56,33 @@
                     <field name="partner_mobile"/>
                     <newline/>
                     <field name="planned_cost" string="Claim Cost"/>
-                    <field name="planned_revenue" string="Claim Revenue"/>
+                    <newline/>
                     <field name="priority"/>
                     <field name="category2_id" string="Type of Action" select="1"/>
                     <field name="ref"/>
                     <field name="ref2"/>
-                    <separator colspan="2" string="Claim Description"/>
-                    <separator colspan="2" string="Action Description"/>
-                    <field name="note" colspan="2" nolabel="1"/>
-                    <field name="description" colspan="2" nolabel="1"/>
-                    <label string="" colspan="2"/>
-                    <group colspan="2">
-                        <button name="case_log_reply"
-                            string="Send Partner &amp; Historize" states="open"
-                            type="object"/>
-                        <button name="case_log" string="Historize" states="open"
-                            type="object"/>
-                    </group>
+                    <separator colspan="4" string="Claim/Action Description"/>
+                    <field name="description" colspan="4" nolabel="1"/>
                     <separator colspan="4" string="Status"/>
                     <group col="8" colspan="4">
                         <field name="state" select="1"/> 
-                         <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                        <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="Extra Info" groups="base.group_extended">
-                    <field name="id" select="2"/>
+                <page string="History">
+                    <field name="id" select="1"/>
                     <field name="active"/>
-                    <field name="email_cc"/>
                     <field name="canal_id"/>
+                    <field name="som"/>                                        
                     <separator colspan="4" string="Dates"/>
                     <field name="create_date"/>
                     <field name="date_closed"/>
                     <field name="date_action_last"/>
                     <field name="date_action_next"/>
-                        <field name="som"/>
-                    <separator colspan="4" string="History"/>
-                    <field name="history_line" colspan="4" nolabel="1" mode="tree,form">
-                        <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                </page>
-                <page string="History">
                     <field name="log_ids" nolabel="1" colspan="4">
                         <form string="Actions">
                             <separator string="Action Information" colspan="4"/>
@@ -118,6 +94,42 @@
                         </form>
                     </field>
                 </page>
+                <page string="Events">
+                   <field name="child_ids" colspan="4" nolabel="1">
+                       <tree string="Related Cases">
+                           <field name="id"/>
+                           <field name="date"/>
+                           <field name="name"/>
+                           <field name="partner_id"/>
+                           <field name="user_id"/>
+                           <field name="section_id"/>
+                           <field name="state"/>
+                        </tree>
+                    </field>
+                </page>
+                <page string="Emails" groups="base.group_extended">
+                   <group colspan="4">
+                       <field colspan="4" name="email_cc" string="CC"/>
+                   </group>
+                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                        <form string="Communication history">
+                            <group col="6" colspan="4">
+                                <field name="date"/>
+                                <field name="email"/>
+                                <field name="canal_id"/>
+                            </group>
+                            <newline/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>                            
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                 </page>
                 </notebook>
             </form>
         </field>
@@ -137,5 +149,29 @@
         </field>
     </record>
 
-    </data>
+   <record id="view_crm_case_claims_filter" model="ir.ui.view">
+            <field name="name">crm.case.claims.select</field>
+            <field name="model">crm.case</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Claims">
+                   <group col="5" colspan="1">
+                       <filter icon="gtk-execute" string="My Claims" domain="[('user_id','=',uid)]" separator="1" help="Claims Related to Current User"/>
+                       <filter icon="gtk-execute" string="Fixed Claims" domain="[('section_id.name','=','Claims'),('stage_id.name','=','Fixed')]" separator="1" help="All Fixed Claims"/>
+                       <filter icon="gtk-execute" string="Waiting Claims" domain="[('section_id.name','=','Claims'),('stage_id.name','=','Awaiting Response')]" separator="1" help="All Waiting Claims"/>
+                       <filter icon="gtk-execute" string="Accepted Claims" domain="[('section_id.name','=','Claims'),('stage_id.name','=','Accepted as Claim')]" separator="1" help="All Accepted Claims"/>
+                   </group>
+                   <group col="4" colspan="4">
+                       <field name="state" select="1">
+                           <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Claims"/>
+                           <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Claims"/>
+                           <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Claims"/>
+                       </field>
+                       <field name="name" select='1'/>
+                       <field name="user_id" select="1" widget="selection"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+     </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index e4916f3551d..bc66e3354f3 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -68,12 +68,12 @@ class crm_cases(osv.osv):
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id)]"),
         'category2_id': fields.many2one('crm.case.category2', 'Category Name', domain="[('section_id','=',section_id)]"),
         'duration': fields.float('Duration'),
-        'note': fields.text('Note'),
         'case_id': fields.many2one('crm.case', 'Related Case'),
         'partner_name': fields.char('Employee Name', size=64),
         'partner_name2': fields.char('Employee Email', size=64),
         'partner_phone': fields.char('Phone', size=32),
         'partner_mobile': fields.char('Mobile', size=32),
+        'child_ids': fields.one2many('crm.case', 'case_id', 'Events'),        
     }
 
     def stage_next(self, cr, uid, ids, context={}):
@@ -119,7 +119,7 @@ class crm_menu_config_wizard(osv.osv_memory):
     _columns = {
         'name': fields.char('Name', size=64),
         'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
-        'lead': fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
+        'lead': fields.boolean('Prospect', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
         'opportunity': fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."),
         'jobs': fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."),
         'document_ics': fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),
diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml
index 03b70146083..a4066bdd47f 100644
--- a/addons/crm_configuration/crm_config_view.xml
+++ b/addons/crm_configuration/crm_config_view.xml
@@ -63,6 +63,20 @@
             </field>
         </record>
 
+        <!-- calendar view -->
+        <record id="crm_case_calendar_section-view" model="ir.ui.view">
+            <field name="name">crm.case.calendar.section</field>
+            <field name="model">crm.case</field>
+            <field name="type">calendar</field>
+            <field name="arch" type="xml">
+                <calendar color="section_id" date_start="date" date_stop="date_deadline" day_length="12" string="Cases">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="state"/>
+                </calendar>
+            </field>
+        </record>
+
     # ------------------------------------------------------ 
     # Stage
     # ------------------------------------------------------ 
diff --git a/addons/crm_configuration/crm_configuration_wizard.xml b/addons/crm_configuration/crm_configuration_wizard.xml
index 25a06d8364a..8bacfa6b68d 100644
--- a/addons/crm_configuration/crm_configuration_wizard.xml
+++ b/addons/crm_configuration/crm_configuration_wizard.xml
@@ -2,6 +2,12 @@
 <openerp>
     <data>
 
+       <wizard 
+           string="History of Events" 
+           name="crm.case.history.events" 
+           model="crm.case" 
+           id="wizard_case_history_event" />
+
         <wizard
             id="wizard_crm_partner_create"
             keyword="client_action_multi"
@@ -26,6 +32,13 @@
             multi="True"
             string="Convert To Opportunity"/>
 
+        <wizard
+            id="wizard_crm_reschedule_phone_call"
+            keyword="client_action_multi"
+            model="crm.case"
+            name="crm.case.reschedule_phone_call"
+            multi="True"
+            string="Schedule Phone Call" />
 
     </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_fund_menu.xml b/addons/crm_configuration/crm_fund_menu.xml
index daa87ab75c6..44df34c9f06 100644
--- a/addons/crm_configuration/crm_fund_menu.xml
+++ b/addons/crm_configuration/crm_fund_menu.xml
@@ -8,6 +8,8 @@
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_fund_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
         <field name="sequence" eval="1"/>
@@ -37,6 +39,9 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid)]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_fund_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my1">
         <field name="sequence" eval="1"/>
@@ -56,7 +61,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
     </record>
-    <menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise"/>
+    <menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1"  parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund1">
         <field name="name">Funds</field>
@@ -64,6 +69,7 @@
         <field name="view_mode">form,graph</field>
         <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund1">
         <field name="sequence" eval="2"/>
@@ -77,7 +83,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund1"/>
     </record>
-    <menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_category_act_fund_my1"/>
+    <menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_fund_raise" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_my2">
         <field name="name">My Funds Waiting Validation</field>
@@ -85,6 +91,9 @@
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_fund_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my2">
         <field name="sequence" eval="1"/>
@@ -104,7 +113,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
     </record>
-    <menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1"/>
+    <menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_my3">
         <field name="name">My Funds To Be Processed</field>
@@ -112,6 +121,9 @@
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_fund_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my3">
         <field name="sequence" eval="1"/>
@@ -131,10 +143,10 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
     </record>
-    <menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1"/>
+    <menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1" groups="base.group_extended_menu"/>
 
     <!-- All Funds -->
-    <menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise"/>
+    <menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all2">
         <field name="name">All Funds Waiting Validation</field>
@@ -142,6 +154,9 @@
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'draft\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_fund_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all2">
         <field name="sequence" eval="1"/>
@@ -161,7 +176,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
     </record>
-    <menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1"/>
+    <menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all3">
         <field name="name">All Funds To Be Processed</field>
@@ -169,6 +184,9 @@
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_fund_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all3">
         <field name="sequence" eval="1"/>
@@ -188,7 +206,7 @@
         <field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
     </record>
-    <menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1"/>
+    <menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1" groups="base.group_extended_menu"/>
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index e39a9a5d7c3..87919838797 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -19,6 +19,12 @@
                 <field name="probability"/>
                 <field name="user_id"/>
                 <field name="state"/>
+                <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
+                <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
+                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>                
             </tree>
         </field>
     </record>
@@ -49,63 +55,34 @@
                     <field name="planned_revenue"/>
                     <field name="probability"/>
                     <separator colspan="4" string="Description Information"/>
-                        <field name="note" nolabel="1" colspan="4"/>
+                        <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" select="2"/> 
-                         <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                        <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
+                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="Extra Info">
-                    <field name="id" select="2"/>
+                <page string="History">
+                    <field name="id" select="1"/>
                     <field name="active"/>
-                    <field name="email_cc"/>
                     <field name="priority" string="Priority"/>
+                    <newline/>
+                    <field name="canal_id"/>
+                    <field name="som"/>                    
                     <separator colspan="4" string="Dates"/>
                     <field name="create_date"/>
                     <field name="date_closed"/>
                     <field name="date_action_last"/>
                     <field name="date_action_next"/>
-                    <separator colspan="4"/>
-                    <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-                        <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <group col="2" colspan="2" expand="1">
-                        <field name="canal_id"/>
-                        <field name="som"/>
-                        <button name="add_reply" string="Add Last Mail for Replying"
-                            states="open" type="object" colspan="2"/>
-                        <field name="description" colspan="2" nolabel="1"/>
-                        <button name="case_log_reply"
-                            string="Send Partner &amp; Historize" states="open"
-                            type="object"/>
-                        <button name="case_log" string="Historize" states="open"
-                            type="object"/>
-                    </group>
-
                     <separator colspan="4" string="References"/>
                     <field name="ref" colspan="4"/>
                     <field name="ref2" colspan="4"/>
-                </page>
-                <page string="History">
+                
                     <field name="log_ids" nolabel="1" colspan="4">
                         <form string="Actions">
                             <separator string="Action Information" colspan="4"/>
@@ -117,6 +94,29 @@
                         </form>
                     </field>
                 </page>
+                 <page string="Emails">
+                   <group colspan="4">
+                       <field colspan="4" name="email_cc" string="CC"/>
+                   </group>
+                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                       <form string="Communication history">
+                            <group col="6" colspan="4">
+                                <field name="date"/>
+                                <field name="email"/>
+                                <field name="canal_id"/>
+                            </group>
+                            <newline/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>                            
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                 </page>
                 </notebook>
             </form>
         </field>
@@ -145,5 +145,26 @@
             </graph>
         </field>
     </record>
+    
+    <record id="view_crm_case_fund_filter" model="ir.ui.view">
+            <field name="name">crm.case.fund.select</field>
+            <field name="model">crm.case</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Funds">
+                   <group col='6' colspan='4'>
+                       <filter icon="gtk-execute" string="My Funds" domain="[('user_id','=',uid)]" separator="1" help="Funds Related to Current User"/>
+                       <field name="state" select="1">
+                           <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Funds"/>
+                           <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Funds"/>
+                           <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Funds"/>
+                       </field>
+                       <field name="name" select='1'/>
+                       <field name="user_id" select="1" widget="selection"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+        
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 8d408464f4e..7989897f927 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -10,6 +10,8 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm.crm_case_tree-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
         <field name="sequence" eval="1"/>
@@ -37,6 +39,9 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm.crm_case_tree-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid)]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
         <field name="sequence" eval="1"/>
@@ -57,7 +62,7 @@
         <field name="act_window_id" ref="crm_case_categ_help_act"/>
     </record>
     
-    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_my_act" action="crm_case_categ_help_act"/>
+    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_my_act" action="crm_case_categ_help_act" groups="base.group_extended_menu"/>
     
     <record model="ir.actions.act_window" id="crm_case_categ_help_new_act">
         <field name="name">New Helpdesk</field>
@@ -65,6 +70,7 @@
         <field name="view_mode">form,tree</field>
         <field name="view_id" ref="crm.crm_case-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view1">
         <field name="sequence" eval="2"/>
@@ -79,7 +85,7 @@
         <field name="act_window_id" ref="crm_case_categ_help_new_act"/>
     </record>
     
-    <menuitem parent="menu_help_support_main" id="menu_crm_case_categ_help_new_act" action="crm_case_categ_help_new_act" sequence="1"/>
+    <menuitem parent="menu_help_support_main" id="menu_crm_case_categ_help_new_act" action="crm_case_categ_help_new_act" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
         <field name="name">My Unclosed Requests</field>
@@ -87,6 +93,9 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm.crm_case_tree-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
     </record>
     
     <record model="ir.actions.act_window.view" id="action_crm_helpdesk_tree_view_my1">
@@ -110,7 +119,7 @@
         <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
     </record>
     
-    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1"/>    
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_my_helpdesk" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my2">
         <field name="name">My helpdesk Propositions to Review</field>
@@ -118,6 +127,9 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm.crm_case_tree-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my2">
         <field name="sequence" eval="1"/>
@@ -137,7 +149,7 @@
         <field name="view_id" ref="crm.crm_case-view"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my2"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk2" action="crm_case_helpdesk_act_my2"/>    
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk2" action="crm_case_helpdesk_act_my2" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my1">
         <field name="name">My Pending helpdesk Requests</field>
@@ -145,6 +157,9 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm.crm_case_tree-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my1">
         <field name="sequence" eval="1"/>
@@ -164,7 +179,7 @@
         <field name="view_id" ref="crm.crm_case-view"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my1"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk1" action="crm_case_helpdesk_act_my1"/>        
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk1" action="crm_case_helpdesk_act_my1" groups="base.group_extended_menu"/>                
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_my0">
         <field name="name">My Open Helpdesk Requests</field>
@@ -172,6 +187,9 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm.crm_case_tree-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my0">
         <field name="sequence" eval="1"/>
@@ -191,7 +209,7 @@
         <field name="view_id" ref="crm.crm_case-view"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_my0"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk0" action="crm_case_helpdesk_act_my0"/>    
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk0" action="crm_case_helpdesk_act_my0" groups="base.group_extended_menu"/>    
         
     
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_myhelpdesk">
@@ -200,6 +218,7 @@
         <field name="view_mode">calendar,tree,form</field>
         <field name="view_id" ref="crm.crm_case_calendar-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myhelpdesk">
         <field name="sequence" eval="1"/>
@@ -219,13 +238,13 @@
         <field name="view_id" ref="crm.crm_case-view"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_myhelpdesk"/>
     </record>    
-    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk" action="crm_case_helpdesk_act_myhelpdesk"/>
+    <menuitem parent="menu_crm_case_helpdesk_my_act" id="menu_crm_case_helpdesk_act_myhelpdesk" action="crm_case_helpdesk_act_myhelpdesk" groups="base.group_extended_menu"/>
     
     <!-- 
         ALL Helpdesk REQUESTS 
     -->
 
-    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111"/>    
+    <menuitem parent="menu_help_support_main" id="menu_crm_case_helpdesk_act_all" action="crm_case_helpdesk_act111" groups="base.group_extended_menu"/>        
     
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all3">
@@ -234,6 +253,9 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm.crm_case_tree-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'&lt;&gt;\',\'done\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all3">
         <field name="sequence" eval="1"/>
@@ -253,7 +275,7 @@
         <field name="view_id" ref="crm.crm_case-view"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all3"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all3" action="crm_case_helpdesk_act_all3"/>
+    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all3" action="crm_case_helpdesk_act_all3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all2">
         <field name="name">All Helpdesk Propositions</field>
@@ -261,6 +283,9 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm.crm_case_tree-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'draft\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all2">
         <field name="sequence" eval="1"/>
@@ -280,7 +305,7 @@
         <field name="view_id" ref="crm.crm_case-view"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all2"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all2" action="crm_case_helpdesk_act_all2"/>    
+    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all2" action="crm_case_helpdesk_act_all2" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all1">
         <field name="name">All Pending Helpdesk Requests</field>
@@ -288,6 +313,9 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm.crm_case_tree-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'pending\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all1">
         <field name="sequence" eval="1"/>
@@ -307,7 +335,7 @@
         <field name="view_id" ref="crm.crm_case-view"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all1"/>
     </record>
-    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all1" action="crm_case_helpdesk_act_all1"/>    
+    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all1" action="crm_case_helpdesk_act_all1" groups="base.group_extended_menu"/>        
 
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_all0">
@@ -316,6 +344,9 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm.crm_case_tree-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all0">
         <field name="sequence" eval="1"/>
@@ -335,7 +366,7 @@
         <field name="view_id" ref="crm.crm_case-view"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_all0"/>
     </record>
-    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all0" action="crm_case_helpdesk_act_all0"/>    
+    <menuitem  parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_all0" action="crm_case_helpdesk_act_all0" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act_allhelpdesk">
         <field name="name">Calendar of Helpdesk</field>
@@ -343,6 +374,7 @@
         <field name="view_mode">calendar,tree,form</field>
         <field name="view_id" ref="crm.crm_case_calendar-view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+'),(\'state\',\'=\',\'done\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_allhelpdesk">
         <field name="sequence" eval="1"/>
@@ -362,7 +394,7 @@
         <field name="view_id" ref="crm.crm_case-view"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act_allhelpdesk"/>
     </record>
-    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk" action="crm_case_helpdesk_act_allhelpdesk"/>
+    <menuitem parent="menu_crm_case_helpdesk_act_all" id="menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk" action="crm_case_helpdesk_act_allhelpdesk" groups="base.group_extended_menu"/>
     
     
 </data>
diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index 83ef45b370b..06762cae4a9 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -10,6 +10,8 @@
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
         <field name="sequence" eval="1"/>
@@ -49,6 +51,9 @@
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
         <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view1">
         <field name="sequence" eval="1"/>
@@ -74,7 +79,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act11"/>
     </record>
-    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act11" action="crm_case_categ0_act11"/>
+    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act11" action="crm_case_categ0_act11" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my_new3">
         <field name="name">New Job Request</field>
@@ -82,6 +87,7 @@
         <field name="view_mode">form,tree</field>
         <field name="view_id" ref="crm_case_form_view11"/>
         <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my3">
         <field name="sequence" eval="2"/>
@@ -107,6 +113,9 @@
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
         <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'in\',(\'pending\',\'open\',\'draft\')),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my3">
         <field name="sequence" eval="1"/>
@@ -132,7 +141,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_my3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs3" action="crm_case_categ0_act_my3"/>
+    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs3" action="crm_case_categ0_act_my3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my2">
         <field name="name">My Jobs Propositions to Review</field>
@@ -140,6 +149,9 @@
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
         <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my2">
         <field name="sequence" eval="1"/>
@@ -169,7 +181,7 @@
         parent="menu_crm_case_categ0_act_myjobs3"
         id="menu_crm_case_categ0_act_myjobs2"
         action="crm_case_categ0_act_my2"
-        groups="base.group_extended"/>
+        groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my1">
         <field name="name">My Pending Jobs Requests</field>
@@ -177,6 +189,9 @@
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
         <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my1">
         <field name="sequence" eval="1"/>
@@ -204,7 +219,7 @@
     </record>
     <menuitem parent="menu_crm_case_categ0_act_myjobs3"
         id="menu_crm_case_categ0_act_myjobs1" action="crm_case_categ0_act_my1"
-        groups="base.group_extended"/>
+        groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_my0">
         <field name="name">My Open Jobs Requests</field>
@@ -212,6 +227,9 @@
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
         <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my0">
         <field name="sequence" eval="1"/>
@@ -239,7 +257,7 @@
     </record>
     <menuitem parent="menu_crm_case_categ0_act_myjobs3" id="menu_crm_case_categ0_act_myjobs0"
         action="crm_case_categ0_act_my0"
-        groups="base.group_extended"/>
+        groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_myjobs">
         <field name="name">Calendar Of My Interviews</field>
@@ -247,6 +265,7 @@
         <field name="view_mode">calendar,tree,form,graph</field>
         <field name="view_id" ref="crm_case_calendar_view11"/>
         <field name="domain" eval="'[(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myjobs">
         <field name="sequence" eval="1"/>
@@ -272,7 +291,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_myjobs"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs"/>
+    <menuitem parent="menu_crm_case_categ0_act11" id="menu_crm_case_categ0_act_myjobs_myjobs" action="crm_case_categ0_act_myjobs" groups="base.group_extended_menu"/>
     
     <!-- 
         ALL JOBS REQUESTS 
@@ -286,6 +305,9 @@
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
         <field name="domain" eval="'[(\'state\',\'&lt;&gt;\',\'done\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all3">
         <field name="sequence" eval="1"/>
@@ -311,7 +333,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_all3" action="crm_case_categ0_act_all3"/>
+    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_all3" action="crm_case_categ0_act_all3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all2">
         <field name="name">All Jobs Propositions to Review</field>
@@ -319,6 +341,9 @@
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
         <field name="domain" eval="'[(\'state\',\'=\',\'draft\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all2">
         <field name="sequence" eval="1"/>
@@ -344,7 +369,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all2"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all2" action="crm_case_categ0_act_all2"/>    
+    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all2" action="crm_case_categ0_act_all2" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all1">
         <field name="name">All Pending Jobs Requests</field>
@@ -352,6 +377,9 @@
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
         <field name="domain" eval="'[(\'state\',\'=\',\'pending\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all1">
         <field name="sequence" eval="1"/>
@@ -377,7 +405,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all1" action="crm_case_categ0_act_all1"/>    
+    <menuitem parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all1" action="crm_case_categ0_act_all1" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_all0">
         <field name="name">All Open Jobs Requests</field>
@@ -385,6 +413,9 @@
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
         <field name="domain" eval="'[(\'state\',\'=\',\'open\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_jobs_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all0">
         <field name="sequence" eval="1"/>
@@ -410,7 +441,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_all0"/>
     </record>
-    <menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all0" action="crm_case_categ0_act_all0"/>    
+    <menuitem  parent="menu_crm_case_categ0_act_myjobs_all3" id="menu_crm_case_categ0_act_myjobs_all0" action="crm_case_categ0_act_all0" groups="base.group_extended_menu"/>        
 
     <record model="ir.actions.act_window" id="crm_case_categ0_act_alljobs">
         <field name="name">Calendar Of Interviews</field>
@@ -418,6 +449,7 @@
         <field name="view_mode">calendar,tree,form,graph</field>
         <field name="view_id" ref="crm_case_calendar_view11"/>
         <field name="domain" eval="'[(\'state\',\'=\',\'done\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_alljobs">
         <field name="sequence" eval="1"/>
@@ -443,7 +475,7 @@
         <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
         <field name="act_window_id" ref="crm_case_categ0_act_alljobs"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs"/>
+    <menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs" groups="base.group_extended_menu"/>
     
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index de1b7a2536f..4c3f1d8ed37 100644
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -21,6 +21,11 @@
                 <field name="priority" string="Appreciation"/>
                 <field name="user_id"/>
                 <field name="state"/>
+                <button name="case_close" string="Candidate Hired" states="open,draft,pending" type="object" icon="terp-partner"/>
+                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                <button name="case_cancel" string="Candidate Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
             </tree>
         </field>
     </record>
@@ -35,7 +40,7 @@
                     <field name="name" string="Description" colspan="2"/>
                     <field name="section_id" colspan="1"/>
                     <field name="user_id" string="Responsible" select="2"/>
-                    <button name="set_partner" string="Convert to Partner" icon="terp-sale"/>
+                    <button name="set_partner" string="Convert to Partner" icon="terp-partner"/>
                     <newline/>
                         <label string="Stage: " align="1.0"/>
                         <group colspan="1" col="2">
@@ -70,68 +75,63 @@
                         <separator colspan="4" string="Status"/>
                         <group col="8" colspan="4">
                             <field name="state" select="1"/> 
-                            <button name="case_close" string="Candidate Hired" states="open,draft,pending" type="object"/>
-                            <button name="case_open" string="Open" states="draft,pending" type="object"/>
-                            <button name="case_cancel" string="Candidate Refused" states="draft,open,pending" type="object"/>
-                            <button name="case_pending" string="Pending" states="draft,open" type="object"/>
-                            <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                            <button name="case_close" string="Candidate Hired" states="open,draft,pending" type="object" icon="terp-partner"/>
+                            <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                            <button name="case_cancel" string="Candidate Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                            <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                            <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                         </group>
-                   </page><page string="Communication">
-                        <separator colspan="4" string="Communication"/>
-                        <group col="2" colspan="4" expand="1">
-                            <field name="description" colspan="2" nolabel="1"/>
-                            <button name="case_log_reply"
-                                string="Send Candidate &amp; Historize" states="open"
-                                type="object" icon="terp-crm"/>
-                            <button name="case_log" string="Historize" states="open"
-                                type="object" icon="gtk-go-forward"/>
-                        </group>
-                         <field name="history_line" colspan="4" nolabel="1" mode="tree,form">
-                            <form string="Communication history">
-                                <group col="6" colspan="4">
-                                    <field name="date"/>
-                                    <field name="email"/>
-                                    <field name="canal_id"/>
-                                </group>
-                                <newline/>
-                                <field name="description" colspan="4" nolabel="1"/>
-                            </form>
-                            <tree string="Communication history">
-                                <field name="description"/>
-                                <field name="email"/>
+                   </page>
+                   <page string="Internal Notes">
+                       <field name="description" nolabel="1" colspan="4"/>
+                   </page>
+                   <page string="History">
+                       <field name="id" select="1"/>
+                       <field name="active"/>
+                       <field name="canal_id"/>
+                       <separator colspan="4" string="Dates"/>
+                       <field name="create_date"/>
+                       <field name="date_closed"/>
+                       <field name="date_action_last"/>
+                       <field name="date_action_next"/>
+                       <separator colspan="4" string="References"/>
+                       <field name="ref" colspan="4"/>
+                       <field name="ref2" colspan="4"/>
+                   
+                       <field name="log_ids" nolabel="1" colspan="4">
+                           <form string="Actions">
+                               <separator string="Action Information" colspan="4"/>
+                               <field name="name" colspan="4"/>
+                               <field name="date"/>
+                               <field name="user_id"/>
+                               <field name="som"/>
+                               <field name="canal_id"/>
+                           </form>
+                       </field>
+                   </page>
+                   <page string="Emails" groups="base.group_extended">
+                       <group colspan="4">
+                           <field colspan="4" name="email_cc" string="CC"/>
+                       </group>
+                       <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                        <form string="Communication history">
+                            <group col="6" colspan="4">
                                 <field name="date"/>
-                            </tree>
-                        </field>
-                </page>
-                <page string="Internal Notes">
-                    <field name="note" nolabel="1" colspan="4"/>
-                </page>
-                <page string="Extra Info">
-                    <field name="id" select="2"/>
-                    <field name="active"/>
-                    <field name="email_cc"/>
-                    <field name="canal_id"/>
-                    <separator colspan="4" string="Dates"/>
-                    <field name="create_date"/>
-                    <field name="date_closed"/>
-                    <field name="date_action_last"/>
-                    <field name="date_action_next"/>
-                    <separator colspan="4" string="References"/>
-                    <field name="ref" colspan="4"/>
-                    <field name="ref2" colspan="4"/>
-                </page>
-                <page string="History">
-                    <field name="log_ids" nolabel="1" colspan="4">
-                        <form string="Actions">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                            <field name="som"/>
-                            <field name="canal_id"/>
+                                <field name="email"/>
+                                <field name="canal_id"/>
+                            </group>
+                            <newline/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
                         </form>
+                        <tree string="Communication history">
+                           <field name="description"/>
+                           <field name="email"/>
+                           <field name="date"/>
+                        </tree>
                     </field>
-                </page>
+                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                 </page>                   
                 </notebook>
             </form>
         </field>
@@ -150,5 +150,31 @@
             </calendar>
         </field>
     </record>
+
+    <record id="view_crm_case_jobs_filter" model="ir.ui.view">
+            <field name="name">crm.case.jobs.select</field>
+            <field name="model">crm.case</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Jobs">
+                   <group col="5" colspan="1">
+                       <filter icon="gtk-execute" string="My Jobs" domain="[('user_id','=',uid)]" separator="1" help="Jobs Related to Current User"/>
+                       <filter icon="gtk-execute" string="Initial Jobs" domain="[('section_id.name','=','Jobs'),('stage_id.name','=','Initial Jobs Demand')]" separator="1" help="All Initial Jobs"/>
+                       <filter icon="gtk-execute" string="First Interview" domain="[('section_id.name','=','Jobs'),('stage_id.name','=','First Interview')]" separator="1" help="First Interview"/>
+                       <filter icon="gtk-execute" string="Second Interview" domain="[('section_id.name','=','Jobs'),('stage_id.name','=','Second Interview')]" separator="1" help="Second Interview"/>
+                   </group>
+                   <group col="4" colspan="4">
+                       <field name="state" select="1">
+                           <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Jobs"/>
+                           <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Jobs"/>
+                           <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Jobs"/>
+                       </field>
+                       <field name="name" select='1'/>
+                       <field name="user_id" select="1" widget="selection"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_lead_data.xml b/addons/crm_configuration/crm_lead_data.xml
index 521ba37377c..7f3106981ad 100644
--- a/addons/crm_configuration/crm_lead_data.xml
+++ b/addons/crm_configuration/crm_lead_data.xml
@@ -3,8 +3,8 @@
 <data noupdate="1">
 <!--        CASE SECTION        -->
     <record model="crm.case.section" id="section_support2">
-        <field name="name">Leads</field>
-        <field name="code">leads</field>
+        <field name="name">Prospects</field>
+        <field name="code">prospects</field>
     </record>
 
 <!--        CASE CATEGORY(categ_id)        -->    
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index b84646bad20..6127d36b35a 100644
--- a/addons/crm_configuration/crm_lead_menu.xml
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -6,11 +6,13 @@
 <!--        MENU        -->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
-        <field name="name">All Leads</field>
+        <field name="name">All Prospects</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
         <field name="sequence" eval="1"/>
@@ -24,15 +26,18 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
-    <menuitem parent="menu_presale" name="Leads" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all"/>
-    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_all" action="crm_case_category_act_leads_all"/>
+    <menuitem parent="menu_presale" name="Prospects" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all"/>
+    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_all" action="crm_case_category_act_leads_all" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all1">
-        <field name="name">Current Leads</field>
+        <field name="name">Current Prospects</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all1">
         <field name="sequence" eval="1"/>
@@ -46,14 +51,17 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all1" action="crm_case_category_act_leads_all1"/>
+    <menuitem parent="menu_crm_case_categ0_act_leads_all" id="menu_crm_case_categ0_act_leads_all1" action="crm_case_category_act_leads_all1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_unassigned">
-        <field name="name">Unassigned Leads</field>
+        <field name="name">Unassigned Prospects</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\'),(\'user_id\',\'=\',False)]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_unassigned">
         <field name="sequence" eval="1"/>
@@ -70,14 +78,18 @@
     <menuitem
         parent="menu_crm_case_categ0_act_leads_all"
         id="menu_crm_case_categ0_act_leads_unassigned"
-        action="crm_case_category_act_leads_unassigned"/>
+        action="crm_case_category_act_leads_unassigned"
+        groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all2">
-        <field name="name">All Draft Leads</field>
+        <field name="name">All Draft Prospects</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'draft\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all2">
         <field name="sequence" eval="1"/>
@@ -91,14 +103,17 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all2"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all2" action="crm_case_category_act_leads_all2"/>
+    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all2" action="crm_case_category_act_leads_all2" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all3">
-        <field name="name">All Open Leads</field>
+        <field name="name">All Prospects to Qualify</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all3">
         <field name="sequence" eval="1"/>
@@ -112,14 +127,17 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all3" action="crm_case_category_act_leads_all3"/>
+    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all3" action="crm_case_category_act_leads_all3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all4">
-        <field name="name">All Pending Leads</field>
+        <field name="name">All Pending Prospects</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'state\',\'=\',\'pending\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all4">
         <field name="sequence" eval="1"/>
@@ -133,15 +151,18 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all4"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all4" action="crm_case_category_act_leads_all4"/>
+    <menuitem parent="menu_crm_case_categ0_act_leads_all1" id="menu_crm_case_categ0_act_leads_all4" action="crm_case_category_act_leads_all4" groups="base.group_extended_menu"/>
 
 <!-- =================================================================== -->
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my">
-        <field name="name">My Leads</field>
+        <field name="name">My Prospects</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid)]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my">
         <field name="sequence" eval="1"/>
@@ -155,15 +176,16 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_my" action="crm_case_category_act_leads_my"/>
+    <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_categ0_act_leads_my" action="crm_case_category_act_leads_my" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my_new">
-        <field name="name">New Lead</field>
+        <field name="name">New Prospect</field>
         <field name="res_model">crm.case</field>
         <field name="view_type">form</field>
         <field name="view_mode">form,tree</field>
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_new">
         <field name="sequence" eval="2"/>
@@ -180,11 +202,14 @@
     <menuitem parent="menu_crm_case_categ0_act_leads" id="menu_crm_case_category_act_leads_my_new" action="crm_case_category_act_leads_my_new" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my1">
-        <field name="name">My Current Leads</field>
+        <field name="name">My Current Prospects</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'&lt;&gt;\',\'done\'),(\'state\',\'&lt;&gt;\',\'cancel\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my1">
         <field name="sequence" eval="1"/>
@@ -198,14 +223,17 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my1"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my1" action="crm_case_category_act_leads_my1"/>
+    <menuitem parent="menu_crm_case_categ0_act_leads_my" id="menu_crm_case_categ0_act_leads_my1" action="crm_case_category_act_leads_my1" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my3">
-        <field name="name">My Open Leads</field>
+        <field name="name">My Prospects to Qualify</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my3">
         <field name="sequence" eval="1"/>
@@ -219,14 +247,17 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my3"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my3" action="crm_case_category_act_leads_my3"/>
+    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my3" action="crm_case_category_act_leads_my3" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_my4">
-        <field name="name">My Pending Leads</field>
+        <field name="name">My Pending Prospects</field>
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_my4">
         <field name="sequence" eval="1"/>
@@ -240,18 +271,20 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_my4"/>
     </record>
-    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my4" action="crm_case_category_act_leads_my4"/>
+    <menuitem parent="menu_crm_case_categ0_act_leads_my1" id="menu_crm_case_categ0_act_leads_my4" action="crm_case_category_act_leads_my4" groups="base.group_extended_menu"/>
 
 <!--        REPORTS        -->
-    <menuitem name="Leads"  id="menu_action_report_crm_case_lead" parent="report_crm.next_id_64"/>    
+    <menuitem name="Prospects"  id="menu_action_report_crm_case_lead" parent="report_crm.next_id_64"/>    
 
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_user">
         <field name="res_model">report.crm.case.user</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
     </record>
-    <menuitem name="Cases by Leads and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>
+    <menuitem name="Cases by Prospects and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>
+    
 
 
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_categ">
@@ -259,22 +292,25 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
     </record>
-    <menuitem parent="menu_action_report_crm_case_lead" name="Cases by Leads and Type" action="action_report_crm_case_lead_categ" id="menu_action_report_crm_case_lead_categ"/>
+    <menuitem parent="menu_action_report_crm_case_lead" name="Cases by Prospects and Type" action="action_report_crm_case_lead_categ" id="menu_action_report_crm_case_lead_categ"/>
 
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_stage">
         <field name="res_model">report.crm.case.section.stage</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
     </record>
-    <menuitem name="Cases by Leads and Stage" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_stage" id="menu_action_report_crm_case_lead_stage"/>
+    <menuitem name="Cases by Prospects and Stage" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_stage" id="menu_action_report_crm_case_lead_stage"/>
 
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_stage">
         <field name="res_model">report.crm.case.section.categ.stage</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree</field>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <menuitem name="Cases by Section, Category and Stage" parent="menu_action_report_crm_case_lead"  action="action_report_crm_case_lead_categ_stage" id="menu_action_report_crm_case_lead_categ_stage"/>
 
@@ -283,6 +319,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree</field>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <menuitem name="Cases by Section, Category and Type" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_categ_categ2" id="menu_action_report_crm_case_lead_categ_categ2"/>
 
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 8a8e76916ff..eb171394414 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -3,31 +3,31 @@
 <data>
 
     # ------------------------------------------------------ 
-    # Leads
+    # Prospects
     # ------------------------------------------------------ 
 
     <record model="ir.ui.view" id="crm_case_form_view_leads">
-        <field name="name">CRM - Leads Form</field>
+        <field name="name">CRM - Prospects Form</field>
         <field name="model">crm.case</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Leads Form">
+            <form string="Prospects Form">
                 <group colspan="4" col="7">
-                    <field name="name" select="1" string="Lead Subject"/>
+                    <field name="name" select="1" string="Prospect Subject"/>
                     <field name="section_id" colspan="1"/>
-                        <label string="Stage: " align="1.0"/>
-                        <group colspan="1" col="2">
-                            <field name="stage_id" select="1" nolabel="1"/>
-                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                        </group>
-                    <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>
+                    <label string="Stage: " align="1.0"/>
+                    <group colspan="1" col="2">
+                        <field name="stage_id" select="1" nolabel="1"/>
+                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                    </group>
+                    <button string="Convert to Partner" icon="terp-partner" name="%(wizard_crm_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>
                     <field name="user_id" select="2"/>
-                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
+                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Prospect Source"/>
                     <field name="category2_id" string="Campaign Type" select="1"/>
-                    <button string="Convert to Opportunity" name="%(wizard_crm_opportunity_set)d" icon="gtk-go-forward" type="action"/>
+                    <button string="Convert to Opportunity" name="%(wizard_crm_opportunity_set)d" icon="gtk-index" type="action"/>
                 </group>
                 <notebook colspan="4">
-                <page string="Leads">
+                <page string="Prospects">
                     <separator string="Prospect Information" colspan="4"/>
                     <field name="partner_name" string="Prospect Name"/>
                     <field name="partner_name2" string="Contact Name"/>
@@ -40,69 +40,40 @@
 
                     <field name="priority" string="Priority"/>
                     <newline/>
-                    <separator colspan="4" string="Lead Details"/>
-                    <field name="note" nolabel="1" colspan="4"/>
+                    <separator colspan="4" string="Prospect Details"/>
+                    <field name="description" nolabel="1" colspan="4"/>
 
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" select="2"/> 
-                        <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                        <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
+                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
                     </group>
                  </page>
 
-                 <page string="Extra Info" groups="base.group_extended">
-                    <field name="id" select="2"/>
+                 <page string="History">
+                    <field name="id" select="1"/>
                     <field name="active" select="2"/>
-                    <field name="email_cc" colspan="2"/>
                     <newline/>
                     <field name="planned_revenue"/>
                     <field name="planned_cost"/>
                     <field name="probability"/>
+                    <newline/>                    
+                    <field name="canal_id"/>
+                    <field name="som"/>                    
                     <separator colspan="4" string="Dates"/>
                     <field name="create_date"/>
                     <field name="date_closed"/>
                     <field name="date_action_last"/>
                     <field name="date"/>
-                    <separator colspan="4"/>
-                    <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-                        <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <group col="2" colspan="2" expand="1">
-                        <field name="canal_id"/>
-                        <field name="som"/>
-                        <button name="add_reply" string="Add Last Mail for Replying"
-                            states="open" type="object" colspan="2"/>
-                        <field name="description" colspan="2" nolabel="1"/>
-                        <button name="case_log_reply"
-                            string="Send Prospect &amp; Historize" states="open"
-                            type="object"/>
-                        <button name="case_log" string="Historize" states="open"
-                            type="object"/>
-                    </group>
-
                     <separator colspan="4" string="References"/>
                     <field name="ref" colspan="4"/>
                     <field name="ref2" colspan="4"/>
-                 </page>
-                 <page string="History">
+                 
                     <field name="log_ids" nolabel="1" colspan="4">
                         <form string="Actions">
                             <separator string="Action Information" colspan="4"/>
@@ -114,40 +85,108 @@
                         </form>
                     </field>
                  </page>
+                 <page string="Events">
+                   <field name="child_ids" colspan="4" nolabel="1">
+                       <tree string="Related Cases">
+                           <field name="id"/>
+                           <field name="date"/>
+                           <field name="name"/>
+                           <field name="partner_id"/>
+                           <field name="user_id"/>
+                           <field name="section_id"/>
+                           <field name="state"/>
+                       </tree>
+                    </field>
+                 </page>
+                 <page string="Emails">
+                   <group colspan="4">
+                       <field colspan="4" name="email_cc" string="CC"/>
+                   </group>
+                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                        <form string="Communication history">
+                            <group col="6" colspan="4">
+                                <field name="date"/>
+                                <field name="email"/>
+                                <field name="canal_id"/>
+                            </group>
+                            <newline/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>                            
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                 </page>
                 </notebook>
             </form>
         </field>
     </record>
     <record model="ir.ui.view" id="crm_case_tree_view_leads">
-        <field name="name">CRM - Leads Tree</field>
+        <field name="name">CRM - Prospects Tree</field>
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads Tree"  colors="red:state=='open'">
+            <tree string="Prospects Tree"  colors="red:state=='open'">
                 <field name="id"/>
-                <field name="name" string="Lead Subject"/>
+                <field name="name" string="Prospect Subject"/>
                 <field name="partner_phone"/>
                 <field name="partner_name2" string="Contact Name"/>
                 <field name="stage_id"/>
-                <field name="categ_id" string="Lead Source"/>
+                <field name="categ_id" string="Prospects Source"/>
                 <field name="category2_id" string="Campaign Type"/>
                 <field name="user_id"/>
                 <field name="state"/>
+                <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
+                <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
+                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>                
             </tree>
         </field>
     </record>
     <record model="ir.ui.view" id="crm_case_calendar_view_leads">
-        <field name="name">CRM - Leads Calendar</field>
+        <field name="name">CRM - Prospects Calendar</field>
         <field name="model">crm.case</field>
         <field name="type">calendar</field>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
-            <calendar string="Meeting For Leads Generation" date_start="date" color="user_id" date_delay="duration">
+            <calendar string="Meeting For Prospects Generation" date_start="date" color="user_id" date_delay="duration">
                 <field name="name"/>
                 <field name="partner_name"/>
                 <field name="partner_name2"/>
             </calendar>
         </field>
     </record>
+
+    <record id="view_crm_case_leads_filter" model="ir.ui.view">
+        <field name="name">crm.case.leads.select</field>
+        <field name="model">crm.case</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Prospects">
+               <group col="5" colspan="1">
+                   <filter icon="gtk-execute" string="My Prospects" domain="[('user_id','=',uid)]" separator="1" help="Prospects Related to Current User"/>
+                   <filter icon="gtk-execute" string="Assigned Prospects" domain="[('section_id.name','=','Prospects'),('stage_id.name','=','Assigned')]" separator="1" help="All Assigned Prospects"/>
+                   <filter icon="gtk-execute" string="In Process Prospects" domain="[('section_id.name','=','Prospects'),('stage_id.name','=','In Process')]" separator="1" help="In Process Prospects"/>
+                   <filter icon="gtk-execute" string="Converted Prospects" domain="[('section_id.name','=','Prospects'),('stage_id.name','=','Converted')]" separator="1" help="Converted Prospects"/>
+               </group>
+               <group col="4" colspan="4">
+                   <field name="state" select="1">
+                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Prospects"/>
+                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Prospects"/>
+                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Prospects"/>
+                   </field>
+                   <field name="name" select='1'/>
+                   <field name="user_id" select="1" widget="selection"/>
+               </group>
+           </search>
+        </field>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_demo.xml b/addons/crm_configuration/crm_meeting_demo.xml
index 52622cd9ee4..d491e1449fd 100644
--- a/addons/crm_configuration/crm_meeting_demo.xml
+++ b/addons/crm_configuration/crm_meeting_demo.xml
@@ -12,7 +12,7 @@
 			<field name="partner_id" ref="base.res_partner_maxtor"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="note"/>
+			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
 			<field eval="&quot;open&quot;" name="state"/>
 			<field name="section_id" ref="crm_configuration.section_support1"/>
 			<field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
@@ -49,7 +49,7 @@
 			<field name="partner_id" ref="base.res_partner_3"/>
 			<field eval="&quot;1&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
-			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="note"/>
+			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
 			<field eval="&quot;done&quot;" name="state"/>
 			<field name="section_id" ref="crm_configuration.section_support1"/>
 			<field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
index 5d75c4be201..c918efacf76 100644
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -7,12 +7,13 @@
         name="Schedule a Meeting"
         res_model="crm.case"
         src_model="res.partner"
-        view_mode="calendar,tree,form"
+        view_mode="calendar,tree,form,gantt"
         context="{'default_partner_id': active_id, 'default_duration': 4.0}"
         domain="[('section_id','=','Meetings')]"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support1'))+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_partner">
@@ -33,12 +34,19 @@
         <field name="view_id" ref="crm_case_form_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
-
+	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_partner">
+        <field name="sequence" eval="3"/>
+        <field name="view_mode">gantt</field>
+        <field name="view_id" ref="crm_case_gantt_view_meet"/>
+        <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
+    </record>
 
     <record model="ir.actions.act_window" id="crm_case_categ_meet">
         <field name="res_model">crm.case</field>
-        <field name="view_mode">calendar,tree,form</field>
+        <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
         <field name="sequence" eval="1"/>
@@ -58,6 +66,12 @@
         <field name="view_id" ref="crm_case_form_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet"/>
     </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">gantt</field>
+        <field name="view_id" ref="crm_case_gantt_view_meet"/>
+        <field name="act_window_id" ref="crm_case_categ_meet"/>
+    </record>
     <menuitem parent="crm.menu_crm" name="Calendar" id="menu_crm_case_category_act_meetings"/>
 
     <!-- 
@@ -65,9 +79,12 @@
     -->
     <record model="ir.actions.act_window" id="crm_case_categ_meetmy">
         <field name="res_model">crm.case</field>
-        <field name="view_mode">calendar,tree,form,graph</field>
+        <field name="view_mode">calendar,tree,form,graph,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="domain" eval="'[(\'user_id\',\'=\',uid)]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_my">
         <field name="sequence" eval="1"/>
@@ -87,6 +104,12 @@
         <field name="view_id" ref="crm_case_form_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meetmy"/>
     </record>
+    <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_my">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">gantt</field>
+        <field name="view_id" ref="crm_case_gantt_view_meet"/>
+        <field name="act_window_id" ref="crm_case_categ_meetmy"/>
+    </record>
     <menuitem name="My Meetings" id="menu_crm_case_categ_meet_my" action="crm_case_categ_meetmy" parent="menu_crm_case_category_act_meetings"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_meetings">
@@ -94,7 +117,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_type">form</field>
         <field name="view_mode">form,tree</field>
-        <field name="context" eval="{'default_section_id':ref('section_support1')}"/>
+        <field name="context" eval="{'default_state':'open','default_section_id':ref('section_support1')}"/>
         <field name="view_id" ref="crm_case_form_view_meet"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetings">
@@ -124,9 +147,10 @@
         <field name="name">Next Meetings</field>
         <field name="res_model">crm.case</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar,form</field>
+        <field name="view_mode">tree,calendar,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="domain" eval="[('state','in',('pending','draft','open')),('date','>=',time.strftime('%Y-%m-%d'))]"/>
+        <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall3">
         <field name="sequence" eval="2"/>
@@ -146,6 +170,11 @@
         <field name="view_id" ref="crm_case_form_view_meet"/>
         <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
     </record>
-
+	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_view_meetall3">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">gantt</field>
+        <field name="view_id" ref="crm_case_gantt_view_meet"/>
+        <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
+    </record>
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index f0f43a107af..6f5ebcd9e88 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -21,88 +21,82 @@
                     <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)"/>
                 </group>
                 <notebook colspan="4">
-                <page string="Meeting">
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
-                    <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-                    <field name="email_from"/>
-                    <newline/>
-                    <field name="categ_id" select="2" on_change="onchange_categ_id(categ_id)"/>
-                    <field name="category2_id" select="1" string="Location"/>
-                    <separator string="Description" colspan="4"/>
-                    <field name="note"  nolabel="1" colspan="4" />
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state" select="2"/> 
-                        <button name="case_open" string="Confirm Meeting" states="draft,cancel,pending" type="object"/>
-                        <button name="case_cancel" string="Cancel Meeting" states="draft,open,pending" type="object"/>
-                        <button name="case_reset" string="Reset to Unconfirmed" states="done,open,cancel" type="object"/>
-                    </group>
-                </page>
-                <page string="Extra Info">
-                    <group colspan="4">
-                        <field name="id" select="2"/>
-                        <field name="active" select="2"/>
-                        <newline/>
-                        <field name="email_cc" colspan="1"/>
-                        <field name="date_deadline" select="2" string="Deadlines"/>
-                        <field name="priority" select="2"/>
-                        <newline/>
-
-                        <field name="planned_revenue"/>
-                        <field name="planned_cost"/>
-                        <field name="probability"/>
-                        <separator colspan="4" string="Dates"/>
-                        <field name="create_date"/>
-                        <field name="date_closed"/>
-                        <field name="date_action_last"/>
-                        <field name="date_action_next"/>
-                    </group>
-                    <separator colspan="4"/>
-                    <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-                        <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <group col="2" colspan="2" expand="1">
-                        <field name="canal_id"/>
-                        <field name="som"/>
-                        <button name="add_reply" string="Add Last Mail for Replying"
-                            states="open" type="object" colspan="2"/>
-                        <field name="description" colspan="2" nolabel="1"/>
-                        <button name="case_log_reply"
-                            string="Send Partner &amp; Historize" states="open"
-                            type="object"/>
-                        <button name="case_log" string="Historize" states="open"
-                            type="object"/>
-                    </group>
-                    
-                    <separator colspan="4" string="References"/>
-                    <field name="ref" colspan="4"/>
-                    <field name="ref2" colspan="4"/>
-                </page>
-                <page string="History">
-                    <field name="log_ids" nolabel="1" colspan="4">
-                        <form string="Actions">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                            <field name="som"/>
-                            <field name="canal_id"/>
-                        </form>
-                    </field>
-                </page>
+	                <page string="Meeting">
+	                    <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
+	                    <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
+	                    <field name="email_from"/>
+	                    <newline/>
+	                    <field name="categ_id" select="2" on_change="onchange_categ_id(categ_id)"/>
+	                    <field name="category2_id" select="1" string="Location"/>
+	                    <separator string="Description" colspan="4"/>
+	                    <field name="description" nolabel="1" colspan="4"/>
+	                    <separator colspan="4"/>
+	                    <group col="8" colspan="4">
+	                        <field name="state" select="2"/> 
+	                        <button name="case_open" string="Confirm Meeting" states="draft,cancel,pending" type="object" icon="terp-crm"/>
+	                        <button name="case_cancel" string="Cancel Meeting" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+	                        <button name="case_reset" string="Reset to Unconfirmed" states="done,open,cancel" type="object" icon="gtk-convert"/>
+	                    </group>
+	                </page>
+	                <page string="History">
+	                    <group colspan="4">
+	                        <field name="id" select="1"/>
+	                        <field name="active" select="2"/>
+	                        <newline/>
+	                        <field name="date_deadline" select="2" string="Deadlines"/>
+	                        <field name="priority" select="2"/>
+	                        <newline/>
+	
+	                        <field name="planned_revenue"/>
+	                        <field name="planned_cost"/>
+	                        <field name="probability"/>
+	                        <newline/>                        
+	                        <field name="canal_id"/>
+	                        <field name="som"/>                        
+	                        <separator colspan="4" string="Dates"/>
+	                        <field name="create_date"/>
+	                        <field name="date_closed"/>
+	                        <field name="date_action_last"/>
+	                        <field name="date_action_next"/>
+	                        <separator colspan="4" string="References"/>
+	                        <field name="ref" colspan="4"/>
+	                        <field name="ref2" colspan="4"/>
+	                    </group>                
+	
+	                    <field name="log_ids" nolabel="1" colspan="4">
+	                        <form string="Actions">
+	                            <separator string="Action Information" colspan="4"/>
+	                            <field name="name" colspan="4"/>
+	                            <field name="date"/>
+	                            <field name="user_id"/>
+	                            <field name="som"/>
+	                            <field name="canal_id"/>
+	                        </form>
+	                    </field>
+	                </page>
+	                <page string="Emails" groups="base.group_extended">
+	                    <group colspan="4">
+	                        <field colspan="4" name="email_cc" string="CC"/>
+	                    </group>
+	                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+	                       <form string="Communication history">
+	                           <group col="6" colspan="4">
+	                               <field name="date"/>
+	                               <field name="email"/>
+	                               <field name="canal_id"/>
+	                           </group>
+	                           <newline/>
+	                           <field name="description" colspan="4" nolabel="1"/>
+	                           <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+	                        </form>
+	                        <tree string="Communication history">
+	                            <field name="description"/>
+	                            <field name="email"/>
+	                            <field name="date"/>
+	                        </tree>
+	                    </field>
+	                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+	                </page>                
                 </notebook>
             </form>
         </field>
@@ -122,6 +116,9 @@
                 <field name="category2_id" string="Type"/>
                 <field name="user_id"/>
                 <field name="state"/>
+                <button name="case_open" string="Confirm Meeting" states="draft,cancel,pending" type="object" icon="terp-crm"/>
+                <button name="case_cancel" string="Cancel Meeting" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                <button name="case_reset" string="Reset to Unconfirmed" states="done,open,cancel" type="object" icon="gtk-convert"/>                
             </tree>
         </field>
     </record>
@@ -138,5 +135,40 @@
             </calendar>
         </field>
     </record>
-    </data>
+
+    <record id="crm_case_gantt_view_meet" model="ir.ui.view">
+        <field name="name">CRM - Meetings Gantt</field>
+        <field name="model">crm.case</field>
+        <field name="type">gantt</field>
+        <field name="arch" type="xml">
+            <gantt color="user_id" date_delay="duration" date_start="date" string="Meetings">
+               <level object="crm.case" link="id" domain="[]">
+                   <field name="name"/>
+                   <field name="partner_id"/>
+                </level>
+            </gantt>
+        </field>
+    </record>
+    <record id="view_crm_case_meetings_filter" model="ir.ui.view">
+        <field name="name">crm.case.meetings.select</field>
+        <field name="model">crm.case</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Meetings">
+               <group col="5" colspan="1">
+                   <filter icon="gtk-execute" string="My Meetings" domain="[('user_id','=',uid)]" help="Meetings Related to Current User"/>
+               </group>
+               <group col="4" colspan="4">
+                   <field name="state" select="1">
+                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Meetings"/>
+                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Meetings"/>
+                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Meetings"/>
+                   </field>
+                   <field name="name" select='1'/>
+                   <field name="user_id" select="1" widget="selection"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+     </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_opportunity_menu.xml b/addons/crm_configuration/crm_opportunity_menu.xml
index f312da8e072..120ed288f92 100644
--- a/addons/crm_configuration/crm_opportunity_menu.xml
+++ b/addons/crm_configuration/crm_opportunity_menu.xml
@@ -6,15 +6,11 @@
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <field name="name">All Opportunities</field>
           <field name="res_model">crm.case</field>
-          <field name="view_mode">tree,form,calendar,graph</field>
+          <field name="view_mode">tree,form,graph</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor11">
-          <field name="sequence" eval="3"/>
-          <field name="view_mode">calendar</field>
-          <field name="view_id" ref="crm_case_calendar_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
+          <field name="context" eval="{'default_state':'open'}"/>
+          <field name="search_view_id" ref="crm_configuration.view_crm_case_opportunities_filter"/>
      </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
           <field name="sequence" eval="1"/>
@@ -38,14 +34,17 @@
 
 
 <!--          MENU          -->
-     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11"/>
+     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor11" action="crm_case_category_act_oppor11" groups="base.group_extended_menu"/>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor1">
           <field name="name">All Open Opportunities</field>
           <field name="res_model">crm.case</field>
-          <field name="view_mode">tree,calendar,form,graph</field>
+          <field name="view_mode">tree,form,graph</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\')]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
+          <field name="filter" eval="True"/>
+          <field name="search_view_id" ref="crm_configuration.view_crm_case_opportunities_filter"/>
      </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor1">
           <field name="sequence" eval="1"/>
@@ -53,12 +52,6 @@
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor1"/>
      </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor1">
-          <field name="sequence" eval="2"/>
-          <field name="view_mode">calendar</field>
-          <field name="view_id" ref="crm_case_calendar_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor1"/>
-     </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor1">
           <field name="sequence" eval="3"/>
           <field name="view_mode">form</field>
@@ -71,15 +64,18 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor1"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor1" action="crm_case_category_act_oppor1"/>
+     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor1" action="crm_case_category_act_oppor1" groups="base.group_extended_menu"/>
 
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor_all2">
           <field name="name">All Unassigned Opportunities</field>
           <field name="res_model">crm.case</field>
-          <field name="view_mode">tree,calendar,form,graph</field>
+          <field name="view_mode">tree,form,graph</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'pending\'),(\'user_id\',\'=\',False)]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
+          <field name="filter" eval="True"/>
+          <field name="search_view_id" ref="crm_configuration.view_crm_case_opportunities_filter"/>
      </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor_all2">
           <field name="sequence" eval="1"/>
@@ -87,12 +83,6 @@
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
      </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor_all2">
-          <field name="sequence" eval="2"/>
-          <field name="view_mode">calendar</field>
-          <field name="view_id" ref="crm_case_calendar_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
-     </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor_all2">
           <field name="sequence" eval="3"/>
           <field name="view_mode">form</field>
@@ -105,22 +95,18 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor_all2"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor_all2" action="crm_case_category_act_oppor_all2"/>
+     <menuitem parent="menu_crm_case_categ0_act_oppor11" id="menu_crm_case_categ0_act_oppor_all2" action="crm_case_category_act_oppor_all2" groups="base.group_extended_menu"/>
 
 
 <!-- ======================================================== -->
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor22">
           <field name="name">My Opportunities</field>
           <field name="res_model">crm.case</field>
-          <field name="view_mode">tree,calendar,form,graph</field>
-          <field name="view_id" ref="crm_case_calendar_view_oppor"/>
+          <field name="view_mode">tree,form,graph</field>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'user_id\',\'=\',uid)]'"/>
-     </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor22">
-          <field name="sequence" eval="2"/>
-          <field name="view_mode">calendar</field>
-          <field name="view_id" ref="crm_case_calendar_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor22"/>
+          <field name="context" eval="{'default_state':'open'}"/>
+          <field name="filter" eval="True"/>
+          <field name="search_view_id" ref="crm_configuration.view_crm_case_opportunities_filter"/>
      </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor22">
           <field name="sequence" eval="1"/>
@@ -140,15 +126,16 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor22"/>
      </record>
-     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor22" action="crm_case_category_act_oppor22"/>
+     <menuitem parent="menu_crm_case_opp" id="menu_crm_case_categ0_act_oppor22" action="crm_case_category_act_oppor22" groups="base.group_extended_menu"/>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor">
           <field name="name">Opportunity</field>
           <field name="res_model">crm.case</field>
           <field name="view_type">form</field>
-          <field name="view_mode">form,tree,calendar</field>
+          <field name="view_mode">form,tree</field>
           <field name="view_id" ref="crm_case_form_view_oppor"/>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor">
           <field name="sequence" eval="1"/>
@@ -162,11 +149,6 @@
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor"/>
      </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_cal_view_oppor">
-          <field name="sequence" eval="3"/>
-          <field name="view_mode">calendar</field>
-          <field name="act_window_id" ref="crm_case_category_act_oppor"/>
-     </record>
      <menuitem name="New Opportunity"
         parent="menu_crm_case_opp"
         id="menu_crm_case_categ0_act_oppor"
@@ -176,9 +158,12 @@
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor2">
           <field name="name">My Open Opportunities</field>
           <field name="res_model">crm.case</field>
-          <field name="view_mode">tree,calendar,form,graph</field>
+          <field name="view_mode">tree,form,graph</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'open\'),(\'user_id\',\'=\',uid)]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
+          <field name="filter" eval="True"/>
+          <field name="search_view_id" ref="crm_configuration.view_crm_case_opportunities_filter"/>
      </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor2">
           <field name="sequence" eval="1"/>
@@ -186,12 +171,6 @@
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor2"/>
      </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor2">
-          <field name="sequence" eval="2"/>
-          <field name="view_mode">calendar</field>
-          <field name="view_id" ref="crm_case_calendar_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor2"/>
-     </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor2">
           <field name="sequence" eval="3"/>
           <field name="view_mode">form</field>
@@ -204,14 +183,17 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor2"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor2" action="crm_case_category_act_oppor2"/>
+     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor2" action="crm_case_category_act_oppor2" groups="base.group_extended_menu"/>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor_my2">
           <field name="name">My Pending Opportunities</field>
           <field name="res_model">crm.case</field>
-          <field name="view_mode">tree,calendar,form,graph</field>
+          <field name="view_mode">tree,form,graph</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+'),(\'state\',\'=\',\'pending\'),(\'user_id\',\'=\',uid)]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
+          <field name="filter" eval="True"/>
+          <field name="search_view_id" ref="crm_configuration.view_crm_case_opportunities_filter"/>
      </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor_my2">
           <field name="sequence" eval="1"/>
@@ -219,12 +201,6 @@
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
      </record>
-     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_oppor_my2">
-          <field name="sequence" eval="2"/>
-          <field name="view_mode">calendar</field>
-          <field name="view_id" ref="crm_case_calendar_view_oppor"/>
-          <field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
-     </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor_my2">
           <field name="sequence" eval="3"/>
           <field name="view_mode">form</field>
@@ -237,7 +213,7 @@
           <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor_my2"/>
      </record>
-     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor_my2" action="crm_case_category_act_oppor_my2"/>
+     <menuitem parent="menu_crm_case_categ0_act_oppor22" id="menu_crm_case_categ0_act_oppor_my2" action="crm_case_category_act_oppor_my2" groups="base.group_extended_menu"/>
 
 <!--          REPORTS               -->
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
@@ -245,6 +221,7 @@
           <field name="view_type">form</field>
           <field name="view_mode">graph,tree</field>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Opportunity" parent="report_crm.next_id_64" id="menu_action_report_crm_case_oppor"/>
      <menuitem name="Cases by Opportunities and User" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_user" id="menu_action_report_crm_case_oppor_user"/>
@@ -254,6 +231,7 @@
           <field name="view_type">form</field>
           <field name="view_mode">graph,tree</field>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities and Type"  parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ" id="menu_action_report_crm_case_oppor_categ"/>
 
@@ -262,6 +240,7 @@
           <field name="view_type">form</field>
           <field name="view_mode">graph,tree</field>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities and Stage" parent="menu_action_report_crm_case_oppor"  action="action_report_crm_case_oppor_stage" id="menu_action_report_crm_case_oppor_stage"/>
 
@@ -270,6 +249,7 @@
           <field name="view_type">form</field>
           <field name="view_mode">tree</field>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities, Category and Stage" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_stage" id="menu_action_report_crm_case_oppor_categ_stage"/>
 
@@ -278,6 +258,7 @@
           <field name="view_type">form</field>
           <field name="view_mode">tree</field>
           <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities, Category and Type" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_categ2" id="menu_action_report_crm_case_oppor_categ_categ2"/>
 
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 018f5d117d0..45ae181368a 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -16,14 +16,16 @@
                     <field name="name" select="1" string="Opportunity" colspan="2"/>
                     <field name="section_id" colspan="1"/>
                     <field name="user_id" select="2" string="Responsible"/>
+                    <button string="Schedule a Phone Call"
+                        name="%(wizard_crm_reschedule_phone_call)d" icon="gtk-redo" type="action" />                    
                         <newline/>
                         <label string="Sales Stage: " align="1.0"/>
                         <group colspan="1" col="2">
                         <field name="stage_id" select="1" nolabel="1"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
-                    <field name="date" string="Next Meeting"/>
-                    <field name="duration"/>
+                    <field name="date" string="Deadline"/>
+                    <field name="id" select="1"/>
                     <button string="Schedule Meeting" icon="terp-crm" name="%(wizard_crm_meeting)d" type="action"/>
                 </group>
                 <notebook colspan="4">
@@ -39,65 +41,34 @@
                     <field name="planned_cost"/>
                     <field name="probability"/>
                     <separator colspan="4" string="Description Information"/>
-                        <field name="note" nolabel="1" colspan="4"/>
+                        <field name="description" nolabel="1" colspan="4"/>
 
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" select="2"/> 
-                         <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                        <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                     </group>
                 </page>
 
-                <page string="Extra Info" groups="base.group_extended">
-                    <field name="id" select="2"/>
+                <page string="History">
                     <field name="active"/>
-                    <field name="email_cc" colspan="4"/>
+                    <field name="canal_id"/>
+                    <field name="som"/>
                     
                     <separator colspan="4" string="Dates"/>
                     <field name="create_date"/>
                     <field name="date_closed"/>
                     <field name="date_action_last"/>
                     <field name="date_action_next"/>
-                    <separator colspan="4"/>
-                    <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-                        <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <group col="2" colspan="2" expand="1">
-                        <field name="canal_id"/>
-                        <field name="som"/>
-                        <button name="add_reply" string="Add Last Mail for Replying"
-                            states="open" type="object" colspan="2"/>
-                        <field name="description" colspan="2" nolabel="1"/>
-                        <button name="case_log_reply"
-                            string="Send Partner &amp; Historize" states="open"
-                            type="object"/>
-                        <button name="case_log" string="Historize" states="open"
-                            type="object"/>
-                    </group>
-
                     <separator colspan="4" string="References"/>
                     <field name="ref" colspan="4"/>
                     <field name="ref2" colspan="4"/>
-                </page>
-                <page string="History">
+                
                     <field name="log_ids" nolabel="1" colspan="4">
                         <form string="Actions">
                             <separator string="Action Information" colspan="4"/>
@@ -109,6 +80,42 @@
                         </form>
                     </field>
                 </page>
+                 <page string="Events">
+                   <field name="child_ids" colspan="4" nolabel="1">
+                       <tree string="Related Cases">
+                           <field name="id"/>
+                           <field name="date"/>
+                           <field name="name"/>
+                           <field name="partner_id"/>
+                           <field name="user_id"/>
+                           <field name="section_id"/>
+                           <field name="state"/>
+                       </tree>
+                    </field>
+                 </page>
+                 <page string="Emails">
+                   <group colspan="4">
+                       <field colspan="4" name="email_cc" string="CC"/>
+                   </group>
+                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                        <form string="Communication history">
+                            <group col="6" colspan="4">
+                                <field name="date"/>
+                                <field name="email"/>
+                                <field name="canal_id"/>
+                            </group>
+                            <newline/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>                            
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                 </page>
                 </notebook>
             </form>
         </field>
@@ -125,22 +132,40 @@
                 <field name="partner_id" string="Partner"/>
                 <field name="planned_revenue"/>
                 <field name="probability"/>
-                <field name="date" string="Next Meeting"/>
+                <field name="date" string="Deadline"/>
                 <field name="user_id"/>
                 <field name="state"/>
+                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
+                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
             </tree>
         </field>
     </record>
-    <record model="ir.ui.view" id="crm_case_calendar_view_oppor">
-        <field name="name">CRM - Opportunities Calendar</field>
+    <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
+        <field name="name">crm.case.opportunities.select</field>
         <field name="model">crm.case</field>
-        <field name="type">calendar</field>
-        <field name="priority" eval="2"/>
+        <field name="type">search</field>
         <field name="arch" type="xml">
-            <calendar string="Opportunities" date_start="date" color="user_id" date_delay="duration">
-                <field name="name"/>
-                <field name="partner_id"/>
-            </calendar>
+            <search string="Search Opportunities">
+               <group col="5" colspan="1">
+                   <filter icon="gtk-execute" string="My Opportunities" domain="[('user_id','=',uid)]" separator="1" help="Opportunities Related to Current User"/>
+                   <filter icon="gtk-execute" string="Prospecting" domain="[('section_id.name','=','Opportunities'),('stage_id.name','=','Prospecting')]" separator="1" help="All Prospecting Prospects"/>
+                   <filter icon="gtk-execute" string="Proposition" domain="[('section_id.name','=','Opportunities'),('stage_id.name','=','Value Proposition')]" separator="1" help="Value Proposition Prospects"/>
+                   <filter icon="gtk-execute" string="Analysis" domain="[('section_id.name','=','Opportunities'),('stage_id.name','=','Needs Analysis')]" separator="1" help="Needs Analysis Prospects"/>
+                   </group>
+               <group col="4" colspan="4">
+                   <field name="state" select="1">
+                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Opportunities"/>
+                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Opportunities"/>
+                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Opportunities"/>
+                   </field>
+                   <field name="name" select='1'/>
+                   <field name="user_id" select="1" widget="selection"/>
+                   </group>
+           </search>
         </field>
     </record>
 </data>
diff --git a/addons/crm_configuration/crm_phonecall_menu.xml b/addons/crm_configuration/crm_phonecall_menu.xml
index d072e0669f6..16e9f552e52 100644
--- a/addons/crm_configuration/crm_phonecall_menu.xml
+++ b/addons/crm_configuration/crm_phonecall_menu.xml
@@ -22,6 +22,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+')]'"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone0">
         <field name="sequence" eval="1"/>
@@ -50,6 +51,8 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_inbound_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
         <field name="sequence" eval="1"/>
@@ -78,6 +81,7 @@
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming1">
         <field name="sequence" eval="2"/>
@@ -91,7 +95,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming1"/>
     </record>
-    <menuitem name="New Incoming Call" id="menu_crm_case_categ_phone_incoming1"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming1"/>
+    <menuitem name="New Incoming Call" id="menu_crm_case_categ_phone_incoming1"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming1" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming2">
         <field name="name">Planned Calls</field>
@@ -99,7 +103,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+'), (\'state\',\'=\',\'\open\')]'"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone1'))+'), (\'state\',\'=\',\'open\')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_inbound_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming2">
         <field name="sequence" eval="1"/>
@@ -119,7 +126,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming2"/>
     </record>
-    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_incoming2"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming2"/>
+    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_incoming2"  parent="menu_crm_case_categ_phone_incoming0" action="crm_case_categ_phone_incoming2" groups="base.group_extended_menu"/>
 
 ################################################################
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
@@ -129,6 +136,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_outbound_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
         <field name="sequence" eval="1"/>
@@ -170,7 +178,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing1"/>
     </record>
-    <menuitem name="New Outgoing Call" id="menu_crm_case_categ_phone_outgoing1"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing1"/>
+    <menuitem name="New Outgoing Call" id="menu_crm_case_categ_phone_outgoing1"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing1" sequence="50"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing2">
         <field name="name">Planned Calls</field>
@@ -178,7 +186,9 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+'), (\'state\',\'=\',\'open\')]'"/>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+'), (\'state\',\'=\',\'draft\')]'"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_outbound_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing2">
         <field name="sequence" eval="1"/>
@@ -198,7 +208,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing2"/>
     </record>
-    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_outgoing2"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing2"/>
+    <menuitem name="Planned Calls" id="menu_crm_case_categ_phone_outgoing2"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing2" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing4">
         <field name="name">Calls Not Held</field>
@@ -207,6 +217,8 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_phone'))+'), (\'categ_id\',\'=\','+str(ref('categ_phone2'))+'), (\'state\',\'=\',\'pending\')]'"/>
+        <field name="filter" eval="True"/>
+        <field name="search_view_id" ref="crm_configuration.view_crm_case_outbound_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing4">
         <field name="sequence" eval="1"/>
@@ -226,7 +238,7 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing4"/>
     </record>
-    <menuitem name="Calls Not Held" id="menu_crm_case_categ_phone_outgoing4"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing4"/>
+    <menuitem name="Calls Not Held" id="menu_crm_case_categ_phone_outgoing4"  parent="menu_crm_case_categ_phone_outgoing0" action="crm_case_categ_phone_outgoing4" groups="base.group_extended_menu"/>
 
 </data>
 </openerp>
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index af73dfc8907..8b7a0605754 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -19,6 +19,11 @@
                 <field name="date" string="Date"/>
                 <field name="user_id" string="Assigned to"/>
                 <field name="state"/>
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
+                <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
             </tree>
         </field>
     </record>
@@ -29,14 +34,22 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Claims">
-                <group colspan="4" col="6">
+                <group colspan="4" col="7">
                     <field name="name" string="Subject"/>
                     <field name="section_id" colspan="1"/>
                     <field name="user_id" string="Assigned to" select="2"/>
+                    <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>                    
                     <newline/>
-                    <field name="date" string="Date"/>
+                    <field name="date" string="Planned Date"/>
                     <field name="duration"/>
-                    <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)"/>
+                    <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)" 
+                    context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
+                           'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
+                           'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}"/>
+                    <button string="Convert to Opportunity" name="%(wizard_crm_opportunity_set)d" icon="gtk-index" type="action"/>
+                    <label string='' colspan='6' />
+                    <button string="Schedule a Phone Call"
+                        name="%(wizard_crm_reschedule_phone_call)d" icon="gtk-redo" type="action" />
                 </group>
                 <notebook colspan="4">
                 <page string="General">
@@ -51,20 +64,19 @@
                     <field name="som"/>
                     <field name="priority" string="Relevant"/>
                     <separator string= "Description" colspan="4"/>
-                    <field name="note" nolabel="1" colspan="4"/>
+                    <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" select="1"/> 
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object"/>
-                        <button name="case_pending" string="Not Held" states="open" type="object"/>
-                        <button name="case_close" string="Held" states="open,draft,pending" type="object"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
+                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                        <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
+                        <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="Extra Info" groups="base.group_extended">
-                    <field name="id" select="2" colspan="4"/>
-                    <field name="email_cc"/>
+                <page string="History">
+                    <field name="id" select="1"/>
                     <field name="canal_id"/>
                     <separator colspan="4" string="Dates"/>
                     <field name="create_date"/>
@@ -74,38 +86,9 @@
                     <field name="planned_cost"/>
                     <field name="planned_revenue"/>
                     <field name="probability"/>
-                    <separator colspan="4"/>
-                    <field name="history_line" colspan="2" nolabel="1" mode="tree,form">
-                        <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email"/>
-                                <field name="canal_id"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <group col="2" colspan="2" expand="1">
-                        <button name="add_reply" string="Add Last Mail for Replying"
-                            states="open" type="object" colspan="2"/>
-                        <field name="description" colspan="2" nolabel="1"/>
-                        <button name="case_log_reply"
-                            string="Send Partner &amp; Historize" states="open"
-                            type="object"/>
-                        <button name="case_log" string="Historize" states="open"
-                            type="object"/>
-                    </group>
                     <separator colspan="4" string="References"/>
                     <field name="ref" colspan="4"/>
                     <field name="ref2" colspan="4"/>
-                </page>
-                <page string="History">
                     <field name="log_ids" nolabel="1" colspan="4">
                         <form string="Actions">
                             <separator string="Action Information" colspan="4"/>
@@ -117,8 +100,31 @@
                         </form>
                     </field>
                 </page>
-                </notebook>
-            </form>
+                <page string="Emails" groups="base.group_extended">
+                    <group colspan="4">
+                        <field colspan="4" name="email_cc" string="CC"/>
+                    </group>
+                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                       <form string="Communication history">
+                           <group col="6" colspan="4">
+                               <field name="date"/>
+                               <field name="email"/>
+                               <field name="canal_id"/>
+                           </group>
+                           <newline/>
+                           <field name="description" colspan="4" nolabel="1"/>
+                           <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                </page>                                    
+               </notebook>
+           </form>
         </field>
     </record>
 
@@ -134,6 +140,79 @@
                 <field name="categ_id"/>
             </calendar>
         </field>
-    </record>    
+    </record>
+        
+    <record id="view_crm_case_phonecalls_filter" model="ir.ui.view">
+        <field name="name">crm.case.phonecalls.select</field>
+        <field name="model">crm.case</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Phonecalls">
+               <group col="4" colspan="1">
+                   <filter icon="gtk-execute" string="My Phonecalls" domain="[('user_id','=',uid)]" separator="1" help="Phonecalls Related to Current User"/>
+                   <filter icon="gtk-execute" string="Inbound Phonecalls" domain="[('section_id.name','=','Phone Calls'),('categ_id.name','=','Inbound')]" separator="1" help="All Inbound Phonecalls"/>
+                   <filter icon="gtk-execute" string="Outbound Phonecalls" domain="[('section_id.name','=','Phone Calls'),('categ_id.name','=','Outbound')]" separator="1" help="All Outbound Phonecalls"/>
+                   </group>
+               <group col="4" colspan="4">
+                   <field name="state" select="1">
+                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Phonecalls"/>
+                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Phonecalls"/>
+                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Phonecalls"/>
+                   </field>
+                   <field name="name" select='1'/>
+                   <field name="user_id" select="1" widget="selection"/>
+                   </group>
+           </search>
+        </field>
+    </record>
+    
+    <record id="view_crm_case_inbound_phonecalls_filter" model="ir.ui.view">
+        <field name="name">crm.case.inbound.phonecalls.select</field>
+        <field name="model">crm.case</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Inbound Phonecalls">
+               <group col="4" colspan="1">
+                   <filter icon="gtk-execute" string="My Inbound Phonecalls" domain="[('user_id','=',uid),('categ_id.name','=','Inbound')]" separator="1" help="Inbound Phonecalls Related to Current User"/>
+                   <filter icon="gtk-execute" string="Planned" domain="[('section_id.name','=','Phone Calls'),('stage_id.name','=','Planned')]" separator="1" help="All Planned Inbound Phonecalls"/>
+                   <filter icon="gtk-execute" string="Not Held" domain="[('section_id.name','=','Phone Calls'),('stage_id.name','=','Not Held')]" separator="1" help="All Not Held Inbound Phonecalls"/>
+                   </group>
+               <group col="4" colspan="4">
+                   <field name="state" select="1">
+                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Inbound Phonecalls"/>
+                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Inbound Phonecalls"/>
+                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Inbound Phonecalls"/>
+                   </field>
+                   <field name="name" select='1'/>
+                   <field name="user_id" select="1" widget="selection"/>
+                   </group>
+           </search>
+        </field>
+    </record>
+    
+    <record id="view_crm_case_outbound_phonecalls_filter" model="ir.ui.view">
+        <field name="name">crm.case.outbound.phonecalls.select</field>
+        <field name="model">crm.case</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Outbound Phonecalls">
+               <group col="4" colspan="1">
+                   <filter icon="gtk-execute" string="My Outbound Phonecalls" domain="[('user_id','=',uid),('categ_id.name','=','Outbound')]" separator="1" help="Outbound Phonecalls Related to Current User"/>
+                   <filter icon="gtk-execute" string="Planned" domain="[('section_id.name','=','Phone Calls'),('stage_id.name','=','Planned')]" separator="1" help="All Planned Outbound Phonecalls"/>
+                   <filter icon="gtk-execute" string="Not Held" domain="[('section_id.name','=','Phone Calls'),('stage_id.name','=','Not Held')]" separator="1" help="All Not Held Outbound Phonecalls"/>
+                   </group>
+               <group col="4" colspan="4">
+                   <field name="state" select="1">
+                       <filter icon="terp-crm" domain="[('state','=','draft')]" help="Draft Outbound Phonecalls"/>
+                       <filter icon="terp-crm" domain="[('state','=','open')]" help="Open Outbound Phonecalls"/>
+                       <filter icon="terp-crm" domain="[('state','=','pending')]" help="Pending Outbound Phonecalls"/>
+                   </field>
+                   <field name="name" select='1'/>
+                   <field name="user_id" select="1" widget="selection"/>
+                   </group>
+           </search>
+        </field>
+    </record>
+        
     </data>
 </openerp>
diff --git a/addons/crm_configuration/process/crm_configuration_process.xml b/addons/crm_configuration/process/crm_configuration_process.xml
index 048e7101a87..6fb1533c7b0 100755
--- a/addons/crm_configuration/process/crm_configuration_process.xml
+++ b/addons/crm_configuration/process/crm_configuration_process.xml
@@ -19,7 +19,7 @@
 		<record id="process_node_leads0" model="process.node">
 			<field name="model_id" ref="crm.model_crm_case"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Leads&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Prospects&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Very first contact with new prospect&quot;&quot;&quot;" name="note"/>
 			<field name="process_id" ref="process_process_contractprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
@@ -63,8 +63,8 @@
 		<record id="process_transition_leadopportunity0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Lead Opportunity&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Creating business opportunities from leads&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Prospect Opportunity&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Creating business opportunities from prospects&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_opportunities0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_leads0"/>
 		</record>
@@ -72,7 +72,7 @@
 		<record id="process_transition_leadpartner0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Lead Partner&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Prospect Partner&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Prospect is converting to business partner&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_partner0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_leads0"/>
diff --git a/addons/crm_configuration/report/crm_report.py b/addons/crm_configuration/report/crm_report.py
index 1d1b6753a46..c05e3af63e7 100644
--- a/addons/crm_configuration/report/crm_report.py
+++ b/addons/crm_configuration/report/crm_report.py
@@ -26,7 +26,7 @@ import tools.sql
 AVAILABLE_STATES = [
     ('draft','Draft'),
     ('open','Open'),
-    ('cancel', 'Canceled'),
+    ('cancel', 'Cancelled'),
     ('done', 'Closed'),
     ('pending','Pending')
 ]
diff --git a/addons/crm_configuration/wizard/__init__.py b/addons/crm_configuration/wizard/__init__.py
index 3fbc5f7ef54..3be034d69c5 100644
--- a/addons/crm_configuration/wizard/__init__.py
+++ b/addons/crm_configuration/wizard/__init__.py
@@ -23,4 +23,6 @@
 import meeting_planify
 import wizard_partner_create
 import wizard_opportunity_set
+import schedule_phone_call
+import wizard_history_event
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_configuration/wizard/meeting_planify.py b/addons/crm_configuration/wizard/meeting_planify.py
index f2044987ac3..1fad9f9770f 100644
--- a/addons/crm_configuration/wizard/meeting_planify.py
+++ b/addons/crm_configuration/wizard/meeting_planify.py
@@ -50,14 +50,48 @@ class make_meeting(wizard.interface):
 
     def _makeMeeting(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
-
         case_obj = pool.get('crm.case')
-        new_id = case_obj.write(cr, uid, data['id'], {
+        sec_obj = pool.get('crm.case.section')
+        meeting_id = sec_obj.search(cr, uid, [('code','=','Mtngs')])
+        if not meeting_id:
+            raise wizard.except_wizard(_('Error !'),
+                _('You did not installed the Meetings when you configured the crm_configuration module.' \
+                  '\nyou must create a section with the code \'Mtngs\'.'
+                  ))
+        for case in case_obj.browse(cr, uid, data['ids']):
+            new_id=case_obj.copy(cr, uid, case.id)
+            modif = {
             'date': data['form']['date'],
-            'duration': data['form']['duration']
-        }, context=context)
-        case_obj._history(cr, uid, case_obj.browse(cr, uid, [data['id']]), _('meeting'))
-        return {}
+            'duration': data['form']['duration'],
+            'case_id': case.id,
+            }
+            if meeting_id:
+                modif['section_id']=meeting_id[0]
+            new_id = case_obj.write(cr, uid, [new_id], modif, context=context)
+#        case_obj._history(cr, uid, case_obj.browse(cr, uid, data['ids']), _('meeting'))
+        data_obj = pool.get('ir.model.data')
+        result = data_obj._get_id(cr, uid, 'crm_configuration', 'view_crm_case_meetings_filter')
+        id = data_obj.read(cr, uid, result, ['res_id'])
+        id1 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_calendar_view_meet')
+        id2 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_form_view_meet')
+        id3 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_tree_view_meet')
+        if id1:
+            id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        return {
+            'domain':"[('section_id','=','Meetings')]",
+            'name': _('Meetings'),
+            'view_type': 'form',
+            'view_mode': 'calendar,form,tree',
+            'res_model': 'crm.case',
+            'view_id': False,
+            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
+            }
 
     states = {
         'init': {
diff --git a/addons/crm_configuration/wizard/schedule_phone_call.py b/addons/crm_configuration/wizard/schedule_phone_call.py
new file mode 100644
index 00000000000..53da7f3bf11
--- /dev/null
+++ b/addons/crm_configuration/wizard/schedule_phone_call.py
@@ -0,0 +1,128 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from mx.DateTime import now
+
+import wizard
+import netsvc
+import ir
+import pooler
+import time
+
+from tools.translate import _
+
+case_form = """<?xml version="1.0"?>
+<form string="Schedule Phone Call">
+    <separator string="Phone Call Description" colspan="2" />
+    <newline />
+    <field name='user_id' />
+    <field name='deadline' />
+    <newline />
+    <field name='note' colspan="4"/>
+    <newline />
+    <field name='section_id' />    
+    <field name='category_id' domain="[('section_id','=',section_id)]"/>
+</form>"""
+
+case_fields = {
+    'user_id' : {'string' : 'Assign To', 'type' : 'many2one', 'relation' : 'res.users'},
+    'deadline' : {'string' : 'Planned Date', 'type' : 'datetime', 'required' : True},
+    'note' : {'string' : 'Goals', 'type' : 'text'},
+    'category_id' : {'string' : 'Category', 'type' : 'many2one', 'relation' : 'crm.case.categ', 'required' : True},
+    'section_id' : {'string' : 'Section', 'type' : 'many2one', 'relation' : 'crm.case.section', 'required' : True},
+    
+}
+
+class reschedule_phone_call(wizard.interface):
+    def _default_values(self, cr, uid, data, context):
+        case_obj = pooler.get_pool(cr.dbname).get('crm.case')
+        sec_obj = pooler.get_pool(cr.dbname).get('crm.case.section')
+        sec_id = sec_obj.search(cr, uid, [('code', '=', 'Phone')])
+        
+        if not sec_id:
+            raise wizard.except_wizard(_('Error !'),
+                _('You did not installed the Phone Calls when you configured the crm_configuration module.' \
+                  '\nyou must create a section with the code \'Phone\'.'
+                  ))
+        categ_id=pooler.get_pool(cr.dbname).get('crm.case.categ').search(cr, uid, [('name','=','Outbound')])            
+        case = case_obj.browse(cr, uid, data['ids'][0])
+        return {
+                'user_id' : case.user_id and case.user_id.id,
+                'category_id' : categ_id and categ_id[0] or case.categ_id and case.categ_id.id,
+                'deadline' : time.strftime('%Y-%m-%d %H:%M:%S'),
+                'section_id' : sec_id and sec_id[0],
+                'note' : case.description
+               }
+
+    def _doIt(self, cr, uid, data, context):
+        form = data['form']
+        pool = pooler.get_pool(cr.dbname)
+        mod_obj = pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'crm_configuration', 'view_crm_case_phonecalls_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        case_obj = pool.get('crm.case')
+
+        # Select the view
+        
+        data_obj = pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_phone_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_phone_form_view')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        # We duplicate the current object
+        for id in data['ids']:
+            new_case = case_obj.copy(cr, uid, id, {'case_id':id,'user_id':form['user_id'],'categ_id':form['category_id'],'description':form['note'],'date' : form['deadline'], 'section_id' : form['section_id']}, context=context)
+            # Don't forget to cancel the current object,
+        for case in case_obj.browse(cr, uid, data['ids']):
+            if case.section_id.code == 'Phone': 
+                case_obj.write(cr, uid, [case.id], {'state' : 'cancel'})
+        value = {
+            'domain': "[('section_id','=',%d)]"%form['section_id'],
+            'name': _('Phone Call'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'crm.case',
+#            'view_id': id2,
+            'views': [(id2,'tree'),(id3,'form'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id']
+        }
+        return value
+
+    states = {
+        'init': {
+            'actions': [_default_values],
+            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
+                'state' : [('end', 'Cancel','gtk-cancel'),('order', 'Schedule Phone Call','gtk-go-forward')]}
+        },
+        'order': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _doIt, 'state': 'end'}
+        }
+    }
+
+reschedule_phone_call('crm.case.reschedule_phone_call')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_configuration/wizard/wizard_history_event.py b/addons/crm_configuration/wizard/wizard_history_event.py
new file mode 100644
index 00000000000..c082628664a
--- /dev/null
+++ b/addons/crm_configuration/wizard/wizard_history_event.py
@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+import time
+
+def _open_history_event(self, cr, uid, data, context): 
+    pool = pooler.get_pool(cr.dbname)
+    data_obj = pool.get('ir.model.data')
+    result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_filter')
+    id = data_obj.read(cr, uid, result, ['res_id'])
+    id2 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_calendar_section-view')
+    if id2:
+        id2 = data_obj.browse(cr, uid, id2, context=context).res_id     
+    return {
+        'name': 'History : ' +  pooler.get_pool(cr.dbname).get(data['model']).browse(cr,uid,data['ids'])[0].name,
+        'view_type': 'form',
+        "view_mode": 'calendar, tree, form',
+        'view_id' : False,
+        'views': [(id2,'calendar'),(False,'form'),(False,'tree'),(False,'graph')],
+        'res_model': 'crm.case',
+        'type': 'ir.actions.act_window',
+        'domain': "[('case_id','=',%d)]" % (data['id']),
+        'search_view_id': id['res_id'] 
+    }
+    
+class case_history_event(wizard.interface):
+    states = {
+    'init': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _open_history_event, 'state':'end'}
+        }
+    }
+    
+case_history_event('crm.case.history.events')
\ No newline at end of file
diff --git a/addons/crm_configuration/wizard/wizard_opportunity_set.py b/addons/crm_configuration/wizard/wizard_opportunity_set.py
index 6d3527feda4..1768697d931 100644
--- a/addons/crm_configuration/wizard/wizard_opportunity_set.py
+++ b/addons/crm_configuration/wizard/wizard_opportunity_set.py
@@ -28,18 +28,38 @@ import ir
 import pooler
 from tools.translate import _
 
+partner_form = """<?xml version="1.0"?>
+<form string="Convert To Partner">
+    <label string="Are you sure you want to create a partner based on this prospect ?" colspan="4"/>
+    <label string="You may have to verify that this partner does not exist already." colspan="4"/>
+    <newline />
+    <field name="action"/>
+    <group attrs="{'invisible':[('action','=','create')]}">
+        <field name="partner_id" attrs="{'required':[('action','=','exist')]}"/>
+    </group>
+</form>"""
+
+partner_fields = {
+    'action': {'type':'selection',
+            'selection':[('exist','Link to an existing partner'),('create','Create a new partner')],
+            'string':'Action', 'required':True, 'default': lambda *a:'create'},
+    'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
+}
+
 case_form = """<?xml version="1.0"?>
 <form string="Convert To Opportunity">
     <field name="name"/>
+    <field name="partner_id"/>
     <newline/>
     <field name="planned_revenue"/>
     <field name="probability"/>
 </form>"""
 
 case_fields = {
-    'name': {'type':'char', 'size':64, 'string':'Opportunity Summary'},
+    'name': {'type':'char', 'size':64, 'string':'Opportunity Summary', 'required':True},
     'planned_revenue': {'type':'float', 'digits':(16,2), 'string': 'Expected Revenue'},
     'probability': {'type':'float', 'digits':(16,2), 'string': 'Success Probability'},
+    'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
 }
 
 
@@ -50,51 +70,118 @@ class make_opportunity(wizard.interface):
         case_obj = pool.get('crm.case')
         for case in case_obj.browse(cr, uid, data['ids']):
             if not case.partner_id:
-                raise wizard.except_wizard(_('Warning !'),
-                    _('You must assign a partner to this lead before converting to opportunity.\n' \
-                  'You can use the convert to partner button.'))
-        return {'name': case.name, 'probability': case.probability or 20.0, 'planned_revenue':case.planned_revenue}
+                return 'create_partner'
+        return {'name': case.name, 'probability': case.probability or 20.0,
+                'planned_revenue':case.planned_revenue, 'partner_id':case.partner_id.id}
+
+    def _selectChoice(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        case_obj = pool.get('crm.case')
+        for case in case_obj.browse(cr, uid, data['ids']):
+            if not case.partner_id:
+                return 'create_partner'
+        return 'opportunity'
 
     def _makeOrder(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
-        section_obj = pool.get('crm.case.section')
         data_obj = pool.get('ir.model.data')
+        result = data_obj._get_id(cr, uid, 'crm_configuration', 'view_crm_case_opportunities_filter')
+        res = data_obj.read(cr, uid, result, ['res_id'])
+        section_obj = pool.get('crm.case.section')
         id = section_obj.search(cr, uid, [('code','=','oppor')], context=context)
         if not id:
             raise wizard.except_wizard(_('Error !'),
                 _('You did not installed the opportunities tracking when you configured the crm_configuration module.' \
-                  '\nI can not convert the lead to an opportunity, you must create a section with the code \'oppor\'.'
+                  '\nYou can not convert the prospect to an opportunity, you must create a section with the code \'oppor\'.'
                   ))
         id = id[0]
 
         id2 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_form_view_oppor')
+        id3 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_tree_view_oppor')
         if id2:
             id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
         case_obj = pool.get('crm.case')
-        case_obj._history(cr, uid, case_obj.browse(cr, uid, [data['id']]), 'convert')
-        case_obj.write(cr, uid, data['ids'], {
+        new_pros=case_obj.copy(cr, uid, data['id'])
+#        case_obj._history(cr, uid, case_obj.browse(cr, uid, [new_pros]), 'convert')
+        case_obj.write(cr, uid, [new_pros], {
             'section_id': id,
             'name': data['form']['name'],
             'planned_revenue': data['form']['planned_revenue'],
             'probability': data['form']['probability'],
+            'partner_id': data['form']['partner_id'],
+            'case_id':data['id'],
+            'state':'open',
+        })
+        case_obj.write(cr, uid, [data['id']], {
+            'partner_id': data['form']['partner_id'],
+            'state':'done',
         })
         value = {
-            'domain': "[]",
+            'domain': "[('section_id','=',%d)]"%(id),
             'name': _('Opportunity'),
             'view_type': 'form',
             'view_mode': 'form,tree',
             'res_model': 'crm.case',
-            'res_id': int(data['ids'][0]),
+            'res_id': int(new_pros),
             'view_id': False,
-            'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
+            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
             'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
         }
         return value
 
+    def _makePartner(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        case_obj = pool.get('crm.case')
+        partner_obj = pool.get('res.partner')
+        contact_obj = pool.get('res.partner.address')
+        if data['form']['action']=='create':
+            for case in case_obj.browse(cr, uid, data['ids']):
+                partner_id = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])
+                if partner_id:
+                    raise wizard.except_wizard(_('Warning !'),_('A partner is already existing with the same name.'))
+                else:
+                    partner_id = partner_obj.create(cr, uid, {
+                        'name': case.partner_name or case.name,
+                        'user_id': case.user_id.id,
+                        'comment': case.description,
+                    })
+                contact_id = contact_obj.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': case.partner_name2,
+                    'phone': case.partner_phone,
+                    'mobile': case.partner_mobile,
+                    'email': case.email_from
+                })
+        else:
+            partner = partner_obj.browse(cr,uid,data['form']['partner_id'])
+            partner_id=partner.id
+            contact_id=partner.address and partner.address[0].id 
+        
+        case_obj.write(cr, uid, data['ids'], {
+            'partner_id': partner_id,
+            'partner_address_id': contact_id
+        })
+        return {}
+
     states = {
         'init': {
+            'actions': [],
+            'result': {'type':'choice','next_state':_selectChoice}
+        },
+        'create_partner': {
+            'actions': [],
+            'result': {'type': 'form', 'arch': partner_form, 'fields': partner_fields,
+                'state' : [('end', 'Cancel', 'gtk-cancel'),('create', 'Continue', 'gtk-go-forward')]}
+        },
+        'create': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _makePartner, 'state':'opportunity' }
+        },
+        'opportunity': {
             'actions': [_selectopportunity],
             'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
                 'state' : [('end', 'Cancel', 'gtk-cancel'),('confirm', 'Create Opportunity', 'gtk-go-forward')]}
diff --git a/addons/crm_configuration/wizard/wizard_partner_create.py b/addons/crm_configuration/wizard/wizard_partner_create.py
index a5e8e0f47b0..34558e3f1b5 100644
--- a/addons/crm_configuration/wizard/wizard_partner_create.py
+++ b/addons/crm_configuration/wizard/wizard_partner_create.py
@@ -30,13 +30,13 @@ from tools.translate import _
 
 case_form = """<?xml version="1.0"?>
 <form string="Convert To Partner">
-    <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+    <label string="Are you sure you want to create a partner based on this prospect ?" colspan="4"/>
     <label string="You may have to verify that this partner does not exist already." colspan="4"/>
-    <field name="close"/>
+    <!--field name="close"/-->
 </form>"""
 
 case_fields = {
-    'close': {'type':'boolean', 'string':'Close Lead'}
+    'close': {'type':'boolean', 'string':'Close Prospect'}
 }
 
 
@@ -48,11 +48,14 @@ class make_partner(wizard.interface):
         for case in case_obj.browse(cr, uid, data['ids']):
             if case.partner_id:
                 raise wizard.except_wizard(_('Warning !'),
-                    _('A partner is already defined on this lead.'))
+                    _('A partner is already defined on this prospect.'))
         return {}
 
     def _makeOrder(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
+        mod_obj = pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
         case_obj = pool.get('crm.case')
         partner_obj = pool.get('res.partner')
         contact_obj = pool.get('res.partner.address')
@@ -64,7 +67,7 @@ class make_partner(wizard.interface):
                 partner_id = partner_obj.create(cr, uid, {
                     'name': case.partner_name or case.name,
                     'user_id': case.user_id.id,
-                    'comment': case.note,
+                    'comment': case.description,
                 })
             contact_id = contact_obj.create(cr, uid, {
                 'partner_id': partner_id,
@@ -90,6 +93,7 @@ class make_partner(wizard.interface):
             'res_id': int(partner_id),
             'view_id': False,
             'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
         }
         return value
 
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 16489e209f6..1f0c3fa4480 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -65,9 +65,11 @@
 		  <form string="Questionnaires">
 			<field name="name" select="1" />
 			<newline/>
-			<field name="description" select="1" />
+			<separator string="Questions List" colspan="4"/>
+			<field name="questions_ids" colspan="4" nolabel="1"/>
 			<newline/>
-			<field name="questions_ids" colspan="4"/>
+			<separator string="Description" colspan="4"/>
+			<field name="description" colspan="4" select="1" nolabel="1"/>
 		  </form>
 		</field>
 	</record>
@@ -139,7 +141,7 @@
 		<field name="arch" type="xml">
 			<notebook position="inside">
 				<page string="Profiling">
-				  <button string="Use a questionnaire" name="%(wizard_open_questionnaire)d" type="action" colspan="1"/>
+				  <button string="Use a questionnaire" name="%(wizard_open_questionnaire)d" type="action" colspan="1" icon="gtk-justify-fill"/>
 				  <newline/>
 				  <field name="answers_ids" colspan="4" nolabel="1"/>
 				</page>
@@ -164,9 +166,9 @@
 					<field name="description" select="2" colspan="4"/>
 					<field name="state"/>
 					<group col="3" colspan="2">
-						<button name="process_start" states="not running" string="Compute Segmentation" type="object"/>
-						<button name="process_stop" states="running" string="Stop Process" type="object"/>
-						<button name="process_continue" states="running" string="Continue Process" type="object"/>
+						<button name="process_start" states="not running" string="Compute Segmentation" type="object" icon="gtk-apply"/>
+						<button name="process_stop" states="running" string="Stop Process" type="object" icon="gtk-stop"/>
+						<button name="process_continue" states="running" string="Continue Process" type="object" icon="gtk-go-forward"/>
 					</group>
 				</page>
 				<page string="Sales Purchase">
diff --git a/addons/crm_vertical/crm_lead_vertical_view.xml b/addons/crm_vertical/crm_lead_vertical_view.xml
index be658f099de..7fd0be28988 100644
--- a/addons/crm_vertical/crm_lead_vertical_view.xml
+++ b/addons/crm_vertical/crm_lead_vertical_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 	<data>		
 		<record id="crm_configuration.menu_crm_case_categ0_act_leads" model="ir.ui.menu">
-			<field eval="&quot;Leads Tracking&quot;" name="name"/>
+			<field eval="&quot;Prospects Tracking&quot;" name="name"/>
 			<field eval="&quot;terp-account&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
 		</record>
@@ -10,7 +10,7 @@
 	<record id="ir_ui_view_sc_myleads0" model="ir.ui.view_sc">
 			<field ref="crm_configuration.menu_crm_case_categ0_act_leads_my" name="res_id"/>
 			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
-			<field eval="&quot;My Leads&quot;" name="name"/>
+			<field eval="&quot;My Prospects&quot;" name="name"/>
 			<field name="user_id" ref="base.user_root"/>
 	</record>
 		
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 543b194b938..d05aa480367 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -164,9 +164,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]</field>
+            <field name="filter" eval="True"/>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>
         </record>
-        <menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree"/>
+        <menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree" groups="base.group_extended_menu"/>
 
         <record id="action_picking_tree5" model="ir.actions.act_window">
             <field name="name">Generate Draft Invoices On Receptions</field>
@@ -175,8 +177,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','in')]</field>
+            <field name="filter" eval="True"/>
+            <field name="context">{'contact_display': 'partner'}</field>
+            <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>            
         </record>
-        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4"/>
+        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_extended_menu"/>
 
     </data>
 </openerp>
diff --git a/addons/event/event.py b/addons/event/event.py
index 9f12281d8f9..34433683a1a 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -131,7 +131,7 @@ class event(osv.osv):
         'register_prospect': fields.function(_get_prospect, method=True, string='Unconfirmed Registrations'),
         'date_begin': fields.datetime('Beginning date', required=True),
         'date_end': fields.datetime('Ending date', required=True),
-        'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Canceled')], 'Status', readonly=True, required=True),
+        'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'Status', readonly=True, required=True),
         'mail_auto_registr':fields.boolean('Mail Auto Register',help='Check this box if you want to use the automatic mailing for new registration'),
         'mail_auto_confirm':fields.boolean('Mail Auto Confirm',help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
         'mail_registr':fields.text('Registration Email',help='This email will be sent when someone subscribes to the event.'),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index bb5a4818593..1df91d87cbc 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -73,10 +73,10 @@
 						<separator string="Status" colspan="4"/>
 						<field name="state" select="1"/>
 						<group col="4" colspan="2">
-							<button string="Confirm Event" name="button_confirm" states="draft" type="object"/>
-							<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
-							<button string="Event Done" name="button_done" states="confirm" type="object"/>
-							<button string="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object"/>
+                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                           <button string="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object" icon="gtk-convert"/>
 						</group>
 					</page>
 					<page string="Mailing">
@@ -119,44 +119,47 @@
 		</record>
 
 	<!-- Events Organisation/CONFIGURATION/EVENTS  -->
-		<record model="ir.actions.act_window" id="action_new_event_form">
+       <record model="ir.actions.act_window" id="action_event_view">
+           <field name="name">Events</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">event.event</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+       </record>
+       
+       <menuitem name="All Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />	
+	    
+	    <record model="ir.actions.act_window" id="action_new_event_form">
 			<field name="name">New event</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="res_model">event.event</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">form,tree</field>
 		</record>
-		<menuitem parent="menu_event_main" id="menu_event_new_event" action="action_new_event_form" />
 
-
-		<record model="ir.actions.act_window" id="action_event_view">
-			<field name="name">Events</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">event.event</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-		</record>
-		<menuitem name="All Events" id="menu_event_event" action="action_event_view" parent="menu_event_main"/>
+        <menuitem parent="menu_event_event" id="menu_event_new_event" action="action_new_event_form" />
 
 		<record model="ir.actions.act_window" id="action_event_view_draft">
 			<field name="name">Draft Events</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="res_model">event.event</field>
 			<field name="domain">[('state','=','draft')]</field>
+            <field name="filter" eval="True"/>			
 		</record>
 		<menuitem
 			parent="menu_event_event"
 			id="menu_event_event_draft"
-			action="action_event_view_draft" />
+            action="action_event_view_draft" groups="base.group_extended_menu"/>
 		<record model="ir.actions.act_window" id="action_event_view_confirm">
 			<field name="name">Confirmed Events</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="res_model">event.event</field>
 			<field name="domain">[('state','=','confirm')]</field>
+            <field name="filter" eval="True"/>			
 		</record>
 		<menuitem parent="menu_event_event"
 			id="menu_event_event_confirm"
-			action="action_event_view_confirm" />
+            action="action_event_view_confirm" groups="base.group_extended_menu"/>
 
 
 	<!-- EVENTS/REGISTRATIONS/EVENTS  -->
@@ -189,7 +192,7 @@
 						<field name="nb_register"/>
 						<group colspan="2">
 							<field name="user_id" select="1"/>
-							<button name="remind_user" string="Send Reminder" states="open,pending" type="object" colspan="2"/>
+                            <button name="remind_user" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
 						</group>
 						<field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id,event_id)" />
 						<field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
@@ -199,7 +202,7 @@
 					<page string="General">
 						<field name="contact_id" select="2" on_change="onchange_contact_id(contact_id, partner_id)" /><newline/>
 						<field name="email_from" select="2"/>
-						<button name="remind_partner" string="Send Reminder" states="open,pending" type="object" colspan="2"/>
+                        <button name="remind_partner" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
 						<newline/>
 						<separator string="Badge" colspan="4"/>
 						<field name="badge_title" select="2"/>
@@ -209,9 +212,9 @@
 						<separator string="Status" colspan="4"/>
 						<group col="8" colspan="4">
 							<field name="state" select="1" colspan="2"/>
-							<button name="button_reg_close" string="Registration Invoiced" states="open" type="object"/>
-							<button name="%(event_confirm_registration)d" string="Confirm Registration" states="draft" type="action"/>
-							<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
+                            <button name="button_reg_close" string="Registration Invoiced" states="open" type="object" icon="gtk-print"/>
+                            <button name="%(event_confirm_registration)d" string="Confirm Registration" states="draft" type="action" icon="gtk-apply"/>
+                            <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
 						</group>
 					</page>
 					<page string="Extra Info">
@@ -230,7 +233,8 @@
 						<field name="ref2" colspan="4"/>
 					</page>
 					<page string="History">
-						<field name="history_line" colspan="4" nolabel="1" mode="tree,form">						<form string="Communication history">
+                        <field name="history_line" colspan="4" nolabel="1" mode="tree,form">                        
+                            <form string="Communication history">
 								<field name="date"/>
 								<field name="som"/>
 								<newline/>
@@ -283,27 +287,38 @@
 			name="All Registrations"
 			id="menu_action_registration" parent="menu_event_main"
 			action="action_registration"/>
+        <record model="ir.actions.act_window" id="action_registration_new">
+            <field name="name">New Registration</field>
+            <field name="res_model">event.registration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+        </record>
+       
+        <menuitem parent="menu_action_registration" id="menu_action_registration_new" action="action_registration_new"/>			
+		
 		<record model="ir.actions.act_window" id="action_registration_draft">
 		  <field name="name">Unconfirmed Registrations</field>
 		  <field name="res_model">event.registration</field>
 		  <field name="view_type">form</field>
 		  <field name="domain">[('state','=','draft')]</field>
 		  <field name="view_mode">tree,form</field>
+          <field name="filter" eval="True"/>		  
 		</record>
 		<menuitem
 			parent="menu_action_registration"
 			id="menu_action_registration_draft"
-			action="action_registration_draft"/>
+            action="action_registration_draft" groups="base.group_extended_menu"/>
 		<record model="ir.actions.act_window" id="action_registration_confirm">
 		  <field name="name">Confirmed Registrations</field>
 		  <field name="res_model">event.registration</field>
 		  <field name="view_type">form</field>
 		  <field name="domain">[('state','in',('open','done'))]</field>
+          <field name="filter" eval="True"/>		  
 		</record>
 		<menuitem
 			parent="menu_action_registration"
 			id="menu_action_registration_confirm"
-			action="action_registration_confirm"/>
+            action="action_registration_confirm" groups="base.group_extended_menu"/>
 
 
 	<!-- report , event on registration... start -->
diff --git a/addons/event/wizard/event_registrations_partner.py b/addons/event/wizard/event_registrations_partner.py
index 63745828924..9331c2aa757 100644
--- a/addons/event/wizard/event_registrations_partner.py
+++ b/addons/event/wizard/event_registrations_partner.py
@@ -40,6 +40,9 @@ def _list_partners(self, cr, uid, data, context):
 class event_partners(wizard.interface):
     def _reg_partners(self, cr, uid, data, context):
         pool_obj = pooler.get_pool(cr.dbname)
+        mod_obj = pool_obj.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'])        
         model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_partner_form')])
         resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
         return {
@@ -49,7 +52,8 @@ class event_partners(wizard.interface):
             'view_mode': 'tree,form',
             'res_model': 'res.partner',
             'views': [(False,'tree'),(resource_id,'form')],
-            'type': 'ir.actions.act_window'
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id'] 
         }
         return {}
 
diff --git a/addons/event_project/event_view.xml b/addons/event_project/event_view.xml
index 011eb01bb40..b4155119e72 100644
--- a/addons/event_project/event_view.xml
+++ b/addons/event_project/event_view.xml
@@ -13,7 +13,7 @@
 				<field name="register_max" position="after">
 					<separator string="Tasks management" colspan="4"/>
 					<field name="project_id"/>
-					<button string="Create Retro-Planning" name="%(event_wiz)d" type="action"/>
+                    <button string="Create Retro-Planning" name="%(event_wiz)d" type="action" icon="gtk-execute"/>
 				</field>
 			</field>
 		</record>
diff --git a/addons/event_project/wizard/event_task.py b/addons/event_project/wizard/event_task.py
index 8821f389f86..57a9782e151 100644
--- a/addons/event_project/wizard/event_task.py
+++ b/addons/event_project/wizard/event_task.py
@@ -24,6 +24,10 @@ import pooler
 from tools.translate import _
 
 def _event_tasks(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname) 
+    mod_obj = pool.get('ir.model.data') 
+    result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')
+    id = mod_obj.read(cr, uid, result, ['res_id'])    
     event_id = data['id']
     cr.execute('SELECT project_id FROM event_event WHERE id = %s', (event_id, ))
     res = cr.fetchone()
@@ -36,7 +40,8 @@ def _event_tasks(self, cr, uid, data, context):
         'view_mode': 'tree,form,calendar',
         'res_model': 'project.task',
         'context': { },
-        'type': 'ir.actions.act_window'
+        'type': 'ir.actions.act_window',
+        'search_view_id': id['res_id']         
     }
     return value
 
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
index 453a6b0c556..3fd078ca408 100644
--- a/addons/google_map/google_map_view.xml
+++ b/addons/google_map/google_map_view.xml
@@ -13,7 +13,7 @@
 					<group colspan="1" col="2">
 						<field name="street2" nolabel="1"/>
 						<button name="%(wizard_google_map)d"
-							string="Map" type="action"/>
+                           string="Map" type="action" icon="gtk-zoom-in"/>
 					</group>
 				</field>
 			</field>
@@ -29,7 +29,7 @@
 					<label string="Street2 : " align="1.0"/>
 					<group colspan="1" col="2">
 						<field name="street2" nolabel="1"/>
-						<button name="%(wizard_google_map)d" string="Map" type="action"/>
+                        <button name="%(wizard_google_map)d" string="Map" type="action" icon="gtk-zoom-in"/>
 					</group>
 				</field>
 			</field>
@@ -47,7 +47,7 @@
 						<group colspan="1" col="2">
 						<field name="street2" nolabel="1"/>
 						<button name="%(wizard_google_map)d"
-							string="Map" type="action"/>
+                            string="Map" type="action" icon="gtk-zoom-in"/>
 						</group>
 					</field>
 				</field>
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 3fe64ea6bba..2a707e79eb6 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -131,7 +131,7 @@ class hr_employee(osv.osv):
         'sinid': fields.char('SIN No', size=32),
         'otherid': fields.char('Other ID', size=32),
         'gender': fields.selection([('',''),('male','Male'),('female','Female')], 'Gender'),
-        'marital': fields.selection([('maried','Maried'),('unmaried','Unmaried'),('divorced','Divorced'),('other','Other')],'Marital Status', size=32),
+        'marital': fields.selection([('married','Married'),('unmarried','Unmarried'),('divorced','Divorced'),('other','Other')],'Marital Status', size=32),
 
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 3fd8fb7321e..a11441e98b6 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -86,45 +86,65 @@ class res_users(osv.osv):
     _inherit = 'res.users'
     _description = 'res.users'
 
-    def _parent_compute(self, cr, uid, ids, name, arg, context={}):
+    def _parent_compute(self, cr, uid, ids, name, args, context={}):
         result = {}
         obj_dept = self.pool.get('hr.department')
-        for id in ids:
-            ids_dept = obj_dept.search(cr, uid, [('member_ids', 'in', [id])])
+        for user_id in ids:
+            ids_dept = obj_dept.search(cr, uid, [('member_ids', 'in', [user_id])])
             parent_ids = []
             if ids_dept:
                 data_dept = obj_dept.read(cr, uid, ids_dept, ['manager_id'])
                 parent_ids = map(lambda x: x['manager_id'][0], data_dept)
-            result[id] = parent_ids
+            result[user_id] = parent_ids
         return result
 
-    def _child_compute(self, cr, uid, ids):
-        obj_dept = self.pool.get('hr.department')
-        child_ids = []
-        for id in ids:
-            ids_dept = obj_dept.search(cr, uid, [('manager_id', '=', id)])
-            if ids_dept:
-                data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'])
-                childs = map(lambda x: x['member_ids'], data_dept)
-                childs = tools.flatten(childs)
-                if id in childs:
-                    childs.remove(id)
-                child_ids.extend(tools.flatten(childs))
-        return child_ids
-
     def _parent_search(self, cr, uid, obj, name, args):
         parent = []
         for arg in args:
             if arg[0] == 'parent_id':
                 parent = arg[2]
-        child_ids = self._child_compute(cr, uid, parent)
+        child_ids = self._child_compute(cr, uid, parent,name, args, {})
+        if not child_ids:
+            return [('id', 'in', [0])]
+        return [('id', 'in', child_ids)]
+
+    def _child_compute(self, cr, uid, ids, name, args, context={}):
+        obj_dept = self.pool.get('hr.department')
+        result = {}
+        for manager_id in ids:
+            child_ids = []
+            mgnt_dept_ids = obj_dept.search(cr, uid, [('manager_id', '=', manager_id)])
+            ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)])
+            if ids_dept:
+                data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'])
+                childs = map(lambda x: x['member_ids'], data_dept)
+                childs = tools.flatten(childs)
+                if manager_id in childs:
+                    childs.remove(manager_id)
+                child_ids.extend(tools.flatten(childs))
+                set = {}
+                map(set.__setitem__, child_ids, [])
+                child_ids =  set.keys()
+            else:
+               child_ids = []
+            result[manager_id] = child_ids
+        return result
+
+    def _child_search(self, cr, uid, obj, name, args):
+        parent = []
+        for arg in args:
+            if arg[0] == 'child_ids':
+                parent = arg[2]
+        child_ids = self._child_compute(cr, uid, parent,name, args, {})
         if not child_ids:
             return [('id', 'in', [0])]
         return [('id', 'in', child_ids)]
 
     _columns = {
-        'parent_id': fields.function(_parent_compute, relation='res.users',fnct_search=_parent_search, method=True, string="Parent Users", type='many2many'),
-               }
+        'parent_id': fields.function(_parent_compute, relation='res.users',fnct_search=_parent_search, method=True, string="Managers", type='many2many'),
+        'child_ids': fields.function(_child_compute, relation='res.users', fnct_search=_child_search,method=True, string="Subordinates", type='many2many'),
+    }
+
 
 res_users()
 
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index cf939258f50..2bd219dcf7d 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -13,13 +13,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="department">
-                    <notebook>
-                        <page string="Department">
-                            <field colspan="4" name="name" select="1"/>
-                            <field name="company_id" select="1"/>
-                            <field name="parent_id" select="2"/>
-                            <field colspan="4" name="manager_id" select="1"/>
-                            <field colspan="4" name="member_ids"/>
+					<field colspan="4" name="name" select="1"/>
+					<field name="company_id" select="1"/>
+					<field name="parent_id" select="2"/>
+					<field colspan="4" name="manager_id" select="1"/>
+                    <notebook colspan="4" >
+                        <page string="Members">
+                            <field colspan="4" name="member_ids" nolabel="1"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
@@ -65,8 +65,11 @@
 			<field name="inherit_id" ref="base.view_users_form"/>
 			<field name="arch" type="xml">
 				<notebook position="inside">
-					<page string="Parents">
-						<field name="parent_id" nolabel="1"/>
+					<page string="Departements Informations">
+						<separator string="Managers" colspan="4"/>
+						<field name="parent_id" nolabel="1" colspan="4"/>
+						<separator string="Subordinates" colspan="4"/>
+						<field name="child_ids" nolabel="1" colspan="4"/>
 					</page>
 				</notebook>
 			</field>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 5ff3c9226d9..347538622a3 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -93,8 +93,8 @@
             <field name="arch" type="xml">
                 <field name="parent_id" position="after">
                     <field name="state"/>
-                    <button name="sign_in" states="absent" string="Sign In" type="object"/>
-                    <button name="sign_out" states="present" string="Sign Out" type="object"/>
+                    <button name="sign_in" states="absent" string="Sign In" type="object" icon="gtk-go-back"/>
+                    <button name="sign_out" states="present" string="Sign Out" type="object" icon="gtk-go-forward"/>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 424819a062f..0425fb9e3db 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -86,14 +86,13 @@ class hr_contract(osv.osv):
         'function' : fields.many2one('res.partner.function', 'Function'),
         'date_start' : fields.date('Start Date', required=True),
         'date_end' : fields.date('End Date'),
-        'working_hours_per_day' : fields.integer('Working hours per day'),
+        'working_hours_per_day_id' : fields.many2one('hr.timesheet.group','Working hours per day'),
         'wage_type_id' : fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
         'wage' : fields.float('Wage', required=True),
         'notes' : fields.text('Notes'),
     }
     _defaults = {
         'date_start' : lambda *a : time.strftime("%Y-%m-%d"),
-        'working_hours_per_day' : lambda *a : 8,
     }
 hr_contract()
 
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 1b512f52fcf..1f43bc78884 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -83,7 +83,7 @@
                                 <field name="function"/>
                                 <field name="date_start"/>
                                 <field name="date_end"/>
-                                <field name="working_hours_per_day"/>
+                                <field name="working_hours_per_day_id"/>
                                 <field name="wage_type_id"/>
                                 <field name="wage"/>
                             </tree>
@@ -94,7 +94,7 @@
                                 <newline/>
                                 <separator colspan="4" string="Contract Duration"/>
                                 <field name="function"/>
-                                <field name="working_hours_per_day"/>
+                                <field name="working_hours_per_day_id"/>
                                 <field name="date_start" select="1"/>
                                 <field name="date_end" select="1"/>
                                 
@@ -155,7 +155,7 @@
                     <separator colspan="4" string="Contract Duration"/>
                     <field name="date_start" select="1"/>
                     <field name="date_end" select="1"/>
-                    <field name="working_hours_per_day"/>
+                    <field name="working_hours_per_day_id"/>
                     <newline/>
                     
                     <separator colspan="4" string="Remuneration"/>
@@ -189,7 +189,7 @@
                     <field name="function"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                    <field name="working_hours_per_day"/>
+                    <field name="working_hours_per_day_id"/>
                     <field name="wage_type_id"/>
                     <field name="wage"/>
                 </tree>
@@ -200,11 +200,12 @@
             <field name="name">Contract</field>
             <field name="res_model">hr.contract</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
+            <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
         </record>
         
-        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root"/>
+        <menuitem name="Contract" id="menu_hr_contract" parent="hr.menu_hr_root"/>
+        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="menu_hr_contract"/>
         
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index e822d52558b..3930d31a50f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -69,12 +69,12 @@
                             </field>
                             <field name="state" select="2"/>
                             <group col="6" colspan="2">
-                                <button name="confirm" states="draft" string="Confirm" type="workflow"/>
-                                <button name="cancel" states="cancel" string="Cancel" type="workflow"/>
-                                <button name="validate" states="confirm" string="Accept" type="workflow"/>
-                                <button name="invoice" states="accepted" string="Invoice" type="workflow"/>
-                                <button name="draft" states="confirm" string="Set to Draft" type="workflow"/>
-                                <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow"/>
+                                <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
+                                <button name="cancel" states="cancel" string="Cancel" type="workflow" icon="gtk-cancel"/>
+                                <button name="validate" states="confirm" string="Accept" type="workflow" icon="gtk-ok"/>
+                                <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-print"/>
+                                <button name="draft" states="confirm" string="Set to Draft" type="workflow" icon="gtk-convert"/>
+                                <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no"/>
                             </group>
                         </page>
                         <page string="Other Info">
@@ -92,10 +92,33 @@
                 </form>
             </field>
         </record>
+        
+        <record id="view_hr_expense_filter" model="ir.ui.view">
+            <field name="name">hr.expense.expense.filter</field>
+            <field name="model">hr.expense.expense</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Expense">
+	               	<group col='6' colspan='4'>
+	               		<filter icon="gtk-execute" string="My Expense" domain="[('user_id','=',uid)]" separator="1" help="Expenses Related to Current User"/>
+	              		<field name="state" select="1">
+	              			<filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Expense"/>
+	              			<filter icon="terp-hr" domain="[('state','=','accepted')]" help="Accepted Expense"/>
+	              			<filter icon="terp-hr" domain="[('state','=','invoiced')]" help="Invoiced Expense"/>
+	              		</field>
+	              		<separator orientation="vertical"/>
+	              		<field name="name" select='1'/>
+	              		<field name="user_id" select="1" widget="selection"/>
+	              	</group>
+             	</search>
+            </field>
+        </record>
+        
         <record id="expense_all" model="ir.actions.act_window">
             <field name="name">All expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
+            <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
         <menuitem
             id="next_id_49"
@@ -112,32 +135,40 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_all_draft" id="menu_expense_all_draft" parent="hr_expense.menu_expense_all"/>
+        <menuitem action="expense_all_draft" id="menu_expense_all_draft" parent="hr_expense.menu_expense_all" groups="base.group_extended_menu"/>
         <record id="expense_all_confirm" model="ir.actions.act_window">
             <field name="name">Expenses waiting validation</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','confirm')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_all_confirm" id="menu_expense_all_confirm" parent="hr_expense.menu_expense_all"/>
+        <menuitem action="expense_all_confirm" id="menu_expense_all_confirm" parent="hr_expense.menu_expense_all" groups="base.group_extended_menu"/>
         <record id="expense_all_valid" model="ir.actions.act_window">
             <field name="name">Expenses waiting invoice</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','accepted')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_all_valid" id="menu_expense_all_valid" parent="hr_expense.menu_expense_all"/>
+        <menuitem action="expense_all_valid" id="menu_expense_all_valid" parent="hr_expense.menu_expense_all" groups="base.group_extended_menu"/>
         <record id="expense_all_invoiced" model="ir.actions.act_window">
             <field name="name">Expenses waiting payment</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','invoiced')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_all_invoiced" id="menu_expense_all_invoiced" parent="hr_expense.menu_expense_all"/>
+        <menuitem action="expense_all_invoiced" id="menu_expense_all_invoiced" parent="hr_expense.menu_expense_all" groups="base.group_extended_menu"/>
         
         <!--
 		My expenses menu
@@ -148,8 +179,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid)]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_my" id="menu_expense_my" parent="hr_expense.next_id_49"/>
+        <menuitem action="expense_my" id="menu_expense_my" parent="hr_expense.next_id_49" groups="base.group_extended_menu"/>
 
         <record id="expense_my_new" model="ir.actions.act_window">
             <field name="name">New Expenses Sheet</field>
@@ -167,16 +200,20 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid),('state','=','draft')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_my_draft" id="menu_expense_my_draft" parent="hr_expense.menu_expense_my"/>
+        <menuitem action="expense_my_draft" id="menu_expense_my_draft" parent="hr_expense.menu_expense_my" groups="base.group_extended_menu"/>
         <record id="expense_my_confirm" model="ir.actions.act_window">
             <field name="name">My expenses waiting validation</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid),('state','=','confirm')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_my_confirm" id="menu_expense_my_confirm" parent="hr_expense.menu_expense_my"/>
+        <menuitem action="expense_my_confirm" id="menu_expense_my_confirm" parent="hr_expense.menu_expense_my" groups="base.group_extended_menu"/>
         
         <record id="view_product_hr_expense_form" model="ir.ui.view">
 			<field name="name">product.product.expense.form</field>
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index 338503936c9..7a9162936c9 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -3,27 +3,27 @@
 
 {
     "name" : "Human Resources: Holidays management",
-    "version" : "1.1",
+    "version" : "1.5",
     "author" : "Tiny & Axelor",
     "category" : "Generic Modules/Human Resources",
     "website" : "http://www.openerp.com",
     "description": """Human Ressources: Holidays tracking and workflow
 
-    This module allows you to manage holidays and holidays requests. For each employee, you can also define a number of available holidays per holiday status.
+    This module allows you to manage leaves and leaves requests.
 
     Note that:
     - A synchronisation with an internal agenda (use of the CRM module) is possible: in order to automatically create a case when an holiday request is accepted, you have to link the holidays status to a case section. You can set up this info and your colour preferences in
-                HR / Configuration / Holidays Status
-    - An employee can make a negative holiday request (holiday request of -2 days for example), this is considered by the system as an ask for more off-days. It will increase his total of that holiday status available (if the request is accepted).
+                HR \ Configuration \ Holidays Status
+    - An employee can make an ask for more off-days by making a new Allocation It will increase his total of that leave type available (if the request is accepted).
     - There are two ways to print the employee's holidays:
         * The first will allow to choose employees by department and is used by clicking the menu item located in
-                HR / Holidays Request / Print Summary of Holidays
+                HR \ Holidays Request \ Print Summary of Holidays
         * The second will allow you to choose the holidays report for specific employees. Go on the list
-                HR / Employees / Employees
+                HR \ Employees \ Employees
             then select the ones you want to choose, click on the print icon and select the option
                 'Print Summary of Employee's Holidays'
     - The wizard allows you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. These states must be set up by a user from the group 'HR' and with the role 'holidays'. You can define these features in the security tab from the user data in
-                Administration / Users / Users
+                Administration \ Users \ Users
             for example, you maybe will do it for the user 'admin'.
 """,
     'author': 'Tiny & Axelor',
@@ -36,7 +36,7 @@
         'hr_view.xml',
         'hr_holidays_report.xml',
         'hr_holidays_wizard.xml',
-        'process/hr_holidays_process.xml'
+        #'process/hr_holidays_process.xml'
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py
index 5e4b1ed7a05..4081f9863e2 100644
--- a/addons/hr_holidays/hr.py
+++ b/addons/hr_holidays/hr.py
@@ -36,25 +36,53 @@ import datetime
 from osv import fields, osv
 from tools.translate import _
 
-def _employee_get(obj,cr,uid,context={}):
-    ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
-    if ids:
-        return ids[0]
-    return False
-
-def strToDate(dt):
-    dt_date=datetime.date(int(dt[0:4]),int(dt[5:7]),int(dt[8:10]))
-    return dt_date
-
 class hr_holidays_status(osv.osv):
     _name = "hr.holidays.status"
-    _description = "Holidays Status"
+    _description = "Leave Types"
+
+    def get_days(self, cr, uid, ids, employee_id, return_false, context={}):
+        res = {}
+        for record in self.browse(cr, uid, ids, context):
+            res[record.id] = {}
+            max_leaves = leaves_taken = 0
+            if not return_false:
+                cr.execute("""SELECT type, sum(number_of_days) FROM hr_holidays WHERE employee_id = %s AND state='validate' AND holiday_status_id = %s GROUP BY type""", (str(employee_id), str(record.id)))
+                for line in cr.fetchall():
+                    if line[0] =='remove':
+                        leaves_taken = -line[1]
+                    if line[0] =='add':
+                        max_leaves = line[1]
+            res[record.id]['max_leaves'] = max_leaves
+            res[record.id]['leaves_taken'] = leaves_taken
+            res[record.id]['remaining_leaves'] = max_leaves - leaves_taken
+        return res
+
+    def _user_left_days(self, cr, uid, ids, name, args, context={}):
+        res = {}
+        return_false = False
+        if context and context.has_key('employee_id'):
+            if not context['employee_id']:
+                return_false = True 
+            employee_id = context['employee_id']
+        else:
+            employee_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)])
+            if employee_ids:
+                employee_id = employee_ids[0]
+            else:
+                return_false = True
+        res = self.get_days(cr, uid, ids, employee_id, return_false, context=context)
+        return res
+
     _columns = {
-        'name' : fields.char('Holiday Status', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Section'),
-        'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color of the status', required=True),
-        'limit' : fields.boolean('Allow to override Limit'),
-        'active' : fields.boolean('Active')
+        'name' : fields.char('Name', size=64, required=True, translate=True),
+        'section_id': fields.many2one('crm.case.section', 'CRM Section', help='If you link this type of leave with a section in the CRM, it will synchronize each leave asked with a case in this section, to display it in the company shared calendar for example.'),
+        'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color of the status', required=True, help='This color will be used in the leaves summary located in Reporting\Print Summary of Leaves'),
+        'limit' : fields.boolean('Allow to override Limit', help='If you thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
+        'active' : fields.boolean('Active'),
+        'max_leaves' : fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'), 
+        'leaves_taken' : fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'), 
+        'remaining_leaves' : fields.function(_user_left_days, method=True, string='Remaining Leaves', multi='user_left_days'), 
+
     }
     _defaults = {
         'color_name': lambda *args: 'red',
@@ -62,123 +90,115 @@ class hr_holidays_status(osv.osv):
     }
 hr_holidays_status()
 
-class hr_holidays_per_user(osv.osv):
-    _name = "hr.holidays.per.user"
-    _description = "Holidays Per User"
-    _rec_name = "user_id"
-
-    def _get_remaining_leaves(self, cr, uid, ids, field_name, arg=None, context={}):
-        obj_holiday = self.pool.get('hr.holidays')
-        result = {}
-        for holiday_user in self.browse(cr, uid, ids):
-            days = 0.0
-            ids_request = obj_holiday.search(cr, uid, [('employee_id', '=', holiday_user.employee_id.id),('state', '=', 'validate'),('holiday_status', '=', holiday_user.holiday_status.id)])
-            if ids_request:
-                holidays = obj_holiday.browse(cr, uid, ids_request)
-                for holiday in holidays:
-                    days += holiday.number_of_days
-            days = holiday_user.max_leaves - days
-            result[holiday_user.id] = days
-        return result
-
-    _columns = {
-        'employee_id': fields.many2one('hr.employee', 'Employee',required=True),
-        'user_id' : fields.many2one('res.users','User'),
-        'holiday_status' : fields.many2one("hr.holidays.status", "Holiday's Status", required=True),
-        'max_leaves' : fields.float('Maximum Leaves Allowed',required=True),
-        'leaves_taken' : fields.float('Leaves Already Taken',readonly=True),
-        'active' : fields.boolean('Active'),
-        'notes' : fields.text('Notes'),
-        'remaining_leaves': fields.function(_get_remaining_leaves, method=True, string='Remaining Leaves', type='float'),
-        'holiday_ids': fields.one2many('hr.holidays', 'holiday_user_id', 'Holidays')
-    }
-    _defaults = {
-        'active' : lambda *a: True,
-    }
-
-    def create(self, cr, uid, vals, *args, **kwargs):
-        if vals['employee_id']:
-            obj_emp=self.pool.get('hr.employee').browse(cr,uid,vals['employee_id'])
-            vals.update({'user_id': obj_emp.user_id.id})
-        return super(osv.osv,self).create(cr, uid, vals, *args, **kwargs)
-
-hr_holidays_per_user()
-
 class hr_holidays(osv.osv):
     _name = "hr.holidays"
     _description = "Holidays"
+    _order = "type desc, date_from asc"
+
+    def _employee_get(obj,cr,uid,context={}):
+        ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        if ids:
+            return ids[0]
+        return False
 
     _columns = {
         'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft', 'draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validate'), ('cancel', 'Cancel')], 'Status', readonly=True),
-        'date_from' : fields.datetime('Vacation start day', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'date_to' : fields.datetime('Vacation end day',required=True,readonly=True, states={'draft':[('readonly',False)]}),
-        'holiday_status' : fields.many2one("hr.holidays.status", "Holiday's Status", required=True,readonly=True, states={'draft':[('readonly',False)]}),
-        'employee_id' : fields.many2one('hr.employee', 'Employee', select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}),
-        'user_id':fields.many2one('res.users', 'Employee_id', states={'draft':[('readonly',False)]}, select=True, readonly=True),
-        'manager_id' : fields.many2one('hr.employee', 'Holiday manager', invisible=False, readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'Status', readonly=True),
+        'date_from' : fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
+        'user_id':fields.many2one('res.users', 'User', states={'draft':[('readonly',False)]}, select=True, readonly=True),
+        'date_to' : fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
+        'holiday_status_id' : fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
+        'employee_id' : fields.many2one('hr.employee', 'Employee', select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
+        'manager_id' : fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
         'notes' : fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
-        'number_of_days': fields.float('Number of Days in this Holiday Request', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'number_of_days': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
+        'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
         'case_id': fields.many2one('crm.case', 'Case'),
-        'holiday_user_id': fields.many2one('hr.holidays.per.user', 'Holiday per user')
+        'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone"),
+        'allocation_type': fields.selection([('employee','Employee Request'),('company','Company Allocation')], 'Allocation Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help='This field is only for informative purposes, to depict if the leave request/allocation comes from an employee or from the company'),
+        'parent_id': fields.many2one('hr.holidays', 'Parent'),
+        'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
     }
 
     _defaults = {
         'employee_id' : _employee_get ,
         'state' : lambda *a: 'draft',
+        'type': lambda *a: 'remove',
+        'allocation_type': lambda *a: 'employee',
         'user_id': lambda obj, cr, uid, context: uid,
     }
     _order = 'date_from desc'
 
-    def _check_date(self, cr, uid, ids):
-        if ids:
-            cr.execute('select number_of_days from hr_holidays where id in ('+','.join(map(str, ids))+')')
-            res =  cr.fetchall()
-            if res and res[0][0] < 0:
-                return False
-        return True
+    def create(self, cr, uid, vals, context={}):
+        print 'create', vals, context
+        if context:
+            if context.has_key('type'):
+                vals['type'] = context['type']
+            if context.has_key('allocation_type'):
+                vals['allocation_type'] = context['allocation_type']
+        return super(osv.osv,self).create(cr, uid, vals, context)
 
-    _constraints = [(_check_date, 'Start date should not be larger than end date! ', ['number_of_days'])]
+    #~ def _check_date(self, cr, uid, ids):
+        #~ if ids:
+             #~ cr.execute('select number_of_days from hr_holidays where id in ('+','.join(map(str, ids))+')')
+             #~ res = cr.fetchall()
+             #~ if res and res[0][0] <= 0:
+                 #~ return False
+        #~ return True
 
-    def create(self, cr, uid, vals, *args, **kwargs):
-        id_holiday = super(hr_holidays, self).create(cr, uid, vals, *args, **kwargs)
-        self._create_holiday(cr, uid, [id_holiday])
-        return id_holiday
-
-    def _create_holiday(self, cr, uid, ids):
-        holidays_user_obj = self.pool.get('hr.holidays.per.user')
-        holidays_data = self.browse(cr, uid, ids[0])
-        list_holiday = []
-        ids_user_hdays = holidays_user_obj.search(cr, uid, [('employee_id', '=', holidays_data.employee_id.id),('holiday_status', '=', holidays_data.holiday_status.id)])
-        for hdays in holidays_user_obj.browse(cr, uid, ids_user_hdays):
-            for req in hdays.holiday_ids:
-                list_holiday.append(req.id)
-        list_holiday.append(ids[0])
-        holidays_user_obj.write(cr, uid, ids_user_hdays, {'holiday_ids': [(6, 0, list_holiday)]})
-        return True
+    #_constraints = [(_check_date, 'Start date should not be greater than end date! ', ['number_of_days'])]
+    
+    def onchange_date_from(self, cr, uid, ids, date_to, date_from):
+        result = {}
+        if date_to and date_from:
+            from_dt = time.mktime(time.strptime(date_from,'%Y-%m-%d %H:%M:%S'))
+            to_dt = time.mktime(time.strptime(date_to,'%Y-%m-%d %H:%M:%S'))
+            diff_day = (to_dt-from_dt)/(3600*24)
+            result['value'] = {
+                'number_of_days_temp': round(diff_day)+1
+            }
+            return result
+        result['value'] = {
+            'number_of_days_temp': 0,
+        }
+        return result
 
     def onchange_date_to(self, cr, uid, ids, date_from, date_to):
         result = {}
-        if date_from:
-            if date_to:
-                from_dt = time.mktime(time.strptime(date_from,'%Y-%m-%d %H:%M:%S'))
-                to_dt = time.mktime(time.strptime(date_to,'%Y-%m-%d %H:%M:%S'))
-                diff_day = (to_dt-from_dt)/(3600*24)
-                result['value'] = {
-                    'number_of_days': round(diff_day)+1
-                }
-                return result
+        if date_from and date_to:
+            from_dt = time.mktime(time.strptime(date_from,'%Y-%m-%d %H:%M:%S'))
+            to_dt = time.mktime(time.strptime(date_to,'%Y-%m-%d %H:%M:%S'))
+            diff_day = (to_dt-from_dt)/(3600*24)
+            result['value'] = {
+                'number_of_days_temp': round(diff_day)+1
+            }
+            return result
         result['value'] = {
-            'number_of_days': 0
+            'number_of_days_temp': 0
         }
         return result
 
+    def onchange_sec_id(self, cr, uid, ids, status, context={}):
+        warning = {}
+        if status:
+            brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, [status])[0]
+            if brows_obj.section_id and not brows_obj.section_id.allow_unlink:
+                warning = {
+                    'title': "Warning for ",
+                    'message': "You won\'t be able to cancel this leave request because the CRM Section of the leave type disallows."
+                        }
+        return {'warning': warning}
+
+
     def set_to_draft(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {
             'state':'draft',
-            'manager_id': False
+            'manager_id': False,
+            'number_of_days': 0,
         })
-        self._create_holiday(cr, uid, ids)
+        wf_service = netsvc.LocalService("workflow")
+        for holiday_id in ids:
+            wf_service.trg_create(uid, 'hr.holidays', holiday_id, cr)
         return True
 
     def holidays_validate(self, cr, uid, ids, *args):
@@ -190,113 +210,111 @@ class hr_holidays(osv.osv):
         if ids2:
             vals['manager_id'] = ids2[0]
         self.write(cr, uid, ids, vals)
-        self._create_holiday(cr, uid, ids)
         return True
 
     def holidays_confirm(self, cr, uid, ids, *args):
-        user = False
-        for id in self.browse(cr, uid, ids):
-            if id.employee_id.user_id:
-                user = id.employee_id.user_id.id
-        self.write(cr, uid, ids, {
-            'state':'confirm',
-            'user_id': user,
-        })
-        self._create_holiday(cr, uid, ids)
+        for record in self.browse(cr, uid, ids):
+            leave_asked = record.number_of_days_temp
+            if record.type == 'remove':
+                if record.employee_id and not record.holiday_status_id.limit:
+                    leaves_rest = self.pool.get('hr.holidays.status').get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
+                    if leaves_rest < leave_asked:
+                        raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for %s while available leaves are less than asked leaves.' %(record.employee_id.name)))
+                nb = -(record.number_of_days_temp)
+            else:
+                nb = record.number_of_days_temp
+            if record.employee_id:
+                user_id = record.employee_id.user_id and record.employee_id.user_id.id or uid
+
+            self.write(cr, uid, [record.id], {
+                'state':'confirm',
+                'number_of_days': nb,
+                'user_id': user_id
+            })
         return True
 
     def holidays_refuse(self, cr, uid, ids, *args):
-        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
-        self.write(cr, uid, ids, {
+        vals = {
             'state':'refuse',
-            'manager_id':ids2[0]
-        })
-        self._create_holiday(cr, uid, ids)
+        }
+        ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+        if ids2:
+            vals['manager_id'] = ids2[0]
+        self.write(cr, uid, ids, vals)
         return True
 
     def holidays_cancel(self, cr, uid, ids, *args):
         for record in self.browse(cr, uid, ids):
             if record.state=='validate':
-                holiday_id=self.pool.get('hr.holidays.per.user').search(cr, uid, [('employee_id','=', record.employee_id.id),('holiday_status','=',record.holiday_status.id)])
-                if holiday_id:
-                    obj_holidays_per_user=self.pool.get('hr.holidays.per.user').browse(cr, uid,holiday_id[0])
-                    self.pool.get('hr.holidays.per.user').write(cr,uid,obj_holidays_per_user.id,{'leaves_taken':obj_holidays_per_user.leaves_taken - record.number_of_days})
                 if record.case_id:
-                    if record.case_id.state <> 'draft':
-                        raise osv.except_osv(_('Warning !'),
-                    _('You can not cancel this holiday request. first You have to make its case in draft state.'))
-                    else:
-                        self.pool.get('crm.case').unlink(cr,uid,[record.case_id.id])
+                    self.pool.get('crm.case').unlink(cr,uid,[record.case_id.id])
+                if record.linked_request_ids:
+                    list_ids = []
+                    for id in record.linked_request_ids:
+                        list_ids.append(id.id)
+                    self.holidays_cancel(cr,uid,list_ids)
+                    self.unlink(cr,uid,list_ids)
         self.write(cr, uid, ids, {
             'state':'cancel'
             })
-        self._create_holiday(cr, uid, ids)
         return True
 
     def holidays_draft(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {
             'state':'draft'
         })
-        self._create_holiday(cr, uid, ids)
         return True
 
     def check_holidays(self,cr,uid,ids):
-
         for record in self.browse(cr, uid, ids):
-            leave_asked = record.number_of_days
-            holiday_id=self.pool.get('hr.holidays.per.user').search(cr, uid, [('employee_id','=', record.employee_id.id),('holiday_status','=',record.holiday_status.id)])
-            if leave_asked>=0.00:
-                if holiday_id:
-                    obj_holidays_per_user=self.pool.get('hr.holidays.per.user').browse(cr, uid,holiday_id[0])
-                    leaves_rest=obj_holidays_per_user.max_leaves - obj_holidays_per_user.leaves_taken
-                    if not obj_holidays_per_user.holiday_status.limit:
-                        if leaves_rest < leave_asked:
-                            raise osv.except_osv(_('Attention!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
-                    self.pool.get('hr.holidays.per.user').write(cr,uid,obj_holidays_per_user.id,{'leaves_taken':obj_holidays_per_user.leaves_taken + leave_asked})
-                if record.holiday_status.section_id:
-                    vals={}
-                    vals['name']=record.name
-                    vals['section_id']=record.holiday_status.section_id.id
-                    epoch_c = time.mktime(time.strptime(record.date_to,'%Y-%m-%d %H:%M:%S'))
-                    epoch_d = time.mktime(time.strptime(record.date_from,'%Y-%m-%d %H:%M:%S'))
-                    diff_day = (epoch_c - epoch_d)/(3600*24)
-                    vals['duration']= (diff_day) * 8
-                    vals['note']=record.notes
-                    vals['user_id']=record.user_id.id
-                    vals['date']=record.date_from
-                    case_id=self.pool.get('crm.case').create(cr,uid,vals)
-                    self.write(cr, uid, ids, {'case_id':case_id})
-            else:
-                if holiday_id:
-                    obj_holidays_per_user=self.pool.get('hr.holidays.per.user').browse(cr, uid,holiday_id[0])
-                    note=obj_holidays_per_user.notes or ''
-                    notes= note + '\n***' + time.strftime('%Y-%m-%d %H:%M:%S') + ' ' + record.name
-                    self.pool.get('hr.holidays.per.user').write(cr,uid,obj_holidays_per_user.id,{'max_leaves':obj_holidays_per_user.max_leaves + abs(leave_asked),'notes':notes})
-                else:
-                    vals={}
-                    vals['employee_id']=record.employee_id.id
-                    vals['holiday_status']=record.holiday_status.id
-                    vals['max_leaves']=abs(leave_asked)
-                    vals['leaves_taken']=0.00
-                    self.pool.get('hr.holidays.per.user').create(cr,uid,vals)
+            if not record.number_of_days:
+                    raise osv.except_osv(_('Warning!'),_('Wrong leave definition.'))
+            if record.employee_id:
+                leave_asked = record.number_of_days
+                if leave_asked < 0.00:
+                    if not record.holiday_status_id.limit:
+                        leaves_rest = self.pool.get('hr.holidays.status').get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
 
+                        if leaves_rest < -(leave_asked):
+                            raise osv.except_osv(_('Warning!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
+            else:
+                holiday_ids = []
+                vals = {
+                    'name' : record.name,
+                    'holiday_status_id' : record.holiday_status_id.id,
+                    'state': 'draft',
+                    'date_from' : record.date_from,
+                    'date_to' : record.date_to,
+                    'notes' : record.notes,
+                    'number_of_days': record.number_of_days,
+                    'number_of_days_temp': record.number_of_days_temp, 
+                    'type': record.type,
+                    'allocation_type': record.allocation_type,
+                    'parent_id': record.id,
+                }
+                employee_ids = self.pool.get('hr.employee').search(cr, uid, [])
+                for employee in employee_ids:
+                    vals['employee_id'] = employee
+                    holiday_ids.append(self.create(cr, uid, vals, context={}))
+                self.holidays_confirm(cr, uid, holiday_ids)
+                self.holidays_validate(cr, uid, holiday_ids)
+
+            if record.holiday_status_id.section_id and record.date_from and record.date_to and record.employee_id:
+                vals={}
+                vals['name']=record.name
+                vals['section_id']=record.holiday_status_id.section_id.id
+                epoch_c = time.mktime(time.strptime(record.date_to,'%Y-%m-%d %H:%M:%S'))
+                epoch_d = time.mktime(time.strptime(record.date_from,'%Y-%m-%d %H:%M:%S'))
+                diff_day = (epoch_c - epoch_d)/(3600*24)
+                vals['duration'] = (diff_day) * 8
+                vals['note'] = record.notes
+                vals['user_id'] = record.user_id.id
+                vals['date'] = record.date_from
+                case_id = self.pool.get('crm.case').create(cr,uid,vals)
+                self.write(cr, uid, ids, {'case_id':case_id})
         return True
 hr_holidays()
 
-class holiday_user_log(osv.osv):
-    _name = 'hr.holidays.log'
-    _description = 'hr.holidays.log'
-    _order = "holiday_req_id desc"
-    _columns = {
-        'name' : fields.char('Action', size=64, readonly=True),
-        'holiday_req_id' : fields.char('Holiday Request ID', size=64),
-        'nb_holidays' : fields.float('Number of Holidays Requested'),
-        'employee_id' : fields.many2one('hr.employee', 'Employee', readonly=True),
-        'holiday_status' : fields.many2one("hr.holidays.status", "Holiday's Status", readonly=True),
-        'holiday_user_id' : fields.many2one('hr.holidays.per.user', 'Holidays user'),
-        'date': fields.datetime('Date'),
-                }
-    _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-    }
-holiday_user_log()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml
index 2d89b467c26..23d1e1a75bf 100644
--- a/addons/hr_holidays/hr_holidays_report.xml
+++ b/addons/hr_holidays/hr_holidays_report.xml
@@ -2,7 +2,7 @@
 <openerp>
 	<data>
 		<report id="report_holidays_summary"
-				string="Summary Of Holidays"
+				string="Summary Of Leaves"
 				model="hr.holidays"
 				name="holidays.summary"
 				xsl="hr_holidays/report/holidays_summary.xsl"
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index a9b38bf2f0f..78796226ba5 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -4,29 +4,96 @@
 
         <!-- Holidays -->
         <record model="ir.ui.view" id="edit_holiday_new">
-            <field name="name">hr.holidays.form</field>
+            <field name="name">Leave Request</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">form</field>
+            <field name="priority">1</field>
+            <field name="arch" type="xml">
+                <form string="Leave Request">
+                    <field name="name" select="1"/>
+                    <field name="holiday_status_id" select="1" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
+                    <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" required="1"/>
+                    <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" required="1"/>
+                    <notebook colspan="4">
+                        <page string="General">
+                            <field name="employee_id" select="1" required="1"/>
+                            <field name="number_of_days_temp"/>
+                            <field name="manager_id"/>
+                            <field name="notes" colspan="4"/>
+
+                            <newline/>
+                            <field name="state" select="1" colspan="2"/>
+                            <group colspan="2">
+                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+                                <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no"/>
+                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
+                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <!-- Holidays -->
+        <record model="ir.ui.view" id="allocation_leave_new">
+            <field name="name">Allocation Request</field>
             <field name="model">hr.holidays</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee Holidays">
+                <form string="Allocation Request">
                     <field name="name" select="1"/>
-                    <field name="holiday_status" select="1"/>
-                    <field name="date_from" select="1"/>
-                    <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)"/>
+                    <field name="holiday_status_id" select="1" />
+                    <field name="employee_id" select="1" required="1"/>
+                    <field name="number_of_days_temp"/>
                     <notebook colspan="4">
                         <page string="General">
-                            <field name="employee_id" select="1" />
-                            <field name="number_of_days"/>
+
                             <field name="manager_id"/>
                             <field name="notes" colspan="4"/>
                             <newline/>
                             <field name="state" select="1" colspan="2"/>
                             <group colspan="2">
-                                <button string="Confirm" name="confirm" states="draft" type="workflow"/>
-                                <button string="Validate" name="validate" states="confirm" type="workflow"/>
-                                <button string="Refuse" name="refuse" states="confirm" type="workflow"/>
-                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow"/>
-                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object"/>
+                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+                                <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no"/>
+                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
+                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <!-- Holidays -->
+        <record model="ir.ui.view" id="allocation_company_new">
+            <field name="name">Company Allocation</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Company Allocation">
+                    <field name="name" select="1"/>
+                    <field name="holiday_status_id" select="1"/>
+                    <field name="employee_id" select="1" />
+                    <field name="type"/>
+                    <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                    <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                    <field name="number_of_days_temp"/>
+
+                    <notebook colspan="4">
+                        <page string="General">
+                            <field name="manager_id"/>
+                            <field name="notes" colspan="4"/>
+                            <newline/>
+                            <field name="state" select="1" colspan="2"/>
+                            <group colspan="2">
+                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+                                <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no"/>
+                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
+                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
                     </notebook>
@@ -39,25 +106,74 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Employee Holidays">
+                <tree string="Employee Leaves">
                     <field name="name"/>
                     <field name="employee_id"/>
-                    <field name="number_of_days" string="Number of Days"/>
+                    <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    <field name="holiday_status"/>
+                    <field name="holiday_status_id"/>
                     <field name="state"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
 
+
+        <menuitem
+            name="Holidays Management"
+            parent="hr.menu_hr_root"
+            id="menu_open_ask_holidays"/>
+
+        <record model="ir.actions.act_window" id="open_ask_holidays">
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="edit_holiday_new"/>
+            <field name="domain">[('type','=','remove')]</field>
+        </record>
+
+        <menuitem
+            name="New Holidays Request"
+            parent="menu_open_ask_holidays"
+            id="menu_open_ask_holidays_new"
+            action="open_ask_holidays"/>
+
+        <record model="ir.actions.act_window" id="open_allocation_holidays">
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="context">{'type':'add'}</field>
+            <field name="domain">[('type','=','add')]</field>
+            <field name="view_id" ref="allocation_leave_new" />
+        </record>
+
+        <menuitem
+            name="New Allocation Request"
+            parent="menu_open_ask_holidays"
+            id="menu_open_allocation_holidays"
+            action="open_allocation_holidays"/>
+
+        <record model="ir.actions.act_window" id="open_company_allocation">
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="allocation_company_new" />
+            <field name="context">{'allocation_type':'company'}</field>
+        </record>
+
+        <menuitem
+            name="Leaves Management"
+            parent="menu_open_ask_holidays"
+            id="menu_open_company_allocation"
+            action="open_company_allocation"
+            groups="hr.group_hr_manager"/>
+
         <!-- holidays status -->
         <record model="ir.ui.view" id="edit_holiday_status_form">
             <field name="name">hr.holidays.status.form</field>
             <field name="model">hr.holidays.status</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Define holiday status">
+                <form string="Leave Type">
                     <field colspan="4" name="name" select="1"/>
                     <field name="color_name" select="2"/>
                     <field name="section_id"  select="1" />
@@ -71,17 +187,15 @@
             <field name="model">hr.holidays.status</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Holiday status">
+                <tree string="Leave Type">
                     <field name="name"/>
-                    <field name="color_name" />
-                    <field name="section_id" />
+                    <field name="remaining_leaves"/>
                     <field name="limit" />
-                    <field name="active" />
                 </tree>
             </field>
         </record>
         <record id="open_view_holiday_status" model="ir.actions.act_window">
-            <field name="name">Holiday Status</field>
+            <field name="name">Leave Type</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.status</field>
             <field name="view_type">form</field>
@@ -92,149 +206,131 @@
             id="menu_open_view_holiday_status"
             parent="hr.menu_hr_configuration"/>
 
-        <!-- holidays per user -->
-        <record model="ir.ui.view" id="view_holidays_per_user_form">
-            <field name="name">hr.holidays.per.user.form</field>
-            <field name="model">hr.holidays.per.user</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            	<form string="Holidays Per Employee">
-            		<group>
-	                    <field name="employee_id" select="1" />
-	                    <field name="holiday_status" select="1" />
-						<field name="max_leaves" select="2" />
-						<field name="active" select="2"/>
-            		</group>
-	            	<notebook colspan="4">
-	            		<page string="General Information">
-		                    <field name="leaves_taken" select="2" />
-		                    <field name="remaining_leaves" select="2" colspan="2" />
-		                    <newline/>
-		                    <field name="notes" colspan="4" select="2"/>
-		              	</page>
-		              	<page string="Holidays" >
-		              		<field name="holiday_ids" nolabel="1">
-                                <tree string="Employee Holidays">
-                                    <field name="name"/>
-                                    <field name="number_of_days" string="Number of Days"/>
-                                    <field name="date_from"/>
-                                    <field name="date_to"/>
-                                    <field name="holiday_status"/>
-                                    <field name="state"/>
-                                </tree>
-                            </field>
-		              	</page>
-	                </notebook>
-                </form>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="view_holidays_per_user_tree">
-            <field name="name">hr.holidays.per.user.tree</field>
-            <field name="model">hr.holidays.per.user</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Holidays Per Employee">
-                    <field name="employee_id"/>
-                    <field name="holiday_status"/>
-                    <field name="max_leaves"/>
-                    <field name="remaining_leaves"/>
-                    <field name="active"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_holidays_per_user_graph">
-            <field name="name">hr.holidays.per.user.graph</field>
-            <field name="model">hr.holidays.per.user</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-            <graph type="bar" string="Holidays Allowed">
-                <field name="employee_id"/>
-                <field name="max_leaves" operator="+"/>
-                <field name="leaves_taken" operator="+"/>
-            </graph>
-        </field>
-        </record>
 
         <!-- Menu Items -->
-        <record model="ir.actions.act_window" id="open_ask_holidays">
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="edit_holiday_new" />
+
+        <record id="view_hr_holidays_filter" model="ir.ui.view">
+            <field name="name">hr.holidays.filter</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Leave">
+	               	<group col='6' colspan='4'>
+	               		<filter icon="gtk-execute" string="My Leaves" domain="[('user_id','=',uid)]" separator="1" help="Leaves Related to Current User"/>
+                        <filter icon="gtk-execute" string="My Departments Leaves" domain="[('user_id','child_of',[uid])]" help="Leaves Related to Department"/>
+	              		<field name="state" select="1">
+	              			<filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Holidays"/>
+	              			<filter icon="terp-hr" domain="[('state','=','refuse')]" help="Refused Holidays"/>
+	              			<filter icon="terp-hr" domain="[('state','=','validate')]" help="Validated Holidays"/>
+	              		</field>
+	              		<field name="name" select='1'/>
+	              		<field name="user_id" select="1" widget="selection"/>
+	              	</group>
+             	</search>
+            </field>
         </record>
 
-        <menuitem
-            name="Holidays Management"
-            parent="hr.menu_hr_root"
-            id="menu_open_ask_holidays"/>
-
-        <menuitem
-            name="New Holidays Request"
-            parent="menu_open_ask_holidays"
-            id="menu_open_ask_holidays_new"
-            action="open_ask_holidays"/>
-
         <record model="ir.actions.act_window" id="action_all_holiday">
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem name="All Holidays Requests"
+        <menuitem name="All Leave Requests"
             parent="menu_open_ask_holidays"
             id="menu_action_all_holiday"
             action="action_all_holiday"
             groups="hr.group_hr_manager"/>
 
         <record model="ir.actions.act_window" id="action_my_holiday">
-            <field name="name">My Holidays Request</field>
+            <field name="name">My Leave Requests</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid)]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem name="My Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" />
+        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" groups="base.group_extended_menu" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_draft">
-            <field name="name">My Holidays Request Draft</field>
+            <field name="name">My Draft Leave Request</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid), ('state','=','draft')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem name="My Draft Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" />
+
+        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" groups="base.group_extended_menu" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_waiting">
-            <field name="name">My Awaiting Confirmation Holidays Requests</field>
+            <field name="name">My Awaiting Confirmation Leave Requests</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid), ('state','=','confirm')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" />
+        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" groups="base.group_extended_menu" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_validate">
-            <field name="name">My Holidays Request Validated</field>
+            <field name="name">My Validated Leave Requests</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid), ('state','=','validate')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem name="My Validated Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_validate" action="action_my_holiday_validate" />
+        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_validate" action="action_my_holiday_validate" groups="base.group_extended_menu" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_refuse">
-            <field name="name">My Holidays Request Refused</field>
+            <field name="name">My Refused Leave Requests</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid), ('state','=','refuse')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem name="My Refused Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_refuse" action="action_my_holiday_refuse" />
+        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_refuse" action="action_my_holiday_refuse" groups="base.group_extended_menu" />
+
+
+        <record model="ir.actions.act_window" id="action_departments_my_holiday">
+            <field name="name">My Department's Leave Requests</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id', 'child_of', [uid])]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
+        </record>
+        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_departments_holiday" action="action_departments_my_holiday" groups="base.group_extended_menu"/>
+
+
+        <record model="ir.actions.act_window" id="action_my_departments_holiday_waiting">
+            <field name="name">Leave Requests to Validate</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id', 'child_of', [uid]), ('state','=','confirm')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
+        </record>
+        <menuitem parent="menu_action_my_departments_holiday" id="menu_action_my_departments_holiday_waiting" action="action_my_departments_holiday_waiting" groups="base.group_extended_menu" />
+
+
 
         <record model="ir.actions.act_window" id="action_holiday_waiting">
             <field name="name">Requests Awaiting for Validation</field>
@@ -243,34 +339,18 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','confirm')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem name="Holidays Requests Awaiting for Validation" parent="menu_action_all_holiday" id="menu_action_holiday_waiting" action="action_holiday_waiting" />
-
-        <record model="ir.actions.act_window" id="action_holidays_per_user">
-            <field name="name">Holidays Per Employee</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays.per.user</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
-        </record>
-        <menuitem name="Holidays Per Employee" parent="hr.menu_hr_configuration" id="menu_open_holidays_per_user" action="action_holidays_per_user"/>
-
-        <record model="ir.actions.act_window" id="action_my_holiday_available">
-            <field name="name">My Available Holidays</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays.per.user</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-            <field name="domain">[('user_id','=',uid)]</field>
-        </record>
-        <menuitem name="My Available Holidays" parent="hr.menu_hr_reporting" id="menu_action_my_holiday_available" action="action_my_holiday_available" />
+        <menuitem parent="menu_action_all_holiday" id="menu_action_holiday_waiting" action="action_holiday_waiting" groups="base.group_extended_menu" />
 
 
     <!--  Shortcuts -->
         <act_window name="My Holiday Requests"
-            domain="[('employee_id', '=', active_id)]"
+            domain="[('employee_id', '=', active_id), ('type','=','remove')]"
             res_model="hr.holidays"
             src_model="hr.employee"
+            view_id ="eval('edit_holiday_new')"
             id="act_hr_employee_holiday_request"/>
 
     </data>
diff --git a/addons/hr_holidays/hr_workflow.xml b/addons/hr_holidays/hr_workflow.xml
index 668e84022c1..1fdb6f01c1b 100644
--- a/addons/hr_holidays/hr_workflow.xml
+++ b/addons/hr_holidays/hr_workflow.xml
@@ -5,7 +5,7 @@
 	<!-- Roles definition -->
 
 	<record model="res.roles" id="HR_holidays">
-		<field name="name">holidays</field>
+		<field name="name">Leaves Manager</field>
 	</record>
 
 	<!-- Workflow definition -->
@@ -53,6 +53,10 @@
 		<field name="action">holidays_cancel()</field>
 		<field name="join_mode">XOR</field>
 	</record>
+	
+	<!-- 	
+		workflow transition
+	-->
 
 	<record model="workflow.transition" id="t1">
 		<field name="act_from" ref="act_draft" />
@@ -91,6 +95,8 @@
 	<record model="workflow.transition" id="t7">
 		<field name="act_from" ref="act_cancel" />
 		<field name="act_to" ref="act_draft" />
+		<field name="signal">set_to_draft</field>
 	</record>
+	
 </data>
 </openerp>
diff --git a/addons/hr_holidays/migrations/1.5/post-00-change-requests-signs.py b/addons/hr_holidays/migrations/1.5/post-00-change-requests-signs.py
new file mode 100644
index 00000000000..637d0383ef2
--- /dev/null
+++ b/addons/hr_holidays/migrations/1.5/post-00-change-requests-signs.py
@@ -0,0 +1,5 @@
+__name__ = "Change signs of old holiday requests"
+
+def migrate(cr, version):
+    cr.execute("DELETE FROM hr_holidays WHERE number_of_days < 0")
+    cr.execute("UPDATE hr_holidays SET number_of_days = -number_of_days, type ='remove'")
diff --git a/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py b/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
new file mode 100644
index 00000000000..ce067f8f98f
--- /dev/null
+++ b/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
@@ -0,0 +1,14 @@
+__name__ = "Convert the Holidays Per User limits into positive leave request"
+
+def migrate(cr, version):
+    cr.execute("""SELECT id, employee_id, holiday_status, max_leaves, notes, create_uid
+                    FROM hr_holidays_per_user;""")
+    for record in cr.fetchall():
+        cr.execute("""INSERT INTO hr_holidays 
+            (employee_id, type, allocation_type, name, holiday_status_id, 
+            state, number_of_days, notes, manager_id) VALUES
+            (%s, 'add', 'company', 'imported holiday_per_user', %s,
+            'validated', %s, %s, %s) """, (record[1],record[2],record[3],record[4],record[5]))
+        
+
+
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index a7be0e2b51c..b6539fbd52e 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -15,26 +15,29 @@ def lengthmonth(year, month):
     return [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]
 
 def strToDate(dt):
-    dt_date=datetime.date(int(dt[0:4]),int(dt[5:7]),int(dt[8:10]))
-    return dt_date
+    if dt:
+        dt_date=datetime.date(int(dt[0:4]),int(dt[5:7]),int(dt[8:10]))
+        return dt_date
+    else:
+        return 
+    
 
 def emp_create_xml(self,cr,uid,dept,holiday_type,row_id,empid,name,som,eom):
-
     display={}
 
     if dept==0:
         count=0
-        p_id=pooler.get_pool(cr.dbname).get('hr.holidays').search(cr,uid,[('employee_id','in',[empid,False])])
-        ids_date = pooler.get_pool(cr.dbname).get('hr.holidays').read(cr,uid,p_id,['date_from','date_to','holiday_status','state'])
-
+        p_id=pooler.get_pool(cr.dbname).get('hr.holidays').search(cr,uid,[('employee_id','in',[empid,False]), ('type', '=', 'remove')])
+        ids_date = pooler.get_pool(cr.dbname).get('hr.holidays').read(cr,uid,p_id,['date_from','date_to','holiday_status_id','state'])
+        
         for index in range(1,61):
             diff=index-1
             current=som+datetime.timedelta(diff)
-
+            
             for item in ids_date:
                 if current >= strToDate(item['date_from']) and current <= strToDate(item['date_to']):
                     if item['state'] in holiday_type:
-                        display[index]=item['holiday_status'][0]
+                        display[index]=item['holiday_status_id'][0]
                         count=count +1
                     else:
                         display[index]=' '
@@ -68,7 +71,7 @@ class report_custom(report_rml):
     def create_xml(self, cr, uid, ids, data, context):
         depts=[]
         emp_id={}
-        done={}
+#        done={}
 
         cr.execute("select name from res_company")
         res=cr.fetchone()[0]
@@ -78,7 +81,6 @@ class report_custom(report_rml):
 
         cr.execute("select id,name,color_name from hr_holidays_status order by id")
         legend=cr.fetchall()
-
         today=datetime.datetime.today()
 
         first_date=data['form']['date_from']
@@ -130,7 +132,7 @@ class report_custom(report_rml):
 
         while day_diff1>0:
             if month+i<=12:
-                if day_diff1 > lengthmonth(year,i+month): # Not on 30 else you have problems when entering 01-01-2009 for example
+                if day_diff1>30:
                     som1=datetime.date(year,month+i,1)
                     date_xml += ['<dayy number="%d" name="%s" cell="%d"/>' % (x, som1.replace(day=x).strftime('%a'),cell+x) for x in range(1, lengthmonth(year,i+month)+1)]
                     i=i+1
@@ -195,34 +197,37 @@ class report_custom(report_rml):
 
                  emp_xml += emp_create_xml(self,cr,uid,0,holiday_type,row_id,items['id'],items['name'],som, eom)
                  row_id = row_id +1
-
+                 
         elif data['model']=='ir.ui.menu':
-
             for id in data['form']['depts'][0][2]:
                 dept = pooler.get_pool(cr.dbname).get('hr.department').browse(cr, uid, id, context.copy())
                 depts.append(dept)
+                dept_ids = tuple(data['form']['depts'][0][2])
+                
+                cr.execute("""select dept_user.user_id \
+                from hr_department_user_rel dept_user \
+                where dept_user.department_id = %s\
+                union\
+                select dept.manager_id from hr_department dept\
+                where dept.id = %s""", (id, id))
 
-                cr.execute('select user_id from hr_department_user_rel where department_id=%s', (dept.id,))
                 result=cr.fetchall()
-
                 if result==[]:
                     continue
                 dept_done=0
                 for d in range(0,len(result)):
                     emp_id[d]=pooler.get_pool(cr.dbname).get('hr.employee').search(cr,uid,[('user_id','=',result[d][0])])
                     items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr,uid,emp_id[d],['id','name'])
-
                     for item in items:
-                        if item['id'] in done:
-                            continue
-                        else:
-                            if dept_done==0:
-                                emp_xml += emp_create_xml(self,cr,uid,1,holiday_type,row_id,dept.id,dept.name,som, eom)
-                                row_id = row_id +1
-                            dept_done=1
-
-                        done[item['id']] = 1
+#                        if item['id'] in done:
+#                            continue
+#                        else:
+                        if dept_done==0:
+                            emp_xml += emp_create_xml(self,cr,uid,1,holiday_type,row_id,dept.id,dept.name,som, eom)
+                            row_id = row_id +1
+                        dept_done=1
 
+#                        done[item['id']] = 1
                         emp_xml += emp_create_xml(self,cr,uid,0,holiday_type,row_id,item['id'],item['name'],som, eom)
                         row_id = row_id +1
 
@@ -234,7 +239,7 @@ class report_custom(report_rml):
         %s
         </report>
         ''' % (months_xml,date_xml, emp_xml)
-
+        
         return xml
 
 report_custom('report.holidays.summary', 'hr.holidays', '', 'addons/hr_holidays/report/holidays_summary.xsl')
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index b095b8bf50d..26b35b97741 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,4 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_holidays_per_user","hr.holidays.per.user","model_hr_holidays_per_user","hr.group_hr_user",1,1,1,1
 "access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,1,1,1
 "access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index 4677c2c24af..a3f385272d0 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -2,26 +2,12 @@
 <openerp>
     <data noupdate="1">
         
-        <record id="uom_categ_wtime" model="product.uom.categ">
-            <field name="name">Working Time</field>
-        </record>
-        <record id="uom_hour" model="product.uom">
-            <field name="name">Hour</field>
-            <field eval="uom_categ_wtime" name="category_id"/>
-            <field name="factor">8.0</field>
-        </record>
-        <record id="uom_day" model="product.uom">
-            <field name="name">Day</field>
-            <field eval="uom_categ_wtime" name="category_id"/>
-            <field name="factor">1.0</field>
-        </record>
-        
         <record id="product_consultant" model="product.product">
             <field name="default_code">DEV</field>
             <field name="list_price">75.0</field>
             <field name="standard_price">30.0</field>
-            <field name="uom_id" ref="uom_hour"/>
-            <field name="uom_po_id" ref="uom_hour"/>
+            <field name="uom_id" ref="product.uom_hour"/>
+            <field name="uom_po_id" ref="product.uom_hour"/>
             <field name="name">Consultancy - Senior Developer</field>
             <field name="categ_id" ref="product.product_category_10"/>
             <field name="type">service</field>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index e6769788cbb..436dd3d9eb6 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -59,8 +59,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid),('date', '=',time.strftime('%Y-%m-%d'))]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="act_hr_timesheet_line_evry1_today_form_my" id="menu_act_hr_timesheet_line_evry1_today_form_my" parent="menu_act_hr_timesheet_line_me_all_form"/>
+        <menuitem action="act_hr_timesheet_line_evry1_today_form_my" id="menu_act_hr_timesheet_line_evry1_today_form_my" parent="menu_act_hr_timesheet_line_me_all_form" groups="base.group_extended_menu"/>
  
         
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
@@ -82,9 +83,10 @@
             <field name="res_model">hr.analytic.timesheet</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('date', '=',    time.strftime('%Y-%m-%d'))]</field>
+            <field name="domain">[('date', '=', time.strftime('%Y-%m-%d'))]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="menu_act_hr_timesheet_line_evry1_all_form"/>
+        <menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="menu_act_hr_timesheet_line_evry1_all_form" groups="base.group_extended_menu"/>
        
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 742895d78e4..29b5809db5b 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -38,6 +38,9 @@ class final_invoice_create(wizard.interface):
 
     def _do_create(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
+        mod_obj = pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
         analytic_account_obj = pool.get('account.analytic.account')
         res_partner_obj = pool.get('res.partner')
         account_payment_term_obj = pool.get('account.payment.term')
@@ -158,7 +161,8 @@ class final_invoice_create(wizard.interface):
             'res_model': 'account.invoice',
             'view_id': False,
             'context': "{'type':'out_invoice'}",
-            'type': 'ir.actions.act_window'
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
         }
 
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 6a7d878d1ae..7d911bfeeed 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -42,6 +42,9 @@ class invoice_create(wizard.interface):
 
     def _do_create(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
+        mod_obj = pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])        
         analytic_account_obj = pool.get('account.analytic.account')
         res_partner_obj = pool.get('res.partner')
         account_payment_term_obj = pool.get('account.payment.term')
@@ -170,24 +173,17 @@ class invoice_create(wizard.interface):
         mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
         act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
         
-        mod_id = mod_obj.search(cr, uid, [('name', '=', 'action_invoice_tree1')])[0]
-        res_id = mod_obj.read(cr, uid, mod_id, ['res_id'])['res_id']
-        act_win = act_obj.read(cr, uid, res_id, [])
-        act_win['domain'] = [('id','in',[(','.join(map(str,invoices)))]),('type','=','out_invoice')]
-        act_win['name'] = _('Invoices')
-        return act_win
-        
-#        return {
-#            'domain': "[('id','in', ["+','.join(map(str,invoices))+"])]",
-#            'name': _('Invoices'),
-#            'view_type': 'form',
-#            'view_mode': 'tree,form',
-#            'res_model': 'account.invoice',
-#            'view_id': False,
-#            'context': "{'type':'out_invoice'}",
-#            'type': 'ir.actions.act_window'
-#        }
-
+        return {
+            'domain': "[('id','in', ["+','.join(map(str,invoices))+"])]",
+            'name': _('Invoices'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'view_id': False,
+            'context': "{'type':'out_invoice'}",
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
+        }
 
     _create_form = """<?xml version="1.0"?>
     <form string="Invoice on analytic entries">
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 3fbf615ad18..3f8ac28dc8f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -98,23 +98,34 @@ class hr_timesheet_sheet(osv.osv):
     _order = "id desc"
 
     def _total_day(self, cr, uid, ids, name, args, context):
-        field_name = name.strip('_day')
-        cr.execute('SELECT sheet.id, day.' + field_name +' \
+        res = {}
+        cr.execute('SELECT sheet.id, day.total_attendance, day.total_timesheet, day.total_difference\
                 FROM hr_timesheet_sheet_sheet AS sheet \
                 LEFT JOIN hr_timesheet_sheet_sheet_day AS day \
                     ON (sheet.id = day.sheet_id \
                         AND day.name = sheet.date_current) \
                 WHERE sheet.id in (' + ','.join([str(x) for x in ids]) + ')')
-        return dict(cr.fetchall())
+        for record in cr.fetchall():
+            res[record[0]] = {}
+            res[record[0]]['total_attendance_day'] = record[1]
+            res[record[0]]['total_timesheet_day'] = record[2]
+            res[record[0]]['total_difference_day'] = record[3]
+        return res
 
     def _total(self, cr, uid, ids, name, args, context):
-        cr.execute('SELECT s.id, COALESCE(SUM(d.' + name + '),0) \
+        res = {}
+        cr.execute('SELECT s.id, COALESCE(SUM(d.total_attendance),0), COALESCE(SUM(d.total_timesheet),0), COALESCE(SUM(d.total_difference),0) \
                 FROM hr_timesheet_sheet_sheet s \
                     LEFT JOIN hr_timesheet_sheet_sheet_day d \
                         ON (s.id = d.sheet_id) \
                 WHERE s.id in ('+ ','.join(map(str, ids)) + ') \
                 GROUP BY s.id')
-        return dict(cr.fetchall())
+        for record in cr.fetchall():
+            res[record[0]] = {}
+            res[record[0]]['total_attendance'] = record[1]
+            res[record[0]]['total_timesheet'] = record[2]
+            res[record[0]]['total_difference'] = record[3]
+        return res
 
     def _state_attendance(self, cr, uid, ids, name, args, context):
         result = {}
@@ -221,12 +232,12 @@ class hr_timesheet_sheet(osv.osv):
         'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True, states={'draft':[('readonly',False)],'new':[('readonly',False)]}),
         'state' : fields.selection([('new', 'New'),('draft','Draft'),('confirm','Confirmed'),('done','Done')], 'Status', select=True, required=True, readonly=True),
         'state_attendance' : fields.function(_state_attendance, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present'),('none','No employee defined')], string='Current Status'),
-        'total_attendance_day': fields.function(_total_day, method=True, string='Total Attendance'),
-        'total_timesheet_day': fields.function(_total_day, method=True, string='Total Timesheet'),
-        'total_difference_day': fields.function(_total_day, method=True, string='Difference'),
-        'total_attendance': fields.function(_total, method=True, string='Total Attendance'),
-        'total_timesheet': fields.function(_total, method=True, string='Total Timesheet'),
-        'total_difference': fields.function(_total, method=True, string='Difference'),
+        'total_attendance_day': fields.function(_total_day, method=True, string='Total Attendance', multi="_total_day"),
+        'total_timesheet_day': fields.function(_total_day, method=True, string='Total Timesheet', multi="_total_day"),
+        'total_difference_day': fields.function(_total_day, method=True, string='Difference', multi="_total_day"),
+        'total_attendance': fields.function(_total, method=True, string='Total Attendance', multi="_total_sheet"),
+        'total_timesheet': fields.function(_total, method=True, string='Total Timesheet', multi="_total_sheet"),
+        'total_difference': fields.function(_total, method=True, string='Difference', multi="_total_sheet"),
         'period_ids': fields.one2many('hr_timesheet_sheet.sheet.day', 'sheet_id', 'Period', readonly=True),
         'account_ids': fields.one2many('hr_timesheet_sheet.sheet.account', 'sheet_id', 'Analytic accounts', readonly=True),
     }
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index dad78eb0f7f..7e9ff90607d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -19,7 +19,6 @@
             </field>
         </record>
         
-        
         <record id="hr_timesheet_account_form" model="ir.ui.view">
             <field name="name">hr.timesheet.account.form</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>
@@ -48,7 +47,6 @@
             </field>
         </record>
         
-        
         <record id="hr_timesheet_day_form" model="ir.ui.view">
             <field name="name">hr.timesheet.day.form</field>
             <field name="model">hr_timesheet_sheet.sheet.day</field>
@@ -64,7 +62,6 @@
             </field>
         </record>
         
-        
         <record id="hr_timesheet_day_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.day.tree</field>
             <field name="model">hr_timesheet_sheet.sheet.day</field>
@@ -94,11 +91,11 @@
                     <notebook colspan="4">
                         <page string="Daily View">
                             <group col="6" colspan="4">
-                                <button name="button_dummy" string="Go to:" type="object"/>
+                                <button name="button_dummy" string="Go to:" type="object" icon="gtk-redo"/>
                                 <field name="date_current" nolabel="1"/>
                                 <label string=""/>
                                 <button icon="gtk-media-previous" name="date_previous" string="" type="object"/>
-                                <button name="date_today" string="Today" type="object"/>
+                                <button name="date_today" string="Today" type="object" icon="gtk-home"/>
                                 <button icon="gtk-media-next" name="date_next" string="" type="object"/>
                             </group>
                             
@@ -110,11 +107,10 @@
                                 </tree>
                             </field>
                             <group col="1" colspan="1" groups="hr_attendance.group_hr_attendance">
-                                <button name="sign_in" string="Sign In" type="object"/>
-                                <button name="sign_out" string="Sign Out" type="object"/>
+                                <button name="sign_in" string="Sign In" type="object" icon="gtk-go-back"/>
+                                <button name="sign_out" string="Sign Out" type="object" icon="gtk-go-forward"/>
                             </group>
                             
-                            
                             <field name="state_attendance" groups="hr_attendance.group_hr_attendance"/>
                             <field name="total_attendance_day" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
                             <field colspan="4" context="date=date_current,user_id=user_id" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
@@ -164,14 +160,34 @@
                     </notebook>
                     <field name="state"/>
                     <group col="4" colspan="2">
-                        <button name="button_confirm" states="draft" string="Confirm" type="object"/>
-                        <button name="action_set_to_draft" states="done" string="Set to Draft" type="object"/>
-                        <button name="cancel" states="confirm" string="Refuse"/>
-                        <button name="done" states="confirm" string="Accept"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-execute"/>
+                        <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
+                        <button name="cancel" states="confirm" string="Refuse" icon="gtk-stop"/>
+                        <button name="done" states="confirm" string="Accept" icon="gtk-apply"/>
                     </group>
                 </form>
             </field>
         </record>
+
+        <record id="view_hr_timesheet_sheet_filter" model="ir.ui.view">
+            <field name="name">hr_timesheet_sheet.sheet.filter</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Timesheet">
+                   <group col='6' colspan='4'>
+                       <filter icon="gtk-execute" string="My Timesheet" domain="[('user_id','=',uid)]" separator="1" help="Timesheets Related to Current User"/>
+                        <filter icon="gtk-execute" string="My Departments Timesheet" domain="[('user_id', 'child_of', [uid])]" help="Timesheets Related to Department"/>
+                       <field name="state">
+                           <filter icon="terp-hr" domain="[('state','=','draft')]" help="Draft Timesheets"/>
+                           <filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
+                       </field>
+                       <field name="name" select='1'/>
+                       <field name="user_id" select="1" widget="selection" />
+                   </group>
+               </search>
+            </field>
+        </record>
         
         <record id="act_hr_timesheet_sheet_form" model="ir.actions.act_window">
             <field name="name">Timesheets</field>
@@ -179,6 +195,7 @@
             <field name="res_model">hr_timesheet_sheet.sheet</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
+            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
         <menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="next_id_60"
@@ -191,8 +208,10 @@
             <field name="domain">[('user_id','=',uid)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my" id="menu_act_hr_timesheet_sheet_form_my" parent="hr_timesheet_sheet.next_id_60"/>
+        <menuitem action="act_hr_timesheet_sheet_form_my" id="menu_act_hr_timesheet_sheet_form_my" parent="hr_timesheet_sheet.next_id_60" groups="base.group_extended_menu"/>
         
         <record id="act_hr_timesheet_sheet_form_my_confirm" model="ir.actions.act_window">
             <field name="name">My timesheets to confirm</field>
@@ -201,40 +220,49 @@
             <field name="domain">[('user_id','=',uid),('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my_confirm" id="menu_act_hr_timesheet_sheet_form_my_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my"/>
-        
-        <wizard
-            id="act_hr_timesheet_sheet_form_department_current" 
-            model="hr.employee" 
-            name="hr_timesheet_sheet.department.open" 
-            string="My Department's Timesheet"
-            multi="True"/>
-        <menuitem action="act_hr_timesheet_sheet_form_department_current" 
-            icon="STOCK_JUSTIFY_FILL" 
-            id="menu_act_hr_timesheet_sheet_form_department_current" 
-            parent="hr_timesheet_sheet.next_id_60" 
-            groups="hr.group_hr_manager"
-            type="wizard"/>
-        
-        <wizard
-            id="act_hr_timesheet_sheet_form_department_validate" 
-            model="hr.employee" 
-            name="hr_timesheet_sheet.department.validate.open" 
-            string="My Department's Timesheet to Validate"
-            multi="True"/>
-        <menuitem action="act_hr_timesheet_sheet_form_department_validate" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_validate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current" type="wizard"/>
-        
-        <wizard 
-            id="act_hr_timesheet_sheet_form_department_confirm" 
-            model="hr.employee" 
-            name="hr_timesheet_sheet.department.confirm.open" 
-            string="My Department's Timesheet to Confirm"
-            multi="True"/>
+        <menuitem action="act_hr_timesheet_sheet_form_my_confirm" id="menu_act_hr_timesheet_sheet_form_my_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my" groups="base.group_extended_menu"/>
 
-        <menuitem action="act_hr_timesheet_sheet_form_department_confirm" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current" type="wizard"/>
+        <record id="act_hr_timesheet_sheet_form_my_department" model="ir.actions.act_window">
+            <field name="name">My Department's Timesheets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="domain">[('user_id', 'child_of', [uid])]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
+        </record>
+        <menuitem action="act_hr_timesheet_sheet_form_my_department" id="menu_act_hr_timesheet_sheet_form_my_department" parent="hr_timesheet_sheet.next_id_60" groups="base.group_extended_menu"/>
+
+        <record id="act_hr_timesheet_sheet_form_my_confirm_department" model="ir.actions.act_window">
+            <field name="name">My Department's Timesheets to Confirm</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="domain">[('user_id', 'child_of', [uid]),('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
+        </record>
+        <menuitem action="act_hr_timesheet_sheet_form_my_confirm_department" id="menu_act_hr_timesheet_sheet_form_my_confirm_department" parent="menu_act_hr_timesheet_sheet_form_my_department" groups="base.group_extended_menu"/>
+
+        <record id="act_hr_timesheet_sheet_form_my_validate_department" model="ir.actions.act_window">
+            <field name="name">My Department's Timesheets to Validate</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="domain">[('user_id', 'child_of', [uid]),('state','=','confirm'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
+        </record>
+        <menuitem action="act_hr_timesheet_sheet_form_my_validate_department" id="menu_act_hr_timesheet_sheet_form_my_validate_department" parent="menu_act_hr_timesheet_sheet_form_my_department" groups="base.group_extended_menu"/>
         
         <wizard id="act_hr_timesheet_sheet_form_my_current" model="hr.employee" name="hr_timesheet_sheet.current.open" string="My Current Timesheet"/>
+
         <menuitem action="act_hr_timesheet_sheet_form_my_current" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my" type="wizard"/>
         
         <record id="act_hr_timesheet_sheet_form_all_confirm" model="ir.actions.act_window">
@@ -244,8 +272,10 @@
             <field name="domain">[('state','=','draft'),('date_to','&lt;=',time.strftime('%Y-%m-%d'))]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_all_confirm" id="menu_act_hr_timesheet_sheet_form_all_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
+        <menuitem action="act_hr_timesheet_sheet_form_all_confirm" id="menu_act_hr_timesheet_sheet_form_all_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended_menu"/>
         
         <record id="act_hr_timesheet_sheet_form_all_valid" model="ir.actions.act_window">
             <field name="name">Timesheets To Validate</field>
@@ -254,8 +284,10 @@
             <field name="domain">[('state','=','confirm')]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_all_valid" id="menu_act_hr_timesheet_sheet_form_all_valid" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
+        <menuitem action="act_hr_timesheet_sheet_form_all_valid" id="menu_act_hr_timesheet_sheet_form_all_valid" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended_menu"/>
         
         <!--
             Company inheritancy
@@ -349,8 +381,10 @@
             <field name="domain">[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%Y-%m-%d'))]</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="hr_timesheet_sheet_tree_simplified"/>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
         
-        <menuitem action="act_hr_timesheet_sheet_unvalidate" id="menu_hr_timesheet_sheet_unvalidate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
+        <menuitem action="act_hr_timesheet_sheet_unvalidate" id="menu_hr_timesheet_sheet_unvalidate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended_menu"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index bc08e566376..e1c63460864 100755
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -71,7 +71,6 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-    
             
         <record id="process_node_attendance0" model="process.node">
             <field name="model_id" ref="hr.model_hr_employee"/>
@@ -138,6 +137,17 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
+
+        <record id="process_node_workontask0" model="process.node">
+            <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
+            <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Work on Task&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Defines the work summary of task&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="hr_timesheet_sheet.process_process_hrtimesheetprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('open', pending', 'done', 'cancelled')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
         
         <!-- 
             Process Transition
@@ -233,6 +243,15 @@
             <field model="process.node" name="source_node_id" ref="process_node_review0"/>
         </record>
         
+        <record id="process_transition_tasktimesheet0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Task timesheet&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Moves task entry into the timesheet line&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_timesheet0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_workontask0"/>
+         </record>        
+        
         <!-- 
             Process Action
         -->
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 38ecd157968..c6b1e84bd20 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -48,11 +48,11 @@ class idea_idea(osv.osv):
         if not len(ids):
             return {}
 
-        sql = """select i.id, avg(v.score::integer) 
+        sql = """select i.id, avg(v.score::integer)
                    from idea_idea i left outer join idea_vote v on i.id = v.idea_id
                     where i.id in (%s)
                     group by i.id
-                """ % ','.join(['%d']*len(ids))
+                """ % ','.join(['%s']*len(ids))
 
         cr.execute(sql, ids)
         return dict(cr.fetchall())
@@ -61,11 +61,11 @@ class idea_idea(osv.osv):
         if not len(ids):
             return {}
 
-        sql = """select i.id, count(1) 
+        sql = """select i.id, count(1)
                    from idea_idea i left outer join idea_vote v on i.id = v.idea_id
                     where i.id in (%s)
                     group by i.id
-                """ % ','.join(['%d']*len(ids))
+                """ % ','.join(['%s']*len(ids))
 
         cr.execute(sql, ids)
         return dict(cr.fetchall())
@@ -74,11 +74,11 @@ class idea_idea(osv.osv):
         if not len(ids):
             return {}
 
-        sql = """select i.id, count(1) 
+        sql = """select i.id, count(1)
                    from idea_idea i left outer join idea_comment c on i.id = c.idea_id
                     where i.id in (%s)
                     group by i.id
-                """ % ','.join(['%d']*len(ids))
+                """ % ','.join(['%s']*len(ids))
 
 
         cr.execute(sql,ids)
@@ -120,13 +120,13 @@ class idea_idea(osv.osv):
         'count_votes' : fields.function(_vote_count, method=True, string="Count of votes", type="integer"),
         'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"),
         'category_id': fields.many2one('idea.category', 'Category', required=True ),
-        'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Canceled')], 'Status', readonly=True),
+        'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'Status', readonly=True),
         'stat_vote_ids': fields.one2many('idea.vote.stat', 'idea_id', 'Statistics', readonly=True),
     }
 
     _defaults = {
         'user_id': lambda self,cr,uid,context: uid,
-        'my_vote': lambda *a: '-1', 
+        'my_vote': lambda *a: '-1',
         'state': lambda *a: 'draft'
     }
     _order = 'id desc'
@@ -190,7 +190,7 @@ class idea_vote_stat(osv.osv):
     def init(self, cr):
         """
         initialize the sql view for the stats
-        
+
         cr -- the cursor
         """
         cr.execute("""
@@ -202,7 +202,7 @@ class idea_vote_stat(osv.osv):
                     count(1) as nbr
                 from
                     idea_vote v
-                    left join 
+                    left join
                     idea_idea i on (v.idea_id=i.id)
                 group by
                     i.id, v.score, i.id
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 072da309cc6..d0f5388be64 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -118,9 +118,9 @@
                     <field name="description" colspan="4" select="2" widget="text_wiki"/>
                     <field name="state" select="2"/>
                     <group colspan="2" col="3">
-                        <button name="idea_open" string="Open" states="draft"/>
-                        <button name="idea_close" string="Close" states="open"/>
-                        <button name="idea_cancel" string="Cancel" states="open" />
+                        <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
+                        <button name="idea_close" string="Close" states="open" icon="gtk-close"/>
+                        <button name="idea_cancel" string="Cancel" states="open"  icon="gtk-cancel"/>
                     </group>
                 </page>
                 <page string="Comments">
@@ -191,8 +191,9 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state','=','open')]</field>
+        <field name="filter" eval="True"/>        
     </record>
-    <menuitem name="Open Ideas" parent="menu_idea_idea" id="menu_idea_idea_open" action="action_idea_idea_open"/>
+    <menuitem name="Open Ideas" parent="menu_idea_idea" id="menu_idea_idea_open" action="action_idea_idea_open" groups="base.group_extended_menu" />
 
 
     <record model="ir.actions.act_window" id="action_idea_idea_my_idea">
@@ -202,7 +203,7 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('user_id', '=', uid)]</field>
     </record>
-    <menuitem name="My Ideas" parent="menu_ideas1" id="menu_idea_idea_my_idea" action="action_idea_idea_my_idea" />
+    <menuitem name="My Ideas" parent="menu_ideas1" id="menu_idea_idea_my_idea" action="action_idea_idea_my_idea"/>
 
     <record model="ir.actions.act_window" id="action_idea_idea_draft_my">
         <field name="name">My Draft Ideas</field>
@@ -210,12 +211,13 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+        <field name="filter" eval="True"/>        
     </record>
     <menuitem 
         name="My Draft Ideas" parent="menu_idea_idea_my_idea"
         id="menu_idea_idea_draft_my" 
-        action="action_idea_idea_draft_my"/>
-
+        action="action_idea_idea_draft_my"
+        groups="base.group_extended_menu" />
 
     <record model="ir.actions.act_window" id="action_idea_idea_open_my">
         <field name="name">My Open Ideas</field>
@@ -223,11 +225,14 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
+        <field name="filter" eval="True"/>        
     </record>
     <menuitem 
         name="My Open Ideas" parent="menu_idea_idea_my_idea"
         id="menu_idea_idea_open_my"
-        action="action_idea_idea_open_my"/>
+        action="action_idea_idea_open_my"
+        groups="base.group_extended_menu"
+        />
 
         <record model="ir.ui.view" id="view_idea_vote_stat_graph">
             <field name="name">idea.vote_stat.graph</field>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index caef74d4540..f5d4c7cd15e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -127,9 +127,11 @@ class mrp_routing_workcenter(osv.osv):
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence'),
         'cycle_nbr': fields.float('Number of Cycle', required=True,
-            help="A cycle is defined in the workcenter definition."),
-        'hour_nbr': fields.float('Number of Hours', required=True),
-        'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True),
+            help="Time in hours for doing one cycle."),
+        'hour_nbr': fields.float('Number of Hours', required=True, help="Cost per hour"),
+        'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True,
+             help="routing indicates all the workcenters used, for how long and/or cycles." \
+                "If Routing is indicated then,the third tab of a production order (workcenters) will be automatically pre-completed."),
         'note': fields.text('Description')
     }
     _defaults = {
@@ -186,9 +188,9 @@ class mrp_bom(osv.osv):
         'position': fields.char('Internal Ref.', size=64, help="Reference to a position in an external plan."),
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_uos_qty': fields.float('Product UOS Qty'),
-        'product_uos': fields.many2one('product.uom', 'Product UOS'),
+        'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."),
         'product_qty': fields.float('Product Qty', required=True),
-        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, help="UoM (Unit of Measure) is the unit of measurement for the inventory control"),
         'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity. For integer only values, put 1.0"),
         'product_efficiency': fields.float('Product Efficiency', required=True, help="Efficiency on the production. A factor of 0.9 means a loss of 10% in the production."),
         'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'),
@@ -421,7 +423,7 @@ class mrp_production(osv.osv):
         'date_finnished': fields.datetime('End Date'),
 
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
-        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null'),
+        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan futur loads on workcenters based on production plannification."),
 
         'picking_id': fields.many2one('stock.picking', 'Packing list', readonly=True,
             help="This is the internal picking list take bring the raw materials to the production plan."),
@@ -432,7 +434,7 @@ class mrp_production(osv.osv):
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
 
-        'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],'Status', readonly=True),
+        'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'Status', readonly=True),
         'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
         'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
 
@@ -779,6 +781,7 @@ mrp_production_product_line()
 class mrp_procurement(osv.osv):
     _name = "mrp.procurement"
     _description = "Procurement"
+    _order = 'priority,date_planned'    
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'origin': fields.char('Origin', size=64,
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 83a1b4423a8..04a93ac71ee 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -453,7 +453,7 @@
                         <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
                         <field name="product_qty"/>
                         <field name="product_uom"/>
-                        <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production"/>
+                        <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production" icon="gtk-ok"/>
                         <newline/>
                         <label string="" colspan="2"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
@@ -470,13 +470,13 @@
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list"/>
                             <group col="9" colspan="4">
                                 <field name="state" select="2"/>
-                                <button name="action_compute" states="draft" string="Compute Data" type="object"/>
-                                <button name="button_confirm" states="draft" string="Confirm Production"/>
-                                <button name="button_produce" states="ready" string="Start Production"/>
-                                <button name="button_produce_done" states="in_production" string="Production done"/>
-                                <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object"/>
-                                <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel"/>
-                                <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
+                                <button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
+                                <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
+                                <button name="button_produce" states="ready" string="Start Production" icon="gtk-media-play"/>
+                                <button name="button_produce_done" states="in_production" string="Production done" icon="gtk-ok"/>
+                                <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
+                                <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
+                                <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="gtk-convert"/>
                             </group>
                         </page>
                         <page string="Scheduled Products">
@@ -518,6 +518,26 @@
                 </form>
             </field>
         </record>
+        
+        <record id="view_mrp_production_filter" model="ir.ui.view">
+            <field name="name">mrp.production.select</field>
+            <field name="model">mrp.production</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Production">
+                   <group col='6' colspan='4'>
+                       <field name="state" select="1">
+                           <filter icon="terp-mrp" domain="[('state','=','confirmed')]" help="Confirmed Production Orders"/>
+                           <filter icon="terp-mrp" domain="[('state','=','ready')]" help="Production orders which are ready to produce"/>
+                           <filter icon="terp-mrp" domain="[('state','=','in_production')]" help="Production orders which are in production"/>
+                       </field>
+                       <separator orientation="vertical"/>
+                       <field name="name" select='1'/>
+                   </group>
+               </search>
+            </field>
+        </record>
+        
         <record id="mrp_production_action" model="ir.actions.act_window">
             <field name="name">Production Orders</field>
             <field name="type">ir.actions.act_window</field>
@@ -525,6 +545,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="view_id" eval="False"/>
+            <field name="search_view_id" ref="view_mrp_production_filter"/>            
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root"/>
 
@@ -540,7 +561,7 @@
             action="mrp_production_action2_gantt"
             id="menu_production_orders_start_gantt"
             parent="menu_mrp_production_action"
-            sequence="20"/>
+            sequence="20" icon="terp-calendar"/>
 
         <record id="mrp_production_action2" model="ir.actions.act_window">
             <field name="name">Production Orders To Start</field>
@@ -549,8 +570,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="domain">[('state','=','ready')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_mrp_production_filter"/>            
         </record>
-        <menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action"/>
+        <menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action" groups="base.group_extended_menu" />
         <record id="mrp_production_action3" model="ir.actions.act_window">
             <field name="name">Production Orders in Progress</field>
             <field name="type">ir.actions.act_window</field>
@@ -558,8 +581,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="domain">[('state','=','in_production')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_mrp_production_filter"/>            
         </record>
-        <menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="menu_mrp_production_action"/>
+        <menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="menu_mrp_production_action" groups="base.group_extended_menu"/>
         <record id="mrp_production_action4" model="ir.actions.act_window">
             <field name="name">Production Orders Waiting Products</field>
             <field name="type">ir.actions.act_window</field>
@@ -567,8 +592,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="domain">[('state','=','confirmed')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_mrp_production_filter"/>            
         </record>
-        <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.menu_mrp_production_action"/>
+        <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.menu_mrp_production_action" groups="base.group_extended_menu"/>
 
          <record id="mrp_production_new" model="ir.actions.act_window">
             <field name="name">New Production Order</field>
@@ -696,11 +723,11 @@
                         <field colspan="4" name="message" readonly="1"/>
                         <field name="state" readonly="1" select="2"/>
                         <group col="7" colspan="2">
-                            <button name="button_confirm" states="draft" string="Confirm"/>
-                            <button name="button_restart" states="exception" string="Retry"/>
-                            <button name="button_cancel" states="exception,waiting" string="Cancel"/>
-                            <button name="button_check" states="confirmed" string="Run procurement"/>
-                            <button name="button_cancel" states="draft,running" string="Cancel"/>
+                            <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
+                            <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
+                            <button name="button_cancel" states="exception,waiting" string="Cancel" icon="gtk-cancel"/>
+                            <button name="button_check" states="confirmed" string="Run procurement" icon="gtk-media-play"/>
+                            <button name="button_cancel" states="draft,running" string="Cancel" icon="gtk-cancel"/>
                         </group>
                     </page>
                     <page string="Extra Information">
@@ -738,7 +765,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','confirmed')]</field>
         </record>
-        <menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action"/>
+        <menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action" groups="base.group_extended_menu"/>
 
         <record id="mrp_procurement_action5" model="ir.actions.act_window">
             <field name="name">Exceptions Procurements</field>
@@ -748,7 +775,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
         </record>
-        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="menu_mrp_reordering"/>
+        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="menu_mrp_reordering" groups="base.group_extended_menu"/>
 
         <record id="mrp_procurement_action4" model="ir.actions.act_window">
             <field name="name">Exceptions Procurements to Fix</field>
@@ -758,7 +785,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
         </record>
-        <menuitem action="mrp_procurement_action4" id="menu_mrp_procurement_action4" parent="mrp.menu_mrp_procurement_action5"/>
+        <menuitem action="mrp_procurement_action4" id="menu_mrp_procurement_action4" parent="mrp.menu_mrp_procurement_action5" groups="base.group_extended_menu"/>
 
         <record id="mrp_procurement_action11" model="ir.actions.act_window">
             <field name="name">Temporary Procurement Exceptions</field>
@@ -768,7 +795,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
         </record>
-        <menuitem action="mrp_procurement_action11" id="menu_mrp_procurement_action11" parent="mrp.menu_mrp_procurement_action5"/>
+        <menuitem action="mrp_procurement_action11" id="menu_mrp_procurement_action11" parent="mrp.menu_mrp_procurement_action5" groups="base.group_extended_menu"/>
 
          <record id="mrp_procurement_new" model="ir.actions.act_window">
             <field name="name">New Procurement</field>
diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py
index 22bca594c95..4cbd01aa60e 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp/schedulers.py
@@ -58,7 +58,7 @@ class mrp_procurement(osv.osv):
         report_except = 0
         report_later = 0
         while True:
-            cr.execute('select id from mrp_procurement where state=%s and procure_method=%s order by date_planned limit 500 offset %s', ('confirmed', 'make_to_order', offset))
+            cr.execute('select id from mrp_procurement where state=%s and procure_method=%s order by priority,date_planned limit 500 offset %s', ('confirmed', 'make_to_order', offset))
             ids = map(lambda x: x[0], cr.fetchall())
             for proc in procurement_obj.browse(cr, uid, ids):
                 if (maxdate.strftime('%Y-%m-%d')>=proc.date_planned)  or (proc.procure_method=='make_to_order'):
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 059f6a5a0e1..19e9c3ebaf7 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -72,7 +72,7 @@ class mrp_production_workcenter_line(osv.osv):
     _columns = {
        'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'Status', readonly=True),
        'date_start_date': fields.function(_get_date_date, method=True, string='Start Date', type='date'),
-       'date_planned': fields.datetime('Scheduled Date'),
+       'date_planned': fields.related('production_id', 'date_planned', type='datetime', string='Date Planned'),
        'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'),
        'date_start': fields.datetime('Start Date'),
        'date_finnished': fields.datetime('End Date'),
@@ -290,7 +290,7 @@ class mrp_operations_operation_code(osv.osv):
     _columns={
         'name': fields.char('Operation Name',size=64, required=True),
         'code': fields.char('Code', size=16, required=True),
-        'start_stop': fields.selection([('start','Start'),('pause','Pause'),('resume','Resume'),('cancel','Cancel'),('done','Done')], 'Status', required=True),
+        'start_stop': fields.selection([('start','Start'),('pause','Pause'),('resume','Resume'),('cancel','Cancelled'),('done','Done')], 'Status', required=True),
     }
 mrp_operations_operation_code()
 
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 7f248929dd5..7341c31c8d5 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -19,8 +19,8 @@
                 <field name="cycle"/>
                 <field name="hour"/>
                 <field name="state" />
-                <button name="button_start_working" string="Start working" states="draft,pause"/>
-                <button name="button_done" string="Finished" states="startworking"/>
+                <button name="button_start_working" string="Start working" states="draft,pause" icon="gtk-go-forward"/>
+                <button name="button_done" string="Finished" states="startworking" icon="gtk-jump-to"/>
             </tree>
         </field>
     </record>
@@ -151,6 +151,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,graph,gantt,calendar</field>
         <field name="domain">[('production_state','=','ready')]</field>
+        <field name="filter" eval="True"/>        
     </record>
 
     <!-- Action for Draft Operations   -->
@@ -162,6 +163,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="domain">[('state','=','draft')]</field>
+        <field name="filter" eval="True"/>        
     </record>
 
     <record model="ir.values" id="mrp_production_wc_action_open">
diff --git a/addons/product/product.py b/addons/product/product.py
index 12201761466..207e29cc11c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -102,6 +102,11 @@ class product_uom(osv.osv):
         'rounding': lambda *a: 0.01,
     }
 
+    _sql_constraints = [
+        ('factor_gt_zero', 'CHECK (factor!=0)', 'Value of the factor can never be 0 !'),
+        ('factor_inv_data_gt_zero', 'CHECK (factor_inv_data!=0)', 'Value of the factor_inv_data can never be 0 !'),
+    ]
+
     def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False):
         if not from_uom_id or not qty or not to_uom_id:
             return qty
@@ -246,7 +251,7 @@ class product_template(osv.osv):
         'sale_delay': fields.float('Customer Lead Time', help="This is the average time between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different delays will be summed for all levels and purchase orders."),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
-        'rental': fields.boolean('Rentable Product'),
+        'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True),
         'list_price': fields.float('Sale Price', digits=(16, int(config['price_accuracy'])), help="Base price for computing the customer price. Sometimes called the catalog price."),
         'standard_price': fields.float('Cost Price', required=True, digits=(16, int(config['price_accuracy'])), help="The cost of the product for accounting stock valuation. It can serves as a base price for supplier price."),
@@ -390,8 +395,8 @@ class product_product(osv.osv):
         product = self.browse(cr, uid, [product_id], context)[0]
         for supinfo in product.seller_ids:
             if supinfo.name.id == partner_id:
-                return {'code': supinfo.product_code, 'name': supinfo.product_name}
-        return {'code' : product.default_code, 'name' : product.name}
+                return {'code': supinfo.product_code, 'name': supinfo.product_name, 'variants': ''}                
+        return {'code' : product.default_code, 'name' : product.name, 'variants': product.variants}                
 
     def _product_code(self, cr, uid, ids, name, arg, context={}):
         res = {}
@@ -403,12 +408,14 @@ class product_product(osv.osv):
         res = {}
         for p in self.browse(cr, uid, ids, context):
             data = self._get_partner_code_name(cr, uid, [], p.id, context.get('partner_id', None), context)
+            if not data['variants']:
+                data['variants'] = p.variants            
             if not data['code']:
                 data['code'] = p.code
             if not data['name']:
                 data['name'] = p.name
             res[p.id] = (data['code'] and ('['+data['code']+'] ') or '') + \
-                    (data['name'] or '')
+                    (data['name'] or '') + (data['variants'] and (' - '+data['variants']) or '')
         return res
 
     _defaults = {
@@ -438,6 +445,7 @@ class product_product(osv.osv):
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the packing order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits=(16, int(config['price_accuracy']))),
         'price_margin': fields.float('Variant Price Margin', digits=(16, int(config['price_accuracy']))),
+        'pricelist_id': fields.dummy(string='Pricelist',relation='product.pricelist', type='many2one'),        
     }
 
     def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
@@ -530,7 +538,13 @@ class product_product(osv.osv):
         if not context:
             context={}
 
-        if ('variant' in context) and context['variant']:
+        product = self.read(cr, uid, id, ['name'], context=context)
+        if not default:
+            default = {}
+        default = default.copy()
+        default['name'] = product['name'] + _(' (copy)')
+        
+        if context.get('variant',False):
             fields = ['product_tmpl_id', 'active', 'variants', 'default_code',
                     'price_margin', 'price_extra']
             data = self.read(cr, uid, id, fields=fields, context=context)
@@ -573,6 +587,18 @@ class product_packaging(osv.osv):
         'length': fields.float('Length', help='The length of the package'),
     }
 
+    _order = 'sequence'
+    
+    def name_get(self, cr, uid, ids, context={}):
+        if not len(ids):
+            return []
+        res = []
+        for pckg in self.browse(cr, uid, ids,context=context):
+            p_name = pckg.ean and '[' + pckg.ean + '] ' or ''
+            p_name += pckg.ul.name
+            res.append((pckg.id,p_name))
+        return res
+
     def _get_1st_ul(self, cr, uid, context={}):
         cr.execute('select id from product_ul order by id asc limit 1')
         res = cr.fetchone()
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 87b28be3bdb..2f000fdbfc6 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -12,6 +12,9 @@
         <record id="product_uom_categ_kgm" model="product.uom.categ">
             <field name="name">Weight</field>
         </record>
+        <record id="uom_categ_wtime" model="product.uom.categ">
+            <field name="name">Working Time</field>
+        </record>  
         
         <!--
 	Resource: product.uom
@@ -19,11 +22,27 @@
         <record id="product_uom_unit" model="product.uom">
             <field name="category_id" ref="product_uom_categ_unit"/>
             <field name="name">PCE</field>
+            <field name="factor">1.0</field>
+            <field name="factor_inv">1.0</field>            
         </record>
         <record id="product_uom_kgm" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="name">KGM</field>
+            <field name="factor">1.0</field>
+            <field name="factor_inv">1.0</field>            
         </record>
+        <record id="uom_hour" model="product.uom">
+            <field name="name">Hour</field>
+            <field eval="uom_categ_wtime" name="category_id"/>
+            <field name="factor">8.0</field>
+            <field name="factor_inv">1.0</field>            
+        </record>
+        <record id="uom_day" model="product.uom">
+            <field name="name">Day</field>
+            <field eval="uom_categ_wtime" name="category_id"/>
+            <field name="factor">1.0</field>
+            <field name="factor_inv">1.0</field>            
+        </record>            
         
         <!--
 ... to here, it should be in product_demo but we cant just move it 
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a268f3f0eb1..528e3ecde22 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -2,12 +2,28 @@
 <openerp>
     <data>
         <menuitem icon="terp-product" id="menu_main_product" name="Products"/>
+        <menuitem id="menu_products_products" name="Products" parent="product.menu_main_product" sequence="18" />        
         <menuitem
             id="menu_config_product"
             name="Configuration"
             parent="product.menu_main_product"
             sequence="1"
             groups="group_product_manager"/>
+
+        <record id="product_search_form_view" model="ir.ui.view">
+            <field name="name">product.search.form</field>
+            <field name="model">product.product</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Product">
+                   <field name="name" select="1"/>
+                   <field name="default_code" select="1"/>
+                   <field name="categ_id" select="1" widget="selection"/>
+                   <field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
+                </search>
+            </field>
+        </record>
+            
         <record id="product_product_tree_view" model="ir.ui.view">
             <field name="name">product.product.tree</field>
             <field name="model">product.product</field>
@@ -114,7 +130,7 @@
                         </page>
                         <page string="Prices &amp; Suppliers">
                             <separator string="Base Prices" colspan="4"/>
-                            <field name="standard_price"/>
+                            <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                             <field name="list_price"/>
                             <field name="price_margin" select="1"/>
                             <field name="price_extra" select="1"/>
@@ -162,9 +178,10 @@
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="product_product_tree_view"/>
+            <field name="search_view_id" ref="product_search_form_view"/>            
         </record>
         
-        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="18"/>
+        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_products_products" sequence="1"/>
         
         <record id="product_category_form_view" model="ir.ui.view">
             <field name="name">product.category.form</field>
@@ -196,7 +213,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_id</field>
             <field name="arch" type="xml">
-                <tree string="Product Categories">
+                <tree toolbar="True" string="Product Categories">
                     <field name="name"/>
                 </tree>
             </field>
@@ -209,7 +226,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="product_category_tree_view"/>
         </record>
-        <menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="1"/>
+        <menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="3"/>
         
         <record id="product_category_action_form" model="ir.actions.act_window">
             <field name="name">Products Categories</field>
@@ -533,7 +550,7 @@
                         </page>
                         <page string="Prices &amp; Suppliers">
                             <separator string="Base Prices" colspan="4"/>
-                            <field name="standard_price"/>
+                            <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                             <field name="list_price"/>
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
@@ -552,6 +569,15 @@
             </field>
         </record>
         
+        <record id="product_template_action_tree" model="ir.actions.act_window">
+            <field name="name">Product Templates</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.template</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="product_template_tree_view"/>
+        </record>
+        
+        <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products_products" sequence="2"/>
         
     </data>
 </openerp>
diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py
index 969066465f9..c5095d632c2 100644
--- a/addons/product_margin/wizard/wizard_product_margin.py
+++ b/addons/product_margin/wizard/wizard_product_margin.py
@@ -27,6 +27,10 @@ import time
 from tools.translate import _
 
 def _action_open_window(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname) 
+    mod_obj = pool.get('ir.model.data') 
+    result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
+    id = mod_obj.read(cr, uid, result, ['res_id'])    
     cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.graph', 'graph'))
     view_res3 = cr.fetchone()[0]
     cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.form.inherit', 'form'))
@@ -41,7 +45,8 @@ def _action_open_window(self, cr, uid, data, context):
         'res_model':'product.product',
         'type': 'ir.actions.act_window',
         'views': [(view_res,'tree'), (view_res2,'form'), (view_res3,'graph')],
-        'view_id': False
+        'view_id': False,
+        'search_view_id': id['res_id'] 
     }
 
 
diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py
index d5770de8c10..5dfcc68d71a 100644
--- a/addons/profile_manufacturing/profile_manufacturing.py
+++ b/addons/profile_manufacturing/profile_manufacturing.py
@@ -37,7 +37,7 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
             help="Display margins on the sale order form."),
         'sale_crm':fields.boolean('CRM and Calendars',
             help="This installs the customer relationship features like: "\
-            "leads and opportunities tracking, shared calendar, jobs "\
+            "prospects and opportunities tracking, shared calendar, jobs "\
             "tracking, bug tracker, and so on."),
         'sale_journal':fields.boolean('Manage by Journals',
             help="This module  allows you to manage your " \
diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index 2107979c528..d27989f01fc 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -27,7 +27,7 @@ class profile_service_config_install_modules_wizard(osv.osv_memory):
     _name='profile.service.config.install_modules_wizard'
     _rec_name = 'crm_configuration'
     _columns = {
-        'crm_configuration':fields.boolean('CRM & Calendars', help="This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."),
+        'crm_configuration':fields.boolean('CRM & Calendars', help="This installs the customer relationship features like: prospects and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."),
         'project_timesheet':fields.boolean('Timesheets', help="Timesheets allows you to track time and costs spent on different projects, represented by analytic accounts."),
         'hr_timesheet_invoice':fields.boolean('Invoice on Timesheets', help="There are different invoicing methods in OpenERP: from sale orders, from shipping, ... Install this module if you plan to invoice your customers based on time spent on projects."),
         'hr_holidays':fields.boolean('Holidays Management', help="Tracks the full holidays management process, from the employee's request to the global planning."),
diff --git a/addons/project/company.py b/addons/project/company.py
index a99981c9e97..0e17ca9e616 100644
--- a/addons/project/company.py
+++ b/addons/project/company.py
@@ -26,18 +26,14 @@ from osv import osv
 class res_company(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'project_time_mode': fields.selection(
-            [('hours','Hours'),('day','Days'),('week','Weeks'),('month','Months')],
-            'Project Time Unit',
+        'project_time_mode_id': fields.many2one('product.uom', 'Project Time Unit',
             help='This will set the unit of measure used in projects and tasks.\n' \
 "If you use the timesheet linked to projects (project_timesheet module), don't " \
 "forget to setup the right unit of measure in your employees.",
           
         ),
     }
-    _defaults = {
-        'project_time_mode': lambda *args: 'hours',
-    }
+
 res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml
index f19e9ff3396..9e70c16730e 100755
--- a/addons/project/process/task_process.xml
+++ b/addons/project/process/task_process.xml
@@ -39,7 +39,7 @@
         </record>
     
         <record id="process_node_opentask0" model="process.node">
-            <field name="menu_id" ref="project.menu_action_view_task6_prog"/>
+            <field name="menu_id" ref="project.menu_action_view_task"/>
             <field name="model_id" ref="project.model_project_task"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Open task&quot;&quot;&quot;" name="name"/>
diff --git a/addons/project/project.py b/addons/project/project.py
index aaf16082792..ed2f3c65dd8 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -170,9 +170,21 @@ class project(osv.osv):
         return res
 
     def duplicate_template(self, cr, uid, ids,context={}):
-        default = {'parent_id': context.get('parent_id',False)}
-        for id in ids:
-            self.copy(cr, uid, id, default=default)
+        for proj in self.browse(cr, uid, ids):
+            parent_id=context.get('parent_id',False)
+            new_id=self.pool.get('project.project').copy(cr, uid, proj.id,default={'name':proj.name+_(' (copy)'),'state':'open','parent_id':parent_id})
+            cr.execute('select id from project_task where project_id=%s', (proj.id,))
+            res = cr.fetchall()
+            for (tasks_id,) in res:
+                self.pool.get('project.task').copy(cr, uid, tasks_id,default={'project_id':new_id,'active':True}, context=context)
+            cr.execute('select id from project_project where parent_id=%s', (proj.id,))
+            res = cr.fetchall()
+            project_ids = [x[0] for x in res]
+            for child in project_ids:
+                self.duplicate_template(cr, uid, [child],context={'parent_id':new_id})
+
+        # TODO : Improve this to open the new project (using a wizard)
+
         cr.commit()
         raise osv.except_osv(_('Operation Done'), _('A new project has been created !\nWe suggest you to close this one and work on this new project.'))
 
@@ -305,14 +317,13 @@ class task(osv.osv):
     #
     # Override view according to the company definition
     #
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode
-        f = self.pool.get('res.company').fields_get(cr, uid, ['project_time_mode'], context)
-        word = dict(f['project_time_mode']['selection'])[tm]
-
-        res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
-        if tm=='hours':
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        if not tm:
             return res
+        tm = tm.name
+        f = self.pool.get('res.company').fields_get(cr, uid, ['project_time_mode_id'], context)        
         eview = etree.fromstring(res['arch'])
         def _check_rec(eview, tm):
             if eview.attrib.get('widget',False) == 'float_time':
@@ -324,7 +335,7 @@ class task(osv.osv):
         res['arch'] = etree.tostring(eview)
         for f in res['fields']:
             if 'Hours' in res['fields'][f]['string']:
-                res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',word)
+                res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
         return res
 
     def do_close(self, cr, uid, ids, *args):
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 88658b89ca2..e762d3874ba 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -5,6 +5,9 @@
         <!--
 	Resource: project.project
 	-->
+        <record id="base.main_company" model="res.company">
+            <field name="project_time_mode_id" ref="product.uom_hour"></field>
+        </record>
         
         <record id="project_tt_analysis" model="project.task.type">
             <field name="name">Analysis</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 29c67ee640a..5177fce9f88 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -12,11 +12,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="2">
                         <field name="name" select="1"/>
                         <field name="parent_id"/>
+                    </group>
+                    <group colspan="4" col="4">
+                        <field name="date_start"/>                        
                         <field name="manager" select="1"/>
-                        <field name="date_start"/>
                         <field name="date_end"/>
                         <field name="progress_rate" widget="progressbar"/>
                     </group>
@@ -38,12 +40,12 @@
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,done" icon="gtk-ok"/>
                                 <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
-                                <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-ok"/>
+                                <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-jump-to"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
                                 <button name="duplicate_template"
                                     string="New Project Based on Template"
                                     type="object"
-                                    states="template" icon="gtk-execute"/>
+                                    states="template" icon="gtk-new"/>
                             </group>
                         </page>
                         <page groups="base.group_extended" string="Partner Info">
@@ -65,6 +67,22 @@
                                 <label string="Date Stop: %%(date_stop)s"/>
                             </group>
                         </page>
+                        <page string="Tasks">
+                           <field name="tasks" nolabel="1" attrs="{'readonly':[('state','in',['cancelled','done'])]}">
+                               <tree colors="grey:state in ('cancel','done');blue:remaining_hours&lt;0;red:bool(date_deadline) &amp; (date_deadline&lt;current_date) &amp; (state in ('draft','open'))" string="Tasks">
+                                   <field name="sequence"/>
+                                   <field name="name"/>
+                                   <field name="user_id"/>
+                                   <field name="date_deadline"/>
+                                   <field name="planned_hours" sum="Planned" widget="float_time"/>
+                                   <field name="delay_hours" sum="Delay" widget="float_time"/>
+                                   <field name="progress" widget="progressbar"/>
+                                   <field name="priority"/>
+                                   <field name="state"/>
+                                   <field name="remaining_hours" invisible="1"/>
+                                   </tree>
+                           </field>
+                        </page>                        
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
@@ -89,6 +107,25 @@
                 </tree>
             </field>
         </record>
+
+       <record id="view_project_project_filter" model="ir.ui.view">
+            <field name="name">project.project.select</field>
+            <field name="model">project.project</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Project">
+                   <group col='6' colspan='4'>
+                       <field name="state" select="1">
+                           <filter icon="terp-project" domain="[('state','=','open')]" help="Open Projects"/>
+                           <filter icon="terp-project" domain="[('state','=','pending')]" help="Pending Projects"/>
+                       </field>
+                       <separator orientation="vertical"/>
+                       <field name="name" select='1'/>
+                   </group>
+               </search>
+            </field>
+        </record>
+        
         <record id="view_project" model="ir.ui.view">
             <field name="name">project.project.tree</field>
             <field name="model">project.project</field>
@@ -115,6 +152,7 @@
             <field name="view_type">form</field>
             <field name="domain">[]</field>
             <field name="view_id" ref="view_project"/>
+            <field name="search_view_id" ref="view_project_project_filter"/>            
         </record>
         <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_all_project"/>
 
@@ -124,11 +162,13 @@
             <field name="view_type">form</field>
             <field name="domain">[('state','=','open')]</field>
             <field name="view_id" ref="view_project"/>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_project_project_filter"/>            
         </record>
-        <menuitem action="open_view_project_open" id="menu_open_view_project_open" parent="menu_open_view_project_all"/>
+        <menuitem action="open_view_project_open" id="menu_open_view_project_open" groups="base.group_extended_menu" parent="menu_open_view_project_all"/>
 
         <record id="open_view_template_project" model="ir.actions.act_window">
-            <field name="name">Template of Projects</field>
+            <field name="name">Templates of Projects</field>
             <field name="res_model">project.project</field>
             <field name="view_type">form</field>
             <field name="domain">[('state','=','template')]</field>
@@ -195,8 +235,10 @@
             <field name="view_type">form</field>
             <field name="domain">[('manager', '=', uid)]</field>
             <field name="view_id" ref="view_my_project"/>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_project_project_filter"/>            
         </record>
-        <menuitem action="open_view_my_project" id="menu_open_view_my_project" parent="menu_all_project"
+        <menuitem action="open_view_my_project" id="menu_open_view_my_project" parent="menu_all_project" groups="base.group_extended_menu"
             sequence="1"/>
 
         <record id="open_view_my_project_my_run" model="ir.actions.act_window">
@@ -205,10 +247,13 @@
             <field name="view_type">form</field>
             <field name="domain">[('manager', '=', uid),('state','=','open')]</field>
             <field name="view_id" ref="view_my_project"/>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_project_project_filter"/>            
         </record>
         <menuitem
             action="open_view_my_project_my_run"
             id="menu_open_view_my_project_my_run"
+            groups="base.group_extended_menu"
             parent="menu_open_view_my_project"/>
 
         <record id="open_view_my_project_open" model="ir.actions.act_window">
@@ -236,7 +281,7 @@
                     <field name="remaining_hours" widget="float_time"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="compute_hours" string="Update" type="object"/>
+                        <button icon="gtk-refresh" name="compute_hours" string="Update" type="object"/>
                     </group>
                 </form>
             </field>
@@ -259,12 +304,14 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Task edition">
-                    <group colspan="6" col="6">
-                        <field name="name" select="1" attrs="{'readonly':[('state','=','done')]}" />
-                        <field name="project_id" required="1" select="1" attrs="{'readonly':[('state','=','done')]}" />
+                    <group colspan="4" col="2">
+                        <field name="name" select="1"/>
+                        <field name="project_id" required="1" select="1"/>
+                    </group>
+                    <group colspan="4" col="4">
+                        <field name="date_deadline" select="2"/>
+                        <field name="user_id" select="1"/>
                         <field name="total_hours" widget="float_time"/>
-                        <field name="user_id" select="1" attrs="{'readonly':[('state','=','done')]}" />
-                        <field name="date_deadline" select="2" attrs="{'readonly':[('state','=','done')]}" />
                         <field name="progress" widget="progressbar"/>
                     </group>
                     <notebook colspan="4">
@@ -276,14 +323,14 @@
                                 attrs="{'readonly':[('state','!=','draft')]}" 
                                 on_change="onchange_planned(planned_hours,effective_hours)"/>
                                 <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
-                                <button name="%(action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending"/>
+                                <button name="%(action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                             </group>
                             <group col="2" colspan="2">
                             <field name="delay_hours" widget="float_time"/>
                             <field name="effective_hours" widget="float_time"/>
                             </group>
 
-                            <field colspan="4" name="description" nolabel="1" select="2"  attrs="{'readonly':[('state','=','done')]}" />
+                            <field colspan="4" name="description" nolabel="1" select="2"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
                             <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}">
                                 <tree string="Task Work" editable="top">
                                     <field name="date" />
@@ -299,15 +346,16 @@
                                 <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
                                 <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
-                                <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-execute"/>
+                                <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                 <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
 
                             </group>
                         </page>
-                        <page groups="base.group_extended" string="Delegations">
-                            <field colspan="4" name="history" nolabel="1"/>
-                            <field colspan="4" height="150" name="child_ids" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}" context="{'project_id': project_id}">
+                        <page groups="base.group_extended" string="Delegations"> 
+                            <field name="parent_id"/>                           
+                            <newline/>
+                            <field colspan="4" height="150" name="child_ids" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
                                 <tree string="Delegated tasks">
                                     <field name="name"/>
                                     <field name="user_id"/>
@@ -317,17 +365,21 @@
                                     <field name="remaining_hours" widget="float_time"/>
                                     <field name="date_deadline"/>
                                 </tree>
-                            </field>
-                            <field colspan="4" name="parent_id"/>
+                            </field>                            
+                            <field colspan="4" name="history" nolabel="1"/>
                         </page>
-                        <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','in',['draft','done'])]}">
-                            <separator string="Planning" colspan="2"/>
-                            <separator string="Dates" colspan="2"/>
-                            <field name="priority"/>
-                            <field name="date_start" select="2"/>
-                            <field name="sequence"/>
-                            <field name="date_close" select="2"/>
-
+                        <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
+                            <group colspan="2" col="2">
+                                <separator string="Planning" colspan="2"/>
+                                <field name="priority"/>
+                                <field name="sequence"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Dates" colspan="2"/>
+                                <field name="date_start" select="2"/>
+                                <field name="date_close" select="2"/>
+                            </group>
+                            <separator string="Miscelleanous" colspan="4"/>
                             <field name="type"/>
                             <field name="active" select="2"/>
                             <field name="partner_id" select="2"/>
@@ -345,17 +397,49 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel','done');blue:remaining_hours&lt;0;red:bool(date_deadline) &amp; (date_deadline&lt;current_date) &amp; (state in ('draft','open'))" string="Tasks">
-                    <field name="sequence"/>
+                    <field name="sequence" string="Seq."/>
                     <field name="name"/>
-                    <field name="project_id"/>
+                    <field name="project_id" icon="gtk-indent"/>
                     <field name="user_id"/>
                     <field name="date_deadline"/>
-                    <field name="planned_hours" sum="Planned" widget="float_time"/>
-                    <field name="delay_hours" sum="Delay" widget="float_time"/>
+                    <field name="remaining_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="priority"/>
                     <field name="state"/>
-                    <field name="remaining_hours" invisible="1"/>
+                    <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent" help="For changing to draft state"/>
+                    <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state"/>
+                    <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks"/>
+                    <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause" help="For changing to pending state"/>
+                    <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
+                    <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
+                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="view_task_tree3" model="ir.ui.view">
+            <field name="name">project.task.tree</field>
+            <field name="model">project.task</field>
+            <field name="type">tree</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <tree editable="top" colors="grey:state in ('cancel','done');blue:remaining_hours&lt;0;red:bool(date_deadline) &amp; (date_deadline&lt;current_date) &amp; (state in ('draft','open'))" string="Tasks">
+                    <field name="sequence" string="Seq."/>
+                    <field name="name"/>
+                    <field name="project_id" icon="gtk-indent"/>
+                    <field name="user_id"/>
+                    <field name="date_deadline"/>
+                    <field name="remaining_hours" widget="float_time"/>
+                    <field name="progress" widget="progressbar"/>
+                    <field name="priority"/>
+                    <field name="state"/>
+                    <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent" help="For changing to draft state"/>
+                    <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state"/>
+                    <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks"/>
+                    <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause" help="For changing to pending state"/>
+                    <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
+                    <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
+                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>
             </field>
         </record>
@@ -367,17 +451,15 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel','done');blue:remaining_hours&lt;0;red:bool(date_deadline) &amp; (date_deadline&lt;current_date) &amp; (state in ('draft','open'))" string="Tasks">
-                    <field name="sequence"/>
+                    <field name="sequence" string="Seq."/>
                     <field name="name"/>
                     <field name="project_id"/>
                     <field name="delegated_user_id"/>
                     <field name="date_deadline"/>
-                    <field name="planned_hours" sum="Planned" widget="float_time"/>
-                    <field name="delay_hours" sum="Delay" widget="float_time"/>
+                    <field name="remaining_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="priority"/>
                     <field name="state"/>
-                    <field name="remaining_hours" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -422,12 +504,38 @@
             </field>
         </record>
 
+        <record id="view_task_search_form" model="ir.ui.view">
+            <field name="name">project.task.search.form</field>
+            <field name="model">project.task</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+               <search string="Task Edition">
+                    <group col="4" colspan="1">
+                       <filter domain="[('user_id','=',uid)]" help="Tasks Related to Current User" icon="gtk-execute" string="My Task"/>
+                        <filter domain="[('user_id', 'child_of', [uid])]" help="Tasks Related to Department" icon="gtk-execute" separator="1" string="My Departments Task"/>
+                        <filter domain="[('user_id','=',uid),('parent_id','!=',False)]" help="Delegated Tasks Related to Current User" icon="gtk-execute" separator="1" string="My Delegated Task"/>
+                    </group>
+                    <group col="6" colspan="4">
+                        <field name="state" select="1">
+                             <filter domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
+                             <filter domain="[('state','=','pending')]" help="Pending Tasks" icon="terp-project"/>
+                        </field>
+                        <field name="name" select="1"/>
+                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="project_id" select="1" widget="selection"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+    
         <record id="action_view_task" model="ir.actions.act_window">
             <field name="name">All Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,gantt,graph</field>
             <field eval="False" name="view_id"/>
+            <field eval="True" name="filter"/>
+            <field name="search_view_id" ref="view_task_search_form"/>            
         </record>
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_tasks"/>
 
@@ -437,8 +545,23 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,gantt,graph</field>
             <field name="domain">[('user_id', '=', uid)]</field>
+            <field name="view_id" ref="view_task_tree3"/>
+            <field eval="True" name="filter"/>
+            <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="project.menu_tasks"/>
+        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="project.menu_tasks" groups="base.group_extended_menu" />
+
+        <record id="action_view_task_department" model="ir.actions.act_window">
+            <field name="name">My Department Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,gantt,graph</field>
+            <field eval="True" name="filter"/>
+            <field name="domain">[('user_id', 'child_of', [uid])]</field>
+            <field eval="True" name="filter"/>
+            <field name="search_view_id" ref="view_task_search_form"/>
+        </record>
+        <menuitem action="action_view_task_department" id="menu_action_view_department_tasks" parent="project.menu_tasks" groups="base.group_extended_menu"/>
 
         <record id="action_view_task5_pending" model="ir.actions.act_window">
             <field name="name">My Pending Tasks</field>
@@ -446,9 +569,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('user_id', '=', uid),('state','=','pending')]</field>
+            <field eval="True" name="filter"/>            
             <field name="view_id" ref="my_pending_task"/>
+            <field name="search_view_id" ref="view_task_search_form"/>            
         </record>
-        <menuitem action="action_view_task5_pending" id="menu_tasks_yours_pending" parent="menu_action_view_task4"/>
+        <menuitem action="action_view_task5_pending" id="menu_tasks_yours_pending" groups="base.group_extended_menu" parent="menu_action_view_task4"/>
 
         <record id="action_view_task5_prog" model="ir.actions.act_window">
             <field name="name">My Current Tasks</field>
@@ -456,9 +581,12 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('user_id', '=', uid),('state','in',('open','draft'))]</field>
+            <field eval="True" name="filter"/>
+            <field name="view_id" ref="view_task_tree3"/>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_task_search_form"/>                        
         </record>
-        <menuitem action="action_view_task5_prog" id="menu_tasks_yours_prog" parent="menu_action_view_task4"
-            sequence="1"/>
+        <menuitem action="action_view_task5_prog" id="menu_tasks_yours_prog" parent="menu_action_view_task4" sequence="1"/>
 
         <record id="action_view_task5_prog_prog" model="ir.actions.act_window">
             <field name="name">My Tasks in Progress</field>
@@ -466,8 +594,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('user_id', '=', uid),('state','=','open')]</field>
+            <field name="view_id" ref="view_task_tree3"/>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_task_search_form"/>            
         </record>
-        <menuitem action="action_view_task5_prog_prog" id="menu_tasks_yours_prog_prog" parent="menu_tasks_yours_prog"/>
+        <menuitem action="action_view_task5_prog_prog" id="menu_tasks_yours_prog_prog" groups="base.group_extended_menu" parent="menu_tasks_yours_prog"/>
 
         <record id="action_view_task5_prog_draft" model="ir.actions.act_window">
             <field name="name">My Draft Tasks</field>
@@ -475,9 +606,57 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('user_id', '=', uid),('state','=','draft')]</field>
+            <field name="view_id" ref="view_task_tree3"/>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_prog_draft" id="menu_tasks_yours_prog_draft" parent="menu_tasks_yours_prog"/>
+        <menuitem action="action_view_task5_prog_draft" id="menu_tasks_yours_prog_draft" groups="base.group_extended_menu" parent="menu_tasks_yours_prog"/>
 
+        <record id="action_view_task5_departments_pending" model="ir.actions.act_window">
+            <field name="name">My Department's Pending Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('user_id', 'child_of', [uid]),('state','=','pending')]</field>
+            <field name="view_id" ref="my_pending_task"/>
+           <field name="filter" eval="True"/>
+           <field name="search_view_id" ref="view_task_search_form"/>
+        </record>
+        <menuitem action="action_view_task5_departments_pending" id="menu_tasks_yours_departments_pending" groups="base.group_extended_menu" parent="menu_action_view_department_tasks"/>
+
+        <record id="action_view_task5_departments_prog" model="ir.actions.act_window">
+            <field name="name">My Department's Current Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field eval="True" name="filter"/>
+            <field name="domain">[('user_id', 'child_of', [uid]),('state','in',('open','draft'))]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_task_search_form"/>
+        </record>
+        <menuitem action="action_view_task5_departments_prog" id="menu_tasks_yours_departments_prog" parent="menu_action_view_department_tasks" sequence="1"/>
+
+        <record id="action_view_task5_departments_prog_prog" model="ir.actions.act_window">
+            <field name="name">My Department's Tasks in Progress</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('user_id', 'child_of', [uid]),('state','=','open')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_task_search_form"/>
+        </record>
+        <menuitem action="action_view_task5_departments_prog_prog" id="menu_tasks_yours_departments_prog_prog" groups="base.group_extended_menu" parent="menu_tasks_yours_departments_prog"/>
+
+        <record id="action_view_task5_departments_prog_draft" model="ir.actions.act_window">
+            <field name="name">My Department's Draft Tasks</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('user_id', 'child_of', [uid]),('state','=','draft')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_task_search_form"/>
+        </record>
+        <menuitem action="action_view_task5_departments_prog_draft" id="menu_tasks_yours_departments_prog_draft" groups="base.group_extended_menu" parent="menu_tasks_yours_departments_prog"/>
 
         <record id="action_view_task_new" model="ir.actions.act_window">
             <field name="name">New Task</field>
@@ -493,8 +672,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="domain">[('state', '=', 'progress')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_task_search_form"/>            
         </record>
-        <menuitem action="action_view_task6_prog" id="menu_action_view_task6_prog" parent="project.menu_action_view_task"/>
+        <menuitem action="action_view_task6_prog" id="menu_action_view_task6_prog" parent="project.menu_action_view_task" groups="base.group_extended_menu"/>
 
         <record id="action_view_task7" model="ir.actions.act_window">
             <field name="name">Unassigned Tasks</field>
@@ -502,8 +683,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="domain">[('user_id', '=', False)]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_task_search_form"/>                        
         </record>
-        <menuitem action="action_view_task7" id="menu_action_view_task7" parent="project.menu_action_view_task"/>
+        <menuitem action="action_view_task7" id="menu_action_view_task7" parent="project.menu_action_view_task" groups="base.group_extended_menu"/>
 
         <!-- Opening task when double clicking on project -->
         <record id="dblc_proj" model="ir.actions.act_window">
@@ -589,7 +772,7 @@
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
                     <separator string="Project Management" colspan="4"/>
-                    <field name="project_time_mode"/>
+                    <field name="project_time_mode_id"/>
                     <newline/>
                 </page>
             </field>
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 322fe01d0bb..bb0686e5615 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -21,7 +21,7 @@
 ##############################################################################
 
 from xml import dom
-
+from lxml import etree
 
 from mx import DateTime
 from mx.DateTime import now
@@ -90,8 +90,8 @@ class project_gtd_timebox(osv.osv):
         'col_planned_hours': fields.boolean('Planned Hours'),
         'col_effective_hours': fields.boolean('Effective Hours'),
     }
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
-        res = super(project_gtd_timebox,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(project_gtd_timebox,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         if (res['type']=='form') and ('record_id' in context):
             if context['record_id']:
                 rec = self.browse(cr, uid, int(context['record_id']), context)
@@ -137,7 +137,7 @@ class project_gtd_timebox(osv.osv):
         </notebook>
     </form>
             """
-        doc = dom.minidom.parseString(res['arch'])
+        doc = etree.XML(res['arch'])
         xarch, xfields = self._view_look_dom_arch(cr, uid, doc, view_id, context=context)
         res['arch'] = xarch
         res['fields'] = xfields
@@ -171,6 +171,39 @@ class project_task(osv.osv):
     _defaults = {
         'context_id': _get_context
     }
+    
+    def next_timebox(self, cr, uid, ids, *args):
+        for timebox in self.browse(cr, uid , ids):
+            if timebox.timebox_id.type=='daily':
+                timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','weekly')])
+                if timebox_ids:
+                    self.write(cr, uid, ids, {'timebox_id' : timebox_ids[0]})
+            if timebox.timebox_id.type=='weekly':
+                timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','monthly')])
+                if timebox_ids:
+                    self.write(cr, uid, ids, {'timebox_id' : timebox_ids[0]})
+            if timebox.timebox_id.type=='monthly':
+                timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','other')])
+                if timebox_ids:
+                    self.write(cr, uid, ids, {'timebox_id':timebox_ids[0]})
+        return True
+
+    def prev_timebox(self, cr, uid, ids, *args):
+        for timebox in self.browse(cr, uid , ids):
+            if timebox.timebox_id.type=='other':
+                timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','monthly')])
+                if timebox_ids:
+                    self.write(cr, uid, ids, {'timebox_id' : timebox_ids[0]})
+            if timebox.timebox_id.type=='monthly':
+                timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','weekly')])
+                if timebox_ids:
+                    self.write(cr, uid, ids, {'timebox_id' : timebox_ids[0]})
+            if timebox.timebox_id.type=='weekly':
+                timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','daily')])
+                if timebox_ids:
+                    self.write(cr, uid, ids, {'timebox_id':timebox_ids[0]})
+        return True
+    
     # Override read for using this method if context set !!!
     #_order = "((55-ascii(coalesce(priority,'2')))*2 +  coalesce((date_start::date-current_date)/2,8))"
 project_task()
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 13a3f1080bc..b84356684a9 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -102,6 +102,8 @@
                 <tree string="Tasks" editable="bottom" colors="blue:timebox_id">
                     <field name="name"/>
                     <field name="timebox_id" required="1" domain="[('user_id','=',uid)]"/>
+                    <button name="next_timebox" string="Next Timebox" type="object" icon="gtk-indent" attrs="{'invisible':[('timebox_id.type','=','other')]}"/>
+                    <button name="prev_timebox" string="Previous Timebox" type="object" icon="gtk-indent" attrs="{'invisible':[('timebox_id.type','=','daily')]}"/>                    
                     <field name="context_id" required="1"/>
                     <field name="date_start"/>
                     <field name="priority"/>
@@ -114,12 +116,38 @@
                 </tree>
             </field>
         </record>
+        
+        <record id="view_project_gtd_inbox_filter" model="ir.ui.view">
+            <field name="name">project.task.gtd.inbox.select</field>
+            <field name="model">project.task</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search timebox">
+                   <group col='6' colspan='4'>
+                       <field name="timebox_id" select="1" widget="selection">
+                           <filter string="Daily Timebox" domain="[('timebox_id.type','=','daily')]" help="Daily Timebox"/>
+                           <filter string="Inbox" domain="[('user_id','=',uid)]" help="Inbox"/>
+                       </field>
+                       <field name="context_id" select="1" widget="selection">
+                           <filter icon="terp-project" domain="[('context_id.name','=','Office')]" help="Office Context"/>
+                           <filter icon="terp-project" domain="[('context_id.name','=','Car')]" help="Car Context"/>
+                           <filter icon="terp-project" domain="[('context_id.name','=','Travel')]" help="Travel Context"/>
+                           <filter icon="terp-project" domain="[('context_id.name','=','Home')]" help="Home Context"/>
+                       </field>
+                       <separator orientation="vertical"/>
+                       <field name="name" select='1'/>
+                   </group>
+               </search>
+            </field>
+        </record>
+        
         <record model="ir.actions.act_window" id="open_gtd_task_inbox">
             <field name="name">My Inbox</field>
             <field name="res_model">project.task</field>
             <field name="domain">[('user_id','=',uid),('state','in',('open','draft'))]</field>
             <field name="context">{'gtd_sort':True}</field>
             <field name="view_id" ref="task_inbox_view"/>
+            <field name="search_view_id" ref="view_project_gtd_inbox_filter"/>            
         </record>
         
         <menuitem name="Time Management" id="menu_open_time" parent="project.menu_main"/>
@@ -159,13 +187,14 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="project.view_task_form2" />
         <field name="arch" type="xml">
-	        <notebook>
-                <page string="TimeBox Configuration" position="inside">
-                	<separator string="Getting Things Done" colspan="4"/>
-                	<field name="context_id" select="2"/>
-               	 	<field name="timebox_id" select="1" domain="[('user_id', '=', uid)]"/>
-                </page>
-             </notebook>
+            <field name="progress" position="after">
+                <newline/>
+                <separator string="Getting Things Done" colspan="6"/>
+                <newline/>
+                <field name="context_id" select="2" />
+                <field name="timebox_id" select="1" domain="[('user_id', '=', uid)]"/>
+                <newline/>
+            </field>
         </field>
     </record>
 
diff --git a/addons/project_timesheet/__terp__.py b/addons/project_timesheet/__terp__.py
index 8b86f54382c..a81a891d338 100644
--- a/addons/project_timesheet/__terp__.py
+++ b/addons/project_timesheet/__terp__.py
@@ -34,7 +34,7 @@
     'website': 'http://www.openerp.com',
     'depends': ['base', 'project', 'hr_timesheet'],
     'init_xml': [],
-    'update_xml': [],
+    'update_xml': ["process/project_timesheet_process.xml"],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml
new file mode 100644
index 00000000000..80b59f01172
--- /dev/null
+++ b/addons/project_timesheet/process/project_timesheet_process.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+    
+    	<!--        
+            Process Node
+        -->
+        
+        <record id="process_node_timesheettask0" model="process.node">
+            <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form"/>
+            <field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Timesheet task&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Complete Your Timesheet.&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="project.process_process_tasksprocess0"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+        
+        <record id="process_node_taskwork0" model="process.node">
+            <field name="menu_id" ref="project.menu_action_view_task6_prog"/>
+            <field name="model_id" ref="project.model_project_task_work"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Task Work&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Work on task&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="hr_timesheet.process_process_timesheetprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='open'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
+        
+         <!--        
+            Process Transition
+        -->
+        
+        <record id="process_transition_filltimesheet0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Fill Timesheet&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Task summary is comes into the timesheet line&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_timesheettask0"/>
+            <field model="process.node" name="source_node_id" ref="project.process_node_opentask0"/>
+        </record>
+        
+        <record id="process_transition_taskencoding0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Task encoding&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Encode how much time u spent on your task&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="hr_timesheet.process_node_timesheetline0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_taskwork0"/>
+        </record>
+    
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f5bb716f9d1..7e139b55040 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -149,11 +149,11 @@ class purchase_order(osv.osv):
         'origin': fields.char('Origin', size=64,
             help="Reference of the document that generated this purchase order request."
         ),
-        'partner_ref': fields.char('Partner Ref.', size=64),
-        'date_order':fields.date('Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="Date on which this document has been created."),
+        'partner_ref': fields.char('Supplier Ref.', size=64),
+        'date_order':fields.date('Date Ordered', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="Date on which this document has been created."),
         'date_approve':fields.date('Date Approved', readonly=1),
         'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, change_default=True),
-        'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True, states={'posted':[('readonly',True)]}),
+        'partner_address_id':fields.many2one('res.partner.address', 'Supplier Address', required=True, states={'posted':[('readonly',True)]}),
 
         'dest_address_id':fields.many2one('res.partner.address', 'Destination Address', states={'posted':[('readonly',True)]},
             help="Put an address if you want to deliver directly from the supplier to the customer." \
@@ -164,7 +164,7 @@ class purchase_order(osv.osv):
 
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
 
-        'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Confirmed'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
+        'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'notes': fields.text('Notes'),
@@ -495,7 +495,7 @@ class purchase_order_line(osv.osv):
                     qty = temp_qty
 
         dt = (DateTime.now() + DateTime.RelativeDateTime(days=seller_delay or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
-        prod_name = prod.partner_ref
+        prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id])[0][1]
 
 
         res = {'value': {'price_unit': price, 'name':prod_name, 'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id),
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index df971a84b04..51434162854 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -56,11 +56,11 @@
                                 <field name="amount_untaxed" sum="Untaxed amount"/>
                                 <field name="amount_tax"/>
                                 <field name="amount_total" sum="Total amount"/>
-                                <button name="button_dummy" states="draft" string="Compute" type="object"/>
+                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
                             <group col="11" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-execute"/>
+                                <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
                                 <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-ok"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>
@@ -97,11 +97,32 @@
             </field>
         </record>
 
+       <record id="view_purchase_order_filter" model="ir.ui.view">
+            <field name="name">purchase.order.list.select</field>
+            <field name="model">purchase.order</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Purchase Order">
+                 <group col='6' colspan='4'>
+                   <filter icon="gtk-execute" string="Exception Purchases" domain="[('state','in',('except_picking','except_invoice'))]" separator="1" help="Purchases Related to Exception"/>
+                   <field name="state">
+                       <filter icon="terp-purchase" domain="[('state','=','wait')]" help="Waiting Purchases"/>
+                       <filter icon="terp-purchase" domain="[('state','=','confirmed')]" help="Confirmed Purchases"/>
+                       <filter icon="terp-purchase" domain="[('state','=','approved')]" help="Approved Purchases"/>
+                    </field>
+                   <separator orientation="vertical"/>
+                   <field name="name" select="1"/>
+                </group>
+              </search>
+            </field>
+        </record>
+       
         <record id="purchase_form_action" model="ir.actions.act_window">
             <field name="name">Purchase Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="search_view_id" ref="view_purchase_order_filter"/>            
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/>
 
@@ -112,8 +133,10 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_purchase_order_filter"/>            
         </record>
-        <menuitem action="purchase_form_action2" id="menu_purchase_order_draft" parent="purchase.menu_purchase_form_action"/>
+        <menuitem action="purchase_form_action2" id="menu_purchase_order_draft" parent="purchase.menu_purchase_form_action" groups="base.group_extended_menu"/>
 
         <record id="purchase_form_action3" model="ir.actions.act_window">
             <field name="name">Purchase Order Waiting Approval</field>
@@ -122,8 +145,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','confirmed')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_purchase_order_filter"/>            
         </record>
-        <menuitem action="purchase_form_action3" id="menu_purchase_form_action3" parent="purchase.menu_purchase_form_action"/>
+        <menuitem action="purchase_form_action3" id="menu_purchase_form_action3" parent="purchase.menu_purchase_form_action" groups="base.group_extended_menu"/>
 
         <record id="purchase_form_action4" model="ir.actions.act_window">
             <field name="name">Purchase Orders in Progress</field>
@@ -132,8 +157,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','approved')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_purchase_order_filter"/>            
         </record>
-        <menuitem action="purchase_form_action4" id="menu_purchase_form_action4" parent="purchase.menu_purchase_form_action"/>
+        <menuitem action="purchase_form_action4" id="menu_purchase_form_action4" parent="purchase.menu_purchase_form_action" groups="base.group_extended_menu"/>
 
         <record id="purchase_form_action_new" model="ir.actions.act_window">
             <field name="name">New Purchase Order</field>
diff --git a/addons/purchase/wizard/wizard_group.py b/addons/purchase/wizard/wizard_group.py
index 65c09f33593..09ccc5ddd92 100644
--- a/addons/purchase/wizard/wizard_group.py
+++ b/addons/purchase/wizard/wizard_group.py
@@ -53,8 +53,12 @@ ack_form = """<?xml version="1.0"?>
 ack_fields = {}
 
 
-def _merge_orders(self, cr, uid, data, context):
-    order_obj = pooler.get_pool(cr.dbname).get('purchase.order')
+def _mergeOrders(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('purchase.order')
+    mod_obj = pool.get('ir.model.data') 
+    result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
+    id = mod_obj.read(cr, uid, result, ['res_id'])
 
     def make_key(br, fields):
         list_key = []
@@ -148,7 +152,8 @@ def _merge_orders(self, cr, uid, data, context):
         'view_mode': 'tree,form',
         'res_model': 'purchase.order',
         'view_id': False,
-        'type': 'ir.actions.act_window'
+        'type': 'ir.actions.act_window',
+        'search_view_id': id['res_id']
     }
 
 
diff --git a/addons/report_account/report_receivable.py b/addons/report_account/report_receivable.py
index e7da923bd85..005a8458628 100644
--- a/addons/report_account/report_receivable.py
+++ b/addons/report_account/report_receivable.py
@@ -89,14 +89,14 @@ class report_aged_receivable(osv.osv):
         super(report_aged_receivable, self).__init__(pool, cr)
         self.called = False
         
-    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False):
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """ To call the init() method timely
         """
         if not self.called:
             self.init(cr, user)
         self.called = True # To make sure that init doesn't get called multiple times
         
-        res = super(report_aged_receivable, self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
+        res = super(report_aged_receivable, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         return res
     
     def _calc_bal(self, cr, uid, ids, name, args, context):
@@ -121,12 +121,12 @@ class report_aged_receivable(osv.osv):
     
     def init(self, cr, uid=1):
         """ This view will be used in dashboard
+        The reason writing this code here is, we need to check date range from today to first date of fiscal year.        
         """
 #        ranges = _get_ranges(cr) # Gets the ranges for the x axis of the graph (name column values)
         pool_obj_fy = pooler.get_pool(cr.dbname).get('account.fiscalyear')
-        today = mx.DateTime.strptime(time.strftime('%Y-%m-%d'), '%Y-%m-%d') - mx.DateTime.RelativeDateTime(days=1)
-        today = today.strftime('%Y-%m-%d')
-        fy_id  = pool_obj_fy.find(cr,uid, exception=False)
+        today = time.strftime('%Y-%m-%d')
+        fy_id = pool_obj_fy.find(cr, uid, exception=False)
         LIST_RANGES = []
         if fy_id:
             fy_start_date = pool_obj_fy.read(cr, uid, fy_id, ['date_start'])['date_start']
diff --git a/addons/report_analytic_planning/__terp__.py b/addons/report_analytic_planning/__terp__.py
index 53cc8548e16..327b47c6b25 100644
--- a/addons/report_analytic_planning/__terp__.py
+++ b/addons/report_analytic_planning/__terp__.py
@@ -22,20 +22,38 @@
 
 
 {
-    'name': 'Analytic planning - Reporting',
+    'name': 'Planning Management Module',
     'version': '1.0',
-    'category': 'Generic Modules/Accounting',
-    'description': """Planning on analytic accounts.""",
+    'category': 'Generic Modules/Human Ressources',
+    'description': """
+This module helps you to manage your plannings.
+
+This module is based on the analytic accounting and is totally integrated with 
+* the timesheets encoding
+* the holidays management
+* the project management
+
+So that, each department manager can know if someone in his team has still unaloccated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks. 
+
+At the end of the month, the planning manager can also check if the encoded timesheets are respecting the planned time on each analytic account.
+""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['account', 'hr_timesheet_invoice', 'project', 'report_analytic_line'],
+    'depends': [
+        'project', 
+        'hr_timesheet',
+        'hr_holidays',
+    ],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
         'report_analytic_planning_view.xml',
         'report_analytic_planning_report.xml'
     ],
-    'demo_xml': ['report_account_analytic.planning.csv'],
+    'demo_xml': [
+        #'report_account_analytic.planning.csv', 
+        'report_analytic_planning_demo.xml',
+    ],
     'installable': True,
     'active': False,
     'certificate': '0034901836973',
diff --git a/addons/report_analytic_planning/report_account_analytic.planning.csv b/addons/report_analytic_planning/report_account_analytic.planning.csv
index 33247f151eb..41374cedbc0 100644
--- a/addons/report_analytic_planning/report_account_analytic.planning.csv
+++ b/addons/report_analytic_planning/report_account_analytic.planning.csv
@@ -1,10 +1,10 @@
-name,line_ids/amount,line_ids/amount_unit,line_ids/user_id,line_ids/account_id,user_id
-Planning 2007,5.0,Day,admin,Seagate P1,admin
-,7.0,Day,admin,Seagate P2,
-,2.0,Day,admin,Sednacom,
-,3.0,Day,admin,Administratif,
-,4.0,Day,admin,Commercial & Marketing,
-,6.0,Day,demo,Seagate P1,
-,7.0,Day,demo,Seagate P2,
-,1.0,Day,demo,CampToCamp,
-,7.0,Day,demo,Agrolait,
+name,line_ids/amount,line_ids/amount_unit,line_ids/user_id,line_ids/task,line_ids/account_id,user_id
+Planning 2007,5.0,Day,admin,1,Seagate P1,admin
+,7.0,Day,admin,0,Seagate P2,
+,2.0,Day,admin,1,Sednacom,
+,3.0,Day,admin,0,Administratif,
+,4.0,Day,admin,0,Commercial & Marketing,
+,6.0,Day,demo,1,Seagate P1,
+,7.0,Day,demo,1,Seagate P2,
+,1.0,Day,demo,0,CampToCamp,
+,7.0,Day,demo,0,Agrolait,
diff --git a/addons/report_analytic_planning/report_analytic_planning.py b/addons/report_analytic_planning/report_analytic_planning.py
index e5e94cdaf9c..fe4ed5d3e90 100644
--- a/addons/report_analytic_planning/report_analytic_planning.py
+++ b/addons/report_analytic_planning/report_analytic_planning.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution    
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -20,85 +20,345 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
+from tools.translate import _
 
 import time
 import mx.DateTime
 
+class one2many_mod3(fields.one2many):
+    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
+        if not context:
+            context = {}
+        res = {}
+        for obj in obj.browse(cr, user, ids, context=context):
+            res[obj.id] = []
+            list_ids = []
+            for item in obj.user_id.child_ids:
+                list_ids.append(item.id)
+            ids2 = obj.pool.get(self._obj).search(cr, user, ['&',(self._fields_id,'=',obj.id),'|',('user_id','in',list_ids),('user_id','=',False)], limit=self._limit)
+            for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
+                res[r[self._fields_id]].append( r['id'] )
+        return res
+
 class report_account_analytic_planning(osv.osv):
     _name = "report_account_analytic.planning"
     _description = "Planning"
+    
+    def _get_total_planned(self, cr, uid, ids, name, args, context):
+        result = {}
+        for plan in self.browse(cr, uid, ids, context):
+            plan_hrs=0.0
+            for p in plan.planning_user_ids:
+                if not p.plan_open : p.plan_open = 0.0
+                if not p.plan_tasks : p.plan_tasks = 0.0
+                plan_hrs = plan_hrs + p.plan_open + p.plan_tasks
+            result[plan.id] = plan_hrs
+        return result
+     
+    def _get_total_free(self, cr, uid, ids, name, args, context):
+        result = {}
+        for plan in self.browse(cr, uid, ids, context):
+            total_free = 0.0
+            for p in plan.planning_user_ids:
+                if  p.free:
+                    total_free = total_free + p.free
+            result[plan.id] = total_free
+        return result
+
     _columns = {
-        'name': fields.char('Planning Name', size=32, required=True),
-        'user_id': fields.many2one('res.users', 'Responsible', required=True),
-        'date_from':fields.date('Start Date', required=True),
-        'date_to':fields.date('End Date', required=True),
-        'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines'),
-        'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
-        'stat_user_ids': fields.one2many('report_account_analytic.planning.stat.user', 'planning_id', 'Planning by user', readonly=True),
-        'stat_account_ids': fields.one2many('report_account_analytic.planning.stat.account', 'planning_id', 'Planning by account', readonly=True),
-        'state': fields.selection([('open','Open'),('done','Done')], 'Status', required=True)
+        'name': fields.char('Planning Name', size=32, required=True, readonly=True, states={'draft':[('readonly', False)]}), 
+        'user_id': fields.many2one('res.users', 'Responsible', required=True, readonly=True, states={'draft':[('readonly', False)]}), 
+        'date_from':fields.date('Start Date', required=True, readonly=True, states={'draft':[('readonly', False)]}), 
+        'date_to':fields.date('End Date', required=True, readonly=True, states={'draft':[('readonly', False)]}), 
+        'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines', readonly=True, states={'draft':[('readonly', False)]}), 
+        'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True), 
+        'state': fields.selection([('draft','Draft'),('open', 'Open'), ('done', 'Done'),('cancel','Cancelled')], 'Status', required=True), 
+        'business_days' : fields.integer('Business Days', required=True, readonly=True, states={'draft':[('readonly', False)]}, help='Set here the number of working days within this planning for one person full time'),
+        'planning_user_ids': one2many_mod3('report_account_analytic.planning.user', 'planning_id', 'Planning By User'),
+        'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'), 
+        'total_planned'  : fields.function(_get_total_planned, method=True, string='Total Planned'), 
+        'total_free'  : fields.function(_get_total_free, method=True, string='Total Free'),
     }
     _defaults = {
-        'name': lambda *a: time.strftime('%Y-%m-%d'),
-        'date_from': lambda *a: time.strftime('%Y-%m-01'),
-        'date_to': lambda *a: (mx.DateTime.now()+mx.DateTime.RelativeDateTime(months=1,day=1,days=-1)).strftime('%Y-%m-%d'),
-        'user_id': lambda self,cr,uid,c: uid,
-        'state': lambda *args: 'open'
+        'name': lambda *a: time.strftime('%B-%y'), 
+        'date_from': lambda *a: time.strftime('%Y-%m-01'), 
+        'date_to': lambda *a: (mx.DateTime.now()+mx.DateTime.RelativeDateTime(months=1, day=1, days=-1)).strftime('%Y-%m-%d'), 
+        'user_id': lambda self, cr, uid, c: uid, 
+        'state': lambda *args: 'draft', 
+        'business_days' : lambda *a: 20, 
     }
     _order = 'date_from desc'
+    
+    def action_open(self, cr, uid, id, context={}):
+        self.write(cr, uid, id, {'state' : 'open'})
+        return True
+
+    def action_cancel(self, cr, uid, id, context={}):
+        self.write(cr, uid, id, {'state' : 'cancel'})
+        return True
+    
+    def action_draft(self, cr, uid, id, context={}):
+        self.write(cr, uid, id, {'state' : 'draft'})
+        return True
+    
+    def action_done(self, cr, uid, id, context={}):
+        self.write(cr, uid, id, {'state' : 'done'})
+        return True
+        
 report_account_analytic_planning()
 
 class report_account_analytic_planning_line(osv.osv):
     _name = "report_account_analytic.planning.line"
     _description = "Planning Line"
     _rec_name = 'user_id'
+
+    def name_get(self, cr, uid, ids, context={}):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['user_id','planning_id','note'], context)
+        res = []
+        for record in reads:
+            name = '['+record['planning_id'][1] + " - " +record['user_id'][1]+'] '
+            if record['note']:
+                name += record['note']
+            res.append((record['id'], name))
+        return res
+
+    def _amount_base_uom(self, cr, uid, ids, name, args, context):
+        result = {}
+        for line in self.browse(cr, uid, ids, context):
+            result[line.id] = line.amount / line.amount_unit.factor
+        return result
+
     _columns = {
-        'account_id':fields.many2one('account.analytic.account', 'Analytic account', required=True),
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'),
-        'user_id': fields.many2one('res.users', 'User'),
-        'amount': fields.float('Quantity', required=True),
-        'amount_unit':fields.many2one('product.uom', 'Qty UoM', required=True),
-        'note':fields.text('Note', size=64),
+        'account_id':fields.many2one('account.analytic.account', 'Analytic account', required=True), 
+        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'), 
+        'user_id': fields.many2one('res.users', 'User'), 
+        'amount': fields.float('Quantity', required=True), 
+        'amount_unit': fields.many2one('product.uom', 'Qty UoM', required=True), 
+        'note': fields.text('Note', size=64), 
+        'amount_in_base_uom': fields.function(_amount_base_uom, method=True, string='Quantity in base uom', store=True),
+        'task_ids': fields.one2many('project.task', 'planning_line_id', 'Planning Tasks'), 
     }
     _order = 'user_id,account_id'
 report_account_analytic_planning_line()
 
-class report_account_analytic_planning_stat_account(osv.osv):
-    _name = "report_account_analytic.planning.stat.account"
-    _description = "Planning account stat"
-    _rec_name = 'account_id'
+
+class project_task(osv.osv):
+    _name = "project.task"
+    _inherit = "project.task"
+    _columns = {
+        'planning_line_id': fields.many2one('report_account_analytic.planning.line', 'Planning', ondelete='cascade'), 
+    }
+project_task()
+
+
+class report_account_analytic_planning_user(osv.osv):
+    _name = "report_account_analytic.planning.user"
+    _description = "Planning by User"
+    _rec_name = 'user_id'
     _auto = False
-    _log_access = False
-    def _sum_amount_real(self, cr, uid, ids, name, args, context):
+    
+    
+    def _get_tasks(self, cr, uid, ids, name, args, context):
+        result = {}
+        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        if tm and tm.factor:
+            div = tm.factor
+        else:
+            div = 1.0
+        for line in self.browse(cr, uid, ids, context):
+            if line.user_id:
+                cr.execute("""select COALESCE(sum(tasks.remaining_hours),0) from project_task tasks \
+                               where  tasks.planning_line_id in (select id from report_account_analytic_planning_line\
+                where planning_id = %s and user_id=%s)""", (line.planning_id.id, line.user_id.id,))
+                
+                result[line.id] = cr.fetchall()[0][0] / div
+            else:
+                result[line.id] = 0
+        return result
+
+    def _get_free(self, cr, uid, ids, name, args, context):
         result = {}
         for line in self.browse(cr, uid, ids, context):
-            cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%s and date>=%s and date<=%s', (line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
-            result[line.id] = cr.fetchone()[0]
+            if line.user_id:
+                result[line.id] = line.planning_id.business_days - line.plan_tasks - line.plan_open - line.holiday 
+            else:
+                result[line.id] = 0.0
         return result
+    
+    def _get_timesheets(self, cr, uid, ids, name, args, context):
+        result = {}
+        for line in self.browse(cr, uid, ids, context):
+            if line.user_id:
+                cr.execute("""
+                SELECT sum(unit_amount/uom.factor) FROM account_analytic_line acc 
+                LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
+                WHERE acc.date>=%s and acc.date<=%s and acc.user_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.user_id.id ))
+                res = cr.fetchall()
+                result[line.id] = res[0][0] 
+            else:
+                result[line.id] = 0
+        return result
+
     _columns = {
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
-        'quantity': fields.float('Planned', required=True),
-        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
+        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'), 
+        'user_id': fields.many2one('res.users', 'User', readonly=True), 
+        'tasks' : fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'), 
+        'plan_tasks': fields.float('Time Planned on Tasks', readonly=True, help='This value is given by the sum of time allocation with task(s) linked, expressed in days.'), 
+        'free' : fields.function(_get_free, method=True, string='Unallocated Time', readonly=True,help='Computed as \
+Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)'), 
+        'plan_open': fields.float('Time Allocation without Tasks', readonly=True,help='This value is given by the sum of time allocation without task(s) linked, expressed in days.'), 
+        'holiday': fields.float('Leaves',help='This value is given by the total of validated leaves into the \'Date From\' and \'Date To\' of the planning.'), 
+        'timesheet': fields.function(_get_timesheets, method=True, string='Timesheet', help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'), 
     }
+    
     def init(self, cr):
-        cr.execute("""
-            create or replace view report_account_analytic_planning_stat_account as (
-                select
-                    min(l.id) as id,
-                    l.account_id as account_id,
-                    sum(l.amount*u.factor) as quantity,
-                    l.planning_id
-                from
-                    report_account_analytic_planning_line l
-                left join
-                    product_uom u on (l.amount_unit = u.id)
-                group by
-                    planning_id, account_id
+        cr.execute(""" CREATE OR REPLACE VIEW report_account_analytic_planning_user AS (
+        SELECT 
+            planning.id AS planning_id,
+            max(planning.id)+COALESCE(users.id,1) AS id,
+            planning.business_days,
+            users.id AS user_id,
+            (SELECT sum(line1.amount_in_base_uom) 
+                FROM report_account_analytic_planning_line line1
+                WHERE   (
+                        SELECT COUNT(1) 
+                        FROM project_task task 
+                        WHERE task.planning_line_id = line1.id
+                        ) > 0 
+                AND line1.user_id = users.id 
+                AND line1.planning_id = planning.id
+            )AS plan_tasks,
+            (SELECT SUM(line1.amount_in_base_uom) 
+                FROM report_account_analytic_planning_line line1
+                WHERE   (
+                        SELECT COUNT(1) 
+                        FROM project_task task 
+                        WHERE task.planning_line_id = line1.id
+                        ) = 0  
+                AND line1.user_id = users.id 
+                AND line1.planning_id = planning.id
+            ) AS plan_open,
+            (SELECT -(SUM(holidays.number_of_days))
+                FROM hr_holidays holidays 
+                WHERE holidays.employee_id IN 
+                    (
+                    SELECT emp.id 
+                    FROM hr_employee emp WHERE emp.user_id = users.id 
+                    )
+                AND holidays.state IN ('validate')
+                AND holidays.type = 'remove' 
+                AND holidays.date_from >= planning.date_from 
+                AND holidays.date_to <= planning.date_to
+            ) AS holiday
+
+        FROM report_account_analytic_planning planning
+        LEFT JOIN report_account_analytic_planning_line line ON (line.planning_id = planning.id), res_users users
+ 
+        GROUP BY planning.id, planning.business_days, users.id, planning.date_from, planning.date_to
+
+        UNION
+
+        SELECT
+            planning.id AS planning_id,
+            max(planning.id) AS id,
+            planning.business_days,
+            line.user_id,
+            (SELECT SUM(line1.amount_in_base_uom) 
+                FROM report_account_analytic_planning_line line1
+                WHERE (SELECT COUNT(1) FROM project_task task WHERE task.planning_line_id = line1.id) > 0  
+                AND line1.user_id IS NULL
+            ) AS plan_tasks,
+            (SELECT SUM(line1.amount_in_base_uom) 
+                FROM report_account_analytic_planning_line line1
+                WHERE (SELECT COUNT(1) FROM project_task task WHERE task.planning_line_id = line1.id) = 0 
+                AND line1.user_id IS NULL
+            ) AS plan_open,
+            '0' AS holiday
+        FROM report_account_analytic_planning planning 
+        INNER JOIN report_account_analytic_planning_line line ON line.planning_id = planning.id 
+            AND line.user_id IS NULL
+        GROUP BY planning.id, planning.business_days, line.user_id, planning.date_from, planning.date_to
+        )
+        """)
+
+report_account_analytic_planning_user()
+    
+class report_account_analytic_planning_account(osv.osv):
+    _name = "report_account_analytic.planning.account"
+    _description = "Planning by Account"
+    _rec_name = 'account_id'
+    _auto = False
+    
+    def _get_tasks(self, cr, uid, ids, name, args, context):
+        result = {}
+        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        if tm and tm.factor:
+            div = tm.factor
+        else:
+            div = 1.0
+
+        for line in self.browse(cr, uid, ids, context):
+            cr.execute("""
+                SELECT COALESCE(sum(tasks.remaining_hours),0) 
+                FROM project_task tasks 
+                WHERE tasks.planning_line_id IN (
+                    SELECT id 
+                    FROM report_account_analytic_planning_line
+                    WHERE planning_id = %s AND account_id=%s
+                )""", (line.planning_id.id,line.account_id.id ))
+            result[line.id] = cr.fetchall()[0][0] / div
+        return result
+    
+    def _get_timesheets(self, cr, uid, ids, name, args, context):
+        result = {}
+        for line in self.browse(cr, uid, ids, context):
+            cr.execute("""
+                SELECT SUM(unit_amount/uom.factor) FROM account_analytic_line acc 
+                LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
+                WHERE acc.date>=%s and acc.date<=%s and acc.account_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.account_id.id, ))
+            res = cr.fetchall()[0][0]
+            if res:
+                result[line.id] = res 
+            else:
+                result[line.id] = 0
+        return result
+
+    _columns = {
+        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'), 
+        'account_id': fields.many2one('account.analytic.account', 'Analytic account', readonly=True), 
+        'tasks' : fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'), 
+        'plan_tasks': fields.float('Time Allocation of Tasks', readonly=True,help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to TRUE expressed in days.'), 
+        'plan_open': fields.float('Time Allocation without Tasks', readonly=True,help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to FALSE, expressed in days.'), 
+        'timesheet': fields.function(_get_timesheets, method=True, string='Timesheet',help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'), 
+    }
+    
+    def init(self, cr):
+        cr.execute(""" create or replace view report_account_analytic_planning_account as (
+          select 
+            min(l.id) as id,
+            l.account_id as account_id,
+            sum(l.amount) as quantity,
+            l.planning_id as planning_id,
+            (Select sum(line1.amount_in_base_uom) from report_account_analytic_planning_line line1
+        where (select count(1) from project_task task where task.planning_line_id = line1.id) > 0 
+                and l.account_id = line1.account_id
+                    and l.planning_id = line1.planning_id
+        ) as plan_tasks,
+            (Select sum(line1.amount_in_base_uom) from report_account_analytic_planning_line line1
+            where (select count(1) from project_task task where task.planning_line_id = line1.id) = 0  and l.account_id = line1.account_id
+                    and planning.id=l.planning_id
+            )  as plan_open
+        from report_account_analytic_planning_line l
+        inner join report_account_analytic_planning planning on planning.id=l.planning_id
+        group by l.account_id, l.planning_id, planning.date_from, planning.date_to, planning.id
             )
         """)
-report_account_analytic_planning_stat_account()
+    
+    
+report_account_analytic_planning_account()
 
 class report_account_analytic_planning_stat(osv.osv):
     _name = "report_account_analytic.planning.stat"
@@ -110,9 +370,11 @@ class report_account_analytic_planning_stat(osv.osv):
         result = {}
         for line in self.browse(cr, uid, ids, context):
             if line.user_id:
-                cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%s and account_id=%s and date>=%s and date<=%s', (line.user_id.id,line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
+                cr.execute('''select sum(acc.unit_amount/uom.factor) from account_analytic_line acc
+                LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
+where user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
             else:
-                cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%s and date>=%s and date<=%s', (line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
+                cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%s and date>=%s and date<=%s', (line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
             result[line.id] = cr.fetchone()[0]
         return result
     def _sum_amount_tasks(self, cr, uid, ids, name, args, context):
@@ -130,20 +392,20 @@ class report_account_analytic_planning_stat(osv.osv):
                     project_id in (select id from project_project where category_id=%s) and
                     date_close>=%s and
                     date_close<=%s''', (
-                line.account_id.id,
-                line.planning_id.date_from,
+                line.account_id.id, 
+                line.planning_id.date_from, 
                 line.planning_id.date_to)
             )
             result[line.id] = cr.fetchone()[0]
         return result
     _columns = {
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
-        'user_id': fields.many2one('res.users', 'User'),
-        'manager_id': fields.many2one('res.users', 'Manager'),
-        'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
-        'sum_amount': fields.float('Planned hours', required=True),
-        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
-        'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'),
+        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'), 
+        'user_id': fields.many2one('res.users', 'User'), 
+        'manager_id': fields.many2one('res.users', 'Manager'), 
+        'account_id': fields.many2one('account.analytic.account', 'Account', required=True), 
+        'sum_amount': fields.float('Planned Days', required=True), 
+        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'), 
+        'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'), 
     }
     _order = 'planning_id,user_id'
     def init(self, cr):
@@ -154,7 +416,7 @@ class report_account_analytic_planning_stat(osv.osv):
                     l.user_id as user_id,
                     a.user_id as manager_id,
                     l.account_id as account_id,
-                    sum(l.amount*u.factor) as sum_amount,
+                    sum(l.amount/u.factor) as sum_amount,
                     l.planning_id
                 from
                     report_account_analytic_planning_line l
@@ -168,43 +430,4 @@ class report_account_analytic_planning_stat(osv.osv):
         """)
 report_account_analytic_planning_stat()
 
-class report_account_analytic_planning_stat_user(osv.osv):
-    _name = "report_account_analytic.planning.stat.user"
-    _description = "Planning user stat"
-    _rec_name = 'user_id'
-    _auto = False
-    _log_access = False
-    def _sum_amount_real(self, cr, uid, ids, name, args, context):
-        result = {}
-        for line in self.browse(cr, uid, ids, context):
-            result[line.id] = 0.0
-            if line.user_id:
-                cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%s and date>=%s and date<=%s', (line.user_id.id,line.planning_id.date_from,line.planning_id.date_to))
-                result[line.id] = cr.fetchone()[0]
-        return result
-    _columns = {
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True),
-        'user_id': fields.many2one('res.users', 'User'),
-        'quantity': fields.float('Planned', required=True),
-        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
-    }
-    def init(self, cr):
-        cr.execute("""
-            create or replace view report_account_analytic_planning_stat_user as (
-                select
-                    min(l.id) as id,
-                    l.user_id as user_id,
-                    sum(l.amount*u.factor) as quantity,
-                    l.planning_id
-                from
-                    report_account_analytic_planning_line l
-                left join
-                    product_uom u on (l.amount_unit = u.id)
-                group by
-                    planning_id, user_id
-            )
-        """)
-report_account_analytic_planning_stat_user()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/report_analytic_planning/report_analytic_planning_demo.xml b/addons/report_analytic_planning/report_analytic_planning_demo.xml
new file mode 100644
index 00000000000..9a64217f252
--- /dev/null
+++ b/addons/report_analytic_planning/report_analytic_planning_demo.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="hr.dep_administration" model="hr.department">
+            <field name="name">Administration</field>
+            <field name="parent_id" ref="hr.dep_management"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="manager_id" ref="base.user_root"/>
+            <field name="member_ids" eval="[(6,0,[ref('base.user_demo')])]"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 111ea6da645..755bad51320 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -1,207 +1,313 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        <record id="account_analytic_planning_view_tree" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.tree</field>
-            <field name="model">report_account_analytic.planning</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Planning by Account">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record id="account_analytic_planning_view_form" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.form</field>
-            <field name="model">report_account_analytic.planning</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Planning by Account">
-                    <notebook>
-                        <page string="Planning">
-                            <field name="name" select="1"/>
-                            <field name="user_id" select="1"/>
-                            <field name="date_from"/>
-                            <field name="date_to"/>
-                            <field colspan="4" name="line_ids" nolabel="1">
-                                <tree editable="bottom" string="Planning Line">
-                                    <field name="user_id"/>
-                                    <field name="account_id"/>
-                                    <field name="amount"/>
-                                    <field name="amount_unit"/>
-                                    <field name="note"/>
-                                </tree>
-                            </field>
-                            <field name="state" select="1"/>
-                        </page>
-                        <page string="Analysis">
-                            <field colspan="4" name="stat_ids" nolabel="1" readonly="1">
-                                <tree editable="bottom" string="Planning Line">
-                                    <field name="user_id"/>
-                                    <field name="account_id"/>
-                                    <field name="sum_amount"/>
-                                    <field name="sum_amount_real"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Time by User">
-                            <field colspan="4" name="stat_user_ids" nolabel="1">
-                                <tree string="Quantities by User">
-                                    <field name="user_id"/>
-                                    <field name="quantity" sum="Total Planned"/>
-                                    <field name="sum_amount_real" sum="Total Timesheet"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Time by Account">
-                            <field colspan="4" name="stat_account_ids" nolabel="1">
-                                <tree string="Quantities by Account">
-                                    <field name="account_id"/>
-                                    <field name="quantity" sum="Total Planned"/>
-                                    <field name="sum_amount_real" sum="Total Timesheet"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-        
-        <record id="action_account_analytic_planning_form" model="ir.actions.act_window">
-            <field name="name">Planning</field>
-            <field name="res_model">report_account_analytic.planning</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem id="planning_main" name="Planning" parent="hr.menu_hr_root"/>
-		<menuitem 
-			action="action_account_analytic_planning_form" 
-			id="menu_report_account_analytic_planning" 
-			parent="planning_main"/>
-        
-        <record id="action_account_analytic_planning_form_my" model="ir.actions.act_window">
-            <field name="name">My Planning</field>
-            <field name="res_model">report_account_analytic.planning</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid)]</field>
-        </record>
-        <menuitem
-            action="action_account_analytic_planning_form_my"
-            id="menu_report_account_analytic_planning_my2" 
-            parent="planning_main"/>
-        
-        <record id="action_account_analytic_planning_form_current_my" model="ir.actions.act_window">
-            <field name="name">My Current Planning</field>
-            <field name="res_model">report_account_analytic.planning</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
-        </record>
-        <menuitem action="action_account_analytic_planning_form_current_my" id="menu_report_account_analytic_planning_current_my" parent="menu_report_account_analytic_planning_my2"/>
-        
-        <record id="action_account_analytic_planning_form_current" model="ir.actions.act_window">
-            <field name="name">Current Planning</field>
-            <field name="res_model">report_account_analytic.planning</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
-        </record>
-        <menuitem action="action_account_analytic_planning_form_current" id="menu_report_account_analytic_planning_current" parent="report_analytic_planning.menu_report_account_analytic_planning"/>
+	<data>
+	
+        <!-- Planning -->
+		<record id="account_analytic_planning_view_tree" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.tree</field>
+			<field name="model">report_account_analytic.planning</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Planning">
+					<field name="name" />
+					<field name="user_id" />
+					<field name="date_from" />
+					<field name="date_to" />
+					<field name="business_days" />
+					<field name="total_planned" />
+					<field name="total_free" />
+					<field name="state" />
+				</tree>
+			</field>
+		</record>
 
-        <record id="action_account_analytic_planning_form_new" model="ir.actions.act_window">
-            <field name="name">New Planning</field>
-            <field name="res_model">report_account_analytic.planning</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-        </record>
-        <menuitem action="action_account_analytic_planning_form_new" id="menu_report_account_analytic_planning_new" parent="planning_main"/>
-        
-        
-        
-        <!--
-	Planning statistics
--->
-        <record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.stat.form</field>
-            <field name="model">report_account_analytic.planning.stat</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Planning statistics">
+		<record id="account_analytic_planning_view_form" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.form</field>
+			<field name="model">report_account_analytic.planning</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Planning by Account">
+					<group col="6" colspan="4">
+						<field name="name" select="1" />
+						<field name="user_id" select="1" />
+						<field name="business_days" />
+						<field name="date_from" />
+						<field name="date_to" />
+					</group>
+					<notebook colspan="4">
+						<page string="Planning by User">
+						<field colspan="4" name="planning_user_ids"
+								nolabel="1" widget="one2many_list" readonly="1">
+							<tree string="Planning By User (in Days)">
+								<field name="user_id"/>
+								<field name="tasks" sum="Total Remaining Tasks"/>
+								<field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
+								<field name="plan_open" sum="Total Time Allocation without Tasks"/>
+								<field name="holiday" />
+								<field name="free" sum="Total Unallocated Time"/>
+								<field name="timesheet"/>
+							</tree>
+						</field>
+						</page>
+						<page string="Planning by Account">
+						<field colspan="4" name="planning_account"
+								nolabel="1" widget="one2many_list" readonly="1">
+							<tree string="Planning By Account (in Days)">
+								<field name="account_id" />
+								<field name="tasks" sum="Total Remaining Tasks"/>
+								<field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
+								<field name="plan_open" sum="Total Time Allocation without Tasks"/>
+								<field name="timesheet" />
+							</tree>
+						</field>
+						</page>
+						<page string="Time Encoding">
+							<field colspan="4" name="line_ids"
+								nolabel="1">
+								<tree editable="bottom"
+									string="Planning Lines">
+									<field name="user_id"/>
+									<field name="account_id" />
+									<field name="amount" />
+									<field name="amount_unit" />
+									<field name="task_ids" />
+									<field name="note" />
+									<field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
+
+								</tree>
+								<form string="Planning Lines">
+									<field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
+									<field name="account_id" />
+									<field name="amount" />
+									<field name="amount_unit" />
+<!--									WIDGET MANY2MANY GIVES ERROR-->
+<!--									<field name="task_ids" colspan="4" nolabel="1" widget="many2many"/>-->
+									<field name="task_ids" colspan="4" nolabel="1"/>
+									<separator string="Notes" colspan="4" />
+									<field name="note" colspan="4"
+										nolabel="1" />
+								</form>
+							</field>
+						</page>
+					</notebook>
+					<group col="6" colspan="4">
+						<field name="state" select="1"
+							readonly="1" />
+						<button name="action_open" states="draft"
+							string="Open" type="object" icon="gtk-yes" />
+						<button name="action_done" states="open"
+							string="Done" type="object" icon="gtk-jump-to" />
+						<button name="action_cancel" states="draft,open"
+							string="Cancel" type="object" icon="gtk-cancel" />
+						<button name="action_draft" states="done,cancel"
+							string="Reset to Draft" type="object" icon="gtk-convert" />
+					</group>
+				</form>
+			</field>
+		</record>
+
+        <!-- Planning Line -->
+
+		<record id="account_analytic_planning_line_view_tree" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.line.tree</field>
+			<field name="model">report_account_analytic.planning.line</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Planning Line">
+                    <field name="planning_id"/>
+                    <field name="user_id"/>
+                    <field name="account_id" />
+                    <field name="amount" />
+                    <field name="amount_unit" />
+                    <field name="note" select="1"/>
+                    <field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
+				</tree>
+			</field>
+		</record>
+
+		<record id="account_analytic_planning_line_view_form" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.line.form</field>
+			<field name="model">report_account_analytic.planning.line</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Planning Line">
                     <field name="planning_id" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="account_id" select="1"/>
-                </form>
-            </field>
-        </record>
-        
-        
-        <record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.stat.tree</field>
-            <field name="model">report_account_analytic.planning.stat</field>
-            <field name="type">tree</field>
+                    <field name="amount" />
+                    <field name="amount_unit" />
+                    <separator string="Notes" colspan="4" />
+                    <field name="note" colspan="4" nolabel="1" />
+				</form>
+			</field>
+		</record>
+
+		<record id="action_account_analytic_planning_form" model="ir.actions.act_window">
+			<field name="name">Plannings</field>
+			<field name="res_model">report_account_analytic.planning</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+		</record>
+		
+		<menuitem id="planning_main" name="Plannings"
+			parent="hr.menu_hr_root" />
+			
+		<menuitem action="action_account_analytic_planning_form"
+			id="menu_report_account_analytic_planning" parent="planning_main" />
+
+		<record id="action_account_analytic_planning_form_my" model="ir.actions.act_window">
+			<field name="name">My Plannings</field>
+			<field name="res_model">report_account_analytic.planning</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="domain">[('user_id','=',uid)]</field>
+		</record>
+		
+		<menuitem action="action_account_analytic_planning_form_my"
+			id="menu_report_account_analytic_planning_my2"
+			parent="planning_main" />
+
+		<record id="action_account_analytic_planning_form_current_my"
+			model="ir.actions.act_window">
+			<field name="name">My Current Plannings</field>
+			<field name="res_model">report_account_analytic.planning</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid),('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
+		</record>
+		<menuitem
+			action="action_account_analytic_planning_form_current_my"
+			id="menu_report_account_analytic_planning_current_my"
+			parent="menu_report_account_analytic_planning_my2" />
+
+		<record id="action_account_analytic_planning_form_current"
+			model="ir.actions.act_window">
+			<field name="name">Current Plannings</field>
+			<field name="res_model">report_account_analytic.planning</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="domain">[('date_from','&lt;=',time.strftime('%Y-%m-%d')),('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
+		</record>
+		<menuitem action="action_account_analytic_planning_form_current"
+			id="menu_report_account_analytic_planning_current"
+			parent="report_analytic_planning.menu_report_account_analytic_planning" />
+
+		<record id="action_account_analytic_planning_form_new"
+			model="ir.actions.act_window">
+			<field name="name">New Planning</field>
+			<field name="res_model">report_account_analytic.planning</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form,tree</field>
+		</record>
+		
+		<menuitem action="action_account_analytic_planning_form_new"
+			id="menu_report_account_analytic_planning_new"
+			parent="planning_main" />
+
+
+
+		<!--
+			Planning statistics
+		-->
+		<record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.stat.form</field>
+			<field name="model">report_account_analytic.planning.stat</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Planning statistics">
+					<field name="planning_id" select="1" />
+					<field name="user_id" select="1" />
+					<field name="account_id" select="1" />
+				</form>
+			</field>
+		</record>
+
+
+		<record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.stat.tree</field>
+			<field name="model">report_account_analytic.planning.stat</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Planning statistics">
+					<field name="planning_id" />
+					<field name="user_id" />
+					<field name="manager_id" />
+					<field name="account_id" />
+					<field name="sum_amount" />
+					<field name="sum_amount_real" />
+					<field name="sum_amount_tasks" />
+				</tree>
+			</field>
+		</record>
+
+		<record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.stat.graph</field>
+			<field name="model">report_account_analytic.planning.stat</field>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="Planning statistics" type="bar">
+					<field name="account_id" />
+					<field name="sum_amount" operator="+" />
+					<field name="sum_amount_real" operator="+" />
+					<field name="sum_amount_tasks" operator="+" />
+				</graph>
+			</field>
+		</record>
+
+
+
+		<record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
+			<field name="name">Planning Statistics</field>
+			<field name="res_model">report_account_analytic.planning.stat</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">graph,tree</field>
+		</record>
+		<menuitem id="next_id_85" name="Planning"
+			parent="hr.menu_hr_reporting" />
+		<menuitem action="action_account_analytic_planning_stat_form"
+			id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
+
+		<record id="action_account_analytic_planning_stat_my_form"
+			model="ir.actions.act_window">
+			<field name="name">My Planning Statistics</field>
+			<field name="res_model">report_account_analytic.planning.stat</field>
+			<field name="view_type">form</field>
+			<field name="domain">[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]</field>
+			<field name="view_mode">graph,tree</field>
+		</record>
+		
+		<menuitem action="action_account_analytic_planning_stat_my_form"
+			id="menu_report_account_analytic_planning_stat_my"
+			parent="report_analytic_planning.next_id_85" />
+
+		<record
+			id="action_account_analytic_planning_stat_my_manager_form" model="ir.actions.act_window">
+			<field name="name">Planning Statistics of My Projects</field>
+			<field name="res_model">report_account_analytic.planning.stat</field>
+			<field name="view_type">form</field>
+			<field name="domain">[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]</field>
+			<field name="view_mode">graph,tree</field>
+		</record>
+		
+		<menuitem
+			action="action_account_analytic_planning_stat_my_manager_form"
+			id="menu_report_account_analytic_planning_stat_my_manager"
+			parent="report_analytic_planning.next_id_85" />
+		
+
+<!--		Task Form -->
+
+        <record id="view_task_planning_form" model="ir.ui.view">
+            <field name="name">planning.task.form</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <tree string="Planning statistics">
-                    <field name="planning_id"/>
-                    <field name="user_id"/>
-                    <field name="manager_id"/>
-                    <field name="account_id"/>
-                    <field name="sum_amount"/>
-                    <field name="sum_amount_real"/>
-                    <field name="sum_amount_tasks"/>
-                </tree>
+                <field name="priority" position="before">
+                	<field name="planning_line_id" select="2"/>
+                </field>
             </field>
         </record>
-        
-        <record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.stat.graph</field>
-            <field name="model">report_account_analytic.planning.stat</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Planning statistics" type="bar">
-                    <field name="account_id"/>
-                    <field name="sum_amount" operator="+"/>
-                    <field name="sum_amount_real" operator="+"/>
-                    <field name="sum_amount_tasks" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        
-        
-        
-        <record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
-            <field name="name">Planning Statistics</field>
-            <field name="res_model">report_account_analytic.planning.stat</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-        <menuitem id="next_id_85" name="Planning" parent="hr.menu_hr_reporting"/><menuitem action="action_account_analytic_planning_stat_form" id="menu_report_account_analytic_planning_stat" parent="next_id_85"/>
-        
-        <record id="action_account_analytic_planning_stat_my_form" model="ir.actions.act_window">
-            <field name="name">My Planning Statistics</field>
-            <field name="res_model">report_account_analytic.planning.stat</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('user_id','=',uid),('planning_id.state','=','open')]</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-        <menuitem action="action_account_analytic_planning_stat_my_form" id="menu_report_account_analytic_planning_stat_my" parent="report_analytic_planning.next_id_85"/>
-        
-        <record id="action_account_analytic_planning_stat_my_manager_form" model="ir.actions.act_window">
-            <field name="name">Planning Statistics of My Projects</field>
-            <field name="res_model">report_account_analytic.planning.stat</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('manager_id','=',uid),('planning_id.state','=','open')]</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-        <menuitem action="action_account_analytic_planning_stat_my_manager_form" id="menu_report_account_analytic_planning_stat_my_manager" parent="report_analytic_planning.next_id_85"/>
-        
-        
-        
-        
-    </data>
+
+	</data>
 </openerp>
diff --git a/addons/report_analytic_planning/security/ir.model.access.csv b/addons/report_analytic_planning/security/ir.model.access.csv
index c57a1581547..e00e0a01554 100644
--- a/addons/report_analytic_planning/security/ir.model.access.csv
+++ b/addons/report_analytic_planning/security/ir.model.access.csv
@@ -1,10 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_report_account_analytic_planning","report_account_analytic.planning","model_report_account_analytic_planning","project.group_project_manager",1,1,1,1
 "access_report_account_analytic_planning_line","report_account_analytic.planning.line","model_report_account_analytic_planning_line","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning_stat_account_manager","report_account_analytic.planning.stat.account manager","model_report_account_analytic_planning_stat_account","project.group_project_manager",1,1,1,0
-"access_report_account_analytic_planning_stat_account","report_account_analytic.planning.stat.account","model_report_account_analytic_planning_stat_account","project.group_project_user",1,0,0,0
 "access_report_account_analytic_planning_stat_manager","report_account_analytic.planning.stat manager","model_report_account_analytic_planning_stat","project.group_project_manager",1,1,1,1
 "access_report_account_analytic_planning_stat","report_account_analytic.planning.stat","model_report_account_analytic_planning_stat","project.group_project_user",1,0,0,0
-"access_report_account_analytic_planning_stat_user_manager","report_account_analytic.planning.stat.user manager","model_report_account_analytic_planning_stat_user","project.group_project_manager",1,0,0,0
-"access_report_account_analytic_planning_stat_user","report_account_analytic.planning.stat.user","model_report_account_analytic_planning_stat_user","project.group_project_user",1,0,0,0
 "access_account_analytic_account_project_manager","account.analytic.account project manager","account.model_account_analytic_account","project.group_project_manager",1,1,1,1
+"access_report_account_analytic_planning_user","report_account_analytic.planning.user","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1
+"access_report_account_analytic_planning_account","report_account_analytic.planning.account","model_report_account_analytic_planning_account","project.group_project_manager",1,1,1,1
diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py
index 30bf015188e..a502400777c 100644
--- a/addons/report_crm/report_crm.py
+++ b/addons/report_crm/report_crm.py
@@ -25,7 +25,7 @@ from osv import fields,osv
 AVAILABLE_STATES = [
     ('draft','Draft'),
     ('open','Open'),
-    ('cancel', 'Canceled'),
+    ('cancel', 'Cancelled'),
     ('done', 'Closed'),
     ('pending','Pending')
 ]
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index a4dbdad6b2a..20575f56951 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -8,7 +8,7 @@
             <field name="model">report.sale.order.product</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales by Product">
+                <form string="Sale Orders by Product">
                     <field name="name" select="1"/>
                     <field name="product_id" select="1"/>
                     <field name="count"/>
@@ -20,13 +20,12 @@
             </field>
         </record>
         
-        
         <record id="view_order_product_tree" model="ir.ui.view">
             <field name="name">report.sale.order.product.tree</field>
             <field name="model">report.sale.order.product</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Sales by Product">
+                <tree string="Sale Orders by Product">
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="count"/>
@@ -43,7 +42,7 @@
              <field name="model">report.sale.order.product</field>
              <field name="type">graph</field>
              <field name="arch" type="xml">
-                 <graph string="Sales by Product" type="pie">
+                 <graph string="Average Sales by Product" type="pie">
                      <field name="product_id"/>
                      <field name="price_average"/>
                  </graph>
@@ -51,7 +50,7 @@
         </record>
         
         <record id="action_order_product_tree" model="ir.actions.act_window">
-            <field name="name">Sales by Product (this month)</field>
+            <field name="name">Sale Orders by Product (this month)</field>
             <field name="res_model">report.sale.order.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
@@ -59,7 +58,7 @@
         </record>
         <menuitem id="next_id_80" name="Reporting" parent="sale.menu_sale_root"/><menuitem id="next_id_81" name="This Month" parent="next_id_80"/><menuitem action="action_order_product_tree" id="menu_report_order_product" parent="next_id_81"/>
         <record id="action_order_product_tree_all" model="ir.actions.act_window">
-            <field name="name">Sales by Product</field>
+            <field name="name">Sale Orders by Product</field>
             <field name="res_model">report.sale.order.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
@@ -73,7 +72,7 @@
             <field name="model">report.sale.order.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Orders by category">
+                <form string="Sale Orders by category">
                     <field name="name" select="1"/>
                     <field name="category_id" select="1"/>
                     <field name="count"/>
@@ -90,7 +89,7 @@
             <field name="model">report.sale.order.category</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Sales by Category of Products">
+                <tree string="Sale Orders by Category of Products">
                     <field name="name"/>
                     <field name="category_id"/>
                     <field name="count"/>
@@ -107,22 +106,22 @@
             <field name="model">report.sale.order.category</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Sales by Category of Products" type="pie">
+                <graph string="Average Sales by Category of Products" type="pie">
                     <field name="category_id"/>
                     <field name="price_average"/>
                 </graph>
             </field>
         </record>
         <record id="action_order_category_tree" model="ir.actions.act_window">
-            <field name="name">Sales by Category of Product (this month)</field>
+            <field name="name">Sale Orders by Category of Product (this month)</field>
             <field name="res_model">report.sale.order.category</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
+            <field name="domain">[('name','=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
         </record>
         <menuitem action="action_order_category_tree" id="menu_report_order_category" parent="report_sale.next_id_81"/>
         <record id="action_order_category_tree_all" model="ir.actions.act_window">
-            <field name="name">Sales by Category of Products</field>
+            <field name="name">Sale Orders by Category of Products</field>
             <field name="res_model">report.sale.order.category</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
@@ -135,14 +134,14 @@
              <field name="model">sale.order</field>
              <field name="type">graph</field>
              <field name="arch" type="xml">
-                 <graph string="Sales orders" type="pie">
+                 <graph string="Sale orders" type="pie">
                      <field name="partner_id"/>
                      <field name="amount_untaxed"/>
                  </graph>
              </field>
         </record>
         <record id="action_order_sale_list" model="ir.actions.act_window">
-            <field name="name">Sales of the Month</field>
+            <field name="name">Sale Orders of the Month</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
@@ -155,7 +154,7 @@
              <field name="model">sale.order</field>
              <field name="type">graph</field>
              <field name="arch" type="xml">
-                 <graph string="Sales by State" type="bar">
+             <field name="name">Sale Orders by State</field>
                      <field name="state"/>
                      <field name="amount_total"/>
                  </graph>
@@ -248,7 +247,7 @@
             <field name="model">report.sale.order.created</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Created Sales orders">
+                <tree string="Created Sale orders">
                 	<field name="create_date" select="1"/>
                     <field name="date_order"/>
                     <field name="name" string="Reference" select="1"/>
diff --git a/addons/report_timesheet/report_timesheet.py b/addons/report_timesheet/report_timesheet.py
index a5a5c8b33bc..3418dd6a561 100644
--- a/addons/report_timesheet/report_timesheet.py
+++ b/addons/report_timesheet/report_timesheet.py
@@ -172,14 +172,14 @@ class report_random_timsheet(osv.osv):
         super(report_random_timsheet, self).__init__(pool, cr)
         self.called = False
     
-    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False):
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """ To call the init() method timely
         """
         if not self.called:
             self.init(cr, user)
         self.called = True # To make sure that init doesn't get called multiple times
         
-        res = super(report_random_timsheet, self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
+        res = super(report_random_timsheet, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         return res
     
     def init(self, cr, uid=1):
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index ae804757da5..539ebb2cfe3 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -27,6 +27,7 @@
 import sale
 import stock
 import product
+import mrp
 
 import wizard
 import report
diff --git a/addons/sale/mrp.py b/addons/sale/mrp.py
new file mode 100644
index 00000000000..05c86374071
--- /dev/null
+++ b/addons/sale/mrp.py
@@ -0,0 +1,68 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+class mrp_production(osv.osv):
+    
+    _inherit = 'mrp.production'
+    
+    def _ref_calc(self, cr, uid, ids, field_names=None, arg=False, context={}):
+        if not field_names:
+            field_names=[]
+        res = {}
+        for id in ids:
+            res[id] = {}.fromkeys(field_names, False)
+        for f in field_names:  
+            field_name = False          
+            if f=='sale_name':
+                field_name = 'name'
+            if f=='sale_ref':
+                field_name = 'client_order_ref'                           
+            for key, value in self._get_sale_ref(cr, uid, ids, field_name).items():
+                res[key][f] = value
+        return res
+        
+    def _get_sale_ref(self, cr, uid, ids, field_name=False):
+        move_obj=self.pool.get('stock.move')
+        
+        def get_parent_move(move_id):
+            move = move_obj.browse(cr, uid, move_id)
+            if move.move_dest_id:
+                return get_parent_move(move.move_dest_id.id)
+            return move_id
+            
+        productions = self.read(cr, uid, ids, ['id','move_prod_id'])       
+        res={}
+        for production in productions:
+            res[production['id']] = False
+            if production.get('move_prod_id',False):
+                parent_move_line = get_parent_move(production['move_prod_id'][0])
+                if parent_move_line:
+                    move = move_obj.browse(cr,uid,parent_move_line)                    
+                    if field_name == 'name':
+                        res[production['id']] = move.sale_line_id and move.sale_line_id.order_id.name or False
+                    if field_name=='client_order_ref':
+                        res[production['id']] = move.sale_line_id and move.sale_line_id.order_id.client_order_ref or False
+        return res
+    
+mrp_production()
\ No newline at end of file
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1492143a7d0..c5917c08051 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -379,7 +379,8 @@ class sale_order(osv.osv):
             'currency_id': order.pricelist_id.currency_id.id,
             'comment': order.note,
             'payment_term': pay_term,
-            'fiscal_position': order.partner_id.property_account_position.id
+            'fiscal_position': order.partner_id.property_account_position.id,
+            'date_invoice' : context.get('date_invoice',False)
         }
         inv_obj = self.pool.get('account.invoice')
         inv.update(self._inv_get(cr, uid, order))
@@ -390,12 +391,17 @@ class sale_order(osv.osv):
         inv_obj.button_compute(cr, uid, [inv_id])
         return inv_id
 
-    def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception']):
+    def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False):
         res = False
         invoices = {}
         invoice_ids = []
 
-        for o in self.browse(cr, uid, ids):
+        context = {}
+        # If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the 
+        # last day of the last month as invoice date
+        if date_inv:
+            context['date_inv'] = date_inv
+        for o in self.browse(cr,uid,ids):
             lines = []
             for line in o.order_line:
                 if (line.state in states) and not line.invoiced:
@@ -412,15 +418,15 @@ class sale_order(osv.osv):
         picking_obj = self.pool.get('stock.picking')
         for val in invoices.values():
             if grouped:
-                res = self._make_invoice(cr, uid, val[0][0], reduce(lambda x, y: x + y, [l for o, l in val], []))
-                for o, l in val:
-                    self.write(cr, uid, [o.id], {'state': 'progress'})
-                    if o.order_policy == 'picking':
-                        picking_obj.write(cr, uid, map(lambda x: x.id, o.picking_ids), {'invoice_state': 'invoiced'})
+                res = self._make_invoice(cr, uid, val[0][0], reduce(lambda x,y: x + y, [l for o,l in val], []), context=context)
+                for o,l in val:
+                    self.write(cr, uid, [o.id], {'state' : 'progress'})
+                    if o.order_policy=='picking':
+                        picking_obj.write(cr,uid,map(lambda x:x.id,o.picking_ids),{'invoice_state':'invoiced'})
                     cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (o.id, res))
             else:
                 for order, il in val:
-                    res = self._make_invoice(cr, uid, order, il)
+                    res = self._make_invoice(cr, uid, order, il, context=context)
                     invoice_ids.append(res)
                     self.write(cr, uid, [order.id], {'state': 'progress'})
                     if order.order_policy == 'picking':
@@ -951,7 +957,7 @@ class sale_order_line(osv.osv):
             partner = partner_obj.browse(cr, uid, partner_id)
             result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
         if not flag:
-            result['name'] = product_obj.partner_ref
+            result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id])[0][1]
         domain = {}
         if (not uom) and (not uos):
             result['product_uom'] = product_obj.uom_id.id
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f0b8da9a017..a2aa31e86c4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -145,7 +145,7 @@
                                             <field name="state" select="2"/>
                                             <group col="3" colspan="2">
                                                 <field name="invoiced" select="2"/>
-                                                <button colspan="1" name="%(wizard_sale_order_line_invoice)d" states="confirmed" string="Make Invoice" type="action"/>
+                                                <button colspan="1" name="%(wizard_sale_order_line_invoice)d" states="confirmed" string="Make Invoice" type="action" icon="gtk-print"/>
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
@@ -182,16 +182,16 @@
                                 <field name="amount_untaxed" sum="Untaxed amount"/>
                                 <field name="amount_tax"/>
                                 <field name="amount_total" sum="Total amount"/>
-                                <button name="button_dummy" states="draft" string="Compute" type="object"/>
+                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
                             <group col="13" colspan="4">
                                 <field name="state" select="2"/>
-                                <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-execute"/>
-                                <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-execute"/>
-                                <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-go-forward"/>
-                                <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-execute"/>
-                                <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-go-forward"/>
-                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-execute"/>
+                                <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
+                                <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-print"/>
+                                <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
+                                <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
+                                <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
+                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-print"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
@@ -220,12 +220,33 @@
                 </form>
             </field>
         </record>
+        
+        <record id="view_sales_order_filter" model="ir.ui.view">
+            <field name="name">sale.order.list.select</field>
+            <field name="model">sale.order</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Sales Order">
+                    <group col='6' colspan='4'>
+                        <filter icon="gtk-execute" string="Exception sales" domain="[('state','in',('shipping_except','invoice_except'))]" separator="1" help="Sales Related to Exception"/>
+                        <field name="state">
+                           <filter icon="terp-sale" domain="[('state','in',('shipping_except','invoice_except'))]" help="Exception Sales"/>
+                           <filter icon="terp-sale" domain="[('state','=','manual')]" help="In progress Sales"/>
+                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+        
         <record id="action_order_form" model="ir.actions.act_window">
             <field name="name">Sales Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
 
@@ -236,10 +257,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('user_id','=',uid)]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
 
         </record>
-        <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order"/>
-
+        <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree_all" model="ir.actions.act_window">
             <field name="name">All Sales Order</field>
@@ -247,8 +269,10 @@
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order"/>
+        <menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree_new" model="ir.actions.act_window">
             <field name="name">New Quotation</field>
@@ -267,8 +291,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('shipping_except','invoice_except'))]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree2" id="menu_action_order_tree2" parent="menu_action_order_tree_all"/>
+        <menuitem action="action_order_tree2" id="menu_action_order_tree2" parent="menu_action_order_tree_all" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree3" model="ir.actions.act_window">
             <field name="name">Sales Order To Be Invoiced</field>
@@ -277,8 +303,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','manual')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree3" id="menu_action_order_tree3" parent="sale.menu_action_order_tree_all"/>
+        <menuitem action="action_order_tree3" id="menu_action_order_tree3" parent="sale.menu_action_order_tree_all" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree4" model="ir.actions.act_window">
             <field name="name">Sales Order in Progress</field>
@@ -287,8 +315,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('progress','waiting_date','manual'))]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree4" id="menu_action_order_tree4" parent="sale.menu_action_order_tree_all" sequence="2"/>
+        <menuitem action="action_order_tree4" id="menu_action_order_tree4" parent="sale.menu_action_order_tree_all" sequence="2" groups="base.group_extended_menu"/>
 
 
         <record id="action_order_tree5" model="ir.actions.act_window">
@@ -298,8 +328,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','draft')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree5" id="menu_action_order_tree5" parent="sale.menu_action_order_tree_all" sequence="1"/>
+        <menuitem action="action_order_tree5" id="menu_action_order_tree5" parent="sale.menu_action_order_tree_all" sequence="1" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree7" model="ir.actions.act_window">
             <field name="name">My sales in shipping exception</field>
@@ -308,8 +340,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree7" id="menu_action_order_tree7" parent="menu_action_order_tree"/>
+        <menuitem action="action_order_tree7" id="menu_action_order_tree7" parent="menu_action_order_tree" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree8" model="ir.actions.act_window">
             <field name="name">My sales order waiting Invoice</field>
@@ -318,8 +352,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','manual'),('user_id','=',uid)]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree8" id="menu_action_order_tree8" parent="sale.menu_action_order_tree"/>
+        <menuitem action="action_order_tree8" id="menu_action_order_tree8" parent="sale.menu_action_order_tree" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree9" model="ir.actions.act_window">
             <field name="name">My sales order in progress</field>
@@ -328,9 +364,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree9" id="menu_action_order_tree9" parent="sale.menu_action_order_tree" sequence="2"/>
-
+        <menuitem action="action_order_tree9" id="menu_action_order_tree9" parent="sale.menu_action_order_tree" sequence="2" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree10" model="ir.actions.act_window">
             <field name="name">My Quotations</field>
@@ -339,9 +376,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree10" id="menu_action_order_tree10" parent="sale.menu_action_order_tree" sequence="1"/>
-
+        <menuitem action="action_order_tree10" id="menu_action_order_tree10" parent="sale.menu_action_order_tree" sequence="1" groups="base.group_extended_menu"/>
 
         <record id="view_order_line_graph" model="ir.ui.view">
             <field name="name">sale.order.line.graph</field>
@@ -405,8 +443,8 @@
                             <separator colspan="4" string="States"/>
                             <field name="state" select="2"/>
                             <group col="2" colspan="2">
-                                <button name="button_done" states="confirmed,exception" string="Done" type="object"/>
-                                <button name="button_cancel" states="confirmed,exception" string="Cancel" type="object"/>
+                                <button name="button_done" states="confirmed,exception" string="Done" type="object" icon="gtk-no"/>
+                                <button name="button_cancel" states="confirmed,exception" string="Cancel" type="object" icon="gtk-cancel" />
                             </group>
                         </page>
                         <page string="Properties">
@@ -441,8 +479,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_order_line_tree2" id="menu_action_order_line_tree2" parent="sale.menu_action_order_line_tree1"/>
+        <menuitem action="action_order_line_tree2" id="menu_action_order_line_tree2" parent="sale.menu_action_order_line_tree1" groups="base.group_extended_menu"/>
 
         <record id="action_order_line_tree3" model="ir.actions.act_window">
             <field name="name">Uninvoiced and Delivered Lines</field>
@@ -451,8 +490,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_order_line_tree3" id="menu_action_order_line_tree3" parent="sale.menu_action_order_line_tree2"/>
+        <menuitem action="action_order_line_tree3" id="menu_action_order_line_tree3" parent="sale.menu_action_order_line_tree2" groups="base.group_extended_menu"/>
 
         <act_window context="{'partner_id': active_id}" domain="[('partner_id', '=', active_id)]" id="act_res_partner_2_sale_order" name="Sales" res_model="sale.order" src_model="res.partner"/>
 
diff --git a/addons/sale/unit_test/__init__.py b/addons/sale/unit_test/__init__.py
new file mode 100644
index 00000000000..cfc1f614751
--- /dev/null
+++ b/addons/sale/unit_test/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/unit_test/test.py b/addons/sale/unit_test/test.py
new file mode 100644
index 00000000000..6567e0e9f6b
--- /dev/null
+++ b/addons/sale/unit_test/test.py
@@ -0,0 +1,139 @@
+import unittest
+import pooler
+import netsvc
+from cStringIO import StringIO
+from osv import osv
+
+cr = None
+uid = None
+order_id = None
+
+class sale_order_test_case(unittest.TestCase):
+    def setUp(self):
+        try:
+            self.pool = pooler.get_pool(cr.dbname)
+            self.sale_order = self.pool.get('sale.order')
+        except osv.except_osv,e:
+            self.fail(e.name + e.value)
+        except Exception,e:
+            self.fail(e)
+
+
+    def tearDown(self):
+        try:
+            self.pool = None
+            self.sale_order = None
+        except osv.except_osv,e:
+            self.fail(e.name + e.value)
+        except Exception,e:
+            self.fail(e)
+
+
+    def test_1_Create(self):
+
+        try:
+            global order_id
+            model_obj = self.pool.get('ir.model.data')
+
+            ### SALE ORDER
+            shop = model_obj._get_id(cr, uid, 'sale', 'shop')
+            shop_id = model_obj.browse(cr, uid, shop).res_id
+            partner = model_obj._get_id(cr,uid, 'base', 'res_partner_9')
+            partner_id = model_obj.browse(cr, uid, partner,).res_id
+            partner_invoice = model_obj._get_id(cr, uid, 'base', 'res_partner_address_9')
+            partner_invoice_id = model_obj.browse(cr, uid, partner_invoice).res_id
+            pricelist_id = self.pool.get('res.partner').browse(cr, uid,partner_id).property_product_pricelist.id
+            order_id = self.sale_order.create(cr,uid,
+                            {'shop_id':shop_id,'pricelist_id':pricelist_id,'user_id':uid,
+                             'partner_id':partner_id,'partner_invoice_id':partner_invoice_id,
+                             'partner_shipping_id':partner_invoice_id,'partner_order_id':partner_invoice_id})
+            ### SALE ORDER LINE
+            product = model_obj._get_id(cr,uid, 'product', 'product_product_pc2')
+            product_id = model_obj.browse(cr, uid, product).res_id
+            product_uom = model_obj._get_id(cr, uid, 'product', 'product_uom_unit')
+            product_uom_id = model_obj.browse(cr, uid, product_uom).res_id
+            self.pool.get('sale.order.line').create(cr,uid,
+                            {'order_id':order_id,'name':'[PC2] Computer assembled on demand',
+                             'product_id':product_id,'product_uom':product_uom_id,'price_unit':600,
+                             'type':'make_to_order'})
+        except osv.except_osv,e:
+            self.fail(e.name + e.value)
+        except Exception,e:
+            self.fail(e)
+
+    def test_2_ConfirmOrder(self):
+        try:
+            self.failUnless(order_id,"No Sale Order Created !")
+            wf_service = netsvc.LocalService("workflow")
+            res = wf_service.trg_validate(uid, 'sale.order',order_id, 'order_confirm', cr)
+        except osv.except_osv,e:
+            self.fail(e.name + e.value)
+        except Exception,e:
+            self.fail(e)
+
+    def test_3_CreateInvoice(self):
+
+        try:
+            self.failUnless(order_id,"No Sale Order Created !")
+            wf_service = netsvc.LocalService("workflow")
+            res = wf_service.trg_validate(uid, 'sale.order',order_id, 'manual_invoice', cr)
+        except osv.except_osv,e:
+            self.fail(e.name + e.value)
+        except Exception,e:
+            self.fail(e)
+
+    def test_4_CancelPicking(self):
+        try:
+            self.failUnless(order_id,"No Sale Order Created !")
+            picking_obj = self.pool.get('stock.picking')
+            pickings = picking_obj.search(cr,uid,[('sale_id','=',order_id)])
+            picking_obj.action_cancel(cr, uid, pickings)
+        except osv.except_osv,e:
+            self.fail(e.name + e.value)
+        except Exception,e:
+            self.fail(e)
+
+    def test_5_PrintOrder(self):
+        try:
+            self.failUnless(order_id,"No Sale Order Created !")
+            report_service = netsvc.LocalService("report")
+            model_obj = self.pool.get('ir.model.data')
+            passwd = self.pool.get('res.users').browse(cr,uid,uid).password
+            report = model_obj._get_id(cr, uid, 'sale', 'report_sale_order')
+            report_id = model_obj.browse(cr, uid, report).res_id
+            report_service.report(cr.dbname, uid, passwd, 'sale.order', [order_id])
+        except osv.except_osv,e:
+            self.fail(e.name + e.value)
+        except Exception,e:
+            self.fail(e)
+
+    def test_6_CancelOrder(self):
+        try:
+            self.failUnless(order_id,"No Sale Order Created !")
+            self.sale_order.action_cancel(cr, uid, [order_id])
+        except osv.except_osv,e:
+            self.fail(e.name + e.value)
+        except Exception,e:
+            self.fail(e)
+
+    def test_7_Unlink(self):
+        try:
+            self.failUnless(order_id,"No Sale Order Created !")
+            self.sale_order.unlink(cr, uid, [order_id])
+        except osv.except_osv,e:
+            self.fail(e.name + e.value)
+        except Exception,e:
+            self.fail(e)
+
+
+def runTest(cursor=None, user=None):
+    global cr
+    global uid
+    cr = cursor
+    uid = user
+    out = StringIO()
+    suite = unittest.TestLoader().loadTestsFromTestCase(sale_order_test_case)
+    res = unittest.TextTestRunner(stream=out,verbosity=2).run(suite)
+    if res.wasSuccessful():
+        return (True,out.getvalue())
+    return (res,out.getvalue())
diff --git a/addons/sale/wizard/make_invoice.py b/addons/sale/wizard/make_invoice.py
index 51fc25f0dbb..0a4a7e305b7 100644
--- a/addons/sale/wizard/make_invoice.py
+++ b/addons/sale/wizard/make_invoice.py
@@ -28,11 +28,13 @@ invoice_form = """<?xml version="1.0"?>
 <form string="Create invoices">
     <separator colspan="4" string="Do you really want to create the invoices ?" />
     <field name="grouped" />
+    <field name="invoice_date" />    
 </form>
 """
 
 invoice_fields = {
-    'grouped' : {'string':'Group the invoices', 'type':'boolean', 'default': lambda x,y,z: False}
+    'grouped' : {'string':'Group the invoices', 'type':'boolean', 'default': lambda x,y,z: False},
+    'invoice_date': {'string': 'Invoiced date', 'type':'date' }
 }
 
 ack_form = """<?xml version="1.0"?>
@@ -43,10 +45,12 @@ ack_form = """<?xml version="1.0"?>
 ack_fields = {}
 
 def _makeInvoices(self, cr, uid, data, context):
-    order_obj = pooler.get_pool(cr.dbname).get('sale.order')
+    pool_obj = pooler.get_pool(cr.dbname)
+    mod_obj = pool_obj.get('ir.model.data') 
+    order_obj = pool_obj.get('sale.order')
     newinv = []
 
-    order_obj.action_invoice_create(cr, uid, data['ids'], data['form']['grouped'])
+    order_obj.action_invoice_create(cr, uid, data['ids'], data['form']['grouped'], date_inv = data['form']['invoice_date'])
     for id in data['ids']:
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
@@ -54,9 +58,7 @@ def _makeInvoices(self, cr, uid, data, context):
     for o in order_obj.browse(cr, uid, data['ids'], context):
         for i in o.invoice_ids:
             newinv.append(i.id)
-    pool = pooler.get_pool(cr.dbname)
-    mod_obj = pool.get('ir.model.data')
-    act_obj = pool.get('ir.actions.act_window')
+    act_obj = pool_obj.get('ir.actions.act_window')
     xml_id='action_invoice_tree5'
     result = mod_obj._get_id(cr, uid, 'account', xml_id)
     id = mod_obj.read(cr, uid, result, ['res_id'])['res_id']
@@ -86,9 +88,7 @@ class make_invoice(wizard.interface):
         },
         'invoice' : {
             'actions' : [_makeInvoices],
-            'result' : {'type' : 'action',
-                    'action' : _makeInvoices,
-                    'state' : 'end'}
+            'result' : {'type': 'state', 'state': 'end'}
         },
     }
 make_invoice("sale.order.make_invoice")
diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
index ceec3cf1307..576601ba7f8 100644
--- a/addons/sale/wizard/make_invoice_advance.py
+++ b/addons/sale/wizard/make_invoice_advance.py
@@ -121,6 +121,9 @@ def _createInvoices(self, cr, uid, data, context={}):
 class sale_advance_payment(wizard.interface):
     def _open_invoice(self, cr, uid, data, context):
         pool_obj = pooler.get_pool(cr.dbname)
+        mod_obj = pool_obj.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'])        
         model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_form')])
         resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
         return {
@@ -131,7 +134,8 @@ class sale_advance_payment(wizard.interface):
             'res_model': 'account.invoice',
             'views': [(False,'tree'),(resource_id,'form')],
             'context': "{'type':'out_invoice'}",
-            'type': 'ir.actions.act_window'
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
         }
 
     states = {
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index 1eb426fec95..4a6f8daf4d2 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -63,6 +63,9 @@ class make_sale(wizard.interface):
 
     def _makeOrder(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
+        mod_obj = pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'])        
         case_obj = pool.get('crm.case')
         sale_obj = pool.get('sale.order')
         partner_obj = pool.get('res.partner')
@@ -129,6 +132,7 @@ class make_sale(wizard.interface):
             'res_model': 'sale.order',
             'view_id': False,
             'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']            
         }
         return value
 
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index 047da333c06..9234d333a52 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -19,13 +19,13 @@
 					<separator string="States" colspan="4"/>
 					<field name="state"/>
 					<group col="3" colspan="2">
-						<button name="button_open" string="Open Journal" states="draft" type="object"/>
-						<button name="button_close" string="Close Journal" states="open" type="object"/>
-						<button name="button_draft" string="Set to Draft" states="close,open" type="object"/>
+                        <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
+                        <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
+                        <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
 					</group>
 				</page>
 				<page string="Packing">
-					<button string="Cancel Packing" name="button_picking_cancel" states="draft,open" type="object"/>
+                    <button string="Cancel Packing" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
 					<newline/>
 					<field name="picking_stats_ids" colspan="4" nolabel="1"/>
 				</page><page string="Notes">
@@ -76,9 +76,10 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
+        <field name="filter" eval="True"/>		
 	</record>
 	
-	<menuitem name="My Open Journals" id="menu_definition_journal_picking_byjournal_my" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_my"/>
+	<menuitem name="My Open Journals" id="menu_definition_journal_picking_byjournal_my" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_my"  groups="base.group_extended_menu"/>
 	
 	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_all">
 		<field name="name">Packing by journal</field>
@@ -86,9 +87,10 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','open')]</field>
+        <field name="filter" eval="True"/>		
 	</record>
 	
-	<menuitem name="All Open Journals" id="menu_definition_journal_picking_byjournal_all" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_all"/>
+	<menuitem name="All Open Journals" id="menu_definition_journal_picking_byjournal_all" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_all" groups="base.group_extended_menu"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_type_tree">
 		<field name="name">Packing by invoice_method</field>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 2c0efe773ea..c2f0aa34581 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -51,14 +51,14 @@
                     <separator string="States" colspan="4"/>
                     <field name="state"/>
                     <group col="3" colspan="2">
-                        <button name="button_open" string="Open Journal" states="draft" type="object"/>
-                        <button name="button_close" string="Close Journal" states="open" type="object"/>
-                        <button name="button_draft" string="Set to Draft" states="close,open" type="object"/>
+                        <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
+                        <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
+                        <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
                     </group>
                 </page>
                 <page string="Sales">
-                    <button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object"/>
-                    <button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object"/>
+                    <button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object" icon="gtk-execute"/>
+                    <button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
                     <newline/>
                     <field name="sale_stats_ids" colspan="4" nolabel="1">
                         <tree string="Sales">
@@ -114,9 +114,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
+        <field name="filter" eval="True"/>        
     </record>
     
-    <menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my"/>
+    <menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my" groups="base.group_extended_menu"/>
 
     <record model="ir.actions.act_window" id="action_definition_journal_tree_all">
         <field name="name">Open journals</field>
@@ -124,9 +125,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state','=','open')]</field>
+        <field name="filter" eval="True"/>        
     </record>
     
-    <menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all"/>
+    <menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all" groups="base.group_extended_menu"/>
 
     <record model="ir.ui.view" id="sale_journal_sale_order">
         <field name="name">sale.order.journal.view.form</field>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 9133f40d242..c4b91a95f9e 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -124,8 +124,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_product_backlog_form_draft" id="menu_action_product_backlog_form_draft" parent="scrum.menu_action_product_backlog_form"/>
+        <menuitem action="action_product_backlog_form_draft" id="menu_action_product_backlog_form_draft" parent="scrum.menu_action_product_backlog_form" groups="base.group_extended_menu"/>
         
         <record id="action_product_backlog_form_open" model="ir.actions.act_window">
             <field name="name">Opened Backlogs</field>
@@ -133,10 +134,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','open')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_product_backlog_form_open" id="menu_action_product_backlog_form_open" parent="scrum.menu_action_product_backlog_form"/>
-        
-        
+        <menuitem action="action_product_backlog_form_open" id="menu_action_product_backlog_form_open" parent="scrum.menu_action_product_backlog_form" groups="base.group_extended_menu"/>
         
         <!--
               Scrum Sprint
@@ -193,73 +193,87 @@
                 </form>
             </field>
         </record>
+        
+        <record id="action_sprint_all_tree" model="ir.actions.act_window">
+            <field name="name">Sprints</field>
+            <field name="res_model">scrum.sprint</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_scrum_sprint_tree"/>
+        </record>
+        <menuitem action="action_sprint_all_tree" id="menu_action_sprint_all_tree" parent="scrum.next_id_67"/>        
+
         <record id="action_sprint_form" model="ir.actions.act_window">
             <field name="name">Sprint</field>
             <field name="res_model">scrum.sprint</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_scrum_sprint_form"/>
         </record>
-        <menuitem action="action_sprint_form" id="menu_action_sprint_form" parent="scrum.next_id_67"/>
+        <menuitem action="action_sprint_form" id="menu_action_sprint_form" parent="menu_action_sprint_all_tree"/>
         
         <record id="action_sprint_open_tree" model="ir.actions.act_window">
             <field name="name">Opened Sprints</field>
             <field name="res_model">scrum.sprint</field>
             <field name="view_type">tree</field>
             <field name="domain">[('state','=','open')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree" id="menu_action_sprint_open_tree" parent="scrum.menu_action_sprint_form"/>
+        <menuitem action="action_sprint_open_tree" id="menu_action_sprint_open_tree" parent="scrum.menu_action_sprint_form" groups="base.group_extended_menu"/>
         <record id="action_sprint_open_tree2" model="ir.actions.act_window">
             <field name="name">Draft Sprints</field>
             <field name="res_model">scrum.sprint</field>
             <field name="view_type">tree</field>
             <field name="domain">[('state','=','draft')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree2" id="menu_action_sprint_open_tree2" parent="scrum.menu_action_sprint_form"/>
+        <menuitem action="action_sprint_open_tree2" id="menu_action_sprint_open_tree2" parent="scrum.menu_action_sprint_form" groups="base.group_extended_menu"/>
         <record id="action_sprint_open_tree3" model="ir.actions.act_window">
             <field name="name">Sprints Done</field>
             <field name="res_model">scrum.sprint</field>
             <field name="view_type">tree</field>
             <field name="domain">[('state','=','done')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree3" id="menu_action_sprint_open_tree3" parent="scrum.menu_action_sprint_form"/>
+        <menuitem action="action_sprint_open_tree3" id="menu_action_sprint_open_tree3" parent="scrum.menu_action_sprint_form" groups="base.group_extended_menu"/>
         
         <record id="action_sprint_open_tree4" model="ir.actions.act_window">
             <field name="name">My Sprints (Product Owner)</field>
             <field name="res_model">scrum.sprint</field>
             <field name="view_type">tree</field>
             <field name="domain">[('product_owner_id','=',uid)]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree4" id="menu_action_sprint_open_tree4" parent="scrum.menu_action_sprint_form"/>
+        <menuitem action="action_sprint_open_tree4" id="menu_action_sprint_open_tree4" parent="scrum.menu_action_sprint_form" groups="base.group_extended_menu"/>
         <record id="action_sprint_open_tree5" model="ir.actions.act_window">
             <field name="name">My Sprints (Scrum Master)</field>
             <field name="res_model">scrum.sprint</field>
             <field name="view_type">tree</field>
             <field name="domain">[('scrum_master_id','=',uid)]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree5" id="menu_action_sprint_open_tree5" parent="scrum.menu_action_sprint_form"/>
+        <menuitem action="action_sprint_open_tree5" id="menu_action_sprint_open_tree5" parent="scrum.menu_action_sprint_form" groups="base.group_extended_menu"/>
         
         <record id="action_sprint_open_tree6" model="ir.actions.act_window">
             <field name="name">My opened sprints (Product Owner)</field>
             <field name="res_model">scrum.sprint</field>
             <field name="view_type">tree</field>
             <field name="domain">[('product_owner_id','=',uid),('state','=','open')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree6" id="menu_action_sprint_open_tree6" parent="scrum.menu_action_sprint_open_tree4"/>
+        <menuitem action="action_sprint_open_tree6" id="menu_action_sprint_open_tree6" parent="scrum.menu_action_sprint_open_tree4" groups="base.group_extended_menu"/>
         <record id="action_sprint_open_tree7" model="ir.actions.act_window">
             <field name="name">My opened sprints (Scrum Master)</field>
             <field name="res_model">scrum.sprint</field>
             <field name="view_type">tree</field>
             <field name="domain">[('scrum_master_id','=',uid),('state','=','open')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree7" id="menu_action_sprint_open_tree7" parent="scrum.menu_action_sprint_open_tree5"/>
-        
-        
+        <menuitem action="action_sprint_open_tree7" id="menu_action_sprint_open_tree7" parent="scrum.menu_action_sprint_open_tree5" groups="base.group_extended_menu"/>
         
         <!--
               Daily Meeting
        -->
         
-        
         <record id="view_scrum_meeting_tree" model="ir.ui.view">
             <field name="name">scrum.meeting.tree</field>
             <field name="model">scrum.meeting</field>
@@ -374,8 +388,6 @@
             <field eval="True" name="object"/>
         </record>
         
-        
-        
         <!--
         Tasks
         -->
@@ -408,8 +420,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id', '=', uid),('scrum','=',1)]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.menu_action_view_task"/>
+        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.menu_action_view_task" groups="base.group_extended_menu"/>
         
         <record id="action_view_task5" model="ir.actions.act_window">
             <field name="name">My opened tasks</field>
@@ -417,8 +430,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid),('state','=','open'),('scrum','=',1)]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_view_task5" id="menu_tasks_yours" parent="scrum.menu_action_view_task4"/>
+        <menuitem action="action_view_task5" id="menu_tasks_yours" parent="scrum.menu_action_view_task4" groups="base.group_extended_menu"/>
         
         <record id="action_view_task6" model="ir.actions.act_window">
             <field name="name">Opened tasks</field>
@@ -427,7 +441,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','open'),('scrum','=',1)]</field>
         </record>
-        <menuitem action="action_view_task6" id="menu_action_view_task6" parent="project.menu_action_view_task"/>
+        <menuitem action="action_view_task6" id="menu_action_view_task6" parent="project.menu_action_view_task" />
     
     </data>
 </openerp>
diff --git a/addons/scrum/wizard/backlog_to_task.py b/addons/scrum/wizard/backlog_to_task.py
index 4701b95ce29..e1cc25fc428 100644
--- a/addons/scrum/wizard/backlog_to_task.py
+++ b/addons/scrum/wizard/backlog_to_task.py
@@ -36,7 +36,11 @@ btt_fields = {
 }
 
 def _do_create(self, cr, uid, data, context):
-    backlogs = pooler.get_pool(cr.dbname).get('scrum.product.backlog').browse(cr, uid, data['ids'])
+    pool = pooler.get_pool(cr.dbname)
+    backlogs = pool.get('scrum.product.backlog').browse(cr, uid, data['ids'])
+    mod_obj = pool.get('ir.model.data') 
+    result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')
+    id = mod_obj.read(cr, uid, result, ['res_id'])
     ids = []
     for backlog in backlogs:
         task = pooler.get_pool(cr.dbname).get('scrum.task')
@@ -57,7 +61,8 @@ def _do_create(self, cr, uid, data, context):
         'view_mode': 'tree,form',
         'res_model': 'scrum.task',
         'view_id': False,
-        'type': 'ir.actions.act_window'
+        'type': 'ir.actions.act_window',
+        'search_view_id': id['res_id']
     }
     return value
 
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 3fbc0407e89..575e043c3b4 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -167,12 +167,13 @@ class product_product(osv.osv):
         'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available'),
         'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available'),
         'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available'),
-        'track_production' : fields.boolean('Track Production Lots' , help="Force to use a Production Lot during production order"),
-        'track_incoming' : fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
-        'track_outgoing' : fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
+        'track_production': fields.boolean('Track Production Lots' , help="Force to use a Production Lot during production order"),
+        'track_incoming': fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
+        'track_outgoing': fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
+        'warehouse_id': fields.dummy(string='Warehouse',relation='stock.warehouse',type='many2one'),
     }
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
-        res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         if ('location' in context) and context['location']:
             location_info = self.pool.get('stock.location').browse(cr, uid, context['location'])
             fields=res.get('fields',{})
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 86711ba4029..92fe8d54ea6 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -2,6 +2,18 @@
 <openerp>
     <data>
 
+	    <record id="product_search_form_view_stock" model="ir.ui.view">
+            <field name="name">product.search.stock.form</field>
+            <field name="model">product.product</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="product.product_search_form_view"/>
+            <field name="arch" type="xml">
+               	<field name="categ_id" select="1" widget="selection" position="after">
+               		<field name="warehouse_id" select="1" widget="selection" context="{'warehouse': self}" />
+               	</field>
+            </field>
+        </record>
+        
         <record id="view_category_property_form" model="ir.ui.view">
             <field name="name">product.category.stock.property.form.inherit</field>
             <field name="model">product.category</field>
diff --git a/addons/stock/report_stock.py b/addons/stock/report_stock.py
index 5e5e517121d..0bd44db1171 100644
--- a/addons/stock/report_stock.py
+++ b/addons/stock/report_stock.py
@@ -81,4 +81,84 @@ class stock_report_prodlots(osv.osv):
         
 stock_report_prodlots()
 
+class stock_report_tracklots(osv.osv):
+    _name = "stock.report.tracklots"
+    _description = "Stock report by tracking lots"
+    _auto = False
+    _columns = {
+            'name': fields.float('Quantity', readonly=True),
+            'location_id': fields.many2one('stock.location', 'Location', readonly=True, select=True),
+            'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
+            'tracking_id': fields.many2one('stock.tracking', 'Tracking lot', readonly=True, select=True),
+    }
+    
+    def init(self, cr):
+        cr.execute("""
+           create or replace view stock_report_tracklots as (
+                
+            select max(id) as id,
+                    location_id,
+                    product_id,
+                    tracking_id,
+                    sum(qty) as name
+                from (
+                    select -max(sm.id) as id,
+                        sm.location_id,
+                        sm.product_id,
+                        sm.tracking_id,
+                        -sum(sm.product_qty /uo.factor) as qty
+                    from stock_move as sm
+                    left join stock_location sl
+                        on (sl.id = sm.location_id)
+                    left join product_uom uo
+                        on (uo.id=sm.product_uom)
+                    where state = 'done'
+                    group by sm.location_id, sm.product_id, sm.product_uom, sm.tracking_id
+                    union all
+                    select max(sm.id) as id,
+                        sm.location_dest_id as location_id,
+                        sm.product_id,
+                        sm.tracking_id,
+                        sum(sm.product_qty /uo.factor) as qty
+                    from stock_move as sm
+                    left join stock_location sl
+                        on (sl.id = sm.location_dest_id)
+                    left join product_uom uo
+                        on (uo.id=sm.product_uom)
+                    where sm.state = 'done'
+                    group by sm.location_dest_id, sm.product_id, sm.product_uom, sm.tracking_id
+                ) as report
+                group by location_id, product_id, tracking_id
+            )""")
+        
+    def unlink(self, cr, uid, ids, context={}):
+        raise osv.except_osv(_('Error !'), _('You cannot delete any record!'))
+
+stock_report_tracklots()
+
+class report_stock_lines_date(osv.osv):
+    _name = "report.stock.lines.date"
+    _description = "Dates of Inventories"
+    _auto = False
+    _columns = {
+        'id': fields.integer('Inventory Line Id', readonly=True),
+        'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
+        'create_date': fields.datetime('Latest Date of Inventory'),
+        }
+    def init(self, cr):
+        cr.execute("""
+            create or replace view report_stock_lines_date as (
+                select
+                l.id as id,
+                p.id as product_id,
+                max(l.create_date) as create_date
+                from
+                product_product p
+                left outer join
+                stock_inventory_line l on (p.id=l.product_id)
+                where l.create_date is not null
+                group by p.id,l.id
+            )""")
+report_stock_lines_date()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report_stock_view.xml b/addons/stock/report_stock_view.xml
index 61381afba56..57b2608aa05 100644
--- a/addons/stock/report_stock_view.xml
+++ b/addons/stock/report_stock_view.xml
@@ -20,9 +20,26 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.report.prodlots</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'full':'1'}</field>
         </record>
 
+
+        <record id="stock_report_tracklots_tree" model="ir.ui.view">
+            <field name="name">stock.report.tracklots.view</field>
+            <field name="model">stock.report.tracklots</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Stock by Lots">
+                    <field name="location_id"/>
+                    <field name="product_id"/>
+                    <field name="tracking_id"/>
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+        
+
         <menuitem
             id="next_id_61"
             name="Reporting"
@@ -46,7 +63,7 @@
             src_model="product.product"/>
 
         <act_window
-            domain="[('location_id', '=', active_id)]"
+            domain="[('location_id', 'child_of', [active_id])]"
             id="act_stock_location_2_stock_report_prodlots"
             name="Stock by Lots"
             res_model="stock.report.prodlots"
@@ -64,45 +81,50 @@
             id="act_stock_production_lot_2_stock_report_prodlots"
             name="Stock" res_model="stock.report.prodlots"
             src_model="stock.production.lot"/>
+	
+		<act_window
+            domain="[('tracking_id', '=', active_id)]"
+            id="act_stock_tracking_lot_2_stock_report_tracklots"
+            name="Stock" res_model="stock.report.tracklots"
+            src_model="stock.tracking"/>
 
+           <!-- report , stock inventories date... start -->
+        <record model="ir.ui.view" id="report_stock_lines_date_tree">
+            <field name="name">report.stock.lines.date.tree</field>
+            <field name="model">report.stock.lines.date</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Dates of Inventories">
+                    <field name="product_id"/>
+                    <field name="id"/>
+                    <field name="create_date" />
+                </tree>
+            </field>
+        </record>
 
-       	<!-- report , stock inventories date... start -->
-		<record model="ir.ui.view" id="report_stock_lines_date_tree">
-			<field name="name">report.stock.lines.date.tree</field>
-			<field name="model">report.stock.lines.date</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Dates of Inventories">
-					<field name="product_id"/>
-					<field name="id"/>
-					<field name="create_date" />
-				</tree>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="report_stock_lines_date_form">
+            <field name="name">report.stock.lines.date.form</field>
+            <field name="model">report.stock.lines.date</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Dates of Inventories">
+                    <field name="product_id" select="1"/>
+                    <field name="id" select="2"/>
+                    <field name="create_date" select="1" />
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="report_stock_lines_date_form">
-			<field name="name">report.stock.lines.date.form</field>
-			<field name="model">report.stock.lines.date</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Dates of Inventories">
-					<field name="product_id" select="1"/>
-					<field name="id" select="2"/>
-					<field name="create_date" select="1" />
-				</form>
-			</field>
-		</record>
-
-		<record model="ir.actions.act_window" id="action_stock_line_date">
-			<field name="name">Dates of Inventories</field>
-			<field name="res_model">report.stock.lines.date</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-		</record>
-		
-		<menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date"/>
-		
-		<record id="view_location_tree_3" model="ir.ui.view">
+        <record model="ir.actions.act_window" id="action_stock_line_date">
+            <field name="name">Dates of Inventories</field>
+            <field name="res_model">report.stock.lines.date</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        
+        <menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date"/>
+        
+        <record id="view_location_tree_3" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
             <field name="type">tree</field>
@@ -125,7 +147,7 @@
         </record>
         <menuitem action="action_location_tree_3" id="menu_action_location_tree_3" parent="next_id_61" />
 
-	<!-- end...  -->
+    <!-- end...  -->
 
     </data>
 </openerp>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 039dfdd99fd..09cbf55b1ed 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -36,8 +36,8 @@ class stock_incoterms(osv.osv):
     _name = "stock.incoterms"
     _description = "Incoterms"
     _columns = {
-        'name': fields.char('Name', size=64, required=True),
-        'code': fields.char('Code', size=3, required=True),
+        'name': fields.char('Name', size=64, required=True,help="Incoterms are series of sales terms.They are used to divide transaction costs and responsibilities between buyer and seller and reflect state-of-the-art transportation practices."),
+        'code': fields.char('Code', size=3, required=True,help="code for Incoterms"),
         'active': fields.boolean('Active'),
     }
     _defaults = {
@@ -58,6 +58,21 @@ class stock_location(osv.osv):
     _parent_order = 'id'
     _order = 'parent_left'
 
+    def name_get(self, cr, uid, ids, context={}):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['name','location_id'], context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if context.get('full',False):
+                if record['location_id']:
+                    name = record['location_id'][1]+' / '+name
+                res.append((record['id'], name))
+            else:
+                res.append((record['id'], name))
+        return res
+
     def _complete_name(self, cr, uid, ids, name, args, context):
         def _get_one_full_name(location, level=4):
             if location.location_id:
@@ -423,30 +438,32 @@ class stock_picking(osv.osv):
         'name': fields.char('Reference', size=64, select=True),
         'origin': fields.char('Origin Reference', size=64),
         'backorder_id': fields.many2one('stock.picking', 'Back Order'),
-        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True),
+        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
         'active': fields.boolean('Active'),
         'note': fields.text('Notes'),
 
-        'location_id': fields.many2one('stock.location', 'Location'),
-        'location_dest_id': fields.many2one('stock.location', 'Dest. Location'),
-        'move_type': fields.selection([('direct', 'Direct Delivery'), ('one', 'All at once')], 'Delivery Method', required=True),
+        'location_id': fields.many2one('stock.location', 'Location', help="Keep empty if you produce at the location where the finished products are needed." \
+                "Set a location if you produce at a fixed location. This can be a partner location " \
+                "if you subcontract the manufacturing operations."),
+        'location_dest_id': fields.many2one('stock.location', 'Dest. Location',help="Location where the system will stock the finished products."),
+        'move_type': fields.selection([('direct', 'Direct Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"),
         'state': fields.selection([
             ('draft', 'Draft'),
             ('auto', 'Waiting'),
             ('confirmed', 'Confirmed'),
             ('assigned', 'Available'),
             ('done', 'Done'),
-            ('cancel', 'Canceled'),
+            ('cancel', 'Cancelled'),
             ], 'Status', readonly=True, select=True),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
-                 method=True, store=True, type='datetime', string='Planned Date', select=1),
-        'date': fields.datetime('Date Order'),
-        'date_done': fields.datetime('Date Done'),
+                 method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Packing. Default it takes current date"),
+        'date': fields.datetime('Date Order', help="Date of Order"),
+        'date_done': fields.datetime('Date Done', help="Date of completion"),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Max. Planned Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
         'auto_picking': fields.boolean('Auto-Packing'),
-        'address_id': fields.many2one('res.partner.address', 'Partner'),
+        'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
@@ -467,7 +484,8 @@ class stock_picking(osv.osv):
         if default is None:
             default = {}
         default = default.copy()
-        default['name'] = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking')
+        if not default.get('name',False):
+            default['name'] = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking')
         return super(stock_picking, self).copy(cr, uid, id, default, context)
 
     def onchange_partner_in(self, cr, uid, context, partner_id=None):
@@ -690,6 +708,7 @@ class stock_picking(osv.osv):
                     'name': (invoice.name or '') + ', ' + (picking.name or ''),
                     'origin': (invoice.origin or '') + ', ' + (picking.name or '') + (picking.origin and (':' + picking.origin) or ''),
                     'comment': (comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''),
+                    'date_invoice':context.get('date_inv',False)                    
                 }
                 invoice_obj.write(cursor, user, [invoice_id], invoice_vals, context=context)
             else:
@@ -703,7 +722,8 @@ class stock_picking(osv.osv):
                     'address_contact_id': address_contact_id,
                     'comment': comment,
                     'payment_term': payment_term_id,
-                    'fiscal_position': partner.property_account_position.id
+                    'fiscal_position': partner.property_account_position.id,
+                    'date_invoice':context.get('date_inv',False)
                     }
                 cur_id = self.get_currency_id(cursor, user, picking)
                 if cur_id:
@@ -744,6 +764,12 @@ class stock_picking(osv.osv):
                         user, picking, move_line)
 
                 account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner.property_account_position, account_id)
+                notes = False
+                if move_line.sale_line_id:
+                    notes = move_line.sale_line_id.notes
+                elif move_line.purchase_line_id:
+                    notes = move_line.purchase_line_id.notes
+                
                 invoice_line_id = invoice_line_obj.create(cursor, user, {
                     'name': name,
                     'origin': origin,
@@ -756,6 +782,7 @@ class stock_picking(osv.osv):
                     'quantity': move_line.product_uos_qty or move_line.product_qty,
                     'invoice_line_tax_id': [(6, 0, tax_ids)],
                     'account_analytic_id': account_analytic_id,
+                    'note': notes,                    
                     }, context=context)
                 self._invoice_line_hook(cursor, user, move_line, invoice_line_id)
 
@@ -934,11 +961,11 @@ class stock_move(osv.osv):
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_uos_qty': fields.float('Quantity (UOS)'),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
-        'product_packaging': fields.many2one('product.packaging', 'Packaging'),
+        'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."),
 
-        'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True),
-        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True),
-        'address_id': fields.many2one('res.partner.address', 'Dest. Address'),
+        'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True, help="Set a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
+        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True, help="Location where the system will stock the finished products."),
+        'address_id': fields.many2one('res.partner.address', 'Dest. Address', help="Adress where goods are to be delivered"),
 
         'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production"),
         'tracking_id': fields.many2one('stock.tracking', 'Tracking Lot', select=True, help="Tracking lot is the code that will be put on the logistical unit/pallet"),
@@ -953,7 +980,7 @@ class stock_move(osv.osv):
 
         'note': fields.text('Notes'),
 
-        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Canceled')], 'Status', readonly=True, select=True),
+        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True),
         'price_unit': fields.float('Unit Price',
             digits=(16, int(config['price_accuracy']))),
     }
@@ -1312,7 +1339,7 @@ class stock_inventory(osv.osv):
         'date_done': fields.datetime('Date done'),
         'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=True, states={'draft': [('readonly', False)]}),
         'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
-        'state': fields.selection( (('draft', 'Draft'), ('done', 'Done')), 'Status', readonly=True),
+        'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'Status', readonly=True),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -1366,6 +1393,12 @@ class stock_inventory(osv.osv):
             self.write(cr, uid, [inv.id], {'state': 'draft'})
         return True
 
+    def action_cancel_inventary(self, cr, uid, ids, context={}):
+        for inv in self.browse(cr,uid,ids):
+            self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in inv.move_ids], context)
+            self.write(cr, uid, [inv.id], {'state':'cancel'})
+        return True
+
 stock_inventory()
 
 
@@ -1460,31 +1493,4 @@ class stock_picking_move_wizard(osv.osv_memory):
 
 stock_picking_move_wizard()
 
-
-class report_stock_lines_date(osv.osv):
-    _name = "report.stock.lines.date"
-    _description = "Dates of Inventories"
-    _auto = False
-    _columns = {
-        'id': fields.integer('Inventory Line Id', readonly=True),
-        'product_id': fields.integer('Product Id', readonly=True),
-        'create_date': fields.datetime('Latest Date of Inventory'),
-        }
-
-    def init(self, cr):
-        cr.execute("""
-            create or replace view report_stock_lines_date as (
-                select
-                l.id as id,
-                p.id as product_id,
-                max(l.create_date) as create_date
-                from
-                product_product p
-                left outer join
-                stock_inventory_line l on (p.id=l.product_id)
-                where l.create_date is not null
-                group by p.id,l.id
-            )""")
-
-report_stock_lines_date()
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 17a0de03be6..6c606663bbd 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -65,9 +65,10 @@
                     </page>
                     </notebook>
                     <field name="state" select="1"/>
-                    <group col="2" colspan="2">
-                        <button name="action_done" states="draft" string="Confirm Inventory" type="object"/>
-                        <button name="action_cancel" states="done" string="Cancel Inventory" type="object"/>
+                    <group col="4" colspan="2">
+                        <button name="action_done" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
+                        <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-cancel"/>
+                        <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -78,6 +79,7 @@
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_inventory_tree"/>
+            <field name="context">{'full':'1'}</field>            
         </record>
         <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_root"/>
 
@@ -87,14 +89,16 @@
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>
             <field name="domain">[('state','=','draft')]</field>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_inventory_form_draft" id="menu_action_inventory_form_draft" parent="menu_action_inventory_form"/>
+        <menuitem action="action_inventory_form_draft" id="menu_action_inventory_form_draft" parent="menu_action_inventory_form" groups="base.group_extended_menu"/>
         <record id="action_inventory_form_new" model="ir.actions.act_window">
             <field name="name">New Periodical Inventory</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
+            <field name="domain">[('state','=','draft')]</field>            
         </record>
         <menuitem action="action_inventory_form_new" id="menu_action_inventory_form_new" parent="menu_action_inventory_form"/>
 
@@ -221,10 +225,10 @@
             <field name="res_model">stock.production.lot</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_production_lot_tree"/>
+            <field name="context">{'full':'1'}</field>            
         </record>
         <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability"/>
 
-
         #
         # Lot composition (history)
         #
@@ -384,6 +388,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_location_tree2"/>
+            <field name="context">{'full':'1'}</field>            
         </record>
         <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration"/>
 
@@ -462,8 +467,8 @@
                     <field name="picking_id" invisible="True"/>
                     <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1"/><newline/>
                     <group colspan="4">
-                        <button special="cancel" string="Cancel"/>
-                        <button name="action_move" string="Add" type="object"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="action_move" string="Add" type="object" icon="gtk-add"/>
                     </group>
                 </form>
                </field>
@@ -551,28 +556,28 @@
                                     <field groups="base.group_extended" name="tracking_id" select="2"/>
                                     <newline/>
                                     <label/>
-                                    <button name="%(track_line)d" string="Split in production lots" type="action"/>
+                                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                     <separator colspan="4" string="Move State"/>
                                     <field name="state" select="1"/>
                                     <group>
-                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object"/>
+                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-no"/>
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="6"/>
-                                <button name="%(move_split)d" string="Split move lines in two" type="action"/>
+                                <button name="%(move_split)d" string="Split move lines in two" type="action" icon="gtk-justify-fill"/>
                             </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="draft_force_assign" states="draft" string="Confirm (Do Not Process Now)" type="object"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object"/>
-                                <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
-                                <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Validate" type="action"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
+                                <button name="draft_force_assign" states="draft" string="Confirm (Do Not Process Now)" type="object" icon="gtk-apply"/>
+                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
+                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-apply"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Notes">
@@ -649,24 +654,24 @@
                                     <separator colspan="4" string="Move State"/>
                                     <field name="state" select="1"/>
                                     <group>
-                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object"/>
+                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="6"/>
-                                <button name="%(move_split)d" string="Split in Two" type="action" states="assigned,confirmed,draft,auto" />
+                                <button name="%(move_split)d" string="Split in Two" type="action" states="assigned,confirmed,draft,auto" icon="gtk-justify-fill"/>
                             </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object"/>
-                                <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
-                                <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Products Sent" type="action"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
+                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
+                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Notes">
@@ -685,6 +690,24 @@
             </field>
         </record>
 
+       <record id="view_stock_delivery_filter" model="ir.ui.view">
+            <field name="name">stock.view_stock_delivery_filter.list.select</field>
+            <field name="model">stock.picking</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Stock Delivery">
+                    <group col='6' colspan='4'>
+                        <field name="state">
+                           <filter icon="terp-stock" domain="[('state','=','auto')]" help="Waiting Orders"/>
+                           <filter icon="terp-stock" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
+                           <filter icon="terp-stock" domain="[('state','=','assigned')]" help="Assigned Orders"/>
+                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                   </group>
+              </search>
+            </field>
+        </record>
 
         <record id="action_picking_tree_delivery" model="ir.actions.act_window">
             <field name="name">Delivery Orders</field>
@@ -694,6 +717,7 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','delivery')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
         <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -723,6 +747,8 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
         <record id="action_picking_tree_delivery_view1_toproc" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -741,7 +767,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree2_delivery"/>
         </record>
-        <menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery"/>
+        <menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended_menu" />
 
         <record id="action_picking_tree3_delivery" model="ir.actions.act_window">
             <field name="name">Future Delivery Orders</field>
@@ -751,6 +777,8 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('state','=','confirmed'),('type','=','delivery')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
         <record id="action_picking_tree_delivery_view1_waiting" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -769,7 +797,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree3_delivery"/>
         </record>
-        <menuitem action="action_picking_tree3_delivery" id="menu_action_picking_tree3_delivery" parent="menu_action_picking_tree_delivery"/>
+        <menuitem action="action_picking_tree3_delivery" id="menu_action_picking_tree3_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended_menu" />
 
        <record id="action_picking_calendar_delivery" model="ir.actions.act_window">
             <field name="name">Calendar of Deliveries</field>
@@ -780,7 +808,7 @@
             <field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <menuitem action="action_picking_calendar_delivery" id="menu_picking_calendar_delivery" parent="menu_action_picking_tree_delivery"/>
+        <menuitem action="action_picking_calendar_delivery" id="menu_picking_calendar_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended_menu" />
 
         #
         # Sending Products
@@ -791,7 +819,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree color="red:state=='cancel'" string="Packing list">
+                <tree colors="red:state=='cancel';grey:state=='confirmed';blue:state=='done'" string="Packing list">            
                     <field name="name"/>
                     <field name="origin"/>
                     <field name="address_id"/>
@@ -839,28 +867,28 @@
                                         on_change="onchange_lot_id(prodlot_id,product_qty, location_id)"/>
                                     <field groups="base.group_extended" name="tracking_id" select="1"/>
                                     <label/>
-                                    <button name="%(track_line)d" string="Split in production lots" type="action"/>
+                                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                     <separator colspan="4" string="Move State"/>
                                     <field name="state" select="1"/>
                                     <group>
-                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object"/>
+                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"  icon="gtk-jump-to"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"  icon="gtk-no"/>
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object"  icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="6"/>
-                                <button name="%(move_split)d" string="Split in Two" type="action"/>
+                                <button name="%(move_split)d" string="Split in Two" type="action" icon="gtk-justify-fill"/>
                             </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object"/>
-                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended"/>
-                                <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Packing Done" type="action"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
+                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
+                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
+                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Packing Done" type="action" icon="gtk-execute"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Notes">
@@ -887,6 +915,8 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','out')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
         <record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -915,6 +945,8 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('state','=','assigned'),('type','=','out')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
         <record id="action_picking_tree2_out_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -933,7 +965,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree2"/>
         </record>
-        <menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree"/>
+        <menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree" groups="base.group_extended_menu"/>
 
         <record id="action_picking_tree3" model="ir.actions.act_window">
             <field name="name">Confirmed Packing Waiting Availability</field>
@@ -943,6 +975,8 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('state','=','confirmed'),('type','=','out')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
         <record id="action_picking_tree3_out_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -961,7 +995,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree3"/>
         </record>
-        <menuitem action="action_picking_tree3" id="menu_action_picking_tree3" parent="menu_action_picking_tree"/>
+        <menuitem action="action_picking_tree3" id="menu_action_picking_tree3" parent="menu_action_picking_tree" groups="base.group_extended_menu"/>
 
         #
         # Reception of Products
@@ -1030,28 +1064,28 @@
                                     <field groups="base.group_extended" name="tracking_id" select="1"/>
                                     <newline/>
                                     <label/>
-                                    <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action"/>
+                                    <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                     <separator colspan="4" string="Move State"/>
                                     <field name="state" select="1"/>
                                     <group>
-                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object"/>
+                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon=""/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon=""/>
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon=""/>
                                     </group>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="5"/>
-                                <button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft,confirmed,assigned"/>
+                                <button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft,confirmed,assigned" icon="gtk-redo"/>
                             </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object"/>
-                                <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
-                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Products Received" type="action"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
+                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
+                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
+                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Notes">
@@ -1062,8 +1096,6 @@
             </field>
         </record>
 
-
-
         <record id="action_picking_tree4" model="ir.actions.act_window">
             <field name="name">Incoming Products</field>
             <field name="res_model">stock.picking</field>
@@ -1072,6 +1104,8 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','in')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -1100,6 +1134,8 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('state','=','assigned'),('type','=','in')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
         <record id="action_invoice_tree6_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -1118,7 +1154,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree5"/>
         </record>
-        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4"/>
+        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_extended_menu"/>
 
         <record id="action_picking_form" model="ir.actions.act_window">
             <field name="name">New Reception Packing</field>
@@ -1156,6 +1192,8 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
         <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_root" sequence="18"/>
 
@@ -1168,8 +1206,10 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('state','=','assigned'),('type','=','internal')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
-        <menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6"/>
+        <menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6" groups="base.group_extended_menu"/>
 
         <record id="action_picking_tree8" model="ir.actions.act_window">
             <field name="name">Confirmed Packing Waiting Availability</field>
@@ -1179,8 +1219,10 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('state','=','confirmed'),('type','=','internal')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
-        <menuitem action="action_picking_tree8" id="menu_action_picking_tree8" parent="menu_action_picking_tree6"/>
+        <menuitem action="action_picking_tree8" id="menu_action_picking_tree8" parent="menu_action_picking_tree6" groups="base.group_extended_menu"/>
 
         <record id="action_picking_tree9" model="ir.actions.act_window">
             <field name="name">New Internal Packing</field>
@@ -1252,14 +1294,14 @@
                     <field name="tracking_id" select="2"/>
                     <newline/>
                     <label/>
-                    <button name="%(track_line)d" string="Split in production lots" type="action"/>
+                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                     <separator colspan="4" string="Move State"/>
                     <field name="state" select="1"/>
                     <group col="4" colspan="2">
-                        <button name="action_confirm" states="draft" string="Confirm" type="object"/>
-                        <button name="action_assign" states="confirmed" string="Set Available" type="object"/>
-                        <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object"/>
-                        <button name="action_done" states="assigned" string="Make Parcel" type="object"/>
+                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
+                        <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                        <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="action_done" states="assigned" string="Make Parcel" type="object" icon="gtk-jump-to"/>
                     </group>
                 </form>
             </field>
@@ -1280,8 +1322,9 @@
             <field name="view_type">form</field>
             <field name="domain">[('state','=','draft')]</field>
             <field name="view_id" ref="view_move_tree"/>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_move_form3" id="menu_action_move_form3" parent="menu_action_move_form2"/>
+        <menuitem action="action_move_form3" id="menu_action_move_form3" parent="menu_action_move_form2" groups="base.group_extended_menu"/>
 
         <record id="action_move_form4" model="ir.actions.act_window">
             <field name="name">Available Moves</field>
@@ -1290,8 +1333,9 @@
             <field name="view_type">form</field>
             <field name="domain">[('state','=','assigned')]</field>
             <field name="view_id" ref="view_move_tree"/>
+            <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2"/>
+        <menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2" groups="base.group_extended_menu"/>
 
         <record id="action_picking_all" model="ir.actions.act_window">
             <field name="name">Packing</field>
diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index eb09fe1b548..3696b5220d0 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -36,6 +36,14 @@
             <field name="action">action_done()</field>
             <field name="flow_stop">True</field>
         </record>
+        <record id="act_cancel_inv" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_picking"/>
+            <field name="name">cancel</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">function</field>
+            <field name="action">action_cancel_inventary()</field>
+        </record>
+        
         <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_picking"/>
             <field name="name">cancel</field>
@@ -105,5 +113,11 @@
             <field name="act_to" ref="act_cancel"/>
             <field name="condition">test_cancel()</field>
         </record>
+        <record id="trans_draft_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_cancel_inv"/>
+            <field name="signal">button_cancel</field>
+        </record>
+        
     </data>
 </openerp>
diff --git a/addons/stock/wizard/wizard_invoice_onshipping.py b/addons/stock/wizard/wizard_invoice_onshipping.py
index abcab123d98..7f07cde5319 100644
--- a/addons/stock/wizard/wizard_invoice_onshipping.py
+++ b/addons/stock/wizard/wizard_invoice_onshipping.py
@@ -32,6 +32,8 @@ invoice_form = """<?xml version="1.0"?>
     <field name="group"/>
     <newline/>
     <field name="type"/>
+    <newline/>
+    <field name="invoice_date" />    
 </form>
 """
 
@@ -49,17 +51,12 @@ invoice_fields = {
     'type': {
         'string': 'Type',
         'type': 'selection',
-        'selection': [
-            ('out_invoice', 'Customer Invoice'),
-            ('in_invoice', 'Supplier Invoice'),
-            ('out_refund', 'Customer Refund'),
-            ('in_refund', 'Supplier Refund'),
-            ],
+        'selection': [],
         'required': True
     },
+    'invoice_date': {'string': 'Invoiced date', 'type':'date' }    
 }
 
-
 def _get_type(obj, cr, uid, data, context):
     picking_obj = pooler.get_pool(cr.dbname).get('stock.picking')
     usage = 'customer'
@@ -72,6 +69,24 @@ def _get_type(obj, cr, uid, data, context):
     if pick.move_lines:
         usage = pick.move_lines[0].location_id.usage
 
+    if pick.type =='out':
+        invoice_fields['type']['selection'] = [
+            ('out_invoice', 'Customer Invoice'),
+            ('in_refund', 'Supplier Refund'),
+            ]
+    elif pick.type =='in':
+        invoice_fields['type']['selection'] = [
+            ('in_invoice', 'Supplier Invoice'),
+            ('out_refund', 'Customer Refund'),
+            ]
+    else:
+        invoice_fields['type']['selection']=[
+            ('out_invoice', 'Customer Invoice'),
+            ('in_invoice', 'Supplier Invoice'),
+            ('out_refund', 'Customer Refund'),
+            ('in_refund', 'Supplier Refund'),
+            ]
+                    
     if pick.type == 'out' and usage == 'supplier':
         type = 'in_refund'
     elif pick.type == 'out' and usage == 'customer':
@@ -96,6 +111,7 @@ def _create_invoice(obj, cr, uid, data, context):
 
     type = data['form']['type']
 
+    context['date_inv'] = data['form']['invoice_date']
     res = picking_obj.action_invoice_create(cr, uid, data['ids'],
             journal_id = data['form']['journal_id'], group=data['form']['group'],
             type=type, context= context)
diff --git a/addons/stock/wizard/wizard_location_product.py b/addons/stock/wizard/wizard_location_product.py
index 68f49f1b46a..7380cf9b901 100755
--- a/addons/stock/wizard/wizard_location_product.py
+++ b/addons/stock/wizard/wizard_location_product.py
@@ -24,7 +24,11 @@ import wizard
 import pooler
 import time
 
-def _action_open_window(self, cr, uid, data, context):      
+def _action_open_window(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname) 
+    mod_obj = pool.get('ir.model.data') 
+    result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
+    id = mod_obj.read(cr, uid, result, ['res_id'])          
     return {
         'name': False,
         'view_type': 'form',
@@ -32,7 +36,8 @@ def _action_open_window(self, cr, uid, data, context):
         'res_model': 'product.product',
         'type': 'ir.actions.act_window',
         'context':{'location': data['ids'][0],'from_date':data['form']['from_date'],'to_date':data['form']['to_date']},
-        'domain':[('type','<>','service')]
+        'domain':[('type','<>','service')],
+        'search_view_id': id['res_id'] 
     }
 
 
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 223a94bdcf5..3bfc3feebf8 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -34,9 +34,9 @@
                             <field colspan="4" name="cron_id" readonly="1"/>
                             <field name="state" readonly="1"/>
                             <group col="3" colspan="2">
-                                <button name="set_process" states="draft" string="Process" type="object"/>
-                                <button name="set_done" states="running" string="Stop" type="object"/>
-                                <button name="set_draft" states="done" string="Set to Draft" type="object"/>
+                                <button name="set_process" states="draft" string="Process" type="object" icon="gtk-go-forward"/>
+                                <button name="set_done" states="running" string="Stop" type="object" icon="gtk-stop"/>
+                                <button name="set_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
                         <page string="Documents created">
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 7f97f08bb14..fe355a088e9 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -41,14 +41,16 @@ class WikiGroup(osv.osv):
     _order = 'name'
     _columns={
        'name':fields.char('Wiki Group', size=256, select=True, required=True),
-       'parent_id':fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
-       'child_ids':fields.one2many('wiki.groups', 'parent_id', 'Child Groups'),
        'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'),
        'notes':fields.text("Description", select=True),
        'create_date':fields.datetime("Created Date", select=True),
        'template': fields.text('Wiki Template'),
        'section': fields.boolean("Make Section ?"),
-       'home':fields.many2one('wiki.wiki', 'Pages')
+       'method':fields.selection([('list','List'),('page','Home Page'),('tree','Tree')],'Display Method'),
+       'home':fields.many2one('wiki.wiki', 'Pages'),
+    }
+    _defaults = {
+        'method': lambda *a: 'page',
     }
 WikiGroup()
 
@@ -77,11 +79,14 @@ class Wiki(osv.osv):
         'history_id':fields.one2many('wiki.wiki.history','wiki_id','History Lines'),
         'minor_edit':fields.boolean('Minor edit', select=True),
         'summary':fields.char('Summary',size=256, select=True),
-        'section': fields.char('Section', size=32, help="Use page section code like 1.2.1"),
+        'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"),
         'group_id':fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
         'toc':fields.boolean('Table of Contents'),
-        'review': fields.boolean('Need Review')
+        'review': fields.boolean('Need Review'),
+        'parent_id':fields.many2one('wiki.wiki', 'Parent Page'),
+        'child_ids':fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
     }
+    
     def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
         if (not group_id) or content:
             return {}
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 9c6df8b9c17..452d948668f 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -21,9 +21,8 @@
             <field name="name">wiki.groups.tree</field>
             <field name="model">wiki.groups</field>
             <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree string="Wiki Groups">
+                <tree string="Wikis">
                     <field name="name"/>
                 </tree>
             </field>
@@ -33,12 +32,13 @@
             <field name="model">wiki.groups</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wiki Groups">
+                <form string="Wikis">
                     <group colspan="4" col="4">
                         <field name="name" select="1"/>
-                        <field name="parent_id" select="2"/>
                         <field name="create_date" readonly="2"/>
-                        <field name="section"/>
+                        <field name="method" select="1"/>
+                        <field name="home" select="1"  attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}"/>
+                        <!--field name="section"/-->
                     </group>
                     <notebook colspan="4">
                     <page string="Notes">
@@ -52,13 +52,13 @@
                         name="%(wizard_group_menu_create)d"
                         string="Create a Menu"
                         type="action"
-                        target="new"/>
+                        target="new" icon="gtk-justify-fill"/>
                 </form>
             </field>
         </record>
 
         <record model="ir.actions.act_window" id="action_wiki_groups">
-            <field name="name">Wiki Groups</field>
+            <field name="name">Wikis</field>
             <field name="res_model">wiki.groups</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -69,7 +69,7 @@
             action="action_wiki_groups"/>
 
         <record model="ir.actions.act_window" id="action_wiki_groups_browse">
-            <field name="name">Wiki Groups</field>
+            <field name="name">Wikis</field>
             <field name="res_model">wiki.groups</field>
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
@@ -79,6 +79,23 @@
             id="menu_action_wiki_groups_browse"
             action="action_wiki_groups_browse"/>
 
+        <record id="view_wiki_tree_childs" model="ir.ui.view">
+            <field name="name">wiki.wiki.tree.childs</field>
+            <field name="model">wiki.wiki</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="priority">100</field>
+            <field name="arch" type="xml">
+                <tree string="Wiki">
+                    <field name="name"/>
+                    <field name="section" invisible="not context.get('section',False)"/>
+                    <field name="review"/>
+                    <field name="write_uid"/>
+                    <field name="write_date"/>
+                </tree>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_wiki_tree">
             <field name="name">wiki.wiki.tree</field>
             <field name="model">wiki.wiki</field>
@@ -102,9 +119,10 @@
             <field name="arch" type="xml">
                 <form string="Wiki">
                     <group col="6" colspan="4">
-                        <field name="name" select="1"/>
+                        <field name="name" select="1" colspan="6"/>
                         <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
                         <field name="section" select="2" invisible="not context.get('section',False)"/>
+                        <field name="parent_id"/>                        
                     </group>
                     <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                     <separator colspan="4" string="Modifications"/>
@@ -112,7 +130,7 @@
                         <field name="write_date" readonly="1" select="2"/>
                         <field name="review" select="1"/>
                         <field name="toc"/>
-                        <field name="tags" select="2" groups="base.group_extended"/>
+                        <field name="tags" select="1" groups="base.group_extended"/>
                         <field name="summary" colspan="4" select="2" groups="base.group_extended"/>
                     </group>
                 </form>
@@ -120,19 +138,43 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_wiki">
-            <field name="name">Wiki Pages</field>
+            <field name="name">Search a Pages</field>
             <field name="res_model">wiki.wiki</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_wiki_tree"/>
             <field name="context">{'section':'1'}</field>
         </record>
-        <menuitem
-            parent="menu_document"
-            id="menu_action_wiki_wiki"
-            string="All Wiki Pages"
-            action="action_wiki"/>
+        <menuitem parent="menu_document" id="menu_action_wiki_wiki" string="Search a Page" action="action_wiki"/>
 
+        <!-- My Pages-->
+        <record model="ir.actions.act_window" id="action_wiki_mypages">
+            <field name="name">My Pages</field>
+            <field name="res_model">wiki.wiki</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="context">{'section':'1'}</field>
+            <field name="domain">[('create_uid','=',uid)]</field>
+            <field name="filter" eval="True"/>
+        </record>
+        <menuitem parent="menu_action_wiki_wiki" id="menu_action_wiki_mypages" string="My Pages" 
+        action="action_wiki_mypages" groups="base.group_extended_menu"/>
+        
+        <!--  Pages Waiting Review -->
+        <record model="ir.actions.act_window" id="action_wiki_review">
+            <field name="name">Pages Waiting Review</field>
+            <field name="res_model">wiki.wiki</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="context">{'section':'1'}</field>
+            <field name="domain">[('review','=',True)]</field>
+            <field name="filter" eval="True"/>
+        </record>
+        <menuitem parent="menu_action_wiki_wiki" id="menu_action_wiki_review" string="Pages Waiting Review" 
+        action="action_wiki_review" groups="base.group_extended_menu"/>
+        
         <record model="ir.ui.view" id="view_wiki_history_tree">
             <field name="name">wiki.wiki.history.tree</field>
             <field name="model">wiki.wiki.history</field>
@@ -175,24 +217,38 @@
 
         <act_window domain="[('wiki_id', '=', active_id)]"
             id="act_wiki_wiki_history"
-            name="History"
+            name="Page History"
             res_model="wiki.wiki.history"
             src_model="wiki.wiki"/>
 
-        <act_window
+        <act_window domain="[('group_id', '=', active_id)]"
             domain="[('group_id', 'child_of', active_ids)]"
             id="act_wiki_group_open"
-            name="Wiki Pages"
+            name="Search a Pages"
             res_model="wiki.wiki"
             src_model="wiki.groups"/>
 
+        <wizard
+            id="wizard_open_page"
+            string="Open Wiki Pages"
+            name="wiki.wiki.page.open"
+            model="wiki.groups"/>
+
         <record id="ir_open_wiki_pages" model="ir.values">
             <field name="key2">tree_but_open</field>
             <field name="model">wiki.groups</field>
-            <field name="name">Wiki Pages</field>
-            <field eval="'ir.actions.act_window,%d'%act_wiki_group_open" name="value"/>
+            <field name="name">Search a Page</field>
+            <field eval="'ir.actions.wizard,%d'%wizard_open_page" name="value"/>
             <field eval="True" name="object"/>
         </record>
+        
+        <!--record id="ir_open_account_account" model="ir.values">
+            <field eval="'tree_but_open'" name="key2"/>
+            <field eval="'wiki.groups'" name="model"/>
+            <field name="name">Search a Page</field>
+           <field eval="'ir.actions.act_window,%d'%act_wiki_group_open" name="value"/>
+            <field eval="True" name="object">
+        </record-->
 
     </data>
 </openerp>
diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
index 69ae1a9e60f..6f734ba3417 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/wiki/wizard/__init__.py
@@ -1,4 +1,5 @@
 import open_page
+import open_help
 import create_menu
 import show_diff
 import make_index
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
index faae94eb926..68bb6b3defe 100644
--- a/addons/wiki/wizard/create_menu.py
+++ b/addons/wiki/wizard/create_menu.py
@@ -30,7 +30,7 @@ section_form = '''<?xml version="1.0"?>
     <separator string="Menu Information" colspan="4"/>
     <field name="menu_name"/>
     <field name="menu_parent_id"/>
-    <field name="page" colspan="4" domain="[('group_id','=', active_id)]"/>
+    <field name="page" colspan="4"/>
 </form>'''
 
 section_fields = {
diff --git a/addons/wiki/wizard/open_page.py b/addons/wiki/wizard/open_page.py
index 2223af453f1..892ce3f8758 100644
--- a/addons/wiki/wizard/open_page.py
+++ b/addons/wiki/wizard/open_page.py
@@ -28,19 +28,15 @@ import pooler
 from osv import osv
 from tools.translate import _
 
-class wiz_timesheet_open(wizard.interface):
+class wiz_open_page(wizard.interface):
     
     def _open_wiki_page(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
-        menu_id = data['id']
-        group_ids = pool.get('wiki.groups.link').search(cr, uid, [('action_id','=',menu_id)])
-        if not group_ids:
-            raise wizard.except_wizard(_('Open Page'), _('No action found'))
-        group = pool.get('wiki.groups.link').browse(cr, uid, group_ids[0])
+        group = pool.get('wiki.groups').browse(cr, uid, data['id'])
         
         value = {
-            'context': "{'group_id':%d, 'section':%s}" % (group.group_id.id, group.group_id.section),
-            'domain': "[('group_id','child_of',[%s])]" % (group.group_id.id),
+            'context': "{'group_id':%d, 'section':%s}" % (group.id, group.section),
+            'domain': "[('group_id','=',%d)]" % (group.id),
             'name': 'Wiki Page',
             'view_type': 'form',
             'view_mode': 'form,tree',
@@ -48,12 +44,17 @@ class wiz_timesheet_open(wizard.interface):
             'view_id': False,
             'type': 'ir.actions.act_window',
         }
-        if group.group_id.home:
-            value['res_id'] = group.group_id.home.id
-        else:
+        if group.method == 'page':
+            value['res_id'] = group.home.id
+        elif group.method == 'list':
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
-            
+        elif group.method == 'tree':
+            view_id = pool.get('ir.ui.view').search(cr, uid, [('name','=','wiki.wiki.tree.childs')])
+            value['view_id'] = view_id
+            value['domain'] = [('group_id','=',group.id),('parent_id','=',False)]
+            value['view_type'] = 'tree'            
+
         return value
 
     states = {
@@ -62,8 +63,7 @@ class wiz_timesheet_open(wizard.interface):
             'result' : {'type':'action', 'action':_open_wiki_page, 'state':'end'}
         }
     }
-wiz_timesheet_open('wiki.wiki.page.open')
+wiz_open_page('wiki.wiki.page.open')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/wiki/wizard/wizard_view.xml b/addons/wiki/wizard/wizard_view.xml
index e94046b749f..cbc5f020731 100644
--- a/addons/wiki/wizard/wizard_view.xml
+++ b/addons/wiki/wizard/wizard_view.xml
@@ -20,10 +20,15 @@
             target="new"
             view_mode="form"
         />
-        <wizard
+<!--        <wizard
             id="wizard_make_index"
             string="Create Index"
             name="wiki.make.index"
+            model="wiki.wiki"/-->
+        <wizard
+            id="wizard_open_help"
+            string="Basic Wiki Editing"
+            name="wiki.wiki.help.open"
             model="wiki.wiki"/>
 
     </data>