diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6fa3b8c09d2..9cb4314ddeb 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -506,12 +506,12 @@
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
-        <act_window context="{'search_default_partner_id':[active_id]}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
+        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
 
         <act_window
            id="act_account_journal_2_account_invoice_opened"
            name="Unpaid Invoices"
-           context="{'search_default_journal_id':active_id, 'search_default_unpaid':1,}"
+           context="{'search_default_journal_id': [active_id], 'search_default_unpaid':1, 'default_journal_id': active_id}"
            res_model="account.invoice"
            src_model="account.journal"/>
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 43a7803fb5c..bab2f43060f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1498,7 +1498,7 @@
         <act_window
             id="act_account_move_to_account_move_line_open"
             name="Journal Items"
-            context="{'search_default_move_id':[active_id]}"
+            context="{'search_default_move_id':[active_id], 'default_move_id': active_id}"
             res_model="account.move.line"
             src_model="account.move"/>
 
@@ -1540,7 +1540,7 @@
         <act_window
             id="act_account_acount_move_line_open"
             name="Entries"
-            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':0}"
+            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':0, 'default_account_id': active_id}"
             res_model="account.move.line"
             src_model="account.account"/>
 
@@ -1548,7 +1548,7 @@
             id="act_account_acount_move_line_open_unreconciled"
             name="Unreconciled Entries"
             res_model="account.move.line"
-            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1,}"
+            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1, 'default_account_id': active_id}"
             src_model="account.account"/>
 
         <act_window domain="[('reconcile_id', '=', active_id)]" id="act_account_acount_move_line_reconcile_open" name="Reconciled entries" res_model="account.move.line" src_model="account.move.reconcile"/>
@@ -1993,20 +1993,20 @@
         <act_window
            id="act_account_journal_2_account_bank_statement"
            name="Bank statements"
-           context="{'search_default_journal_id':active_id,}"
+           context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
            res_model="account.bank.statement"
            src_model="account.journal"/>
 
         <act_window
            id="act_account_journal_2_account_move_line"
            name="Journal Items"
-           context="{'search_default_journal_id':active_id,}"
+           context="{'search_default_journal_id':active_id, 'default_journal_id': active_id}"
            res_model="account.move.line"
            src_model="account.journal"/>
 
-        <act_window context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id]}" domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
+        <act_window context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}" domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
 
-        <act_window context="{'search_default_partner_id':[active_id]}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
+        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Create Account</field>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 13ae352ab08..1afc6d2902d 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -131,7 +131,7 @@
             id="action_analytic_open"
             name="Analytic Accounts"
             res_model="account.analytic.account"
-            context="{'search_default_partner_id':[active_id]}"
+            context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
             src_model="res.partner"
             view_type="form"
             view_mode="tree,form,graph,calendar"
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index f5b1f9ff3dd..f38d43471ad 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -446,7 +446,7 @@
         </record>
 
         <act_window
-            context="{'search_default_account_id': [active_id], 'search_default_user_id': False}"
+            context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}"
             id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
             name="All Analytic Entries"
             res_model="account.analytic.line"
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 3bc3ba5222a..f078ba09c22 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -81,7 +81,7 @@
             id="act_account_acount_move_line_open"
             res_model="account.move.line"
             src_model="account.account"
-            context="{'search_default_account_id': [active_id]}"
+            context="{'search_default_account_id': [active_id], 'default_account_id': active_id}"
             />
 
         <menuitem
@@ -95,7 +95,7 @@
             id="analytic_rule_action_partner"
             res_model="account.analytic.default"
             src_model="res.partner"
-            context="{'search_default_partner_id': [active_id]}"
+            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
             groups="analytic.group_analytic_accounting"/>
 
         <act_window
@@ -103,7 +103,7 @@
             id="analytic_rule_action_user"
             res_model="account.analytic.default"
             src_model="res.users"
-            context="{'search_default_user_id': [active_id]}"
+            context="{'search_default_user_id': [active_id], 'default_user_id': active_id}"
             groups="analytic.group_analytic_accounting"/>
 
         <act_window
@@ -111,7 +111,7 @@
             res_model="account.analytic.default"
             id="analytic_rule_action_product"
             src_model="product.product"
-            context="{'search_default_product_id': [active_id]}"
+            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
             groups="analytic.group_analytic_accounting"/>
 
     </data>
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 676949fd420..8282461e512 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -154,8 +154,8 @@
     </record>
 
     <act_window name="Distribution Models"
