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

fix: POS Opening Entry with empty balance detail rows (#24876)

Browse Source
This commit is contained in:
Marica 2021-03-15 12:49:14 +05:30 committed by GitHub
parent 46d5431bad
commit 4ceea333a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py
View File

@ -20,15 +20,16 @@ class POSOpeningEntry(StatusUpdater):
if not cint(frappe.db.get_value("User", self.user, "enabled")): if not cint(frappe.db.get_value("User", self.user, "enabled")):
frappe.throw(_("User {} is disabled. Please select valid user/cashier").format(self.user)) frappe.throw(_("User {} is disabled. Please select valid user/cashier").format(self.user))
def validate_payment_method_account(self): def validate_payment_method_account(self):
invalid_modes = [] invalid_modes = []
for d in self.balance_details: for d in self.balance_details:
account = frappe.db.get_value("Mode of Payment Account", if d.mode_of_payment:
{"parent": d.mode_of_payment, "company": self.company}, "default_account") account = frappe.db.get_value("Mode of Payment Account",
if not account: {"parent": d.mode_of_payment, "company": self.company}, "default_account")
invalid_modes.append(get_link_to_form("Mode of Payment", d.mode_of_payment)) if not account:
invalid_modes.append(get_link_to_form("Mode of Payment", d.mode_of_payment))
if invalid_modes: if invalid_modes:
if invalid_modes == 1: if invalid_modes == 1:
msg = _("Please set default Cash or Bank account in Mode of Payment {}") msg = _("Please set default Cash or Bank account in Mode of Payment {}")

4
erpnext/selling/page/point_of_sale/pos_controller.js
View File

@ -93,6 +93,10 @@ erpnext.PointOfSale.Controller = class {
}) })
return frappe.utils.play_sound("error"); return frappe.utils.play_sound("error");
} }
// filter balance details for empty rows
balance_details = balance_details.filter(d => d.mode_of_payment);
const method = "erpnext.selling.page.point_of_sale.point_of_sale.create_opening_voucher"; const method = "erpnext.selling.page.point_of_sale.point_of_sale.create_opening_voucher";
const res = await frappe.call({ method, args: { pos_profile, company, balance_details }, freeze:true }); const res = await frappe.call({ method, args: { pos_profile, company, balance_details }, freeze:true });
!res.exc && me.prepare_app_defaults(res.message); !res.exc && me.prepare_app_defaults(res.message);