Merge pull request #2994 from expsa/samir-aladawi-fix-reports-transactions
[FIX] exp_transaction_report
This commit is contained in:
commit
f60eddb922
|
|
@ -78,11 +78,11 @@ class ReportIncomingTransaction(models.AbstractModel):
|
|||
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
|
||||
z.action == 'reply')[0]
|
||||
name = ''
|
||||
for to in rec.to_ids:
|
||||
name += to.name + ','
|
||||
dic = self.set_docs_dic(rec, 'out_in', name, trasc.to_id.name)
|
||||
docs.append(dic)
|
||||
name = ''
|
||||
for to in rec.to_ids:
|
||||
name += to.name + ','
|
||||
dic = self.set_docs_dic(rec, 'out_in', name, trasc.to_id.name)
|
||||
docs.append(dic)
|
||||
elif type_transact == 'internal':
|
||||
domain = []
|
||||
employee_ids = self.env['cm.entity'].browse(entity_ids)
|
||||
|
|
@ -95,11 +95,11 @@ class ReportIncomingTransaction(models.AbstractModel):
|
|||
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
|
||||
z.action == 'reply')[0]
|
||||
name = ''
|
||||
for to in rec.to_ids:
|
||||
name += to.name + ','
|
||||
dic = self.set_docs_dic(rec, 'in', name, trasc.to_id.name)
|
||||
docs.append(dic)
|
||||
name = ''
|
||||
for to in rec.to_ids:
|
||||
name += to.name + ','
|
||||
dic = self.set_docs_dic(rec, 'in', name, trasc.to_id.name)
|
||||
docs.append(dic)
|
||||
else:
|
||||
domain = []
|
||||
employee_ids = self.env['cm.entity'].browse(entity_ids)
|
||||
|
|
@ -112,11 +112,11 @@ class ReportIncomingTransaction(models.AbstractModel):
|
|||
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
|
||||
z.action == 'reply')[0]
|
||||
name = ''
|
||||
for to in rec.to_ids:
|
||||
name += to.name + ','
|
||||
dic = self.set_docs_dic(rec, 'out_in', name, trasc.to_id.name)
|
||||
docs.append(dic)
|
||||
name = ''
|
||||
for to in rec.to_ids:
|
||||
name += to.name + ','
|
||||
dic = self.set_docs_dic(rec, 'out_in', name, trasc.to_id.name)
|
||||
docs.append(dic)
|
||||
internal_ids = self.env['internal.transaction'].search(domain, order="transaction_date desc")
|
||||
if internal_ids:
|
||||
today = fields.date.today()
|
||||
|
|
|
|||
Loading…
Reference in New Issue