nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-27 22:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,207 Commits 623 Branches 1,804 Tags
9312a5b762d2a8efafa6bc21faafda2145f574e2
Commit Graph

10930 Commits

Author SHA1 Message Date
mergify[bot]
3952f5d913 chore: fix flaky test in Tax Withholding Details (backport #48375) (#48394) 
* chore: fix flaky test in Tax Withholding Details

(cherry picked from commit 14a2f98521)

* fix: sort tax withhodling details report by section code and transaction date

(cherry picked from commit 7ee2418f60)

* fix(test): flaky budget test case

(cherry picked from commit 704223e5d0)

* fix(test): import get_accumulated_monthly_budget

---------

Co-authored-by: ljain112 <ljain112@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2025-07-04 12:05:55 +05:30
ravibharathi656
ff362843cb fix: use gain_loss_posting_date instead of today 
(cherry picked from commit 0585bc5aef)
 2025-07-01 10:12:35 +00:00
ruthra kumar
037ef10fcb Merge pull request #48292 from ljain112/fix-bank-cleareance-v15 
perf: use set_value for updating bank clearance_date
 2025-07-01 11:58:13 +05:30
ravibharathi656
9b8fffd1d4 fix: use company default currency in amount_eligible_for_commission 
(cherry picked from commit 7c7b392789)
 2025-06-30 04:39:08 +00:00
Rohit Waghchaure
cfc8c610fa fix: accounting entries for standalone credit notes 
(cherry picked from commit 52177cffcd)
 2025-06-30 04:09:56 +00:00
ljain112
a0db227a7a perf: use set_value for updating bank clearance_date 2025-06-27 14:12:14 +05:30
ruthra kumar
3a6956ba05 Merge pull request #48230 from frappe/mergify/bp/version-15-hotfix/pr-47627 
fix: auto append_taxes_from_item_tax_template in backend (backport #47627)
 2025-06-24 17:38:14 +05:30
ruthra kumar
463ad0a163 Merge pull request #48235 from frappe/mergify/bp/version-15-hotfix/pr-48079 
fix: get already billed amount from current doc instead of database (backport #48079)
 2025-06-24 17:35:37 +05:30
Khushi Rawat
889a14b557 Merge pull request #48120 from aerele/fix/asset-invoice-cancel-validation 
fix(asset-invoice): handle asset invoice cancellation
 2025-06-24 16:24:18 +05:30
ljain112
0b96e1e3ef chore: resolve conflicts 2025-06-24 15:52:24 +05:30
Lakshit Jain
c2c5e45bc6 fix: get already billed amount from current doc instead of database (#48079) 
* fix: get already billed amount from current doc instead of database

* fix: throw overbilling validation for all items in single call

* refactor: minor fixes

---------

Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
(cherry picked from commit 47c3c4808e)
 2025-06-24 10:11:43 +00:00
ljain112
1ccdb67c55 chore: resolve conflicts 2025-06-24 15:31:34 +05:30
ljain112
2bf8dffb60 fix: auto append_taxes_from_item_tax_template in backend 
(cherry picked from commit 4cb1fa2b6b)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
#	erpnext/controllers/tests/test_accounts_controller.py
 2025-06-24 09:48:21 +00:00
rohitwaghchaure
764c81a146 Merge pull request #48215 from frappe/mergify/bp/version-15-hotfix/pr-48195 
fix: incoming rate for the stand-alone credit note (backport #48195)
 2025-06-24 12:02:17 +05:30
rohitwaghchaure
f560286610 chore: fix conflicts 2025-06-24 11:34:04 +05:30
ravibharathi656
4341ac7e7a fix: update journal entry title on amend 
(cherry picked from commit 4a3ee4df29)
 2025-06-24 04:04:04 +00:00
Rohit Waghchaure
ad40bfe4ea fix: incoming rate for the stand-alone credit note 
(cherry picked from commit b06eca8dcb)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
 2025-06-23 15:40:49 +00:00
i-am-vimal
153ed04161 fix: add validation for exchange gain/loss entries 
(cherry picked from commit 5c9eddd31e)
 2025-06-23 14:00:09 +00:00
ruthra kumar
b6dda08290 chore: better label and desciption for pegged currency flag 
(cherry picked from commit c5cd7d91c4)
 2025-06-23 12:14:42 +00:00
mergify[bot]
f0ddf1b223 fix: naming series field in bank transaction (backport #48121) (#48149) 
fix: naming series field in bank transaction (#48121)

* fix: naming series field in bank transaction

* fix: default naming_series

(cherry picked from commit c94764ab52)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-06-20 11:52:53 +05:30
mergify[bot]
7c2bf026ef fix: coa reset root_type on unchecking is_group on new_node (backport #48156) (#48160) 
fix: coa reset root_type on unchecking is_group on new_node (#48156)

(cherry picked from commit 2f8893439f)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-06-19 17:54:08 +05:30
mergify[bot]
bf61014fe5 test: purchase invoice provisional accounting entry (backport #48112) (#48134) 
test: purchase invoice provisional accounting entry (#48112)

* test: fixed purchase invoice provisional accounting entry

* test: added tests for multi currency

(cherry picked from commit 80f992c87f)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-06-19 13:01:51 +05:30
Bhavan23
ea3015a450 test(sales-invoice): add test case for asset invoice cancellation 2025-06-18 19:21:14 +05:30
Bhavan23
d3daeaf475 fix(asset-invoice): handle asset invoice cancellation 2025-06-18 10:54:24 +05:30
ruthra kumar
31cb78e3f3 Merge pull request #48101 from frappe/mergify/bp/version-15-hotfix/pr-47898 
Pegged currency (backport #47898)
 2025-06-17 16:00:54 +05:30
Karuppasamy
cb58d05777 Merge pull request #47898 from aerele/pegged-currency 
Pegged currency

(cherry picked from commit cec0ffad06)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/patches.txt
#	erpnext/setup/install.py
 2025-06-17 15:32:36 +05:30
ruthra kumar
84f9a1fb2d Merge pull request #48094 from frappe/mergify/bp/version-15-hotfix/pr-48082 
fix:add validation for party type (backport #48082)
 2025-06-17 15:14:34 +05:30
AlcinSnowlina
baa08ce496 fix: add validation for party type 
(cherry picked from commit 7c9d6aaae2)
 2025-06-17 08:26:07 +00:00
l0gesh29
1f1e88d52e test: add test for debit/credit calculations in exchange gain/loss account filter in GL 
(cherry picked from commit 6ea32a8762)

# Conflicts:
#	erpnext/accounts/report/general_ledger/test_general_ledger.py
 2025-06-17 13:42:02 +05:30
l0gesh29
97f13049ee fix: add validation for exchange gain/loss entries 
(cherry picked from commit d992f67658)
 2025-06-17 08:04:57 +00:00
mergify[bot]
4d18fd0e80 fix: budget naming series (backport #48075) (#48080) 
* fix: budget naming series (#48075)

(cherry picked from commit c4bdf2a721)

# Conflicts:
#	erpnext/accounts/doctype/budget/budget.json

* chore: resolve conflict

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-06-17 11:21:54 +05:30
l0gesh29
23db22ac0b fix: add validation for calculate ageing with filter for summary and other reports 
(cherry picked from commit c630aa9fe8)
 2025-06-16 03:10:11 +00:00
mergify[bot]
db9f0b6f38 fix: pos invoice consolidation row refer issue (backport #48057) (#48058) 
fix: pos invoice consolidation row refer issue (#48057)

(cherry picked from commit 4178d9e2a1)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-06-13 20:08:22 +05:30
mergify[bot]
56311e6e1e build(deps): bump rapidfuzz (backport #47503) (#48051) 
build(deps): bump rapidfuzz (#47503)


(cherry picked from commit c275c55d6c)

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
Co-authored-by: Akhil Narang <me@akhilnarang.dev>
 2025-06-13 16:01:08 +05:30
Sagar Vora
823cfeaf4f Merge pull request #47978 from frappe/mergify/bp/version-15-hotfix/pr-47976 
fix: throw permission error (backport #47976)
 2025-06-10 07:37:10 +00:00
priyanshshah2442
23b5d2db2c fix: add draft transactions also in calculated mismatch report 
(cherry picked from commit 4e1abc1814)
 2025-06-10 07:12:03 +00:00
priyanshshah2442
59dd5fee26 fix: fieldtype to Currency for discount amounts 
(cherry picked from commit f781a39dbe)
 2025-06-10 06:04:09 +00:00
Sagar Vora
35035c2a31 fix: remove currency col 
(cherry picked from commit 9bf9b34ac4)
 2025-06-10 06:04:08 +00:00
Sagar Vora
78c63869e0 fix: changes in report 
(cherry picked from commit 33e793354c)
 2025-06-10 06:04:08 +00:00
priyanshshah2442
06ea957ae5 fix: test case to verify correct setting of discount amount and percentage 
(cherry picked from commit 3f0c5be5d9)
 2025-06-10 06:04:08 +00:00
priyanshshah2442
d24c2c4cca fix: ensure proper float conversion for discount values 
(cherry picked from commit 3dcb801a37)
 2025-06-10 06:04:07 +00:00
Sagar Vora
5237ff8d94 fix: changes to report and patch 
(cherry picked from commit daad6137f8)
 2025-06-10 06:04:07 +00:00
priyanshshah2442
b3eb49d39d feat: report to verify discount amount mismatch 
(cherry picked from commit 62dd6df24f)
 2025-06-10 06:04:07 +00:00
ruthra kumar
7ecb4d3d6f Merge pull request #47968 from aerele/validate-intercompany-rate 
Add validation for inter company transactions rate
 2025-06-10 11:12:26 +05:30
l0gesh29
66f41d44c4 fix: add .length in list validation (#47974) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit c8cec8cedf)
 2025-06-09 23:16:36 +00:00
Aayush Dalal
9167d2ef64 fix: throw permission error (#47976) 
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
(cherry picked from commit 8b6a8d0c4f)

# Conflicts:
#	erpnext/stock/utils.py
 2025-06-09 17:29:58 +00:00
ravibharathi656
3aee14176c test: pass sales invoice name instead of doc 2025-06-09 19:12:51 +05:30
ravibharathi656
d6796da464 test: add unit test for inter company transaction rate validation 2025-06-09 19:12:51 +05:30
ravibharathi656
9a47c507c0 feat: add validation for inter company transactions 2025-06-09 19:12:51 +05:30
l0gesh29
a2cdd91a0d fix: add user permission while fetching ple 
(cherry picked from commit 1a4bb30923)
 2025-06-09 09:53:13 +00:00