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

[Hotfix] Selecting create on blank field throws error (#13014)

Browse Source 
* selecting create on blank field error fix

* error when fetching default_print_format
This commit is contained in:
Zarrar 2018-02-21 11:13:14 +05:30 committed by Rushabh Mehta
parent f65afac353
commit bc5515651b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/delivery_trip/delivery_trip.py
View File

@ -163,9 +163,9 @@ def notify_customers(docname, date, driver, vehicle, sender_email, delivery_noti
if delivery_stop_info.delivery_notes: if delivery_stop_info.delivery_notes:
delivery_notes = (delivery_stop_info.delivery_notes).split(",") delivery_notes = (delivery_stop_info.delivery_notes).split(",")
default_print_format = frappe.get_meta('Delivery Note').default_print_format
attachments = [] attachments = []
for delivery_note in delivery_notes: for delivery_note in delivery_notes:
default_print_format = frappe.get_value('Delivery Note', delivery_note, 'default_print_format')
attachments.append( attachments.append(
frappe.attach_print('Delivery Note', frappe.attach_print('Delivery Note',
delivery_note, delivery_note,

2
erpnext/utilities/user_progress.py
View File

@ -45,7 +45,7 @@ def get_slide_settings():
help=_("Set a sales goal you'd like to achieve for your company."), help=_("Set a sales goal you'd like to achieve for your company."),
fields=[ fields=[
{"fieldtype":"Currency", "fieldname":"monthly_sales_target", {"fieldtype":"Currency", "fieldname":"monthly_sales_target",
"label":_("Monthly Sales Target (" + currency + ")")}, "label":_("Monthly Sales Target (" + currency + ")"), "reqd":1},
], ],
submit_method="erpnext.utilities.user_progress_utils.set_sales_target", submit_method="erpnext.utilities.user_progress_utils.set_sales_target",
done_state_title=_("Go to " + company), done_state_title=_("Go to " + company),