Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: port from hotfix (#18974)

Browse Source 
* fix: '>' not supported between instances of 'int' and 'str'

* fix: not able to save item because price list has disabled
This commit is contained in:
rohitwaghchaure 2019-09-10 10:47:36 +05:30 committed by Nabin Hait
parent 69aeff15ef
commit d312d11062
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/stock/doctype/item_price/item_price.py
View File

@ -32,10 +32,16 @@ class ItemPrice(Document):
def update_price_list_details(self): def update_price_list_details(self):
if self.price_list: if self.price_list:
self.buying, self.selling, self.currency = \ price_list_details = frappe.db.get_value("Price List",
frappe.db.get_value("Price List", {"name": self.price_list, "enabled": 1},
{"name": self.price_list, "enabled": 1}, ["buying", "selling", "currency"])
["buying", "selling", "currency"])
if not price_list_details:
link = frappe.utils.get_link_to_form('Price List', self.price_list)
frappe.throw("The price list {0} does not exists or disabled".
format(link))
self.buying, self.selling, self.currency = price_list_details
def update_item_details(self): def update_item_details(self):
if self.item_code: if self.item_code:

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

@ -74,7 +74,7 @@
{ {
"description": "Identification of the package for the delivery (for print)", "description": "Identification of the package for the delivery (for print)",
"fieldname": "from_case_no", "fieldname": "from_case_no",
"fieldtype": "Data", "fieldtype": "Int",
"in_list_view": 1, "in_list_view": 1,
"label": "From Package No.", "label": "From Package No.",
"no_copy": 1, "no_copy": 1,
@ -88,7 +88,7 @@
{ {
"description": "If more than one package of the same type (for print)", "description": "If more than one package of the same type (for print)",
"fieldname": "to_case_no", "fieldname": "to_case_no",
"fieldtype": "Data", "fieldtype": "Int",
"in_list_view": 1, "in_list_view": 1,
"label": "To Package No.", "label": "To Package No.",
"no_copy": 1, "no_copy": 1,
@ -180,7 +180,7 @@
"icon": "fa fa-suitcase", "icon": "fa fa-suitcase",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2019-05-31 04:45:08.082862", "modified": "2019-09-09 04:45:08.082862",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Packing Slip", "name": "Packing Slip",
@ -261,4 +261,4 @@
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC"
} }

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

@ -53,7 +53,6 @@ class PackingSlip(Document):
frappe.msgprint(_("'To Case No.' cannot be less than 'From Case No.'"), frappe.msgprint(_("'To Case No.' cannot be less than 'From Case No.'"),
raise_exception=1) raise_exception=1)
res = frappe.db.sql("""SELECT name FROM `tabPacking Slip` res = frappe.db.sql("""SELECT name FROM `tabPacking Slip`
WHERE delivery_note = %(delivery_note)s AND docstatus = 1 AND WHERE delivery_note = %(delivery_note)s AND docstatus = 1 AND
((from_case_no BETWEEN %(from_case_no)s AND %(to_case_no)s) ((from_case_no BETWEEN %(from_case_no)s AND %(to_case_no)s)