nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 00:01:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: '>' not supported between instances of 'int' and 'str' (#18966)

Browse Source
This commit is contained in:
rohitwaghchaure
2019-09-09 13:19:22 +05:30
committed by Nabin Hait
parent 0bc849975c
commit b53e4404dc
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/packing_slip/packing_slip.json
View File

@@ -248,7 +248,7 @@
"description": "Identification of the package for the delivery (for print)",
"fetch_if_empty": 0,
"fieldname": "from_case_no",
"fieldtype": "Data",
"fieldtype": "Int",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -313,7 +313,7 @@
"description": "If more than one package of the same type (for print)",
"fetch_if_empty": 0,
"fieldname": "to_case_no",
"fieldtype": "Data",
"fieldtype": "Int",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -773,7 +773,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2019-05-30 21:50:38.260908",
"modified": "2019-09-09 12:40:22.497613",
"modified_by": "Administrator",
"module": "Stock",
"name": "Packing Slip",

3
erpnext/stock/doctype/packing_slip/packing_slip.py
View File

@@ -49,11 +49,10 @@ class PackingSlip(Document):
frappe.msgprint(_("Please specify a valid 'From Case No.'"), raise_exception=1)
elif not self.to_case_no:
self.to_case_no = self.from_case_no
elif self.from_case_no > self.to_case_no:
elif cint(self.from_case_no) > cint(self.to_case_no):
frappe.msgprint(_("'To Case No.' cannot be less than 'From Case No.'"),
raise_exception=1)
res = frappe.db.sql("""SELECT name FROM `tabPacking Slip`
WHERE delivery_note = %(delivery_note)s AND docstatus = 1 AND
((from_case_no BETWEEN %(from_case_no)s AND %(to_case_no)s)