nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 08:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,439 Commits 397 Branches 1,698 Tags
ee8eb368e7a5ae4fa8bfcd3abb4d85068d1546a4
Commit Graph

52439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ravibharathi656
ee8eb368e7 fix: fetch payment term template from order 
(cherry picked from commit 5ed34d6ff9)
 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
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
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 88e68bb803)

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 9638151f9d)
 2025-07-28 11:42:54 +00:00
mithili
8314059bf7 chore: update query to fetch company currency 
(cherry picked from commit 998617879c)
 2025-07-28 11:42:53 +00:00
mithili
622052b950 fix: get default company currency 
(cherry picked from commit 984947f333)
 2025-07-28 11:42:53 +00:00
mithili
49befc1dfd fix: set company as mandatory 
(cherry picked from commit 2de2ea9f58)
 2025-07-28 11:42:53 +00:00
Rohit Waghchaure
ad75754ca6 fix: prevent concurrency issues 
(cherry picked from commit a186b1266d)
 2025-07-28 10:59:17 +00:00
Rohit Waghchaure
207d2ac63c fix: incorrect GL entries 
(cherry picked from commit 4c273fcc99)
 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 baa612bc72)
 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/

* fix: Ensure .venv/ is ignored in .gitignore

* chore: removing backportrc line

* test: adding test_journal_voucher_against_return_invoice()

* fix: fixed test_journal_voucher_against_return_invoice function

* Revert .gitignore changes

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2025-07-28 14:35:59 +05:30
Mihir Kandoi
bd7de515b1 fix: error when trying to edit quantity of top most FG in bom creator 2025-07-28 11:42:13 +05:30
Smit Vora
8d8d47b0d6 Merge pull request #48729 from frappe/mergify/bp/version-15-hotfix/pr-48382 2025-07-26 12:13:27 +05:30
Soni Karm
0cb2c41cba fix: enhance warehouse filter to support list and tuple values (#48755) 2025-07-26 11:32:23 +05:30
mergify[bot]
fd441e1eff refactor: call hooks after gle & sle rename (backport #48706) (#48754) 
refactor: call hooks after gle & sle rename (#48706)

(cherry picked from commit ed79adebc4)

Co-authored-by: Kitti U. @ Ecosoft <kittiu@gmail.com>
 2025-07-23 18:37:14 +05:30
rohitwaghchaure
0588b68cec Merge pull request #48734 from frappe/mergify/bp/version-15-hotfix/pr-48720 
fix: valuation for rejected materials (backport #48720)
 2025-07-23 08:45:35 +05:30
rohitwaghchaure
c2140625f5 chore: fixed test case 2025-07-23 08:27:33 +05:30
ruthra kumar
3825490f0d Merge pull request #48752 from frappe/mergify/bp/version-15-hotfix/pr-48650 
fix: update outstanding amount on payment reconcillation (backport #48650)
 2025-07-23 07:24:53 +05:30
ruthra kumar
0a1b815546 Merge pull request #48751 from frappe/mergify/bp/version-15-hotfix/pr-48732 
fix: resolve sql syntax on accounting dimension (backport #48732)
 2025-07-23 07:24:18 +05:30
ruthra kumar
3a94c6c86c Merge pull request #48747 from frappe/mergify/bp/version-15-hotfix/pr-48733 
fix: add alias for order by field (backport #48733)
 2025-07-23 06:53:15 +05:30
ravibharathi656
0d496bb05f fix: update outstanding amount on payment reconcillation 
(cherry picked from commit 478766c600)
 2025-07-23 01:23:13 +00:00
l0gesh29
96a1444e92 fix: resolve sql syntax on accounting dimension 
(cherry picked from commit 1662b7c311)
 2025-07-23 01:15:13 +00:00
ruthra kumar
f9d8f510a0 Merge pull request #48725 from frappe/mergify/bp/version-15-hotfix/pr-48671 
revert: do not set pay_to_recd_from to None (backport #48671)
 2025-07-22 17:57:46 +05:30
ruthra kumar
35bc733d28 Merge pull request #48726 from frappe/mergify/bp/version-15-hotfix/pr-48690 
fix: set delivery date if missing (backport #48690)
 2025-07-22 17:56:10 +05:30
l0gesh29
4bef3cc92f fix: add alias for order by field 
(cherry picked from commit feaf39a812)
 2025-07-22 12:25:17 +00:00
Smit Vora
176a124f1a chore: restore removed import as it's used in v15 2025-07-22 15:50:18 +05:30
ruthra kumar
d95306fd60 Merge pull request #48741 from frappe/mergify/bp/version-15-hotfix/pr-48665 
fix: show amount for exchange gain or loss account (backport #48665)
 2025-07-22 12:55:57 +05:30
l0gesh29
90fa7db13c fix: add validation for account key 
(cherry picked from commit b6da350c20)
 2025-07-22 06:44:06 +00:00
l0gesh29
38b223e732 fix: show amount for exchange gain or loss account 
(cherry picked from commit 4f90f50eb2)
 2025-07-22 06:44:06 +00:00
rohitwaghchaure
4453e447dc chore: fix conflicts 2025-07-22 09:57:07 +05:30
Rohit Waghchaure
d378e51492 fix: valuation for rejected materials 
(cherry picked from commit b7039cc506)

# Conflicts:
#	erpnext/controllers/buying_controller.py
 2025-07-22 04:18:22 +00:00
rohitwaghchaure
526c1e7c9a Merge pull request #48727 from frappe/mergify/bp/version-15-hotfix/pr-48704 
fix(production plan): add company filter to sub assembly warehouse (backport #48704)
 2025-07-21 20:04:42 +05:30
Karm Soni
9bf0d852ee fix: update get_data function to use item_query 
(cherry picked from commit 8a97b39028)
 2025-07-21 14:33:53 +00:00
Karm Soni
fb81202830 refactor: revert indentation 
(cherry picked from commit 063c4e9720)
 2025-07-21 14:33:52 +00:00
Karm Soni
a1aee44014 refactor: remove unused imports in stock_balance.py 
(cherry picked from commit bc46045cc7)
 2025-07-21 14:33:52 +00:00
Karm Soni
b57163b7be fix: warehouse filter query by chaining conditions 
(cherry picked from commit 7a266113ed)
 2025-07-21 14:33:52 +00:00
Karm Soni
1d52a8fb69 fix: handle empty warehouse condition in get_warehouse_condition function; typo; 
(cherry picked from commit fca9843fc2)
 2025-07-21 14:33:52 +00:00
Karm Soni
a7e8f404f7 fix: use the item_query for get_data 
(cherry picked from commit 169caaf66f)
 2025-07-21 14:33:51 +00:00
Karm Soni
fa01bdc490 fix: correct query filter assignment in stock ledger and balance reports 
(cherry picked from commit e60c711fdc)
 2025-07-21 14:33:51 +00:00
Karm Soni
62033b5c7a fix(test): update tests 
(cherry picked from commit 0a71ca6739)
 2025-07-21 14:33:51 +00:00
Karm Soni
ecf9e6e748 feat: update stock ledger report to support multi-select for warehouses and items 
(cherry picked from commit f2afd98725)
 2025-07-21 14:33:50 +00:00
Karm Soni
72e8ce0449 refactor: use existing functionality 
(cherry picked from commit 2882576479)
 2025-07-21 14:33:50 +00:00