nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35262 from akiratfli/fix-bad-string

Browse Source 
fix: bad strings format for translations
This commit is contained in:
Deepesh Garg
2023-05-14 08:06:24 +05:30
committed by GitHub
parent c30dda3328 5a54296686
commit 77cf2e5475
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/bank_transaction/bank_transaction.py
View File

@@ -46,7 +46,7 @@ class BankTransaction(StatusUpdater):
def add_payment_entries(self, vouchers): def add_payment_entries(self, vouchers):
"Add the vouchers with zero allocation. Save() will perform the allocations and clearance" "Add the vouchers with zero allocation. Save() will perform the allocations and clearance"
if 0.0 >= self.unallocated_amount: if 0.0 >= self.unallocated_amount:
frappe.throw(frappe._(f"Bank Transaction {self.name} is already fully reconciled")) frappe.throw(frappe._("Bank Transaction {0} is already fully reconciled").format(self.name))
added = False added = False
for voucher in vouchers: for voucher in vouchers:
@@ -114,9 +114,7 @@ class BankTransaction(StatusUpdater):
elif 0.0 > unallocated_amount: elif 0.0 > unallocated_amount:
self.db_delete_payment_entry(payment_entry) self.db_delete_payment_entry(payment_entry)
frappe.throw( frappe.throw(frappe._("Voucher {0} is over-allocated by {1}").format(unallocated_amount))
frappe._(f"Voucher {payment_entry.payment_entry} is over-allocated by {unallocated_amount}")
)
self.reload() self.reload()
@@ -178,7 +176,9 @@ def get_clearance_details(transaction, payment_entry):
if gle["gl_account"] == gl_bank_account: if gle["gl_account"] == gl_bank_account:
if gle["amount"] <= 0.0: if gle["amount"] <= 0.0:
frappe.throw( frappe.throw(
frappe._(f"Voucher {payment_entry.payment_entry} value is broken: {gle['amount']}") frappe._("Voucher {0} value is broken: {1}").format(
payment_entry.payment_entry, gle["amount"]
)
) )
unmatched_gles -= 1 unmatched_gles -= 1

4
erpnext/stock/doctype/pick_list/pick_list.py
View File

@@ -172,8 +172,8 @@ class PickList(Document):
if (row.picked_qty / row.stock_qty) * 100 > over_delivery_receipt_allowance: if (row.picked_qty / row.stock_qty) * 100 > over_delivery_receipt_allowance:
frappe.throw( frappe.throw(
_( _(
f"You are picking more than required quantity for the item {row.item_code}. Check if there is any other pick list created for the sales order {row.sales_order}." "You are picking more than required quantity for the item {0}. Check if there is any other pick list created for the sales order {1}."
) ).format(row.item_code, row.sales_order)
) )
@frappe.whitelist() @frappe.whitelist()