[IMP] pep8 (before improvement)

bzr revid: olt@tinyerp.com-20101004075827-x3yr8cwrx0decxxz
This commit is contained in:
olt@tinyerp.com
2010-10-04 09:58:27 +02:00
parent 3752cffff4
commit ec3f4d6598
@@ -24,6 +24,7 @@ import time
from report import report_sxw
import pooler
class account_invoice_with_message(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(account_invoice_with_message, self).__init__(cr, uid, name, context=context)
@@ -40,115 +41,114 @@ class account_invoice_with_message(report_sxw.rml_parse):
msg = account_msg_data.msg
return msg
def invoice_lines(self,invoice):
result =[]
sub_total={}
info=[]
invoice_list=[]
res={}
list_in_seq={}
def invoice_lines(self, invoice):
result = []
sub_total = {}
info = []
invoice_list = []
res = {}
list_in_seq = {}
ids = self.pool.get('account.invoice.line').search(self.cr, self.uid, [('invoice_id', '=', invoice.id)])
ids.sort()
for id in range(0,len(ids)):
info = self.pool.get('account.invoice.line').browse(self.cr, self.uid,ids[id], self.context.copy())
list_in_seq[info]=info.sequence
i=1
j=0
for id in range(0, len(ids)):
info = self.pool.get('account.invoice.line').browse(self.cr, self.uid, ids[id], self.context.copy())
list_in_seq[info] = info.sequence
i = 1
j = 0
final=sorted(list_in_seq.items(), lambda x, y: cmp(x[1], y[1]))
invoice_list=[x[0] for x in final]
sum_flag={}
sum_flag[j]=-1
invoice_list = [x[0] for x in final]
sum_flag = {}
sum_flag[j] = -1
for entry in invoice_list:
res={}
res = {}
if entry.state=='article':
if entry.state == 'article':
self.cr.execute('select tax_id from account_invoice_line_tax where invoice_line_id=%s', (entry.id,))
tax_ids=self.cr.fetchall()
tax_ids = self.cr.fetchall()
if tax_ids==[]:
res['tax_types']=''
if tax_ids == []:
res['tax_types'] = ''
else:
tax_names_dict={}
for item in range(0,len(tax_ids)) :
tax_names_dict = {}
for item in range(0, len(tax_ids)):
self.cr.execute('select name from account_tax where id=%s', (tax_ids[item][0],))
type=self.cr.fetchone()
tax_names_dict[item] =type[0]
tax_names = ','.join([tax_names_dict[x] for x in range(0,len(tax_names_dict))])
res['tax_types']=tax_names
res['name']=entry.name
res['quantity']="%.2f"%(entry.quantity)
res['price_unit']="%.2f"%(entry.price_unit)
res['discount']="%.2f"%(entry.discount)
res['price_subtotal']="%.2f"%(entry.price_subtotal)
sub_total[i]=entry.price_subtotal
i=i+1
res['note']=entry.note
res['currency']=invoice.currency_id.symbol
res['type']=entry.state
type = self.cr.fetchone()
tax_names_dict[item] = type[0]
tax_names = ','.join([tax_names_dict[x] for x in range(0, len(tax_names_dict))])
res['tax_types'] = tax_names
res['name'] = entry.name
res['quantity'] = "%.2f" % (entry.quantity)
res['price_unit'] = "%.2f" % (entry.price_unit)
res['discount'] = "%.2f" % (entry.discount)
res['price_subtotal'] = "%.2f" % (entry.price_subtotal)
sub_total[i] = entry.price_subtotal
i = i + 1
res['note'] = entry.note
res['currency'] = invoice.currency_id.symbol
res['type'] = entry.state
if entry.uos_id.id==False:
res['uos']=''
if entry.uos_id.id == False:
res['uos'] = ''
else:
uos_name = self.pool.get('product.uom').read(self.cr, self.uid, entry.uos_id.id, ['name'], self.context.copy())
res['uos']=uos_name['name']
res['uos'] = uos_name['name']
else:
res['quantity']=''
res['price_unit']=''
res['discount']=''
res['tax_types']=''
res['type']=entry.state
res['note']=entry.note
res['uos']=''
res['quantity'] = ''
res['price_unit'] = ''
res['discount'] = ''
res['tax_types'] = ''
res['type'] = entry.state
res['note'] = entry.note
res['uos'] = ''
if entry.state=='subtotal':
res['name']=entry.name
sum=0
sum_id=0
if sum_flag[j]==-1:
temp=1
if entry.state == 'subtotal':
res['name'] = entry.name
sum = 0
sum_id = 0
if sum_flag[j] == -1:
temp = 1
else:
temp=sum_flag[j]
temp = sum_flag[j]
for sum_id in range(temp,len(sub_total)+1):
sum+=sub_total[sum_id]
sum_flag[j+1]= sum_id +1
for sum_id in range(temp, len(sub_total)+1):
sum += sub_total[sum_id]
sum_flag[j+1] = sum_id +1
j=j+1
res['price_subtotal']="%.2f"%(sum)
res['currency']=invoice.currency_id.symbol
res['quantity']=''
res['price_unit']=''
res['discount']=''
res['tax_types']=''
res['uos']=''
elif entry.state=='title':
res['name']=entry.name
res['price_subtotal']=''
res['currency']=''
elif entry.state=='text':
res['name']=entry.name
res['price_subtotal']=''
res['currency']=''
elif entry.state=='line':
res['quantity']='_______________'
res['price_unit']='______________'
res['discount']='____________'
res['tax_types']='____________________'
res['uos']='_____'
res['name']='_______________________________________________'
res['price_subtotal']='____________'
res['currency']='____'
elif entry.state=='break':
res['type']=entry.state
res['name']=entry.name
res['price_subtotal']=''
res['currency']=''
j = j + 1
res['price_subtotal'] = "%.2f" % (sum)
res['currency'] = invoice.currency_id.symbol
res['quantity'] = ''
res['price_unit'] = ''
res['discount'] = ''
res['tax_types'] = ''
res['uos'] = ''
elif entry.state == 'title':
res['name'] = entry.name
res['price_subtotal'] = ''
res['currency'] = ''
elif entry.state == 'text':
res['name'] = entry.name
res['price_subtotal'] = ''
res['currency'] = ''
elif entry.state == 'line':
res['quantity'] = '_______________'
res['price_unit'] = '______________'
res['discount'] = '____________'
res['tax_types'] = '____________________'
res['uos'] = '_____'
res['name'] = '_______________________________________________'
res['price_subtotal'] = '____________'
res['currency'] = '____'
elif entry.state == 'break':
res['type'] = entry.state
res['name'] = entry.name
res['price_subtotal'] = ''
res['currency'] = ''
else:
res['name']=entry.name
res['price_subtotal']=''
res['currency']=invoice.currency_id.symbol
res['name'] = entry.name
res['price_subtotal'] = ''
res['currency'] = invoice.currency_id.symbol
result.append(res)
return result