-        domain="[('plan_id', '=', active_id),('plan_id','&lt;&gt;',False)]"
-        context="{'plan_id':active_id}"
+        domain="[('plan_id','&lt;&gt;',False)]"
+        context="{'search_default_plan_id': active_id, 'default_plan_id': active_id}"
         res_model="account.analytic.plan.instance"
         src_model="account.analytic.plan"
         id="account_analytic_instance_model_open"/>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 8ddcf5cdc0a..321014ea859 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -250,7 +250,7 @@
 
         <!--  Shortcuts -->
         <act_window name="Budget Lines"
-            context="{'search_default_analytic_account_id': [active_id]}"
+            context="{'search_default_analytic_account_id': [active_id], 'default_analytic_account_id': active_id}"
             res_model="crossovered.budget.lines"
             src_model="account.analytic.account"
             id="act_account_analytic_account_cb_lines"/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index ac3bcc9d9b5..e4fc585a4fd 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -189,7 +189,7 @@
         <act_window
             id="act_journal_voucher_open"
             name="Voucher Entries"
-            context="{'search_default_journal_id': active_id, 'type':type}"
+            context="{'search_default_journal_id': active_id, 'type':type, 'default_journal_id': active_id}"
             res_model="account.voucher"
             src_model="account.journal"/>
 
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index e55938d2ecd..6e457f06db3 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -254,7 +254,7 @@
     </record>
 
     <act_window name="Open lots"
-        domain="[('auction_id', '=', active_id)]"
+        context="{'search_default_auction_id': [active_id], 'default_auction_id': active_id}"
         res_model="auction.lots"
         src_model="auction.dates"
         id="act_auction_lot_line_open"/>
@@ -499,7 +499,7 @@
     <!-- Action for Bids -->
 
     <act_window name="Open Bids"
-        domain="[('lot_id', '=', active_id)]"
+        context="{'search_default_lot_id': [active_id], 'default_lot_id': active_id}"
         res_model="auction.bid_line"
         src_model="auction.lots"
         id="act_auction_lot_open_bid"/>
@@ -769,7 +769,7 @@
     <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="group_auction_manager"/>
 
     <act_window name="Deposit slip"
-        context="{'search_default_partner_id': [active_id]}"
+        context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
         res_model="auction.deposit"
         src_model="res.partner"
         id="act_auction_lot_open_deposit"/>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 59894ab55d0..659307e289c 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -410,7 +410,7 @@
     <act_window
         id="act_res_partner_jobs" 
         name="Open Jobs"
-        context="{'search_default_address_id': [active_id]}"
+        context="{'search_default_address_id': [active_id], 'default_address_id': active_id}"
         res_model="res.partner.job"
         src_model="res.partner.address"
         />
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index f223ee16be9..41975d9ced4 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -8,7 +8,7 @@
         res_model="crm.phonecall"
         src_model="res.partner"
         view_mode="calendar,tree,form"
-        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0}"
+        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}"
         groups="base.group_extended"
         />
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 50f70b30867..63df2c35d0d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -306,7 +306,7 @@
         </record>
 
         <act_window
-            context="{'search_default_partner_id': [active_id]}"
+            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
             id="act_claim_partner"
             name="Report a Claim"
             view_mode="form,tree"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c91d279021b..8cb80fde45b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -280,7 +280,7 @@
             res_model="event.registration"
             src_model="event.event"
             view_mode="tree,form,calendar,graph"
-            domain="[('event_id','=',active_id)]"
+            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
             view_type="form"/>
 
       <act_window
@@ -289,7 +289,7 @@
             res_model="event.registration"
             src_model="res.partner"
             view_mode="tree,form,calendar,graph"
-            context="{'search_default_partner_id': [active_id]}"
+            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
             view_type="form"/>
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
diff --git a/addons/event_project/event_project_view.xml b/addons/event_project/event_project_view.xml
index 7793d4fbcf7..35bc1b40b81 100644
--- a/addons/event_project/event_project_view.xml
+++ b/addons/event_project/event_project_view.xml
@@ -36,7 +36,7 @@
             res_model="project.task"
             src_model="event.event"
             view_mode="tree,form,calendar,graph"
