odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Task 578: Remove the cr.execute and used orm method 

bzr revid: sbh@tinyerp.com-20100426053224-collzkj3nydyk6xm
This commit is contained in:
sbh (Open ERP) 2010-04-26 11:02:24 +05:30
parent 1021f7784b
commit 1c983a940c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/point_of_sale/account_bank_statement.py
View File

@ -178,11 +178,9 @@ class account_bank_statement(osv.osv):
balance_start=0.0
cash_obj = self.pool.get('singer.statement')
statement_obj = self.pool.get('account.bank.statement')
cursor.execute("Select a.id from account_bank_statement a where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
res2=cursor.fetchone()
res2=res2 and res2[0] or None
if res2:
statmt_id=statement_obj.browse(cursor,user,res2)
statement_ids=statement_obj.search(cursor, user, [('journal_id','=',journal_id), ('user_id','=',user)])
if statement_ids:
statmt_id=statement_obj.browse(cursor,user,statement_ids[0])
check_det=statmt_id.journal_id.check_dtls
if not check_det:
balance_start=statmt_id.balance_end_real or 0.0
@ -208,14 +206,14 @@ class account_bank_statement(osv.osv):
@return: True
"""
obj_inv = self.browse(cr, uid, ids)[0]
sequence_obj=self.pool.get('ir.sequence')
s_id=obj_inv.journal_id
if s_id.statement_sequence_id:
s_id=s_id.id
number = self.pool.get('ir.sequence').get_id(cr, uid, s_id)
number = sequence_obj.get_id(cr, uid, s_id)
else:
number = self.pool.get('ir.sequence').get(cr, uid,
number = sequence_obj.get(cr, uid,
'account.bank.statement')
self.write(cr, uid, ids, {'date':time.strftime("%Y-%m-%d %H:%M:%S"), 'state':'open', 'name':number})
return True

8
addons/point_of_sale/pos.py
View File

@ -270,6 +270,7 @@ class pos_order(osv.osv):
res_obj = self.pool.get('res.users')
res=0.0
res2=0.0
statement_obj = self.pool.get('account.bank.statement.line')
company_disc=self.browse(cr,uid,ids)
if not company_disc:
comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
@ -280,9 +281,10 @@ class pos_order(osv.osv):
if line.discount <=comp:
res=line.discount
if line.discount >comp:
res2=line.discount
cr.execute("select journal_id from account_bank_statement_line where pos_statement_id=%s "%(ids[0]))
res3=cr.fetchall()
res2=line.discount
res3= statement_obj.search(cr,uid,[('pos_statement_id','=', ids[0])])
list_jrnl=[]
for r in res3:
cr.execute("select id from account_journal where name= '%s' and special_journal='t'"%(r[0]))