diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 9cb72780ff1..5b661e3e7d7 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -434,6 +434,7 @@
{'type':'out_invoice', 'journal_type': 'sale'}
With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.
+
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 93bcc7724be..0711e073928 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -12,6 +12,7 @@
form
graph,tree
[('type','=','receivable')]
+
Income Accounts
@@ -19,6 +20,7 @@
form
graph,tree
[('type','=','income')]
+
Company Analysis
@@ -26,15 +28,17 @@
form
tree,graph
{'group_by':['user_type'], 'group_by_no_leaf':1}
-
+
+
Treasury
account.account
form
graph,tree
- [('type','=','liquidity')]
-
+ [('type','=','liquidity')]
+
+
board.account.form
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 17e0dd09bf9..b3c4eb94b93 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -35,8 +35,8 @@
-
-
+
+
@@ -54,8 +54,8 @@
-
-
+
+
@@ -101,11 +101,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 192533e67de..7946bef3b6b 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -65,48 +65,56 @@
validate
+
refuse
+
refuse
+
draft
+
invoice
+
subflow.paid
+
subflow.cancel
+
draft
+
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index fa8b5401497..674b06304d2 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -2,6 +2,7 @@
"access_hr_expense_expense_user","hr.expense.expense.user","model_hr_expense_expense","base.group_hr_user",1,1,1,1
"access_hr_expense_expense_employee","hr.expense.expense.employee","model_hr_expense_expense","base.group_user",1,1,1,1
"access_hr_expense_line_user","hr.expense.line.user","model_hr_expense_line","base.group_hr_user",1,1,1,1
+"access_hr_expense_line_employee","hr.expense.line.employee","model_hr_expense_line","base.group_user",1,1,1,1
"access_hr_expense_report_manager","hr.expense.report.manager","model_hr_expense_report","base.group_hr_manager",1,1,1,1
"access_product_product_hr_expense_user","product.product.hr.expense.user","product.model_product_product","base.group_hr_user",1,1,1,1
"access_product_template_hr_expense_user","product.template.hr.expense.user","product.model_product_template","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 44e5a214c54..6bfc9a6af5e 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -93,11 +93,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -135,11 +135,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -162,8 +162,8 @@
-
-
+
+
@@ -217,9 +217,9 @@
-
-
-
+
+
+
@@ -242,8 +242,8 @@
-
-
+
+
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index b9bac4fdcfc..888b3dd629d 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -63,18 +63,21 @@
validate
True
+
refuse
+
refuse
+
@@ -82,12 +85,14 @@
second_validate
+
refuse
+
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 9333bc4d2b0..65dcdbc54cf 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -132,8 +132,8 @@
-
-
+
+
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
index 1afc8909323..667658685f9 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
@@ -40,21 +40,25 @@
+
confirm
+
done
+
cancel
+