diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 88fa94bb675..d576a66835a 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -1044,8 +1044,8 @@ class SalesInvoice(SellingController): frappe.throw(_("Serial Numbers in row {0} does not match with Delivery Note").format(item.idx)) if item.serial_no and cint(item.qty) != len(si_serial_nos): - frappe.throw(_("Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.".format( - item.idx, item.qty, item.item_code, len(si_serial_nos)))) + frappe.throw(_("Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.").format( + item.idx, item.qty, item.item_code, len(si_serial_nos))) def validate_serial_against_sales_invoice(self): """ check if serial number is already used in other sales invoice """ diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py index df583efcb93..69caabd7249 100644 --- a/erpnext/controllers/buying_controller.py +++ b/erpnext/controllers/buying_controller.py @@ -500,8 +500,8 @@ class BuyingController(StockController): item_row = item_row.as_dict() for fieldname in field_list: if flt(item_row[fieldname]) < 0: - frappe.throw(_("Row #{0}: {1} can not be negative for item {2}".format(item_row['idx'], - frappe.get_meta(item_row.doctype).get_label(fieldname), item_row['item_code']))) + frappe.throw(_("Row #{0}: {1} can not be negative for item {2}").format(item_row['idx'], + frappe.get_meta(item_row.doctype).get_label(fieldname), item_row['item_code'])) def check_for_on_hold_or_closed_status(self, ref_doctype, ref_fieldname): for d in self.get("items"): diff --git a/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py b/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py index 6f9e4a9799d..a8ebe8610ec 100644 --- a/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +++ b/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py @@ -32,8 +32,8 @@ class HotelRoomReservation(Document): + d.qty + self.rooms_booked.get(d.item) total_rooms = self.get_total_rooms(d.item) if total_rooms < rooms_booked: - frappe.throw(_("Hotel Rooms of type {0} are unavailable on {1}".format(d.item, - frappe.format(day, dict(fieldtype="Date")))), exc=HotelRoomUnavailableError) + frappe.throw(_("Hotel Rooms of type {0} are unavailable on {1}").format(d.item, + frappe.format(day, dict(fieldtype="Date"))), exc=HotelRoomUnavailableError) self.rooms_booked[d.item] += rooms_booked @@ -74,8 +74,8 @@ class HotelRoomReservation(Document): net_rate += day_rate[0][0] else: frappe.throw( - _("Please set Hotel Room Rate on {}".format( - frappe.format(day, dict(fieldtype="Date")))), exc=HotelRoomPricingNotSetError) + _("Please set Hotel Room Rate on {}").format( + frappe.format(day, dict(fieldtype="Date"))), exc=HotelRoomPricingNotSetError) d.rate = net_rate d.amount = net_rate * flt(d.qty) self.net_total += d.amount diff --git a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py index 25cda4444bc..1cc23812f75 100644 --- a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +++ b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py @@ -97,9 +97,9 @@ class DailyWorkSummary(Document): return dict(replies=replies, original_message=dws_group.message, - title=_('Work Summary for {0}'.format( + title=_('Work Summary for {0}').format( global_date_format(self.creation) - )), + ), did_not_reply=', '.join(did_not_reply) or '', did_not_reply_title=_('No replies from')) diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py index 0f9156a6b4c..3a187baf9b4 100644 --- a/erpnext/regional/india/utils.py +++ b/erpnext/regional/india/utils.py @@ -550,9 +550,9 @@ def validate_sales_invoice(doc): for fieldname in reqd_fields: if not doc.get(fieldname): - frappe.throw(_('{} is required to generate e-Way Bill JSON'.format( + frappe.throw(_('{} is required to generate e-Way Bill JSON').format( doc.meta.get_label(fieldname) - ))) + )) if len(doc.company_gstin) < 15: frappe.throw(_('You must be a registered supplier to generate e-Way Bill')) diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py index 4f9cc7ff7a0..2c5ab7cb91b 100644 --- a/erpnext/regional/report/gstr_1/gstr_1.py +++ b/erpnext/regional/report/gstr_1/gstr_1.py @@ -719,9 +719,9 @@ def get_company_gstin_number(company): if gstin: return gstin[0]["gstin"] else: - frappe.throw(_("Please set valid GSTIN No. in Company Address for company {0}".format( + frappe.throw(_("Please set valid GSTIN No. in Company Address for company {0}").format( frappe.bold(company) - ))) + )) @frappe.whitelist() def download_json_file():