nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 02:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,114 Commits 636 Branches 1,812 Tags
01af6c876262bf03077503ad7c12e23b9def9fca
Commit Graph

54114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihir Kandoi
85f1efe67e Merge pull request #48777 from frappe/mergify/bp/version-15-hotfix/pr-48773 
fix: create job card for selected operations only (backport #48773)
 2025-07-29 13:00:28 +05:30
ruthra kumar
d543a0c959 Merge pull request #48823 from frappe/mergify/bp/version-15-hotfix/pr-48757 
fix: add patch for update subscription details (backport #48757)
 2025-07-29 12:29:51 +05:30
l0gesh29
ebda396518 fix: update subscription details patch 
(cherry picked from commit c7b1379a7f2cbc8b852330dd7e627acd7c86965c)
 2025-07-29 06:38:09 +00:00
Mihir Kandoi
c086f43964 Merge pull request #48821 from frappe/mergify/bp/version-15-hotfix/pr-48820 
fix: over billed purchase receipt status (backport #48820)
 2025-07-29 12:03:28 +05:30
Mihir Kandoi
3336b5d55d Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-48820 2025-07-29 11:48:27 +05:30
mergify[bot]
18b007dbf2 Merge pull request #48805 from frappe/mergify/bp/version-15-hotfix/pr-48676 
fix: missing account in GL entries (subcontracting) (backport #48676)
 2025-07-29 11:48:12 +05:30
Mihir Kandoi
1efdff0ad1 fix: over billed purchase receipt status 
(cherry picked from commit 15e354f76e2cf92e30381e81f870741434c20150)
 2025-07-29 06:02:50 +00:00
Mihir Kandoi
92e315c4e1 Merge pull request #48811 from frappe/mergify/bp/version-15-hotfix/pr-48804 
fix: sql error in quality inspection (backport #48804)
 2025-07-29 11:18:46 +05:30
Mihir Kandoi
22e6ea41f7 Merge pull request #48819 from frappe/mergify/bp/version-15-hotfix/pr-39555 
ci: Add fake passing tests when CI is skipped (backport #39555)
 2025-07-29 11:18:02 +05:30
ruthra kumar
1c81b2c684 Merge pull request #48815 from frappe/mergify/bp/version-15-hotfix/pr-48797 
fix: avoid auto_repeat on duplicate (backport #48797)
 2025-07-29 09:18:28 +05:30
ruthra kumar
907358a356 Merge pull request #48814 from frappe/mergify/bp/version-15-hotfix/pr-48796 
fix: remove alias for order by field (backport #48796)
 2025-07-29 09:17:55 +05:30
Mihir Kandoi
9c3011cb9f Potential fix for code scanning alert no. 9: Workflow does not contain permissions 
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
 2025-07-28 22:23:42 +05:30
Mihir Kandoi
5840a242a6 Potential fix for code scanning alert no. 13: Workflow does not contain permissions 
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
 2025-07-28 22:23:34 +05:30
Ankush Menat
4fd32fc3bd ci: Add fake passing tests when CI is skipped (#39555) 
(cherry picked from commit dfda5ad67320c000afdbcc7facde03a7cf695f6f)
 2025-07-28 16:50:44 +00:00
Diptanil Saha
2d4419c9d5 Merge pull request #48818 from frappe/mergify/bp/version-15-hotfix/pr-48778 
fix: fetch payment term template from order (backport #48778)
 2025-07-28 20:41:42 +05:30
ravibharathi656
ee8eb368e7 fix: fetch payment term template from order 
(cherry picked from commit 5ed34d6ff9f50a25bde9bb6888463d2086d211f5)
 2025-07-28 14:55:42 +00:00
Diptanil Saha
95470b4262 Merge pull request #48816 from diptanilsaha/backport_48675 
feat(internal-transaction): fetch valuation rate for internal transaction (backport #48675, #48794)
 2025-07-28 18:45:30 +05:30
diptanilsaha
bf5b6a540f fix: patch to enable fetch_valuation_rate_for_internal_transaction 2025-07-28 18:25:16 +05:30
mithili
65a27066cc fix: avoid auto_repeat on duplicate 
(cherry picked from commit 2c54f49cbc530a9d258ef53a9430b6ccba80c44d)
 2025-07-28 12:29:13 +00:00
rohitwaghchaure
f772976676 Merge pull request #48809 from frappe/mergify/bp/version-15-hotfix/pr-48787 
fix: concurrency issues (backport #48787)
 2025-07-28 17:55:49 +05:30
rohitwaghchaure
5e6f957e97 Merge pull request #48808 from frappe/mergify/bp/version-15-hotfix/pr-48801 
fix: incorrect GL entries (backport #48801)
 2025-07-28 17:55:09 +05:30
diptanilsaha
b23f7a9d91 fix: fetch item valuation rate for internal transactions 2025-07-28 17:54:56 +05:30
l0gesh29
f8d1e5a0d3 feat: add fetch_valuation_rate_for_internal_transaction in accounts settings 2025-07-28 17:54:32 +05:30
l0gesh29
1ca81887ca chore: rename variable 
(cherry picked from commit 8fdda31e45e70141339aacdb3b9d62ab127b9bdc)
 2025-07-28 12:10:10 +00:00
l0gesh29
193fbcba11 fix: remove alias for order by field 
(cherry picked from commit 048b87328bb7575a9b56805f1b4eb77c6aa483e5)
 2025-07-28 12:10:10 +00:00
ruthra kumar
794fac12a4 Merge pull request #48812 from frappe/mergify/bp/version-15-hotfix/pr-48480 
Currency sales partner commision report (backport #48480)
 2025-07-28 17:29:32 +05:30
mergify[bot]
9b59fb659b fix: use db_set in email_campaign (backport #45679) (#48806) 
Bug fix in email_campaign's update_status function. (#45679)

During the scheduler event of set_email_campaign_status, the function calling update_status isn't saving the modified status field.

(cherry picked from commit 88e68bb803963d7d44c724c6dbf0be97a5037531)

Co-authored-by: harshpwctech <84438948+harshpwctech@users.noreply.github.com>
 2025-07-28 17:26:17 +05:30
mithili
8d25269de6 refactor: remove join in sql 
(cherry picked from commit 9638151f9d1ef1e46e801d634d9080fc4021611c)
 2025-07-28 11:42:54 +00:00
mithili
8314059bf7 chore: update query to fetch company currency 
(cherry picked from commit 998617879caa2b6a4ad5433a986db8dee23fe52c)
 2025-07-28 11:42:53 +00:00
mithili
622052b950 fix: get default company currency 
(cherry picked from commit 984947f333511922b9ca34e96986adec2dd9b37d)
 2025-07-28 11:42:53 +00:00
mithili
49befc1dfd fix: set company as mandatory 
(cherry picked from commit 2de2ea9f58e7709b3cc40e609ee6b7c7db71c3bd)
 2025-07-28 11:42:53 +00:00
Mihir Kandoi
3e92ae8bd0 fix: sql error in quality inspection 
(cherry picked from commit 062b245e3ffca8430157eeea637a6f602ad52843)
 2025-07-28 11:24:29 +00:00
Rohit Waghchaure
ad75754ca6 fix: prevent concurrency issues 
(cherry picked from commit a186b1266d9f451025e5043cd73c886e7034c284)
 2025-07-28 10:59:17 +00:00
Rohit Waghchaure
207d2ac63c fix: incorrect GL entries 
(cherry picked from commit 4c273fcc99f5601abbe854ed903abc479e2642c2)
 2025-07-28 10:59:06 +00:00
Mihir Kandoi
442fede0fe Merge pull request #48803 from frappe/mergify/bp/version-15-hotfix/pr-48793 
fix: status in MR (material transfer) when using transit stock entries (backport #48793)
 2025-07-28 16:04:11 +05:30
Mihir Kandoi
584b442824 fix: status in MR (material transfer) when using transit stock entries 
(cherry picked from commit baa612bc72bf16969601c74b0cd113a62834d225)
 2025-07-28 10:03:28 +00:00
Mihir Kandoi
faa9006072 Merge pull request #48789 from mihir-kandoi/st44460 
fix: error when trying to edit quantity of top most FG in bom creator
 2025-07-28 14:53:19 +05:30
Assem Bahnasy
01fcd98c84 fix: Misclassification of Journal Voucher Entries in Customer Ledger Summary (#48041) 
* fix: miscalculation of Invoiced Amount, Paid Amount, and Credit Amount in Customer Ledger Summary

* style: Apply ruff-format to customer_ledger_summary.py and ignore .venv/

*