Merge pull request #5113 from expsa/kch_dev_odex25_transactions
[FIX] exp_transaction_report: fix bug in late.transaction.report
This commit is contained in:
commit
2c2b7c2cf6
|
|
@ -77,11 +77,12 @@ class ReportIncomingTransaction(models.AbstractModel):
|
||||||
for rec in incoming_ids:
|
for rec in incoming_ids:
|
||||||
if datetime.datetime.strptime(rec.due_date, "%Y-%m-%d") < datetime.datetime.strptime(str(today), "%Y-%m-%d"):
|
if datetime.datetime.strptime(rec.due_date, "%Y-%m-%d") < datetime.datetime.strptime(str(today), "%Y-%m-%d"):
|
||||||
trasc = rec.trace_ids.filtered(lambda z: z.action == 'forward' or z.action == 'sent' or
|
trasc = rec.trace_ids.filtered(lambda z: z.action == 'forward' or z.action == 'sent' or
|
||||||
z.action == 'reply')[0]
|
z.action == 'reply')
|
||||||
|
tras_name = trasc[0].to_id.name if trasc else ''
|
||||||
name = ''
|
name = ''
|
||||||
for to in rec.to_ids:
|
for to in rec.to_ids:
|
||||||
name += to.name + ','
|
name += to.name + ','
|
||||||
dic = self.set_docs_dic(rec, 'out_in', name, trasc.to_id.name)
|
dic = self.set_docs_dic(rec, 'out_in', name, tras_name)
|
||||||
docs.append(dic)
|
docs.append(dic)
|
||||||
elif type_transact == 'internal':
|
elif type_transact == 'internal':
|
||||||
domain = []
|
domain = []
|
||||||
|
|
@ -94,11 +95,12 @@ class ReportIncomingTransaction(models.AbstractModel):
|
||||||
for rec in internal_ids:
|
for rec in internal_ids:
|
||||||
if datetime.datetime.strptime(str(rec.due_date), "%Y-%m-%d") < datetime.datetime.strptime(str(today), "%Y-%m-%d"):
|
if datetime.datetime.strptime(str(rec.due_date), "%Y-%m-%d") < datetime.datetime.strptime(str(today), "%Y-%m-%d"):
|
||||||
trasc = rec.trace_ids.filtered(lambda z: z.action == 'forward' or z.action == 'sent' or
|
trasc = rec.trace_ids.filtered(lambda z: z.action == 'forward' or z.action == 'sent' or
|
||||||
z.action == 'reply')[0]
|
z.action == 'reply')
|
||||||
|
tras_name = trasc[0].to_id.name if trasc else ''
|
||||||
name = ''
|
name = ''
|
||||||
for to in rec.to_ids:
|
for to in rec.to_ids:
|
||||||
name += to.name + ','
|
name += to.name + ','
|
||||||
dic = self.set_docs_dic(rec, 'in', name, trasc.to_id.name)
|
dic = self.set_docs_dic(rec, 'in', name, tras_name)
|
||||||
docs.append(dic)
|
docs.append(dic)
|
||||||
else:
|
else:
|
||||||
domain = []
|
domain = []
|
||||||
|
|
@ -111,11 +113,12 @@ class ReportIncomingTransaction(models.AbstractModel):
|
||||||
for rec in incoming_ids:
|
for rec in incoming_ids:
|
||||||
if rec.due_date and datetime.datetime.strptime(rec.due_date.strftime("%Y-%m-%d"), "%Y-%m-%d") < datetime.datetime.strptime(str(today), "%Y-%m-%d"):
|
if rec.due_date and datetime.datetime.strptime(rec.due_date.strftime("%Y-%m-%d"), "%Y-%m-%d") < datetime.datetime.strptime(str(today), "%Y-%m-%d"):
|
||||||
trasc = rec.trace_ids.filtered(lambda z: z.action == 'forward' or z.action == 'sent' or
|
trasc = rec.trace_ids.filtered(lambda z: z.action == 'forward' or z.action == 'sent' or
|
||||||
z.action == 'reply')[0]
|
z.action == 'reply')
|
||||||
|
tras_name = trasc[0].to_id.name if trasc else ''
|
||||||
name = ''
|
name = ''
|
||||||
for to in rec.to_ids:
|
for to in rec.to_ids:
|
||||||
name += to.name + ','
|
name += to.name + ','
|
||||||
dic = self.set_docs_dic(rec, 'out_in', name, trasc.to_id.name)
|
dic = self.set_docs_dic(rec, 'out_in', name, tras_name)
|
||||||
docs.append(dic)
|
docs.append(dic)
|
||||||
internal_ids = self.env['internal.transaction'].search(domain, order="transaction_date desc")
|
internal_ids = self.env['internal.transaction'].search(domain, order="transaction_date desc")
|
||||||
if internal_ids:
|
if internal_ids:
|
||||||
|
|
@ -124,11 +127,12 @@ class ReportIncomingTransaction(models.AbstractModel):
|
||||||
if rec.due_date and datetime.datetime.strptime(rec.due_date.strftime("%Y-%m-%d"),
|
if rec.due_date and datetime.datetime.strptime(rec.due_date.strftime("%Y-%m-%d"),
|
||||||
"%Y-%m-%d") < datetime.datetime.strptime(today.strftime("%Y-%m-%d"), "%Y-%m-%d"):
|
"%Y-%m-%d") < datetime.datetime.strptime(today.strftime("%Y-%m-%d"), "%Y-%m-%d"):
|
||||||
trasc = rec.trace_ids.filtered(lambda z: z.action == 'forward' or z.action == 'sent' or
|
trasc = rec.trace_ids.filtered(lambda z: z.action == 'forward' or z.action == 'sent' or
|
||||||
z.action == 'reply')[0]
|
z.action == 'reply')
|
||||||
|
tras_name = trasc[0].to_id.name if trasc else ''
|
||||||
name = ''
|
name = ''
|
||||||
for to in rec.to_ids:
|
for to in rec.to_ids:
|
||||||
name += to.name + ','
|
name += to.name + ','
|
||||||
dic = self.set_docs_dic(rec, 'in', name, trasc.to_id.name)
|
dic = self.set_docs_dic(rec, 'in', name, tras_name)
|
||||||
docs.append(dic)
|
docs.append(dic)
|
||||||
final_dic = {}
|
final_dic = {}
|
||||||
key_list = []
|
key_list = []
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue