From f43ab717cc8ca5a9dc50d611cd0d713a51544b4d Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Thu, 26 Aug 2010 14:23:58 +0530 Subject: [PATCH 01/56] [IMP] Account: Bank statements will not consider boolean on journal entry_posted bzr revid: mra@mra-laptop-20100826085358-d4jgljoknte4q9yd --- addons/account/account_bank_statement.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 270384a1d9f..6874f80bcf3 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -368,16 +368,15 @@ class account_bank_statement(osv.osv): else: account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context) - if st.journal_id.entry_posted: - account_move_obj.write(cr, uid, [move_id], {'state': 'posted'}) - self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name) done.append(st.id) next_number = obj_seq.get(cr, uid, 'account.bank.statement') if not st.name == '/': next_number = st.name + '/' + next_number[-1:] - account_move_obj.write(cr, uid, [move_id], {'state': 'posted', 'name': next_number}) + account_move_obj.write(cr, uid, [move_id], {'name': next_number}) + + account_move_obj.write(cr, uid, [move_id], {'state': 'posted'}) # Bank statements will not consider boolean on journal entry_posted self.write(cr, uid, [st.id], {'name': next_number}, context=context) self.write(cr, uid, done, {'state':'confirm'}, context=context) From 17d6bbf3c9a2520fe058676d82f64dc13d015c58 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Thu, 26 Aug 2010 14:42:23 +0530 Subject: [PATCH 02/56] [FIX] account bank statements: onchange on journal make wrong amount bzr revid: mra@mra-laptop-20100826091223-1u5aee3lkzjiix8k --- addons/account/account_bank_statement.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 6874f80bcf3..50d13d24a5c 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -405,8 +405,8 @@ class account_bank_statement(osv.osv): cursor.execute('SELECT balance_end_real \ FROM account_bank_statement \ - WHERE journal_id = %s \ - ORDER BY date DESC,id DESC LIMIT 1', (journal_id,)) + WHERE journal_id = %s AND NOT state = %s \ + ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft')) res = cursor.fetchone() balance_start = res and res[0] or 0.0 From f96ee5cded18e23b805880a89dd07a36c45e0579 Mon Sep 17 00:00:00 2001 From: vra Date: Thu, 26 Aug 2010 15:15:13 +0530 Subject: [PATCH 03/56] [IMP][FIX] account: Added context instead of domain in different act windows of partner object, Fixed 'active_id' error in code. bzr revid: vra@tinyerp.com-20100826094513-2x22qhx6727g6f5t --- addons/account/account_invoice_view.xml | 2 +- addons/account/account_view.xml | 4 ++-- addons/account/partner_view.xml | 4 ++-- addons/account/report/account_invoice_report_view.xml | 3 +-- addons/account/wizard/account_change_currency.py | 9 +++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 41d0344de92..db70d5e0e5a 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -500,7 +500,7 @@ - + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index bab05321f4d..a95b96aae9b 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1818,9 +1818,9 @@ - + - + Create Account diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index f3a8cca8ada..7f3c344ebff 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -130,8 +130,8 @@ diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index b241b725673..d017a6cbc11 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -156,10 +156,9 @@ diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py index aa6b477d30d..9355691369e 100644 --- a/addons/account/wizard/account_change_currency.py +++ b/addons/account/wizard/account_change_currency.py @@ -33,10 +33,11 @@ class account_change_currency(osv.osv_memory): obj_inv = self.pool.get('account.invoice') if context is None: context = {} - state = obj_inv.browse(cr, uid, context['active_id']).state - if obj_inv.browse(cr, uid, context['active_id']).state != 'draft': - raise osv.except_osv(_('Error'), _('You can only change currency for Draft Invoice !')) - pass + if context.get('active_id',False): + state = obj_inv.browse(cr, uid, context['active_id']).state + if obj_inv.browse(cr, uid, context['active_id']).state != 'draft': + raise osv.except_osv(_('Error'), _('You can only change currency for Draft Invoice !')) + pass def change_currency(self, cr, uid, ids, context=None): obj_inv = self.pool.get('account.invoice') From 8262872c719e6c342650c8069392bad7d6ffe5a3 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Thu, 26 Aug 2010 15:20:19 +0530 Subject: [PATCH 04/56] [IMP] bank statements: on change on journal = >Why it returns the currency it is automatically calculated with function field .. no need to return currency with onchange journal bzr revid: mra@mra-laptop-20100826095019-1mohlmz154fylcnh --- addons/account/account_bank_statement.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 50d13d24a5c..c3809b44c04 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -396,28 +396,15 @@ class account_bank_statement(osv.osv): return True def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None): - if not journal_id: - return {'value': {'currency': False}} - account_journal_obj = self.pool.get('account.journal') res_users_obj = self.pool.get('res.users') - res_currency_obj = self.pool.get('res.currency') - cursor.execute('SELECT balance_end_real \ FROM account_bank_statement \ WHERE journal_id = %s AND NOT state = %s \ ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft')) res = cursor.fetchone() balance_start = res and res[0] or 0.0 - - currency_id = account_journal_obj.browse(cursor, user, journal_id, - context=context).currency.id - if not currency_id: - currency_id = res_users_obj.browse(cursor, user, user, - context=context).company_id.currency_id.id - currency = res_currency_obj.name_get(cursor, user, [currency_id], - context=context)[0] - return {'value': {'balance_start': balance_start, 'currency': currency}} + return {'value': {'balance_start': balance_start}} def unlink(self, cr, uid, ids, context=None): stat = self.read(cr, uid, ids, ['state']) From ad26470a0b68bb0dbfcfe06dca0d18abb8d54e0c Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Thu, 26 Aug 2010 15:32:48 +0530 Subject: [PATCH 05/56] [FIX]: change the name of menu bzr revid: mga@tinyerp.com-20100826100248-e3dfe946epb23yry --- addons/account/account_menuitem.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 3cb21315350..24f4bb795a2 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -3,8 +3,8 @@ - - + + From 31960711d68702a49e2c3a511678e1e3e1e8eb00 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Thu, 26 Aug 2010 15:33:16 +0530 Subject: [PATCH 06/56] [REM]: remove unused report [FIX]: fix the type in menu domain bzr revid: mga@tinyerp.com-20100826100316-ox9bbz4g3vx6bzfq --- .../account_voucher/voucher_payment_receipt_view.xml | 4 ++-- addons/account_voucher/voucher_report.xml | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index f0bebc49d2c..d11fea7f2f6 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -62,7 +62,7 @@ Vendor Payment account.voucher.open form - [('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')] + [('journal_id.type', 'in', ['bank', 'cash'])] {'journal_type':'bank', 'type':'payment'} new @@ -154,7 +154,7 @@ Sales Payment account.voucher.open form - [('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')] + [('journal_id.type', 'in', ['bank', 'cash'])] {'journal_type':'bank', 'type':'receipt'} new diff --git a/addons/account_voucher/voucher_report.xml b/addons/account_voucher/voucher_report.xml index 57134d3cdec..273fc53de5f 100644 --- a/addons/account_voucher/voucher_report.xml +++ b/addons/account_voucher/voucher_report.xml @@ -2,21 +2,12 @@ - - - - - - - - - From a97545d4fe30ecbb940f73c71fcb9f735f6f61de Mon Sep 17 00:00:00 2001 From: "uco (Open ERP)" Date: Thu, 26 Aug 2010 16:15:28 +0530 Subject: [PATCH 07/56] [ADD] board: Added search view for Dashboard definition. bzr revid: uco@tinyerp.com-20100826104528-ixwr6sdxyqi90u1u --- addons/board/board_view.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml index 79e3ff5dd9d..984a17caa51 100644 --- a/addons/board/board_view.xml +++ b/addons/board/board_view.xml @@ -88,7 +88,7 @@
- +