diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index 2a7922c13b2..8380a19b411 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -251,8 +251,8 @@ class account_cash_statement(osv.osv): statement = statement_pool.browse(cr, uid, ids[0]) if not self._user_allow(cr, uid, ids, statement, context={}): - raise osv.except_osv(_('Error !'), _('User %s have no rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name))) - + raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name))) + number = self.pool.get('ir.sequence').get(cr, uid, statement.journal_id.sequence_id.code) if len(statement.starting_details_ids) > 0: diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 8932e90376a..5946661136f 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1197,7 +1197,7 @@ - Journal Vouchers + Journal Entries account.move form tree,form @@ -1252,18 +1252,18 @@ form - - Check Registers - ir.actions.act_window - account.move.line - form - tree,form - - - [('journal_id.type', '=', 'bank')] - - - + + + + + + + + + + + + diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py index ee139c3040c..f6dfd51b729 100644 --- a/addons/account/report/__init__.py +++ b/addons/account/report/__init__.py @@ -35,7 +35,7 @@ import account_balance_landscape import compare_account_balance import account_invoice_report import account_report -import account_analytic_report +#import account_analytic_report import account_account_report import account_entries_report import account_analytic_entries_report diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 27c81ebe427..9865119bd1d 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -88,7 +88,6 @@ "access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0 "access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0 "access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,0,0,0 -"access_analytic_report_manager","analytic.report","model_analytic_report","account.group_account_manager",1,0,0,0 "access_account_account_report_manager","account.account.report","model_account_account_report","account.group_account_manager",1,0,0,0 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,0,0,0 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0 diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 3dff856b716..408df2ee031 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -23,16 +23,11 @@ "name" : "Accounting Voucher Entries", "version" : "1.0", "author" : 'Tiny & Axelor', - "description": """ - Indian Accounting module includes all the basic requirenments of - Basic Accounting, plus new things which are available : - * Indian Account Chart - * New Invoice - (Local, Retail) - * Invoice Report - * Tax structure - * Journals - * VAT Declaration report - * Accounting Periods + "description": """Account Voucher module includes all the basic requirements of + Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc... + * Voucher Entry + * Voucher Receipt + * Cheque Register """, "category" : "Generic Modules/Accounting", "website" : "http://tinyerp.com", diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml index 1ab29f111ff..91038bba0bb 100644 --- a/addons/account_voucher/voucher_view.xml +++ b/addons/account_voucher/voucher_view.xml @@ -75,7 +75,7 @@ - + account.voucher.select account.voucher search @@ -101,13 +101,40 @@ - + + + account.voucher.select + account.voucher + search + + + + + + + + + + + + + + + + + + + + + + + @@ -117,7 +144,7 @@ tree,form [('journal_id.type','=','sale')] - + @@ -130,7 +157,7 @@ tree,form [('journal_id.type','=','purchase')] - + @@ -142,134 +169,21 @@ form tree,form - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Cheque Register + ir.actions.act_window + account.voucher + form + tree,form + + + [('journal_id.type', '=', 'bank')] + + account.journal.form.inherit diff --git a/addons/account_voucher_payment/__openerp__.py b/addons/account_voucher_payment/__openerp__.py index bfe7323d6f1..fc4ce593eac 100755 --- a/addons/account_voucher_payment/__openerp__.py +++ b/addons/account_voucher_payment/__openerp__.py @@ -22,9 +22,8 @@ "name" : "Invoice Payment/Receipt by Vouchers.", "version" : "1.0", "author" : 'Tiny & Axelor', - "description": """This module includes : - * It reconcile the invoice (supplier, customer) while paying through - Accounting Vouchers + "description": """Extension Account Voucher module includes allows to link payment / receipt + entries with voucher, also automatically reconcile during the payment and receipt entries """, "category" : "Generic Modules/Indian Accounting", "website" : "http://tinyerpindia.com", diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml index 5336f52a000..7101473589b 100644 --- a/addons/crm/crm_lead_demo.xml +++ b/addons/crm/crm_lead_demo.xml @@ -12,7 +12,7 @@ lead - + @@ -21,13 +21,14 @@ + lead - + @@ -36,13 +37,14 @@ + lead - + @@ -67,13 +69,14 @@ + lead - + @@ -82,6 +85,7 @@ + @@ -91,7 +95,7 @@ lead - + @@ -107,7 +111,7 @@ lead - + @@ -115,5 +119,107 @@ + + + + + lead + + + + + + + + + + + + + + + + lead + + + + + + + + + + + + + + + + + lead + + + + + + + + + + + + + + + lead + + + + + + + + + + + + + + + + lead + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 379644e72b1..bb0b281820a 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -182,7 +182,7 @@ string="Reply to Last Email" name="%(crm.action_crm_send_mail)d" context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}" - icon="gtk-undo" type="action" /> + icon="terp-mail-replied" type="action" /> @@ -194,10 +194,10 @@