diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 51724f47d33..c53e2030e7f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -100,9 +100,9 @@ module named account_voucherss
'project/wizard/account_analytic_chart_view.xml',
'product_view.xml',
'account_assert_test.xml',
- 'process/statement_process.xml',
- 'process/customer_invoice_process.xml',
- 'process/supplier_invoice_process.xml',
+# 'process/statement_process.xml',
+# 'process/customer_invoice_process.xml',
+# 'process/supplier_invoice_process.xml',
'sequence_view.xml',
'company_view.xml',
'account_installer.xml',
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 77369bdca25..0f70d2d6aaf 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -403,7 +403,7 @@
-
+
Customer Invoices
@@ -426,10 +426,10 @@
-
+
- Supplier Invoices
+ Vendor Invoices
account.invoice
form
tree,form,calendar,graph
@@ -438,7 +438,7 @@
{'type':'in_invoice'}
-
+
Customer Refunds
@@ -464,10 +464,10 @@
-
+
- Supplier Refunds
+ Vendor Refunds
account.invoice
form
tree,form,calendar,graph
@@ -476,7 +476,7 @@
{'type':'in_refund'}
-
+
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 4cdcb7787b6..d0ae2ccc58f 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -1,28 +1,52 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
-
-
+
+
+
+
-
+
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a2729676fe3..ec7d7681c05 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -163,13 +163,13 @@
- List of Accounts
+ Accounts
account.account
form
tree,form,graph
-
+
@@ -197,7 +197,7 @@
[('parent_id','=',False)]
-
+
@@ -609,7 +609,7 @@
-
+
+
Journal Entries
@@ -1019,6 +1030,30 @@
+
+
+ Journal Items
+ account.move
+ form
+ tree,form
+
+
+ [('journal_id.type', '=', 'sale')]
+
+
+
+
+
+ Transaction Journals
+ account.move
+ form
+ tree,form
+
+
+ [('journal_id.type', '=', 'purchase')]
+
+
+
Entry Lines
@@ -1040,7 +1075,30 @@
form
-
+
+ Cash Register
+ ir.actions.act_window
+ account.move.line
+ form
+ tree,form
+
+
+ [('journal_id.type', '=', 'cash')]
+
+
+ Checks Register
+ ir.actions.act_window
+ account.move.line
+ form
+ tree,form
+
+
+ [('journal_id.type', '=', 'bank')]
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
- Models Definition
+ Define Models
account.model
form
tree,form
-
+
Running Subscriptions
@@ -1525,8 +1583,18 @@
+
+
@@ -1577,7 +1645,7 @@
-
+
@@ -1622,7 +1690,7 @@
tree,form
-
+
@@ -1698,7 +1766,7 @@
tree,form
-
+
@@ -1736,7 +1804,7 @@
form
tree,form
-
+
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 8b093fb2310..f71c81b48ca 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -33,7 +33,7 @@
-->
-
+
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index e1e43420d6e..72004afa944 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -57,7 +57,7 @@
+ parent="next_id_27" sequence="20"/>
-
+
Accounts to Renew
@@ -114,7 +114,7 @@
- Analytic Chart of Accounts
+ Chart of Analytic Accounts
ir.actions.act_window
account.analytic.account
[('parent_id','=',False)]
@@ -122,10 +122,10 @@
form,graph
-
+
+
+
+
+
-
+
+
+
+
Analytic Entries
@@ -293,31 +293,49 @@
- Analytic Journal Definition
+ Analytic Journals
account.analytic.journal
form
tree,form
-
+
#
# Open journal entries
#
- Entries of Open Analytic Journals
+ Analytic Journal Items
account.analytic.line
form
tree,form
[('journal_id','=',active_id)]
-
-
-
- Open Analytic Journal
-
-
+
+
+ Check Register
+ account.analytic.line
+ form
+ tree,form
+ [('journal_id','=',active_id)]
+
+
+ Checks Register
+ account.analytic.line
+ form
+ tree,form
+ [('journal_id','=',active_id)]
+
+
+
+
+
+
+
+
+
+
#
# Reporting
@@ -331,13 +349,13 @@
-
- Analytic Entries by Journal
- account.analytic.journal
- tree
-
-
-
+
+
+
+
+
+
+
#
# Statistics
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 9711fc9b941..76b10e8745c 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -43,7 +43,7 @@
name="Automatic reconciliation"
action="action_account_automatic_reconcile"
id="menu_automatic_reconcile"
- parent="next_id_20"/>
+ parent="periodical_processing_reconciliation"/>
Automatic reconcile unreconcile
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index e8db5193275..20547cde235 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -31,7 +31,7 @@
- Generate Fiscal Year Opening Entries
+ Generate Opening Entries
account.fiscalyear.close
form
tree,form
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 7a25932bb98..c3a9e4ad75a 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -32,10 +32,10 @@
new
-
+
+
+
+
\ No newline at end of file
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 dbd25408fe1..795ae925ef9 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -32,7 +32,7 @@
+ id="menu_reconcile_select" parent="periodical_processing_reconciliation" />
\ No newline at end of file
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 7d10c02f010..50449b36d2f 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -32,7 +32,7 @@
+ 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 c5269939e0c..421d3a319e4 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -29,9 +29,9 @@
new
-
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 252865f322e..cfe91171621 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -32,7 +32,7 @@
new
-
+
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index fec632c2e59..a5720e3a0b4 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -39,8 +39,8 @@
account.move.line
-
+
+
account.use.model.open.entry.form
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 27ca48662bc..8e006bf171f 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -34,7 +34,7 @@
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index b94afdc9292..6eda0241eea 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -42,10 +42,10 @@
form
tree,form
-
+
+
+
+
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 55afe582445..656b9105210 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -129,10 +129,10 @@
src_model="account.analytic.plan"
id="account_analytic_instance_model_open"/>
-
+
+
+
+
account.analytic.plan.instance.line.form
@@ -192,11 +192,16 @@
form
tree,form
-
-
+
+
+
account.analytic.plan.line.form
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 6eb6988480d..0095d950f76 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -108,18 +108,29 @@
-
+
- Voucher Entries
+ Customer Vouchers
account.voucher
form
tree,form
-
-
+ [('journal_id.type','=','sale')]
+ action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="8"/>
+
+
+
+ Vendor Vouchers
+ account.voucher
+ form
+ tree,form
+
+ [('journal_id.type','=','purchase')]
+
+