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

style: Fix invalid translation syntax usages

Browse Source
This commit is contained in:
Suraj Shetty 2021-02-01 20:09:20 +05:30
parent 8fef3a3814
commit f57efd1150
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/assets/doctype/asset/asset.py
View File

@ -133,9 +133,10 @@ class Asset(AccountsController):
if self.is_existing_asset: return
if self.gross_purchase_amount and self.gross_purchase_amount != self.purchase_receipt_amount:
frappe.throw(_("Gross Purchase Amount should be {} to purchase amount of one single Asset. {}\
Please do not book expense of multiple assets against one single Asset.")
.format(frappe.bold("equal"), "<br>"), title=_("Invalid Gross Purchase Amount"))
error_message = _("Gross Purchase Amount should be <b>equal</b> to purchase amount of one single Asset.")
error_message += "<br>"
error_message += _("Please do not book expense of multiple assets against one single Asset.")
frappe.throw(error_message, title=_("Invalid Gross Purchase Amount"))
def make_asset_movement(self):
reference_doctype = 'Purchase Receipt' if self.purchase_receipt else 'Purchase Invoice'

5
erpnext/hr/doctype/employee_transfer/employee_transfer.py
View File

@ -50,8 +50,9 @@ class EmployeeTransfer(Document):
employee = frappe.get_doc("Employee", self.employee)
if self.create_new_employee_id:
if self.new_employee_id:
frappe.throw(_("Please delete the Employee <a href='/app/Form/Employee/{0}'>{0}</a>\
to cancel this document").format(self.new_employee_id))
frappe.throw(_("Please delete the Employee {0} to cancel this document").format(
"<a href='/app/Form/Employee/{0}'>{0}</a>".format(self.new_employee_id)
))
#mark the employee as active
employee.status = "Active"
employee.relieving_date = ''

5
erpnext/setup/doctype/company/company.py
View File

@ -89,8 +89,9 @@ class Company(NestedSet):
frappe.throw(_("Account {0} does not belong to company: {1}").format(self.get(account[1]), self.name))
if get_account_currency(self.get(account[1])) != self.default_currency:
frappe.throw(_("""{0} currency must be same as company's default currency.
Please select another account""").format(frappe.bold(account[0])))
error_message = _("{0} currency must be same as company's default currency. Please select another account.") \
.format(frappe.bold(account[0]))
frappe.throw(error_message)
def validate_currency(self):
if self.is_new():