From 01fdfb53fb94b236739b7f0c9fbd87a3a5df4d92 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Tue, 29 Jun 2010 11:59:06 +0530 Subject: [PATCH 1/6] [IMP]: imlement a cheque register, using voucher, also move cheque register to the account_voucher module bzr revid: mga@tinyerp.com-20100629062906-wjfcof2t50uuh8zx --- addons/account/account_cash_statement.py | 4 ++-- addons/account/account_view.xml | 24 ++++++++++++------------ addons/account_voucher/voucher_view.xml | 22 ++++++++++++++++++---- 3 files changed, 32 insertions(+), 18 deletions(-) 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 77bc6a52b2e..053dfb0b651 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1131,18 +1131,18 @@ form - - Checks Register - ir.actions.act_window - account.move.line - form - tree,form - - - [('journal_id.type', '=', 'bank')] - - - + + + + + + + + + + + + diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml index 3f4ebd1b160..4f0e6e12ac1 100644 --- a/addons/account_voucher/voucher_view.xml +++ b/addons/account_voucher/voucher_view.xml @@ -72,7 +72,7 @@ - + account.voucher.select account.voucher search @@ -114,7 +114,7 @@ tree,form [('journal_id.type','=','sale')] - + @@ -127,7 +127,7 @@ tree,form [('journal_id.type','=','purchase')] - + @@ -139,10 +139,24 @@ form tree,form - + + + Cheque Register + ir.actions.act_window + account.voucher + form + tree,form + + + [('journal_id.type', '=', 'bank')] + + + + + From 855f6246ec6155101b3d9d49cdeb4ffec1b5ce7b Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Tue, 29 Jun 2010 12:09:24 +0530 Subject: [PATCH 2/6] [IMP]: improvement in accounting voucher bzr revid: mga@tinyerp.com-20100629063924-0esfvsb9yyzg9k5p --- addons/account_voucher/voucher_view.xml | 167 +++++------------------- 1 file changed, 34 insertions(+), 133 deletions(-) diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml index 4f0e6e12ac1..f08226543d7 100644 --- a/addons/account_voucher/voucher_view.xml +++ b/addons/account_voucher/voucher_view.xml @@ -98,14 +98,41 @@ - + - + + account.voucher.select + account.voucher + search + + + + + + + + + + + + + + + + + + + + + + + + Customer Vouchers @@ -114,7 +141,7 @@ tree,form [('journal_id.type','=','sale')] - + @@ -127,7 +154,7 @@ tree,form [('journal_id.type','=','purchase')] - + @@ -143,6 +170,7 @@ + Cheque Register ir.actions.act_window @@ -150,138 +178,11 @@ form tree,form - + [('journal_id.type', '=', 'bank')] - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - account.journal.form.inherit account.journal From 8f73ad8c1f3d68676a8dfcdd629fd36eb76a58f3 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Tue, 29 Jun 2010 12:14:48 +0530 Subject: [PATCH 3/6] [FIX]: proper module descriptions bzr revid: mga@tinyerp.com-20100629064448-fgkhbeucmm94ixuj --- addons/account_voucher/__openerp__.py | 15 +++++---------- addons/account_voucher_payment/__openerp__.py | 5 ++--- 2 files changed, 7 insertions(+), 13 deletions(-) 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_payment/__openerp__.py b/addons/account_voucher_payment/__openerp__.py index fa1b37399f6..0857e2a2b0a 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", From a3f0a6f36729a2186ff9b9211c07826b374df9b8 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Tue, 29 Jun 2010 12:58:15 +0530 Subject: [PATCH 4/6] [IMP]: crm: * Created lead demo draft and trigger the state for history * Put tooltip in lead search view * Put proper icon for send new mail and reply to last mail bzr revid: rpa@tinyerp.com-20100629072815-ba0xclblf4120ehq --- addons/crm/crm_lead_demo.xml | 118 +++++++++++++++++- addons/crm/crm_lead_view.xml | 20 +-- addons/crm/crm_opportunity_view.xml | 6 +- .../wizard/crm_forward_to_partner_view.xml | 2 +- addons/crm_claim/crm_claim_view.xml | 4 +- .../crm_fundraising/crm_fundraising_view.xml | 4 +- addons/crm_helpdesk/crm_helpdesk_view.xml | 4 +- addons/hr_recruitment/hr_recruitment_view.xml | 4 +- addons/project_issue/project_issue_view.xml | 4 +- 9 files changed, 136 insertions(+), 30 deletions(-) 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 @@