From 1a7d27a47311f648d2da7b2159adfcf4ad59ac84 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Mon, 24 Sep 2012 12:34:32 +0530 Subject: [PATCH 1/4] [IMP] solve graph error in Contract/Analytic Account bzr revid: fka@tinyerp.com-20120924070432-wepedcjy048n1ncv --- addons/analytic/analytic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 66a67ad4219..861111aed25 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -138,7 +138,7 @@ class account_analytic_account(osv.osv): _columns = { 'name': fields.char('Account/Contract Name', size=128, required=True), - 'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'), + 'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name',store=True), 'code': fields.char('Reference', size=24, select=True), 'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True, help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\ @@ -151,7 +151,7 @@ class account_analytic_account(osv.osv): 'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'), 'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', string="Account Hierarchy", type='many2many'), 'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'), - 'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), + 'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account'),store=True), 'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), 'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), 'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'), From 464a5babdaff508e21d47929cdae961b3aa5b558 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Mon, 24 Sep 2012 12:48:11 +0530 Subject: [PATCH 2/4] [IMP] solve KeyError: 'amount' in Open Journal Entries->Journal Entries in Graph view bzr revid: fka@tinyerp.com-20120924071811-w3ok1hrrueyupqhg --- addons/account/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account.py b/addons/account/account.py index d145f0308b0..2078d6d208f 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1285,7 +1285,7 @@ class account_move(osv.osv): 'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}), 'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'), 'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True), - 'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount), + 'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount, store=True), 'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True), 'narration':fields.text('Internal Note'), 'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True), From 5980921d61fd49a8f99d5a302b161f92a80a9c85 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Mon, 24 Sep 2012 16:43:18 +0530 Subject: [PATCH 3/4] [IMP] improve code bzr revid: fka@tinyerp.com-20120924111318-be0zi7vkqffqy8tq --- addons/account/project/project_view.xml | 2 +- addons/analytic/analytic.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index da1a11b9cb6..4446bd1b165 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -377,7 +377,7 @@ account.analytic.account - + diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index a2d191a4c26..3e504bd01a1 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -138,7 +138,7 @@ class account_analytic_account(osv.osv): _columns = { 'name': fields.char('Account/Contract Name', size=128, required=True), - 'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name',store=True), + 'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'), 'code': fields.char('Reference', size=24, select=True), 'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True, help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\ From 8549da26255d26e8778f7ce400598ea34c74ee18 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 26 Sep 2012 12:29:56 +0530 Subject: [PATCH 4/4] [IMP] remove Print Analytic Journals menu from reporting of account bzr revid: fka@tinyerp.com-20120926065956-zn053lwpnnb032gn --- addons/account/project/project_view.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 4446bd1b165..a8ef5b1a641 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -114,9 +114,6 @@ - account.analytic.line.form @@ -351,15 +348,6 @@ # Reporting # - - Print Analytic Journals - account.analytic.journal - tree - To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount. - - account.journal.form.1