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

fix(pos): unsupported operand type -= for 'float' and 'NoneType' (#26096)

Browse Source
This commit is contained in:
Saqib 2021-06-21 10:48:50 +05:30 committed by GitHub
parent 1d3b66eefe
commit 7ff19ebec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@ -257,9 +257,10 @@
}, },
{ {
"default": "1", "default": "1",
"description": "If enabled, ledger entries will be posted for change amount in POS transactions",
"fieldname": "post_change_gl_entries", "fieldname": "post_change_gl_entries",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Post Ledger Entries for Given Change" "label": "Create Ledger Entries for Change Amount"
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
@ -267,7 +268,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2021-05-25 12:34:05.858669", "modified": "2021-06-17 20:26:03.721202",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",

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

@ -989,7 +989,7 @@ class SalesInvoice(SellingController):
for payment_mode in self.payments: for payment_mode in self.payments:
if skip_change_gl_entries and payment_mode.account == self.account_for_change_amount: 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: if payment_mode.amount:
# POS, make payment entries # POS, make payment entries

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

@ -387,7 +387,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
if(this.frm.doc.scan_barcode) { if(this.frm.doc.scan_barcode) {
frappe.call({ 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 } args: { search_value: this.frm.doc.scan_barcode }
}).then(r => { }).then(r => {
const data = r && r.message; const data = r && r.message;