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

Merge pull request #26123 from nextchamp-saqib/pos-change-gl-fix-pre-release

Browse Source 
fix(pos): unsupported operand type -= for 'float' and 'NoneType'
This commit is contained in:
Nabin Hait 2021-06-21 11:27:59 +05:30 committed by GitHub
commit 9cab26b7bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -989,7 +989,7 @@ class SalesInvoice(SellingController):
for payment_mode in self.payments:
if skip_change_gl_entries and payment_mode.account == self.account_for_change_amount:
payment_mode.base_amount -= self.change_amount
payment_mode.base_amount -= flt(self.change_amount)
if payment_mode.amount:
# POS, make payment entries

2
erpnext/public/js/controllers/transaction.js
View File

@ -387,7 +387,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(this.frm.doc.scan_barcode) {
frappe.call({
method: "erpnext.selling.page.point_of_sale.point_of_sale.search_serial_or_batch_or_barcode_number",
method: "erpnext.selling.page.point_of_sale.point_of_sale.search_for_serial_or_batch_or_barcode_number",
args: { search_value: this.frm.doc.scan_barcode }
}).then(r => {
const data = r && r.message;