diff --git a/addons/account/__init__.py b/addons/account/__init__.py index 8e83d9aa7a7..da397978bd2 100644 --- a/addons/account/__init__.py +++ b/addons/account/__init__.py @@ -33,5 +33,4 @@ import product import sequence import company -# 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/__openerp__.py b/addons/account/__openerp__.py index d4408d63bfe..39e40555f39 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -34,14 +34,15 @@ Budgets Customer and Supplier Invoices Bank statements + Reconciliation process by partner Creates a dashboards for accountants that includes: * List of uninvoiced quotations * Graph of aged receivables - * Graph of aged incomes + * Graph of aged incomes The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a -module named account_voucherss +module named account_vouchers """, 'website': 'http://www.openerp.com', 'init_xml': [], @@ -85,6 +86,7 @@ module named account_voucherss 'wizard/account_compare_account_balance_report_view.xml', 'wizard/account_third_party_ledger.xml', 'wizard/account_reconcile_view.xml', + 'wizard/account_reconcile_partner_process_view.xml', 'wizard/account_automatic_reconcile_view.xml', 'project/wizard/project_account_analytic_line_view.xml', 'account_end_fy.xml', diff --git a/addons/account/account.py b/addons/account/account.py index a6e3c09884a..54354b4ea90 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -18,21 +18,38 @@ # along with this program. If not, see . # ############################################################################## - import time -import netsvc - -from osv import fields, osv -import decimal_precision as dp - -from tools.misc import currency -from tools.translate import _ -import pooler from datetime import datetime from dateutil.relativedelta import relativedelta +from operator import itemgetter +import netsvc +import pooler +from osv import fields, osv +import decimal_precision as dp +from tools.misc import currency +from tools.translate import _ from tools import config +def check_cycle(self, cr, uid, ids): + """ climbs the ``self._table.parent_id`` chains for 100 levels or + until it can't find any more parent(s) + + Returns true if it runs out of parents (no cycle), false if + it can recurse 100 times without ending all chains + """ + level = 100 + while len(ids): + cr.execute('SELECT DISTINCT parent_id '\ + 'FROM '+self._table+' '\ + 'WHERE id IN %s '\ + 'AND parent_id IS NOT NULL',(tuple(ids),)) + ids = map(itemgetter(0), cr.fetchall()) + if not level: + return False + level -= 1 + return True + class account_payment_term(osv.osv): _name = "account.payment.term" _description = "Payment Term" @@ -64,7 +81,7 @@ class account_payment_term(osv.osv): if amt: next_date = datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days) if line.days2 < 0: - next_date += relativedelta(day=line.days2) + next_date += relativedelta(day=31) if line.days2 > 0: next_date += relativedelta(day=line.days2, months=1) result.append( (next_date.strftime('%Y-%m-%d'), amt) ) @@ -170,6 +187,7 @@ class account_account(osv.osv): _name = "account.account" _description = "Account" _parent_store = True + logger = netsvc.Logger() def _get_children_and_consol(self, cr, uid, ids, context={}): ids2=[] @@ -229,65 +247,87 @@ class account_account(osv.osv): ids3 = self._get_children_and_consol(cr, uid, ids3, context) return ids2 + ids3 - def __compute(self, cr, uid, ids, field_names, arg, context={}, query=''): - #compute the balance/debit/credit accordingly to the value of field_name for the given account ids - mapping = { - 'balance': "COALESCE(SUM(l.debit),0) - COALESCE(SUM(l.credit), 0) as balance ", - 'debit': "COALESCE(SUM(l.debit), 0) as debit ", - 'credit': "COALESCE(SUM(l.credit), 0) as credit " - } - #get all the necessary accounts - ids2 = self._get_children_and_consol(cr, uid, ids, context) - #compute for each account the balance/debit/credit from the move lines - accounts = {} - if ids2: - aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context) + def __compute(self, cr, uid, ids, field_names, arg=None, context=None, + query='', query_params=()): + """ compute the balance, debit and/or credit for the provided + account ids + Arguments: + `ids`: account ids + `field_names`: the fields to compute (a list of any of + 'balance', 'debit' and 'credit') + `arg`: unused fields.function stuff + `query`: additional query filter (as a string) + `query_params`: parameters for the provided query string + (__compute will handle their escaping) as a + tuple + """ + mapping = { + 'balance': "COALESCE(SUM(l.debit),0) " \ + "- COALESCE(SUM(l.credit), 0) as balance", + 'debit': "COALESCE(SUM(l.debit), 0) as debit", + 'credit': "COALESCE(SUM(l.credit), 0) as credit" + } + #get all the necessary accounts + children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context) + #compute for each account the balance/debit/credit from the move lines + accounts = {} + if children_and_consolidated: + aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context) - wheres = [""] - if query.strip(): - wheres.append(query.strip()) - if aml_query.strip(): - wheres.append(aml_query.strip()) - query = " AND ".join(wheres) + wheres = [""] + if query.strip(): + wheres.append(query.strip()) + if aml_query.strip(): + wheres.append(aml_query.strip()) + filters = " AND ".join(wheres) + self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG, + 'Filters: %s'%filters) + # IN might not work ideally in case there are too many + # children_and_consolidated, in that case join on a + # values() e.g.: + # SELECT l.account_id as id FROM account_move_line l + # INNER JOIN (VALUES (id1), (id2), (id3), ...) AS tmp (id) + # ON l.account_id = tmp.id + # or make _get_children_and_consol return a query and join on that + request = ("SELECT l.account_id as id, " +\ + ' , '.join(map(mapping.__getitem__, field_names)) + + " FROM account_move_line l" \ + " WHERE l.account_id IN %s " \ + + filters + + " GROUP BY l.account_id") + params = (tuple(children_and_consolidated),) + query_params + cr.execute(request, params) + self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG, + 'Status: %s'%cr.statusmessage) - cr.execute("SELECT l.account_id as id, " +\ - ' , '.join(map(lambda x: mapping[x], field_names)) + - "FROM " \ - "account_move_line l " \ - "WHERE " \ - "l.account_id =ANY(%s) " \ - + query + - " GROUP BY l.account_id",(ids2,)) + for res in cr.dictfetchall(): + accounts[res['id']] = res - for res in cr.dictfetchall(): - accounts[res['id']] = res - - - # consolidate accounts with direct children - ids2.reverse() - brs = list(self.browse(cr, uid, ids2, context=context)) - sums = {} - while brs: - current = brs[0] - can_compute = True - for child in current.child_id: - if child.id not in sums: - can_compute = False - try: - brs.insert(0, brs.pop(brs.index(child))) - except ValueError: - brs.insert(0, child) - if can_compute: - brs.pop(0) - for fn in field_names: - sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0) - if current.child_id: - sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id) - res = {} - null_result = dict((fn, 0.0) for fn in field_names) - for id in ids: - res[id] = sums.get(id, null_result) - return res + # consolidate accounts with direct children + children_and_consolidated.reverse() + brs = list(self.browse(cr, uid, children_and_consolidated, context=context)) + sums = {} + while brs: + current = brs[0] + can_compute = True + for child in current.child_id: + if child.id not in sums: + can_compute = False + try: + brs.insert(0, brs.pop(brs.index(child))) + except ValueError: + brs.insert(0, child) + if can_compute: + brs.pop(0) + for fn in field_names: + sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0) + if current.child_id: + sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id) + res = {} + null_result = dict((fn, 0.0) for fn in field_names) + for id in ids: + res[id] = sums.get(id, null_result) + return res def _get_company_currency(self, cr, uid, ids, field_name, arg, context={}): result = {} @@ -392,8 +432,10 @@ class account_account(osv.osv): if (obj_self in obj_self.child_consol_ids) or (p_id and (p_id is obj_self.id)): return False while(ids): - cr.execute('select distinct child_id from account_account_consol_rel where parent_id =ANY(%s)',(ids,)) - child_ids = filter(None, map(lambda x: x[0], cr.fetchall())) + cr.execute('SELECT DISTINCT child_id '\ + 'FROM account_account_consol_rel '\ + 'WHERE parent_id IN %s', (tuple(ids),)) + child_ids = map(itemgetter(0), cr.fetchall()) c_ids = child_ids if (p_id and (p_id in c_ids)) or (obj_self.id in c_ids): return False @@ -542,6 +584,9 @@ class account_journal_column(osv.osv): result = [] cols = self.pool.get('account.move.line')._columns for col in cols: + if col in ('period_id', 'journal_id'): + continue + result.append( (col, cols[col].string) ) result.sort() return result @@ -574,17 +619,17 @@ class account_journal(osv.osv): 'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]), 'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]), 'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."), - 'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]",help="It acts as a default account for credit amount"), - 'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]",help="It acts as a default account for debit amount"), + 'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]", help="It acts as a default account for credit amount"), + 'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"), 'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."), - 'update_posted': fields.boolean('Allow Cancelling Entries',help="Check this box if you want to cancel the entries related to this journal or want to cancel the invoice related to this journal"), + 'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"), 'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."), 'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=True), 'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"), 'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'), 'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'), 'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'), - 'company_id': fields.many2one('res.company', 'Company', required=True,select=1,help="Company associated with a journal"), + 'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"), 'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \ help="The sequence used for invoice numbers in this journal."), 'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'), @@ -615,11 +660,9 @@ class account_journal(osv.osv): # }) return journal_id - def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100): + def name_search(self, cr, user, name, args=None, operator='ilike', context={}, limit=100): if not args: args = [] - if context is None: - context = {} ids = [] if name: ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit, context=context) @@ -636,7 +679,6 @@ class account_journal(osv.osv): res= {'value':{'centralisation': False}} return res - account_journal() class account_fiscalyear(osv.osv): @@ -730,7 +772,7 @@ class account_period(osv.osv): 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True), 'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True, help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'), - 'company_id': fields.related('fiscalyear_id','company_id',type='many2one',relation='res.company',string='Company',store=True) + 'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True) } _defaults = { 'state': lambda *a: 'draft', @@ -791,7 +833,7 @@ class account_period(osv.osv): cr.execute('update account_period set state=%s where id=%s', (mode, id)) return True - def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80): + def name_search(self, cr, user, name, args=None, operator='ilike', context={}, limit=80): if args is None: args = [] if context is None: @@ -803,7 +845,7 @@ class account_period(osv.osv): ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit) return self.name_get(cr, user, ids, context=context) - def write(self, cr, uid, ids, vals, context=None): + def write(self, cr, uid, ids, vals, context={}): obj=[] if 'company_id' in vals: move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)]) @@ -836,7 +878,7 @@ class account_journal_period(osv.osv): 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True, help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'), 'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'), - 'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company') + 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company') } def _check(self, cr, uid, ids, context={}): @@ -910,7 +952,10 @@ class account_move(osv.osv): def _amount_compute(self, cr, uid, ids, name, args, context, where =''): if not ids: return {} - cr.execute('select move_id,sum(debit) from account_move_line where move_id =ANY(%s) group by move_id',(ids,)) + cr.execute( 'SELECT move_id, SUM(debit) '\ + 'FROM account_move_line '\ + 'WHERE move_id IN %s '\ + 'GROUP BY move_id', (tuple(ids),)) result = dict(cr.fetchall()) for id in ids: result.setdefault(id, 0.0) @@ -1009,7 +1054,10 @@ class account_move(osv.osv): if new_name: self.write(cr, uid, [move.id], {'name':new_name}) - cr.execute('update account_move set state=%s where id =ANY(%s) ',('posted',ids,)) + cr.execute('UPDATE account_move '\ + 'SET state=%s '\ + 'WHERE id IN %s', + ('posted', tuple(ids),)) else: raise osv.except_osv(_('Integrity Error !'), _('You can not validate a non-balanced entry !\nMake sure you have configured Payment Term properly !\nIt should contain atleast one Payment Term Line with type "Balance" !')) return True @@ -1022,7 +1070,9 @@ class account_move(osv.osv): if not line.journal_id.update_posted: raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.')) if len(ids): - cr.execute('update account_move set state=%s where id =ANY(%s)',('draft',ids,)) + cr.execute('UPDATE account_move '\ + 'SET state=%s '\ + 'WHERE id IN %s', ('draft', tuple(ids),)) return True def write(self, cr, uid, ids, vals, context={}): @@ -1094,6 +1144,7 @@ class account_move(osv.osv): return amount def _centralise(self, cr, uid, move, mode, context=None): + assert(mode in ('debit', 'credit'), 'Invalid Mode') #to prevent sql injection if context is None: context = {} @@ -1141,7 +1192,7 @@ class account_move(osv.osv): else: line_id2 = 0 - cr.execute('select sum('+mode+') from account_move_line where move_id=%s and id<>%s', (move.id, line_id2)) + cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2)) result = cr.fetchone()[0] or 0.0 cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id)) return True @@ -1295,24 +1346,26 @@ class account_tax_code(osv.osv): This code is used for some tax declarations. """ - def _sum(self, cr, uid, ids, name, args, context, where =''): - ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)]) + def _sum(self, cr, uid, ids, name, args, context,where ='', where_params=()): + parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)])) if context.get('based_on', 'invoices') == 'payments': cr.execute('SELECT line.tax_code_id, sum(line.tax_amount) \ FROM account_move_line AS line, \ account_move AS move \ LEFT JOIN account_invoice invoice ON \ (invoice.move_id = move.id) \ - WHERE line.tax_code_id =ANY(%s) '+where+' \ + WHERE line.tax_code_id IN %s '+where+' \ AND move.id = line.move_id \ AND ((invoice.state = \'paid\') \ OR (invoice.id IS NULL)) \ - GROUP BY line.tax_code_id',(ids2,)) + GROUP BY line.tax_code_id', + (parent_ids,)+where_params) else: cr.execute('SELECT line.tax_code_id, sum(line.tax_amount) \ FROM account_move_line AS line \ - WHERE line.tax_code_id =ANY(%s) '+where+' \ - GROUP BY line.tax_code_id',(ids2,)) + WHERE line.tax_code_id IN %s '+where+' \ + GROUP BY line.tax_code_id', + (parent_ids,)+where_params) res=dict(cr.fetchall()) for record in self.browse(cr, uid, ids, context): def _rec_get(record): @@ -1329,12 +1382,14 @@ class account_tax_code(osv.osv): else: fiscalyear_id = self.pool.get('account.fiscalyear').find(cr, uid, exception=False) where = '' + where_params = () if fiscalyear_id: pids = map(lambda x: str(x.id), self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_id).period_ids) if pids: - where = ' and period_id in (' + (','.join(pids))+')' + where = ' and period_id IN %s' + where_params = (tuple(pids),) return self._sum(cr, uid, ids, name, args, context, - where=where) + where=where, where_params=where_params) def _sum_period(self, cr, uid, ids, name, args, context): if 'period_id' in context and context['period_id']: @@ -1345,7 +1400,7 @@ class account_tax_code(osv.osv): return dict.fromkeys(ids, 0.0) period_id = period_id[0] return self._sum(cr, uid, ids, name, args, context, - where=' and line.period_id='+str(period_id)) + where=' and line.period_id=%s', where_params=(period_id,)) _name = 'account.tax.code' _description = 'Tax Code' @@ -1393,16 +1448,6 @@ class account_tax_code(osv.osv): 'sign': lambda *args: 1.0, 'notprintable': lambda *a: False, } - def _check_recursion(self, cr, uid, ids): - level = 100 - while len(ids): - cr.execute('select distinct parent_id from account_tax_code where id =ANY(%s)',(ids,)) - ids = filter(None, map(lambda x:x[0], cr.fetchall())) - if not level: - return False - level -= 1 - return True - def copy(self, cr, uid, id, default=None, context=None): if default is None: @@ -1411,6 +1456,7 @@ class account_tax_code(osv.osv): default.update({'line_ids': []}) return super(account_tax_code, self).copy(cr, uid, id, default, context) + _check_recursion = check_cycle _constraints = [ (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id']) ] @@ -1758,7 +1804,7 @@ class account_model(osv.osv): 'ref': fields.char('Reference', size=64), 'journal_id': fields.many2one('account.journal', 'Journal', required=True), 'lines_id': fields.one2many('account.model.line', 'model_id', 'Model Entries'), - 'legend' :fields.text('Legend',readonly=True,size=100), + 'legend' :fields.text('Legend', readonly=True, size=100), } _defaults = { @@ -1768,7 +1814,7 @@ class account_model(osv.osv): move_ids = [] for model in self.browse(cr, uid, ids, context): context.update({'date':datas['date']}) - period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date',False)) + period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date', False)) if not period_id: raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !')) period_id = period_id[0] @@ -1970,9 +2016,9 @@ class account_account_template(osv.osv): 'reconcile': fields.boolean('Allow Reconciliation', help="Check this option if you want the user to reconcile entries in this account."), 'shortcut': fields.char('Shortcut', size=12), 'note': fields.text('Note'), - 'parent_id': fields.many2one('account.account.template','Parent Account Template', ondelete='cascade'), - 'child_parent_ids':fields.one2many('account.account.template','parent_id','Children'), - 'tax_ids': fields.many2many('account.tax.template', 'account_account_template_tax_rel','account_id','tax_id', 'Default Taxes'), + 'parent_id': fields.many2one('account.account.template', 'Parent Account Template', ondelete='cascade'), + 'child_parent_ids':fields.one2many('account.account.template', 'parent_id', 'Children'), + 'tax_ids': fields.many2many('account.tax.template', 'account_account_template_tax_rel', 'account_id', 'tax_id', 'Default Taxes'), 'nocreate': fields.boolean('Optional create', help="If checked, the new chart of accounts will not contain this by default."), } @@ -1982,16 +2028,7 @@ class account_account_template(osv.osv): 'nocreate': lambda *a: False, } - def _check_recursion(self, cr, uid, ids): - level = 100 - while len(ids): - cr.execute('select parent_id from account_account_template where id =ANY(%s)',(ids,)) - ids = filter(None, map(lambda x:x[0], cr.fetchall())) - if not level: - return False - level -= 1 - return True - + _check_recursion = check_cycle _constraints = [ (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id']) ] @@ -2021,14 +2058,14 @@ class account_add_tmpl_wizard(osv.osv_memory): acc_obj=self.pool.get('account.account') tmpl_obj=self.pool.get('account.account.template') #print "Searching for ",context - tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']],['parent_id']) + tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id']) if not tids or not tids[0]['parent_id']: return False - ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]],['code']) + ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]], ['code']) res = None if not ptids or not ptids[0]['code']: raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!')) - res = acc_obj.search(cr,uid,[('code','=',ptids[0]['code'])]) + res = acc_obj.search(cr, uid, [('code','=',ptids[0]['code'])]) return res and res[0] or False @@ -2042,9 +2079,9 @@ class account_add_tmpl_wizard(osv.osv_memory): def action_create(self,cr,uid,ids,context=None): acc_obj=self.pool.get('account.account') tmpl_obj=self.pool.get('account.account.template') - data= self.read(cr,uid,ids) - company_id = acc_obj.read(cr,uid,[data[0]['cparent_id']],['company_id'])[0]['company_id'][0] - account_template = tmpl_obj.browse(cr,uid,context['tmpl_ids']) + data= self.read(cr, uid, ids) + company_id = acc_obj.read(cr, uid, [data[0]['cparent_id']], ['company_id'])[0]['company_id'][0] + account_template = tmpl_obj.browse(cr, uid, context['tmpl_ids']) #tax_ids = [] #for tax in account_template.tax_ids: # tax_ids.append(tax_template_ref[tax.id]) @@ -2063,10 +2100,10 @@ class account_add_tmpl_wizard(osv.osv_memory): 'company_id': company_id, } # print "Creating:", vals - new_account = acc_obj.create(cr,uid,vals) + new_account = acc_obj.create(cr, uid, vals) return {'type':'state', 'state': 'end' } - def action_cancel(self,cr,uid,ids,context=None): + def action_cancel(self, cr, uid, ids, context=None): return { 'type': 'state', 'state': 'end' } account_add_tmpl_wizard() @@ -2083,7 +2120,7 @@ class account_tax_code_template(osv.osv): 'info': fields.text('Description'), 'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True), 'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'), - 'sign': fields.float('Sign for parent', required=True), + 'sign': fields.float('Sign for parent', required=True, help="Choose 1.00 to add the total to the parent account or -1.00 to subtract it"), 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"), } @@ -2101,16 +2138,7 @@ class account_tax_code_template(osv.osv): return [(x['id'], (x['code'] and x['code'] + ' - ' or '') + x['name']) \ for x in reads] - def _check_recursion(self, cr, uid, ids): - level = 100 - while len(ids): - cr.execute('select distinct parent_id from account_tax_code_template where id =ANY(%s)',(ids,)) - ids = filter(None, map(lambda x:x[0], cr.fetchall())) - if not level: - return False - level -= 1 - return True - + _check_recursion = check_cycle _constraints = [ (_check_recursion, 'Error ! You can not create recursive Tax Codes.', ['parent_id']) ] @@ -2124,7 +2152,7 @@ class account_chart_template(osv.osv): _columns={ 'name': fields.char('Name', size=64, required=True), - 'account_root_id': fields.many2one('account.account.template','Root Account',required=True,domain=[('parent_id','=',False)]), + 'account_root_id': fields.many2one('account.account.template','Root Account',required=True,domain=[('parent_id','=',False)], help=""), 'tax_code_root_id': fields.many2one('account.tax.code.template','Root Tax Code',required=True,domain=[('parent_id','=',False)]), 'tax_template_ids': fields.one2many('account.tax.template', 'chart_template_id', 'Tax Template List', help='List of all the taxes that have to be installed by the wizard'), 'bank_account_view_id': fields.many2one('account.account.template','Bank Account',required=True), @@ -2273,11 +2301,11 @@ class wizard_multi_charts_accounts(osv.osv_memory): _inherit = 'res.config' _columns = { - 'company_id':fields.many2one('res.company','Company',required=True), - 'chart_template_id': fields.many2one('account.chart.template','Chart Template',required=True), - 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True), - 'code_digits':fields.integer('# of Digits',required=True,help="No. of Digits to use for account code"), - 'seq_journal':fields.boolean('Separated Journal Sequences',help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."), + 'company_id':fields.many2one('res.company', 'Company', required=True), + 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True), + 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True), + 'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"), + 'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."), } def _get_chart(self, cr, uid, context={}): @@ -2286,14 +2314,14 @@ class wizard_multi_charts_accounts(osv.osv_memory): return ids[0] return False _defaults = { - 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.id, + 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id, 'chart_template_id': _get_chart, 'code_digits': lambda *a:6, 'seq_journal': True } def execute(self, cr, uid, ids, context=None): - obj_multi = self.browse(cr,uid,ids[0]) + obj_multi = self.browse(cr, uid, ids[0]) obj_acc = self.pool.get('account.account') obj_acc_tax = self.pool.get('account.tax') obj_journal = self.pool.get('account.journal') @@ -2325,7 +2353,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'company_id': company_id, 'sign': tax_code_template.sign, } - new_tax_code = self.pool.get('account.tax.code').create(cr,uid,vals) + new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals) #recording the new tax code to do the mapping tax_code_template_ref[tax_code_template.id] = new_tax_code @@ -2358,7 +2386,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'company_id': company_id, 'type_tax_use': tax.type_tax_use } - new_tax = obj_acc_tax.create(cr,uid,vals_tax) + new_tax = obj_acc_tax.create(cr, uid, vals_tax) #as the accounts have not been created yet, we have to wait before filling these fields todo_dict[new_tax] = { 'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False, @@ -2396,7 +2424,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'tax_ids': [(6,0,tax_ids)], 'company_id': company_id, } - new_account = obj_acc.create(cr,uid,vals) + new_account = obj_acc.create(cr, uid, vals) acc_template_ref[account_template.id] = new_account #reactivate the parent_store functionnality on account_account self.pool._init = False @@ -2412,11 +2440,11 @@ class wizard_multi_charts_accounts(osv.osv_memory): # Creating Journals vals_journal={} view_id = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Journal View')])[0] - seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0] + seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0] if obj_multi.seq_journal: - seq_id_sale = obj_sequence.search(cr,uid,[('name','=','Sale Journal')])[0] - seq_id_purchase = obj_sequence.search(cr,uid,[('name','=','Purchase Journal')])[0] + seq_id_sale = obj_sequence.search(cr, uid, [('name','=','Sale Journal')])[0] + seq_id_purchase = obj_sequence.search(cr, uid, [('name','=','Purchase Journal')])[0] else: seq_id_sale = seq_id seq_id_purchase = seq_id @@ -2448,8 +2476,8 @@ class wizard_multi_charts_accounts(osv.osv_memory): obj_journal.create(cr,uid,vals_journal) # Bank Journals - view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Cash Journal View')])[0] - view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Multi-Currency Cash Journal View')])[0] + view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Cash Journal View')])[0] + view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Multi-Currency Cash Journal View')])[0] ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id current_num = 1 @@ -2527,7 +2555,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): #create the property property_obj.create(cr, uid, vals) - fp_ids = obj_fiscal_position_template.search(cr, uid,[('chart_template_id', '=', obj_multi.chart_template_id.id)]) + fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)]) if fp_ids: for position in obj_fiscal_position_template.browse(cr, uid, fp_ids): diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index d02dec33af0..2cd1b4d17bd 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -92,9 +92,9 @@ class account_analytic_line(osv.osv): company_id=company_obj._company_default_get(cr, uid, 'account.analytic.line', context) # Compute based on pricetype - pricetype=self.pool.get('product.price.type').browse(cr,uid,company_obj.browse(cr,uid,company_id).property_valuation_price_type.id) + pricetype=self.pool.get('product.price.type').browse(cr, uid, company_obj.browse(cr,uid,company_id).property_valuation_price_type.id) # Take the company currency as the reference one - context['currency_id']=company_obj.browse(cr,uid,company_id).currency_id.id + context['currency_id']=company_obj.browse(cr, uid, company_id).currency_id.id amount_unit=prod.price_get(pricetype.field, context)[prod.id] amount=amount_unit*unit_amount or 1.0 return {'value': { diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 81b6e3157a1..0e46944a436 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -32,7 +32,7 @@ class account_bank_statement(osv.osv): mod_obj = self.pool.get('ir.model.data') if context is None: context = {} - model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice')], context=context) + model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice')], context=context) resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] context.update({'statement_id': ids[0]}) return { @@ -45,7 +45,7 @@ class account_bank_statement(osv.osv): 'type': 'ir.actions.act_window', 'target': 'new', 'nodestroy': True - } + } def _default_journal_id(self, cr, uid, context={}): if context.get('journal_id', False): @@ -556,9 +556,9 @@ account_bank_statement_reconcile_line() class account_bank_statement_line(osv.osv): - def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, - context={}): + def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, context={}): res = {'value': {}} + if not partner_id: return res line = self.browse(cursor, user, line_id) @@ -591,6 +591,10 @@ class account_bank_statement_line(osv.osv): balance = res_currency_obj.compute(cursor, user, company_currency_id, currency_id, balance, context=context) res['value']['amount'] = balance + + if context.get('amount', 0) > 0: + res['value']['amount'] = context.get('amount') + return res def _reconcile_amount(self, cursor, user, ids, name, args, context=None): diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 4c6faae9e19..50e431935bc 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -19,26 +19,26 @@ position="attributes"> You can enhance OpenERP's basic accounting support with a few additional OpenERP applications. - + Configure 23 - - - + + + - + - - -
+ + + @@ -51,15 +51,15 @@ - - + + - - - - - + + + + + @@ -88,12 +88,12 @@ account_installer_action_replace tree - - - + + diff --git a/addons/account_voucher_payment/account_voucher_payment_wizard.xml b/addons/account_voucher_payment/account_voucher_payment_wizard.xml deleted file mode 100644 index 0551b1bbcb5..00000000000 --- a/addons/account_voucher_payment/account_voucher_payment_wizard.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/addons/account_voucher_payment/account_voucher_unreconcile.py b/addons/account_voucher_payment/account_voucher_unreconcile.py deleted file mode 100644 index a209fe13ba0..00000000000 --- a/addons/account_voucher_payment/account_voucher_unreconcile.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import wizard -import pooler - -_info_form = ''' -
- - -