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

fix: Re-order Item Error Email format (#21342)

Browse Source 
* fix: Re-order Item Error Email format

* fix: Translated strings
This commit is contained in:
Marica
2020-04-21 12:52:29 +05:30
committed by GitHub
parent a92eaff83b
commit 9ea1ad4051
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/stock/reorder_item.py
View File

@@ -4,6 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
import erpnext import erpnext
import json
from frappe.utils import flt, nowdate, add_days, cint from frappe.utils import flt, nowdate, add_days, cint
from frappe import _ from frappe import _
@@ -198,19 +199,16 @@ def send_email_notification(mr_list):
subject=_('Auto Material Requests Generated'), message = msg) subject=_('Auto Material Requests Generated'), message = msg)
def notify_errors(exceptions_list): def notify_errors(exceptions_list):
subject = "[Important] [ERPNext] Auto Reorder Errors" subject = _("[Important] [ERPNext] Auto Reorder Errors")
content = """Dear System Manager, content = _("Dear System Manager,") + "<br>" + _("An error occured for certain Items while creating Material Requests based on Re-order level. \
Please rectify these issues :") + "<br>"
An error occured for certain Items while creating Material Requests based on Re-order level. for exception in exceptions_list:
exception = json.loads(exception)
error_message = """<div class='small text-muted'>{0}</div><br>""".format(_(exception.get("message")))
content += error_message
Please rectify these issues: content += _("Regards,") + "<br>" + _("Administrator")
---
<pre>
%s
</pre>
---
Regards,
Administrator""" % ("\n\n".join(exceptions_list),)
from frappe.email import sendmail_to_system_managers from frappe.email import sendmail_to_system_managers
sendmail_to_system_managers(subject, content) sendmail_to_system_managers(subject, content)

6
erpnext/utilities/transaction_base.py
View File

@@ -126,7 +126,7 @@ class TransactionBase(StatusUpdater):
frappe.msgprint(_("Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ") frappe.msgprint(_("Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ")
.format(d.idx, ref_dt, d.get(ref_dn_field), d.rate, ref_rate)) .format(d.idx, ref_dt, d.get(ref_dn_field), d.rate, ref_rate))
frappe.throw(_("To allow different rates, disable the {0} checkbox in {1}.") frappe.throw(_("To allow different rates, disable the {0} checkbox in {1}.")
.format(frappe.bold("Maintain Same Rate Throughout Sales Cycle"), .format(frappe.bold(_("Maintain Same Rate Throughout Sales Cycle")),
get_link_to_form("Selling Settings", "Selling Settings", frappe.bold("Selling Settings")))) get_link_to_form("Selling Settings", "Selling Settings", frappe.bold("Selling Settings"))))
def get_link_filters(self, for_doctype): def get_link_filters(self, for_doctype):
@@ -179,4 +179,6 @@ def validate_uom_is_integer(doc, uom_field, qty_fields, child_dt=None):
qty = d.get(f) qty = d.get(f)
if qty: if qty:
if abs(cint(qty) - flt(qty)) > 0.0000001: if abs(cint(qty) - flt(qty)) > 0.0000001:
frappe.throw(_("Quantity ({0}) cannot be a fraction in row {1}").format(qty, d.idx), UOMMustBeIntegerError) frappe.throw(_("Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}.") \
.format(qty, d.idx, frappe.bold(_("Must be Whole Number")), frappe.bold(d.get(uom_field))),
UOMMustBeIntegerError)