-            context="{'search_default_project_id': project_id}"
+            context="{'search_default_project_id': project_id, 'default_project_id': project_id}"
             view_type="form"/>
 
     </data>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 7d55f9f5a7a..096a83bfa4e 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -150,8 +150,7 @@
                parent="base.menu_mail_gateway" action="action_view_mail_message_emails" />
 
       <act_window 
-            context="{'server_id': active_id}"
-            domain="[('server_id', '=', active_id)]"
+            context="{'search_default_server_id': [active_id], 'default_server_id': active_id}"
             id="act_server_history" name="Emails"
             res_model="mailgate.message" src_model="email.server"/>
             
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index cae7885a754..67607af8146 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -271,7 +271,7 @@
 
         <!-- Contracts Button on Employee Form -->
         <act_window 
-        context="{'search_default_employee_id': [active_id]}"
+        context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
         id="act_hr_employee_2_hr_contract" 
         name="Contracts" 
         res_model="hr.contract" 
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index ac3f723ceb3..27b3ba53d10 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -201,17 +201,17 @@
                     </notebook>
                     <newline/>
                     <group col="8" colspan="4">
-	                    <field name="state"/>
-	                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
-	                            icon="gtk-cancel"/>
-	                    <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
-	                            icon="gtk-execute"/>
-	                    <button name="button_done" string="Done" states="progress" type="object"
-	                            icon="gtk-jump-to"/>
-	                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object"
-	                            icon="terp-stock_effects-object-colorize"/>
-	                    <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
-	                            icon="gtk-go-forward"/>
+                        <field name="state"/>
+                        <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
+                                icon="gtk-cancel"/>
+                        <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
+                                icon="gtk-execute"/>
+                        <button name="button_done" string="Done" states="progress" type="object"
+                                icon="gtk-jump-to"/>
+                        <button name="button_draft" string="Reset to Draft" states="cancel" type="object"
+                                icon="terp-stock_effects-object-colorize"/>
+                        <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
+                                icon="gtk-go-forward"/>
                     </group>
               </form>
             </field>
@@ -366,7 +366,7 @@
             <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar string="Interview Request" color="user_to_review_id" date_start="date_deadline">
-                	<field name="request_id"/>
+                    <field name="request_id"/>
                 </calendar>
             </field>
         </record>
@@ -408,7 +408,7 @@
 
       <!-- Evaluation Interviews Button on Employee Form -->
       <act_window
-      context="{'search_default_user_to_review_id': [active_id]}"
+      context="{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}"
       id="act_hr_employee_2_hr__evaluation_interview"
       name="Evaluation Interviews"
       res_model="hr.evaluation.interview"
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index d8b38f81e73..a3d2b2710ad 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -436,7 +436,7 @@
     <!--  Shortcuts -->
         <act_window name="Holidays"
             domain="[('type','=','remove')]"
-            context="{'search_default_employee_id': [active_id]}"
+            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
             res_model="hr.holidays"
             src_model="hr.employee"
             view_id ="view_holiday"
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index e2c54097cf7..78b9da0f9c1 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -963,6 +963,7 @@
         <!--  Shortcuts -->
         <act_window name="Payslips"
             domain="[('employee_id', '=', active_id)]"
+            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
             res_model="hr.payslip"
             src_model="hr.employee"
             view_id ="view_hr_payslip_tree"
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 6b06ce4fcde..ed3c86939cd 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -136,7 +136,7 @@
 
         <act_window
         domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]"
-        context="{'search_default_account_id': [active_id]}"
+        context="{'search_default_account_id': [active_id], 'default_account_id': active_id}"
         id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice"
         name="Lines to Invoice"
         res_model="account.analytic.line"
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 349f0f45657..5cfcb15089e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -279,14 +279,14 @@
         </record>
 
         <act_window
-        context="{'search_default_sheet_id': [active_id]}"
+        context="{'search_default_sheet_id': [active_id], 'default_sheet_id': active_id}"
         id="act_hr_timesheet_sheet_sheet_by_day"
         name="Timesheet by Account"
         res_model="hr_timesheet_sheet.sheet.account"
         src_model="hr_timesheet_sheet.sheet"/>
 
         <act_window
-        context="{'search_default_sheet_id': [active_id]}"
+        context="{'search_default_sheet_id': [active_id], 'default_sheet_id': active_id}"
         id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet"
         name="Timesheet Lines"
         res_model="hr.analytic.timesheet"
