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

Merge branch 'version-13-pre-release' into version-13

Browse Source
This commit is contained in:
Nabin Hait 2021-06-21 11:28:57 +05:30
commit 6495a4d2ed
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '13.5.0' __version__ = '13.5.1'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

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 = erpnext.taxes_and_totals.extend({
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;