diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 151f7bbc0f0..374304135df 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -23,7 +23,7 @@
23
-
+
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 545bfd41f10..d2621330be5 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -355,7 +355,7 @@
search
-
+
@@ -364,16 +364,16 @@
-
-
+
+
-
-
-
+
+
+
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 2264508a7da..69a28eb6780 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -202,7 +202,7 @@
search
-
+
@@ -387,7 +387,7 @@
account.journal
search
-
+
@@ -404,7 +404,7 @@
-
+
@@ -482,7 +482,7 @@
search
-
+
@@ -526,7 +526,7 @@
search
-
+
@@ -907,7 +907,7 @@
search
-
+
@@ -1176,7 +1176,7 @@
search
-
+
@@ -1188,20 +1188,20 @@
domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
name="unreconciled"/>
-
-
-
-
+
+
+
+
-
+
-
+
@@ -1433,7 +1433,7 @@
search
-
+
@@ -1445,12 +1445,12 @@
-
+
-
+
@@ -1832,7 +1832,7 @@
search
-
+
@@ -2278,7 +2278,7 @@
search
-
+
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 60a3d0eea84..0664fadd761 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -7,7 +7,7 @@
res.company
form
-
+
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index fb3fd14200a..54abae1d992 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -28,15 +28,15 @@
search
-
+
-
-
-
+
+
+
@@ -204,7 +204,7 @@
search
-
+
@@ -430,13 +430,13 @@
search
-
+
-
-
-
+
+
+
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index a9b781d21a9..e30996c11c7 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -34,7 +34,7 @@
search
-
+
@@ -44,7 +44,6 @@
help="Analytic Entries of last 30 days"/>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index b1913fa8fcc..1ceb3b3bbbe 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -67,7 +67,7 @@
search
-
+
search
-
+
@@ -87,7 +86,6 @@
help="Customer And Supplier Invoices"/>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index a625439f6ae..c581f19c17b 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -152,8 +152,8 @@
-
-
+
+
@@ -218,8 +218,8 @@
-
-
+
+
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index f078ba09c22..753765019f6 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -44,7 +44,7 @@
search
-
+
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 41ebcdf437d..caef9ceae94 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -170,12 +170,12 @@
search
-
+
-
-
+
+
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index a16e68d5ee0..c369cf7b921 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -45,7 +45,7 @@
search
-
+
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index bd1d86ab7ef..a5f842b1be3 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -69,7 +69,7 @@
search
-
+
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 55691cd9397..3f5d95a4fa6 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -41,7 +41,7 @@
search
-
+
payment.mode
search
-
+
@@ -201,7 +201,7 @@
search
-
+
diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml
index 540dc437b56..97158e50c12 100644
--- a/addons/account_sequence/account_sequence_installer_view.xml
+++ b/addons/account_sequence/account_sequence_installer_view.xml
@@ -20,7 +20,7 @@
You can enhance the Account Sequence Application by installing .
-
+
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index fd0e1a0c3c6..e44fd264879 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -119,7 +119,7 @@
1
-
+
@@ -130,12 +130,12 @@
-
+
-
+
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index 33e69b54c8a..70b3afbf8f1 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -48,7 +48,7 @@
search
-
+
search
-
+
@@ -19,12 +19,12 @@
-
+
-
+
@@ -41,7 +41,7 @@
search
-
+
@@ -52,12 +52,22 @@
-
+
+<<<<<<< TREE
+=======
+
+
+
+
+
+
+
+>>>>>>> MERGE-SOURCE
-
+
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 356c3f47ac9..33765282ad5 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -7,7 +7,7 @@
search
-
+
@@ -18,12 +18,12 @@
-
+
-
+
@@ -39,7 +39,7 @@
search
-
+
@@ -50,12 +50,22 @@
-
+
+<<<<<<< TREE
+=======
+
+
+
+
+
+
+
+>>>>>>> MERGE-SOURCE
-
+
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index bcfedacce77..abcf53490a5 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -218,7 +218,7 @@
-
+
-
+
-
+
-
+
@@ -70,7 +69,7 @@
-
+
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 7dd30a063ce..debe4d54c1a 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -56,7 +56,7 @@
search
-
+
@@ -64,7 +64,7 @@
-
+
@@ -158,13 +158,13 @@
search
-
+
-
+
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 451152b2b58..a1d7adc0084 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -110,22 +110,22 @@
+ help="Invitations To Review" />
+ help="Accepted Invitations" />
+ help="Declined Invitations" />
+ help="Delegated Invitations" />
-
-
+
+
-
-
+
+
search
-
+
@@ -456,13 +456,13 @@
domain="[('state','=','confirmed')]"
help="Confirmed Events" />
-
-
+
+
-
+
-
-
+
+
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 8029084b7c3..1dc73f16f72 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -108,9 +108,9 @@
search
-
-
-
+
+
+
@@ -344,7 +344,7 @@
-
+
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index cb00ac3eb5b..d37521a3e01 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -24,7 +24,6 @@
Install Applications
-
diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml
index f161d6c31ea..07f71539bb7 100644
--- a/addons/base_synchro/base_synchro_view.xml
+++ b/addons/base_synchro/base_synchro_view.xml
@@ -36,12 +36,12 @@
search
-
+
-
+
@@ -118,12 +118,12 @@
search
-
+
-
+
diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml
index 210a7dfd83f..29146ad53ad 100644
--- a/addons/board/board_administration_view.xml
+++ b/addons/board/board_administration_view.xml
@@ -37,7 +37,7 @@
search
-
+
@@ -47,7 +47,6 @@
help="Log created in current month"/>
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 22123aca661..b5048fa7b3d 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,7 +1,6 @@
-
Applications Tiles
board.home.applications
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 4e0c6218bf6..d8025ef578e 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -158,7 +158,7 @@
-
+
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 0d8a79812f1..9906141b5c9 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -293,24 +293,24 @@
search
-
+
-
-
+
-
-
+
+
-
+
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 878f9a2e5d8..d312a58febd 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -206,13 +206,13 @@
help="Unassigned Phonecalls" />
+ widget="selection" string="Sales Team">
-
+
search
-
+
@@ -78,10 +78,10 @@
help="Cases by Team and Type for this month" />
-
-
-
+ widget="selection" />
+
+
+
@@ -162,7 +162,7 @@
search
-
+
@@ -170,9 +170,9 @@
domain="[('month','=',time.localtime()[1])]"
help="Cases by Team and Stage for this month" />
-
-
-
+
+
+
@@ -238,7 +238,7 @@
search
-
+
@@ -246,9 +246,9 @@
domain="[('month','=',time.localtime()[1])]"
help="Cases by Section, Category and Stage for this month" />
-
-
-
+
+
+
@@ -332,7 +332,7 @@
search
-
+
@@ -340,9 +340,9 @@
domain="[('month','=',time.localtime()[1])]"
help="Cases by User for this month" />
-
-
-
+
+
+
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 0a4b8b8ccd0..09c08108b56 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -71,7 +71,7 @@
search
-
+
-
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index acc91cbef41..2f40ba371b9 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -51,7 +51,7 @@
search
-
+
@@ -60,7 +60,7 @@
domain="[('create_date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Phone calls made in current month"/>
-
@@ -84,7 +84,7 @@
domain="[('section_id.user_id','=',uid)]"
help="My Sales Team(s)" />
-
+
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 21ec4cf028e..15956389e8e 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -227,21 +227,21 @@
+ help="Draft and Open Claims" />
-
-
-
+
+
+
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 1946b0bf9e0..c818c084362 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -53,7 +53,7 @@
search
-
+
@@ -62,7 +62,7 @@
domain="[('create_date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Claims created in current month"/>
-
@@ -94,7 +94,7 @@
help="My company"/>
-
+
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index a527eddd1fd..efee09df384 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -255,16 +255,16 @@
domain="[('state','=','pending')]"
help="Pending Funds" />
-
-
+
-
-
+
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 73514b677b2..645634e15e2 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -75,7 +75,7 @@
search
-
+
@@ -84,7 +84,7 @@
domain="[('create_date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Funds raised in current month"/>
-
@@ -111,7 +111,7 @@
domain="[('section_id.user_id.company_id','=',uid)]"
help="My company"/>
-
+
@@ -123,10 +123,8 @@
-
-
-
-
+
+
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0bdaf256a27..d8bd5319018 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -233,20 +233,19 @@
-
+
-
-
+
+
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index e954c790582..ce23e677394 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -53,14 +53,14 @@
search
-
+
-
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index a218ae76448..01bbefb84d4 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -9,10 +9,10 @@
search
-
+
-
search
-
+
-
-
-
-
+
+
+
+
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index b4f76a03c6c..d6a651f0bc2 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -127,7 +127,7 @@
search
-
+
@@ -137,7 +137,7 @@
-
+
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 41c328d8908..cb31ad04b65 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -228,18 +228,18 @@
search
-
+
-
+
-
+
-
+
@@ -474,7 +474,7 @@
search
-
+
@@ -486,7 +486,7 @@
help="My Registrations"
domain="[('user_id','=',uid)]"/>
-
+
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 076b0dda59a..11d8592350b 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -52,7 +52,7 @@
search
-
+
@@ -62,7 +62,6 @@
help="Events with beginning date in last 30 days"/>
@@ -94,7 +93,7 @@
-
+
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index cfccd8912dc..485b0566120 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -38,7 +38,7 @@
search
-
+
@@ -49,7 +49,7 @@
-
+
@@ -161,7 +161,7 @@
search
-
+
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 869d1f93994..e5a3d0ac818 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -8,7 +8,7 @@
search
-
+
@@ -251,7 +251,7 @@
search
-
+
@@ -345,7 +345,7 @@
search
-
+
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index bc585df7f67..80a6bb51b6c 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -52,7 +52,7 @@
-
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 60dffa22d24..295f9593d0f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -146,13 +146,13 @@
-
-
+
+
-
-
+
+
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 9f4d88a0c20..680003b88be 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -60,7 +60,7 @@
name="month"
domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during current month"/>
-
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 15badadfffa..074b44a4104 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -7,7 +7,7 @@
search
-
+
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index ef2423daeab..912c49b87f5 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -378,7 +378,7 @@
search
-
+
@@ -389,7 +389,7 @@
-
+
@@ -460,8 +460,8 @@
search
-
-
+
+
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 629b1c68012..fad6874b0de 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -244,10 +244,10 @@
-
+
-
+
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 4f39005a3d1..5353a8497ed 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -59,7 +59,6 @@
help="Recruitment performed in current month"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 2092773fad9..710291c8f32 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -62,7 +62,7 @@
search
-
+
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index daeabfdaeee..e4226feb2f3 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -46,7 +46,7 @@
search
-
+
@@ -56,7 +56,6 @@
help="Timesheet lines in this month"/>
@@ -70,7 +69,7 @@
-
+
@@ -162,14 +161,14 @@
search
-
+
-
-
-
+
+
+
@@ -218,9 +217,9 @@
-
-
-
+
+
+
@@ -298,15 +297,15 @@
search
-
+
-
-
-
-
+
+
+
+
@@ -369,18 +368,18 @@
report_timesheet.account
search
-
+
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index ed3c86939cd..c196beae880 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -113,14 +113,14 @@
search
-
+
-
-
-
-
+
+
+
+
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 9569149860c..87f212112c5 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -33,7 +33,7 @@
search
-
+
@@ -159,11 +159,11 @@
search
-
+
-
+
search
-
+
search
-
+
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 4111cd03962..59111a11d04 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -8,12 +8,12 @@
search
-
+
-
+
@@ -169,12 +169,12 @@
search
-
+
-
+
@@ -288,17 +288,17 @@
search
-
+
-
-
-
+
+
+
-
+
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 26608a71301..eb5cfe3c28b 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -37,14 +37,12 @@
help="Idea Vote created in current month"/>
@@ -64,7 +62,7 @@
-
+
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 09f1fcd92a6..6721dd7c1e3 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -87,7 +87,7 @@
-
+
@@ -194,7 +194,7 @@
-
+
@@ -380,16 +380,15 @@
help="Box amount in current month"/>
-
-
-
+
+
+
-
+
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index d65b8b01c1e..5dd25322d47 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -35,12 +35,11 @@
help="Tasks performed in last 30 days"/>
-
+
@@ -66,4 +65,4 @@
-
\ No newline at end of file
+
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index b4539cfef33..9f70651e5ab 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 4ecbda6c4f8..cd872e64635 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -95,10 +95,10 @@
-
-
+
+
-
+
@@ -200,12 +200,12 @@
-
-
-
-
+
+
+
+
-
+
@@ -397,7 +397,7 @@
search
-
+
@@ -412,7 +412,7 @@
-
+
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 745dd4047e5..653cc5c553d 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -59,7 +59,7 @@
-
+
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 463436439c6..0e6ddc630f6 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -35,7 +35,7 @@
search
-
+
-
+
-
+
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9b2ea49e2b5..19e25438cad 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -79,13 +79,13 @@
search
-
+
-
+
@@ -183,7 +183,7 @@
search
-
+
@@ -191,7 +191,7 @@
-
+
@@ -289,7 +289,7 @@
-
+
@@ -420,14 +420,14 @@
search
-
+
-
+
@@ -796,7 +796,7 @@
search
-
+
@@ -817,7 +817,7 @@
-
+
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index f14825e1d16..c8eb9766f9e 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -47,7 +47,7 @@
search
-
+
@@ -57,7 +57,6 @@
help="Production performed during current month"/>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 92faddc66b0..6903cd1e6d7 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -131,7 +131,7 @@
search
-
+
-
+
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index d25ec5132f6..03ec22ce0a5 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -46,7 +46,7 @@
search
-
+
@@ -56,7 +56,6 @@
help="Work orders made during current month"/>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 16cdfc86b3d..69782e00ec3 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -179,7 +179,7 @@
search
-
+
@@ -192,7 +192,7 @@
-
+
diff --git a/addons/mrp_subproduct/mrp_subproduct_view.xml b/addons/mrp_subproduct/mrp_subproduct_view.xml
index 9fc5955a18b..70b3ea8efaa 100644
--- a/addons/mrp_subproduct/mrp_subproduct_view.xml
+++ b/addons/mrp_subproduct/mrp_subproduct_view.xml
@@ -7,7 +7,7 @@
form
-
+
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index 42b60e13729..b246a1914d7 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -49,10 +49,10 @@
-
-
-
-
+
+
+
+
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index 45f89c5062c..d6bfa4eda66 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -39,7 +39,7 @@
search
-
+
@@ -64,7 +64,7 @@
search
-
+
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 233bb019443..a8552cddc15 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -140,7 +140,7 @@
-
+
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index c72a6b6d415..8b18bf0b57a 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -46,14 +46,12 @@
help="POS ordered created during current month"/>
@@ -78,7 +76,7 @@
-
+
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index 167851986cb..8e42a9a5ce0 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -35,14 +35,12 @@
help="Cash Analysis created in current month"/>
@@ -61,7 +59,7 @@
-
+
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index d158dd83425..de92b9c6c60 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -108,12 +108,12 @@
search
-
+
-
+
@@ -213,13 +213,13 @@
search
-
+
-
+
@@ -302,7 +302,7 @@
search
-
+
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 09dd890970a..b2f5e13b756 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -100,7 +100,7 @@
search
-
+
-
+
@@ -181,7 +181,7 @@
search
-
+
@@ -189,7 +189,7 @@
-
+
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 6804e1dadd0..703a8aed9c7 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0f0c4a9ca0b..2bca9293e08 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -106,7 +106,7 @@
search
-
+
@@ -118,7 +118,7 @@
-
+
@@ -452,7 +452,7 @@
search
-
+
@@ -464,16 +464,16 @@
-
-
+
+
-
-
+
+
-
+
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index eaf0985faef..b9be53a2431 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -59,7 +59,7 @@
search
-
+
@@ -69,7 +69,6 @@
help="Current Month"/>
@@ -109,7 +108,7 @@
-
+
@@ -122,7 +121,7 @@
-
+
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 860dd73216b..ebd18969cf7 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -216,7 +216,7 @@
-
+
@@ -298,17 +298,17 @@
search
-
-
-
-
+
+
+
-
+
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 1ed21b8dc01..ddd22e9a945 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -52,7 +52,7 @@
search
-
+
@@ -60,7 +60,7 @@
-
@@ -88,6 +88,7 @@
+<<<<<<< TREE
@@ -95,6 +96,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >>>>>> MERGE-SOURCE
domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 8d976517a34..c53f4196202 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -74,13 +74,13 @@
search
-
+
-
+
@@ -266,7 +266,7 @@
search
-
+
@@ -280,7 +280,7 @@
-
+
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 027403b84f3..f8c98d15785 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -70,7 +70,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 016a10d940f..83da24292ae 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -156,7 +156,7 @@
search
-
+
@@ -274,10 +274,10 @@
search
-
-
-
-
+
+
+
+
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 19d1bcc6b84..53e0d9e442d 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -129,7 +129,7 @@
search
-
+
-
+
@@ -319,7 +319,7 @@
search
-
+
@@ -331,7 +331,7 @@
-
+
@@ -429,7 +429,7 @@
search
-
+
@@ -438,7 +438,7 @@
-
+
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index c73bc9dc039..48cb1b02aed 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -30,7 +30,7 @@
search
-
+