@@ -294,7 +294,7 @@
 
 
         <act_window
-        context="{'search_default_sheet_id': [active_id]}"
+        context="{'search_default_sheet_id': [active_id], 'default_sheet_id': active_id}"
         id="act_hr_timesheet_sheet_sheet_2_hr_attendance"
         name="Attendances"
         res_model="hr.attendance"
@@ -331,7 +331,7 @@
         </record>
   <!-- Timesheet Button on Employee Form -->
   <act_window
-           context="{'search_default_employee_id': [active_id]}"
+           context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
            id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
 
     </data>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 89b459b8896..ce3936337ff 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -446,12 +446,12 @@
         view_type="form"
         view_mode="tree,form"
         id="act_marketing_campaing_segment_opened"
-        context="{'search_default_campaign_id': [active_id]}"
+        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
     />
 
     <!-- Campaign Followups -->
     <act_window
-        context="{'search_default_campaign_id': [active_id]}"
+        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
         id="act_marketing_campaing_followup"
         name="Campaign Follow-up" res_model="marketing.campaign.workitem"
         src_model="marketing.campaign" view_mode="tree,form"
@@ -459,7 +459,7 @@
 
     <!-- Campaign Statistics -->
     <act_window
-        context="{'search_default_campaign_id': [active_id]}"
+        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
         id="act_marketing_campaing_stat"
         name="Campaign Statistics" res_model="campaign.analysis"
         src_model="marketing.campaign" view_mode="tree,form"
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 9c8ad70fe63..e105d828b4f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -244,7 +244,7 @@
         </record>
 
         <act_window
-        context="{'search_default_warehouse_id': active_id}"
+        context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
         id="act_stock_warehouse_2_stock_warehouse_orderpoint"
         name="Minimum Stock Rules" 
         res_model="stock.warehouse.orderpoint" 
@@ -253,8 +253,7 @@
 
         <!-- add product_uom to context to be the default value when adding new orderpoints -->
         <act_window
-            context="{'product_uom': locals().has_key('uom_id') and uom_id,'search_default_product_id': [active_id]}"
-            domain="[('product_id', '=', active_id)]"
+            context="{'product_uom': locals().has_key('uom_id') and uom_id,'search_default_product_id': [active_id], 'default_product_id': active_id}"
             id="act_product_product_2_stock_warehouse_orderpoint"
             name="Minimum Stock Rules"
             res_model="stock.warehouse.orderpoint"
@@ -262,8 +261,7 @@
             groups="stock.group_stock_user"/>
 
         <act_window
-            context="{'product_uom': locals().has_key('uom_id') and uom_id}"
-            domain="[('procurement_id', '=', active_id)]"
+            context="{'product_uom': locals().has_key('uom_id') and uom_id, 'default_procurement_id': active_id}"
             id="act_procurement_2_stock_warehouse_orderpoint"
             name="Minimum Stock Rules"
             res_model="stock.warehouse.orderpoint"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4a93b4d9c91..bce4ba6f2f4 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -512,10 +512,10 @@
         <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
 
-        <act_window context="{'search_default_user_id': [active_id]}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
+        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
         <act_window
-            domain="[('project_id', '=', active_id)]"
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
             id="act_project_project_2_project_task_all"
             name="Tasks"
             res_model="project.task"
@@ -563,7 +563,7 @@
             </page>
        </field>
     </record>
-    <act_window context="{'search_default_user_id': [active_id]}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
-    <act_window context="{'search_default_user_id': [active_id]}" domain="[('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
+    <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+    <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
     </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index e1341ded00d..18c8779704f 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -40,7 +40,7 @@
     </record>
 
     <act_window
-    		context="{'search_default_project_id': [active_id]}"
+    		context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
             id="act_project_project_2_project_issue_all"
             name="Issues"
             res_model="project.issue"
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 3a539b696fe..40e383ab8c9 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -98,7 +98,7 @@
 			<field name="help">An in-project messaging system allows for an efficient and trackable communication between project members. The messages are stored in the system and can be used for post analysis.</field>
         </record>
 
