nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-30 02:14:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into price_fetch_optimize

Browse Source
This commit is contained in:
Deepesh Garg
2021-12-20 12:17:37 +05:30
parent 6087d5a603 0724a148e6
commit 4b3ef24378
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json
View File

@@ -103,10 +103,18 @@
{ {
"fieldname": "dimension_col_break", "fieldname": "dimension_col_break",
"fieldtype": "Column Break" "fieldtype": "Column Break"
},
{
"description": "Reference number of the invoice from the previous system",
"fieldname": "invoice_number",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Invoice Number"
} }
], ],
"istable": 1, "istable": 1,
"modified": "2019-07-25 15:00:00.460695", "links": [],
"modified": "2021-12-17 19:25:06.053187",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Opening Invoice Creation Tool Item", "name": "Opening Invoice Creation Tool Item",
@@ -116,4 +124,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1
} }

9
erpnext/public/js/utils.js
View File

@@ -430,12 +430,9 @@ erpnext.utils.select_alternate_items = function(opts) {
qty = row.qty; qty = row.qty;
} }
row[item_field] = d.alternate_item; row[item_field] = d.alternate_item;
frm.script_manager.trigger(item_field, row.doctype, row.name) frappe.model.set_value(row.doctype, row.name, 'qty', qty);
.then(() => { frappe.model.set_value(row.doctype, row.name, opts.original_item_field, d.item_code);
frappe.model.set_value(row.doctype, row.name, 'qty', qty); frm.trigger(item_field, row.doctype, row.name);
frappe.model.set_value(row.doctype, row.name,
opts.original_item_field, d.item_code);
});
}); });
refresh_field(opts.child_docname); refresh_field(opts.child_docname);

4
erpnext/stock/stock_ledger.py
View File

@@ -1157,7 +1157,7 @@ def _round_off_if_near_zero(number: float, precision: int = 6) -> float:
""" Rounds off the number to zero only if number is close to zero for decimal """ Rounds off the number to zero only if number is close to zero for decimal
specified in precision. Precision defaults to 6. specified in precision. Precision defaults to 6.
""" """
if flt(number) < (1.0 / (10**precision)): if abs(0.0 - flt(number)) < (1.0 / (10**precision)):
return 0 return 0.0
return flt(number) return flt(number)