diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index d29bffb833d..62f5c225a81 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/addons/account/wizard/account_compare_account_balance_report_view.xml b/addons/account/wizard/account_compare_account_balance_report_view.xml
index 2467928a584..22a9ff01cc7 100644
--- a/addons/account/wizard/account_compare_account_balance_report_view.xml
+++ b/addons/account/wizard/account_compare_account_balance_report_view.xml
@@ -1,51 +1,47 @@
-
- account.compare.account.balance.report.form
- account.compare.account.balance.report
- form
-
-
+ account.compare.account.balance.report.form
+ account.compare.account.balance.report
+ form
+
+
-
+
-
+
-
-
\ No newline at end of file
+
+
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 370aacbf2e3..c0944dd8472 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -1,22 +1,22 @@
-
+ account.fiscalyear.close.state.formaccount.fiscalyear.close.stateform
@@ -27,13 +27,13 @@
account.fiscalyear.close.stateformtree,form
-
- new
+
+ new
+ id="menu_wizard_fy_close_state"
+ parent="menu_account_end_year_treatments" />
-
\ No newline at end of file
+
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 20547cde235..b151f7188a9 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -1,47 +1,47 @@
-
+ account.fiscalyear.close.formaccount.fiscalyear.closeform
-
+ Generate Opening Entriesaccount.fiscalyear.closeformtree,form
-
- new
+
+ new
+ id="menu_wizard_fy_close"
+ parent="menu_account_end_year_treatments" />
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index d41993733df..7fd65d00f4e 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -1,26 +1,26 @@
-
+ account.move.bank.reconcile.formaccount.move.bank.reconcileform
-
+
-
+ Bank reconciliationaccount.move.bank.reconcileform
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 1ce7d5f3dab..c4c06dcf28b 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -14,9 +14,7 @@
-
+
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index ae1b069a1dc..33e96b93185 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -1,38 +1,36 @@
-
+ account.move.line.unreconcile.select.formaccount.move.line.unreconcile.selectform
-
+ Unreconcile Entriesaccount.move.line.unreconcile.selectformtree,form
-
- new
+
+ new
+ id="menu_unreconcile_select" parent="periodical_processing_reconciliation" /> -->
-
\ No newline at end of file
+
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index 435f15388c1..d4c3509d47e 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -1,20 +1,20 @@
-
+ account.open.closed.fiscalyear.formaccount.open.closed.fiscalyearform
@@ -25,13 +25,13 @@
account.open.closed.fiscalyearformtree,form
-
- new
+
+ new
-
-
+
+
-
\ No newline at end of file
+
diff --git a/addons/account/wizard/account_pay_invoice_view.xml b/addons/account/wizard/account_pay_invoice_view.xml
index 3601daaef06..78254a90bbe 100644
--- a/addons/account/wizard/account_pay_invoice_view.xml
+++ b/addons/account/wizard/account_pay_invoice_view.xml
@@ -52,7 +52,7 @@
-
+
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 7d1b048546f..161a3f424fc 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -8,21 +8,21 @@
form
-
+ Close a Periodaccount.period.closeform
@@ -32,14 +32,14 @@
-
-
-
- client_action_multi
-
- action
- account.period
-
+
+
+
+ client_action_multi
+
+ action
+ account.period
+
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index f119243a470..05a50e671c2 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -1,39 +1,37 @@
-
-
-
- Partner Reconcilation Process
- account.partner.reconcile.process
- form
-
-
+
- Reconciliation: Go to Next Partner
- account.partner.reconcile.process
- ir.actions.act_window
- form
- tree,form
-
- {'record_id':active_id}
- new
+ Reconciliation: Go to Next Partner
+ account.partner.reconcile.process
+ ir.actions.act_window
+ form
+ tree,form
+
+ {'record_id':active_id}
+ new
-
+ Partner reconciliation
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 49d194af792..673203478e8 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -141,7 +141,7 @@
-
+
diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index 548469ebce1..e107b7a2cfb 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -3,46 +3,46 @@
-
+
+ Account Balance
+ account.balance.report
+ form
+
+
+
+
+
+
+
+
+
+
+ Account Balance
+ ir.actions.act_window
+ account.balance.report
+ form
+ form
+
+ new
+
+
+
+
+
+
+ Account Balance
- account.balance.report
- form
-
-
-
-
-
-
-
-
-
-
- Account Balance
- ir.actions.act_window
- account.balance.report
- form
- form
-
- new
-
-
-
-
-
-
-
- Account Balance
- client_print_multi
-
- action
- account.account
-
+ client_print_multi
+
+ action
+ account.account
+
-
\ No newline at end of file
+
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 8bb3a43938c..ad9c90b2e36 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -2,33 +2,33 @@
-
+ Aged Partner Balanceaccount.aged.trial.balanceform
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+ Aged Partner Balanceaccount.aged.trial.balanceir.actions.act_window
@@ -37,14 +37,14 @@
{'record_id':active_id}new
- Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on.
+ Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on.
-
+
-
-
\ No newline at end of file
+
+
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index a83ab469af0..3a4bfab0b64 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -2,23 +2,23 @@
-
+ Account Balance Sheetaccount.bs.reportform
-
-
-
-
-
+
+
+
+
+
-
+ Balance Sheetaccount.bs.reportir.actions.act_window
@@ -28,11 +28,11 @@
new
-
+
-
+
diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index 9920a5fa80d..91c550dfdca 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -8,11 +8,11 @@
form
-
-
-
-
-
+
+
+
+
+
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index 519543f37d5..b36f9ee27db 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -8,11 +8,11 @@
form
-
-
-
-
-
+
+
+
+
+
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index 68e51e33dcc..87953a367df 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -26,12 +26,12 @@
-
+
-
+ General Ledgerir.actions.act_windowaccount.report.general.ledger
@@ -39,9 +39,9 @@
formnew
-
+
-
+ General Ledger
@@ -49,15 +49,15 @@
actionaccount.account
-
+
+ icon="STOCK_PRINT"
+ name="General Ledger"
+ parent="account.final_accounting_reports"
+ action="action_account_general_ledger_menu"
+ id="menu_general_ledger"
+ />
diff --git a/addons/account/wizard/account_report_partner_balance_view.xml b/addons/account/wizard/account_report_partner_balance_view.xml
index c78d2f3f594..72e94b767c3 100644
--- a/addons/account/wizard/account_report_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_partner_balance_view.xml
@@ -2,21 +2,21 @@
-
+ Partner Balanceaccount.partner.balanceform
-
-
-
+
+
+
-
+ Partner Balanceaccount.partner.balanceir.actions.act_window
@@ -28,11 +28,11 @@
This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance.
-
+
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index 7203c05918f..c3a3c5ed50f 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -2,24 +2,24 @@
-
+ Partner Ledgeraccount.partner.ledgerform
-
-
-
-
-
-
+
+
+
+
+
+
-
+ Select Periodaccount.partner.ledgerir.actions.act_window
@@ -31,11 +31,11 @@
To get detailed information about a partner you can ask for the Partner Ledgers.
-
+
-
\ No newline at end of file
+
diff --git a/addons/account/wizard/account_report_profit_loss_view.xml b/addons/account/wizard/account_report_profit_loss_view.xml
index 86d0c65f975..39937ec59bc 100644
--- a/addons/account/wizard/account_report_profit_loss_view.xml
+++ b/addons/account/wizard/account_report_profit_loss_view.xml
@@ -2,7 +2,7 @@
-
+ Profit and Lossaccount.pl.reportform
@@ -33,8 +33,8 @@
+ id="menu_account_pl_report"
+ parent="final_accounting_reports"/>
-
\ No newline at end of file
+
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 3ed71949b2a..a14d4b66007 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -2,35 +2,34 @@
-
+ Account State Openaccount.state.openform
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+ Account State Openir.actions.act_windowaccount.state.openformform
- {'record_id' : active_id}
+ {'record_id' : active_id}new
-
-
+
-
\ No newline at end of file
+
diff --git a/addons/account/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml
index fce2eb1b18c..2d8d74826f3 100644
--- a/addons/account/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account/wizard/account_statement_from_invoice_view.xml
@@ -48,6 +48,7 @@
+
Import Entriesaccount.statement.from.invoice.lines
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 3ac038329d9..4d5a9da623a 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -7,14 +7,14 @@
account.unreconcileform
-
@@ -32,12 +32,12 @@
This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.
-
+
-
+