nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-13-hotfix' into fetch-valuation-rate

Browse Source
This commit is contained in:
Saqib Ansari
2022-02-21 17:56:11 +05:30
committed by GitHub
parent 1b0ee018b5 9adbaaea4a
commit f107a6f3f2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
View File

@@ -43,7 +43,7 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map):
if entry.account in tds_accounts: if entry.account in tds_accounts:
tds_deducted += (entry.credit - entry.debit) tds_deducted += (entry.credit - entry.debit)
total_amount_credited += (entry.credit - entry.debit) total_amount_credited += entry.credit
if tds_deducted: if tds_deducted:
row = { row = {

2
erpnext/stock/doctype/item/item.js
View File

@@ -594,7 +594,7 @@ $.extend(erpnext.item, {
const increment = r.message.increment; const increment = r.message.increment;
let values = []; let values = [];
for(var i = from; i <= to; i += increment) { for(var i = from; i <= to; i = flt(i + increment, 6)) {
values.push(i); values.push(i);
} }
attr_val_fields[d.attribute] = values; attr_val_fields[d.attribute] = values;