nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,120 Commits 401 Branches 1,700 Tags
b6dda08290dea323cc0bc95a5dc810596146cfc8
Commit Graph

52120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ruthra kumar
1ea876bc7a Merge pull request #48199 from frappe/mergify/bp/version-15-hotfix/pr-48096 
fix: add party and party_name columns to trend reports (backport #48096)
 2025-06-23 15:58:34 +05:30
ruthra kumar
b92662a095 Merge pull request #48197 from frappe/mergify/bp/version-15-hotfix/pr-48186 
fix: add is_group filter for warehouse (backport #48186)
 2025-06-23 15:44:29 +05:30
Karuppasamy923
ceab26d5f1 fix: add party and party_name columns to trend reports 
(cherry picked from commit d05204a960)
 2025-06-23 10:12:18 +00:00
Karuppasamy923
ad0819feee fix: add is_group filter for warehouse 
(cherry picked from commit a29ae9cf90)
 2025-06-23 10:07:10 +00:00
rohitwaghchaure
c5bf889391 Merge pull request #48182 from frappe/mergify/bp/version-15-hotfix/pr-48181 
fix: SABB validation during the LCV (backport #48181)
 2025-06-22 12:17:04 +05:30
Khushi Rawat
7303ee4bea Merge pull request #48175 from frappe/mergify/bp/version-15-hotfix/pr-48151 
fix: duplicate naming issue in contract doctype (backport #48151)
 2025-06-22 00:47:47 +05:30
Rohit Waghchaure
b3d337a45b fix: SABB validation during the LCV 
(cherry picked from commit e958f886d3)
 2025-06-20 15:55:02 +00:00
mergify[bot]
991ddfe187 fix: pos item details fetch uoms on stock settings allow_uom_with_conversion_rate_defined_in_item configuration (backport #48178) (#48179) 
fix: pos item details fetch uoms on stock settings allow_uom_with_conversion_rate_defined_in_item configuration (#48178)

(cherry picked from commit 4aa4942a17)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-06-20 16:23:42 +05:30
Khushi Rawat
881dcf817f fix: resolved conflicts 2025-06-20 14:23:02 +05:30
khushi8112
c07d5b6dec chore: remove unused import 
(cherry picked from commit a1c0727d7b)
 2025-06-20 07:29:35 +00:00
khushi8112
4c2f555379 refactor: remove test case 
(cherry picked from commit 4a027125bc)
 2025-06-20 07:29:35 +00:00
khushi8112
27b5d9493a feat: add search field for contract doctype 
(cherry picked from commit 0665691b88)
 2025-06-20 07:29:35 +00:00
khushi
b3c43e8527 feat: add naming series for Contract Doctype 
(cherry picked from commit bf56c73c6c)

# Conflicts:
#	erpnext/crm/doctype/contract/contract.json
 2025-06-20 07:29:35 +00:00
khushi
1005ee64cd refactor: remove autoname 
(cherry picked from commit a4bb7c4e95)
 2025-06-20 07:29:34 +00:00
khushi
8150638519 chore: linters check 
(cherry picked from commit f7e63936a9)
 2025-06-20 07:29:34 +00:00
khushi
194e15fe6e chore: test contract autoname 
(cherry picked from commit b55d1e61c7)
 2025-06-20 07:29:34 +00:00
khushi
1223f5551f fix: contract autoname 
(cherry picked from commit e13e2bffe2)
 2025-06-20 07:29:33 +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
rohitwaghchaure
f5adfe3f0f Merge pull request #48166 from frappe/mergify/bp/version-15-hotfix/pr-48165 
fix: target inventory dimension for stock entry (backport #48165)
 2025-06-19 20:41:35 +05:30
Rohit Waghchaure
4e70005937 fix: target inventory dimension for stock entry 
(cherry picked from commit d65cb56d66)
 2025-06-19 14:24:39 +00:00
rohitwaghchaure
4eff2b58e6 Merge pull request #48159 from frappe/mergify/bp/version-15-hotfix/pr-48131 
fix: permission issue during reposting (backport #48131)
 2025-06-19 18:08:10 +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
Rohit Waghchaure
6896216276 fix: permission issue during reposting 
(cherry picked from commit dcc9fc2fec)
 2025-06-19 12:14:44 +00:00
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
rohitwaghchaure
7fbefef72a Merge pull request #48135 from aerele/handle-return-qty 
fix: modify query to fetch valid return qty
 2025-06-18 20:24:46 +05:30
ravibharathi656
9146bd95a4 test: update import for change_settings 2025-06-18 18:41:01 +05:30
ravibharathi656
4576fcd96f test: add test for validating sales invoice qty after return 2025-06-18 18:16:06 +05:30
ravibharathi656
764c71d3e1 fix: modify query to fetch valid return qty 2025-06-18 18:16:06 +05:30
mergify[bot]
f85b08d2f5 fix: setup wizard load chart of accounts and fiscal year on change of country (backport #48125) (#48128) 
fix: setup wizard load chart of accounts and fiscal year on change of country (#48125)

(cherry picked from commit 14f0569a39)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-06-18 17:26:55 +05:30
Mihir Kandoi
f0ae90011b Merge pull request #48107 from frappe/mergify/bp/version-15-hotfix/pr-48077 2025-06-18 11:08:43 +05:30
rohitwaghchaure
79a9d583d9 Merge pull request #48113 from frappe/mergify/bp/version-15-hotfix/pr-47988 
fix: stock reconciliation validation for serial nos (backport #47988)
 2025-06-17 23:18:24 +05:30
Rohit Waghchaure
89376ddf8d fix: stock reconciliation validation for serial and batch 
(cherry picked from commit 69d54d2e0f)
 2025-06-17 17:31:05 +00:00
Mihir Kandoi
b33bec4dad fix: use set_query on sales_order link field in work order 
(cherry picked from commit 6def182e1a)
 2025-06-17 12:09:08 +00:00
Sagar Vora
4d1022182d Merge pull request #48105 from frappe/mergify/bp/version-15-hotfix/pr-48104 
fix: incorrect condition for setting party account on change of company (backport #48104)
 2025-06-17 11:26:35 +00:00
ljain112
f2b9e73819 fix: incorrect condition for setting party account on change of company 
(cherry picked from commit 20565f5f19)
 2025-06-17 11:26:13 +00:00
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
ruthra kumar
789cd20d2d Merge pull request #48102 from frappe/mergify/bp/version-15-hotfix/pr-48098 
fix: do not reset party account for return doc (backport #48098)
 2025-06-17 15:42:32 +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
ljain112
ad5421a413 fix: do not reset party account for return doc 
(cherry picked from commit 7e758a9d5b)
 2025-06-17 09:59:44 +00:00
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
ruthra kumar
7d88b8bbb9 Merge pull request #48093 from frappe/mergify/bp/version-15-hotfix/pr-47879 
fix: add validation for exchange gain/loss entries (backport #47879)
 2025-06-17 13:59:08 +05:30
AlcinSnowlina
baa08ce496 fix: add validation for party type 
(cherry picked from commit 7c9d6aaae2)
 2025-06-17 08:26:07 +00:00
ruthra kumar
7031a5033c Merge pull request #48092 from frappe/mergify/bp/version-15-hotfix/pr-48076 
fix: Prevent saving negative quantity in BOM (backport #48076)
 2025-06-17 13:47:20 +05:30
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
iamkhanraheel
1c9032a4c2 fix: prevent saving negative quantity in BOM 
(cherry picked from commit e52d83e756)
 2025-06-17 07:50:27 +00:00
Khushi Rawat
323a91ddd7 Merge pull request #48090 from khushi8112/update-asset-status-after-revaluation-v15-backport 
fix: update asset status after making asset value adjustment record
 2025-06-17 13:06:50 +05:30
Khushi Rawat
ee30357835 fix: update asset status after making asset value adjustment record 2025-06-17 12:35:44 +05:30
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