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

Merge branch 'develop' into drop-shipping

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

6
erpnext/accounts/doctype/gl_entry/gl_entry.py
View File

@ -290,4 +290,8 @@ def rename_temporarily_named_docs(doctype):
oldname = doc.name oldname = doc.name
set_name_from_naming_options(frappe.get_meta(doctype).autoname, doc) set_name_from_naming_options(frappe.get_meta(doctype).autoname, doc)
newname = doc.name newname = doc.name
frappe.db.sql("""UPDATE `tab{}` SET name = %s, to_rename = 0 where name = %s""".format(doctype), (newname, oldname)) frappe.db.sql(
"UPDATE `tab{}` SET name = %s, to_rename = 0 where name = %s".format(doctype),
(newname, oldname),
auto_commit=True
)

2
erpnext/stock/get_item_details.py
View File

@ -110,7 +110,7 @@ def get_item_details(args, doc=None, for_validate=False, overwrite_warehouse=Tru
get_gross_profit(out) get_gross_profit(out)
if args.doctype == 'Material Request': if args.doctype == 'Material Request':
out.rate = args.rate or out.price_list_rate out.rate = args.rate or out.price_list_rate
out.amount = flt(args.qty * out.rate) out.amount = flt(args.qty) * flt(out.rate)
return out return out