From 6b55f66f02b8ee2bfc9f1a11bc176c776f03366e Mon Sep 17 00:00:00 2001
From: John Clarke <clarkejjm@gmail.com>
Date: Thu, 11 Jun 2020 10:24:48 -0600
Subject: [PATCH 1/3] =?UTF-8?q?Stock=20Ageing=20TypeError:=20=E2=80=98<?=
 =?UTF-8?q?=E2=80=99=20not=20supported=20between=20instances=20of=20?=
 =?UTF-8?q?=E2=80=98int=E2=80=99=20and=20=E2=80=98str=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605
---
 erpnext/stock/report/stock_ageing/stock_ageing.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py
index af99780155..53bdfb523d 100644
--- a/erpnext/stock/report/stock_ageing/stock_ageing.py
+++ b/erpnext/stock/report/stock_ageing/stock_ageing.py
@@ -180,14 +180,14 @@ def get_fifo_queue(filters, sle=None):
 				qty_to_pop = abs(d.actual_qty)
 				while qty_to_pop:
 					batch = fifo_queue[0] if fifo_queue else [0, None]
-					if 0 < batch[0] <= qty_to_pop:
+					if 0 < cint(batch[0]) <= qty_to_pop:
 						# if batch qty > 0
 						# not enough or exactly same qty in current batch, clear batch
-						qty_to_pop -= batch[0]
+						qty_to_pop -= cint(batch[0])
 						transferred_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0))
 					else:
 						# all from current batch
-						batch[0] -= qty_to_pop
+						cint(batch[0]) -= qty_to_pop
 						transferred_item_details[(d.voucher_no, d.name)].append([qty_to_pop, batch[1]])
 						qty_to_pop = 0
 
@@ -262,4 +262,4 @@ def get_chart_data(data, filters):
 			]
 		},
 		"type" : "bar"
-	}
\ No newline at end of file
+	}

From 677978dd00e92533d7897dec041a901c0e3cbba9 Mon Sep 17 00:00:00 2001
From: John Clarke <clarkejjm@gmail.com>
Date: Fri, 12 Jun 2020 05:53:24 -0600
Subject: [PATCH 2/3] Update stock_ageing.py

As reviewer Deepesh Garg advised thanks!  batch[0] can be int of float - see line 49 - so change proposed cint to flt
---
 erpnext/stock/report/stock_ageing/stock_ageing.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py
index 53bdfb523d..eea2312a24 100644
--- a/erpnext/stock/report/stock_ageing/stock_ageing.py
+++ b/erpnext/stock/report/stock_ageing/stock_ageing.py
@@ -180,14 +180,14 @@ def get_fifo_queue(filters, sle=None):
 				qty_to_pop = abs(d.actual_qty)
 				while qty_to_pop:
 					batch = fifo_queue[0] if fifo_queue else [0, None]
-					if 0 < cint(batch[0]) <= qty_to_pop:
+					if 0 < flt(batch[0]) <= qty_to_pop:
 						# if batch qty > 0
 						# not enough or exactly same qty in current batch, clear batch
-						qty_to_pop -= cint(batch[0])
+						qty_to_pop -= flt(batch[0])
 						transferred_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0))
 					else:
 						# all from current batch
-						cint(batch[0]) -= qty_to_pop
+						flt(batch[0]) -= qty_to_pop
 						transferred_item_details[(d.voucher_no, d.name)].append([qty_to_pop, batch[1]])
 						qty_to_pop = 0
 

From 85f237257a57cc6e92d04c57515e69bab52661e8 Mon Sep 17 00:00:00 2001
From: John Clarke <clarkejjm@gmail.com>
Date: Fri, 12 Jun 2020 07:22:14 -0600
Subject: [PATCH 3/3] Thanks so much for your pointer Marica - that violation
 is clear and obvious to me in retrospect, but a good relearning experience in
 any case

---
 erpnext/stock/report/stock_ageing/stock_ageing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py
index eea2312a24..723ed5c1c4 100644
--- a/erpnext/stock/report/stock_ageing/stock_ageing.py
+++ b/erpnext/stock/report/stock_ageing/stock_ageing.py
@@ -187,7 +187,7 @@ def get_fifo_queue(filters, sle=None):
 						transferred_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0))
 					else:
 						# all from current batch
-						flt(batch[0]) -= qty_to_pop
+						batch[0] -= qty_to_pop
 						transferred_item_details[(d.voucher_no, d.name)].append([qty_to_pop, batch[1]])
 						qty_to_pop = 0