From d39cd7296c11983d146a9f1a26cc0589b5965a06 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Fri, 15 Oct 2010 12:44:33 +0530 Subject: [PATCH] [REF] cleaing account... bzr revid: mra@mra-laptop-20101015071433-p5vxtfo1b0ms4xu7 --- addons/account/partner.py | 11 +++++++---- addons/account/product.py | 4 ++-- addons/account/project/project.py | 9 +++++---- addons/account/sequence.py | 3 ++- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/addons/account/partner.py b/addons/account/partner.py index 6b88f759c21..fb5af0353a5 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -18,6 +18,7 @@ # along with this program. If not, see . # ############################################################################## + from operator import itemgetter from osv import fields, osv @@ -58,8 +59,8 @@ class account_fiscal_position(osv.osv): account_id = pos.account_dest_id.id break return account_id -account_fiscal_position() +account_fiscal_position() class account_fiscal_position_tax(osv.osv): _name = 'account.fiscal.position.tax' @@ -70,8 +71,8 @@ class account_fiscal_position_tax(osv.osv): 'tax_src_id': fields.many2one('account.tax', 'Tax Source', required=True), 'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax') } -account_fiscal_position_tax() +account_fiscal_position_tax() class account_fiscal_position_account(osv.osv): _name = 'account.fiscal.position.account' @@ -82,6 +83,7 @@ class account_fiscal_position_account(osv.osv): 'account_src_id': fields.many2one('account.account', 'Account Source', domain=[('type','<>','view')], required=True), 'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True) } + account_fiscal_position_account() class res_partner(osv.osv): @@ -89,7 +91,7 @@ class res_partner(osv.osv): _inherit = 'res.partner' _description = 'Partner' - def _credit_debit_get(self, cr, uid, ids, field_names, arg, context): + def _credit_debit_get(self, cr, uid, ids, field_names, arg, context=None): query = self.pool.get('account.move.line')._query_get(cr, uid, context=context) cr.execute("""SELECT l.partner_id, a.type, SUM(l.debit-l.credit) FROM account_move_line l @@ -184,6 +186,7 @@ class res_partner(osv.osv): 'Companies that refers to partner'), 'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time') } + res_partner() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/product.py b/addons/account/product.py index 56e721dcb06..b8af27b03e5 100644 --- a/addons/account/product.py +++ b/addons/account/product.py @@ -19,8 +19,6 @@ # ############################################################################## -import time -import netsvc from osv import fields, osv class product_category(osv.osv): @@ -75,5 +73,7 @@ class product_template(osv.osv): view_load=True, help="This account will be used for invoices instead of the default one to value expenses for the current product"), } + product_template() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/project/project.py b/addons/account/project/project.py index c5c0d223bef..ee142903c87 100644 --- a/addons/account/project/project.py +++ b/addons/account/project/project.py @@ -33,10 +33,11 @@ class account_analytic_journal(osv.osv): 'company_id': fields.many2one('res.company', 'Company', required=True), } _defaults = { - 'active': lambda *a: True, - 'type': lambda *a: 'general', + 'active': True, + 'type': 'general', 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, } + account_analytic_journal() class account_journal(osv.osv): @@ -45,7 +46,7 @@ class account_journal(osv.osv): _columns = { 'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal',help="Journal for analytic entries"), } + account_journal() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/sequence.py b/addons/account/sequence.py index 52c1f5df8c4..1683e5feb06 100644 --- a/addons/account/sequence.py +++ b/addons/account/sequence.py @@ -62,6 +62,7 @@ class ir_sequence(osv.osv): context=context) return super(ir_sequence, self).get_id(cr, uid, sequence_id, test, context=context) + ir_sequence() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file