-        <act_window context="{'search_default_project_id': [active_id]}" id="act_project_messages" name="Messages" res_model="project.messages" src_model="project.project"/>
+        <act_window context="{'search_default_project_id': [active_id], 'default_project_id': active_id}" id="act_project_messages" name="Messages" res_model="project.messages" src_model="project.project"/>
 
          <!--Actions for deshboard -->
 
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 32ed240cba6..950cf0f41cf 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -593,7 +593,7 @@
         </record>
 
         <act_window
-        	context="{'search_default_sprint_id': [active_id]}"
+        	context="{'search_default_sprint_id': [active_id], 'default_sprint_id': active_id}"
             id="act_scrum_sprint_2_product_backlog"
             name="Backlogs"
             res_model="project.scrum.product.backlog"
@@ -602,7 +602,7 @@
             view_type="form"/>
 
         <act_window
-        	context="{'search_default_sprint_id': active_id, 'search_default_user_id': uid, 'search_default_current':1}"
+        	context="{'search_default_sprint_id': active_id, 'search_default_user_id': uid, 'search_default_current':1, 'default_sprint_id': active_id}"
             id="act_scrum_sprint_2_project_task"
             name="Tasks"
             res_model="project.task"
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8c432aa9ecc..8e02a57b7d3 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -439,7 +439,7 @@
         </record>
 
         <act_window
-            context="{'search_default_partner_id': [active_id]}"
+            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
             id="act_res_partner_2_purchase_order"
             name="Purchase Orders"
             groups="purchase.group_purchase_user"
@@ -447,7 +447,7 @@
             src_model="res.partner"/>
 
         <act_window
-            context="{'search_default_product_id': [active_id]}"
+            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
             id="action_purchase_line_product_tree"
             name="Purchases"
             res_model="purchase.order.line"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4c84fde224f..9a59b2dad44 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -511,7 +511,7 @@
         </record>
 
         <act_window
-        context="{'search_default_partner_id': [active_id]}"
+        context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
         id="act_res_partner_2_sale_order"
         name="Sales"
         groups="base.group_sale_salesman"
@@ -519,7 +519,7 @@
         src_model="res.partner"/>
 
         <act_window
-        context="{'search_default_product_id': [active_id]}"
+        context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
         id="action_order_line_product_tree"
         name="Product sales"
         res_model="sale.order.line"
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 28895061565..d774d9a2327 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1823,7 +1823,7 @@
             src_model="stock.location"/>
 
         <act_window
-            context="{'search_default_done': 1,'search_default_product_id': [active_id]}"
+            context="{'search_default_done': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
             id="act_product_stock_move_open"
             name="Stock Moves"
             res_model="stock.move"
@@ -1837,7 +1837,7 @@
             src_model="stock.move"/>
 
         <act_window
-            context="{'search_default_future': 1,'search_default_product_id': [active_id]}"
+            context="{'search_default_future': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
             domain="[('state','in',('waiting','confirmed','assigned'))]"
             id="act_product_stock_move_futur_open"
             name="Future Stock Moves"
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index ab8d50323d9..fa84932cdaa 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1166,14 +1166,14 @@
         </record>
 
         <act_window 
-            context="{'search_default_survey_id': [active_id]}"
+            context="{'search_default_survey_id': [active_id], 'default_survey_id': active_id}"
             id="act_survey_pages"
             name="Pages"
             res_model="survey.page"
             src_model="survey"/>
 
         <act_window 
-            context="{'search_default_survey': active_id}"
+            context="{'search_default_survey': active_id, 'default_survey': active_id}"
             id="act_survey_question"
             name="Questions"
             res_model="survey.question"
@@ -1181,7 +1181,7 @@
 
 
         <act_window 
-            context="{'search_default_page_id': active_id}"
+            context="{'search_default_page_id': active_id, 'default_page_id': active_id}"
             id="act_survey_page_question"
             name="Questions"
             res_model="survey.question"
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index a8f53a5c3a5..ef801704037 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -246,14 +246,14 @@
         </record>
 
         <act_window 
-            context="{'search_default_wiki_id': [active_id]}"
+            context="{'search_default_wiki_id': [active_id], 'default_wiki_id': active_id}"
             id="act_wiki_wiki_history"
             name="Page History"
             res_model="wiki.wiki.history"
             src_model="wiki.wiki"/>
 
         <act_window
-            context="{'search_default_group_id': [active_id]}"
+            context="{'search_default_group_id': [active_id], 'default_group_id': active_id}"
             id="act_wiki_group_open"
             name="Search Page"
             res_model="wiki.wiki"