nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-15 07:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,667 Commits 397 Branches 1,698 Tags
451b1a19a85bdd19b2c8fd8fcda057d072f2b154
Commit Graph

51667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
451b1a19a8 chore: migrate pre-commit config (backport #47132) (#47134) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-04-17 14:18:00 +02:00
mergify[bot]
ad177e08b8 fix: create default warehouse (backport #47125) (#47131) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: create default warehouse (#47125)
 2025-04-17 13:40:05 +02:00
ruthra kumar
673694ae48 Merge pull request #47128 from frappe/mergify/bp/version-15-hotfix/pr-47118 
fix: add group by after user permission condition (backport #47118)
 2025-04-17 16:22:07 +05:30
venkat102
f07c3d9124 fix: add group by after user permission condition 
(cherry picked from commit 756d496235)
 2025-04-17 10:36:57 +00:00
rohitwaghchaure
d18266d839 Merge pull request #47048 from frappe/mergify/bp/version-15-hotfix/pr-46938 
fix: group sub assemblies in production plan (backport #46938)
 2025-04-17 15:31:08 +05:30
rohitwaghchaure
0c714e2bd9 Merge pull request #47114 from frappe/mergify/bp/version-15-hotfix/pr-47050 
fix: consider per_ordered instead of per_billed when creating PO from MR (backport #47050)
 2025-04-16 22:49:24 +05:30
Mihir Kandoi
20aba541c4 fix: cherry pick 2025-04-16 20:32:05 +05:30
Mihir Kandoi
be154a469f fix: consider per_ordered instead of per_billed when creating PO from MR 
(cherry picked from commit 5a524854de)

# Conflicts:
#	erpnext/stock/doctype/material_request/material_request.js
 2025-04-16 10:58:52 +00:00
Shariq Ansari
bb6d6c3edf Merge pull request #47109 from frappe/mergify/bp/version-15-hotfix/pr-47108 2025-04-16 10:22:33 +05:30
Shariq Ansari
99735e0af4 revert: disable customer if creating from opportunity 
(cherry picked from commit fc16199a49)
 2025-04-16 04:51:33 +00:00
ruthra kumar
4a7b91352b Merge pull request #47099 from frappe/mergify/bp/version-15-hotfix/pr-46770 
fix: correct outstanding amount for invoice in dunning (backport #46770)
 2025-04-16 07:44:32 +05:30
Raffael Meyer
188c4f896a fix: backport translations from develop (#47104) 2025-04-15 19:30:17 +02:00
rohitwaghchaure
9bdeacbbfa Merge pull request #47097 from frappe/mergify/bp/version-15-hotfix/pr-46973 
fix: precision issue on qty_to_be_reserved (backport #46973)
 2025-04-15 22:01:34 +05:30
ljain112
c42f76b15a chore: added test for Fetch Overdue Payments in dunning 
(cherry picked from commit 3b613c44a6)

# Conflicts:
#	erpnext/accounts/doctype/dunning/test_dunning.py
 2025-04-15 20:35:09 +05:30
Diptanil Saha
a944853b56 fix: configuration to accept partial payment in pos invoice (#47052) 2025-04-15 19:03:55 +05:30
ljain112
b7c3fa23d2 fix: correct outstanding amount for invoice in dunning 
(cherry picked from commit c2bdd30e6d)
 2025-04-15 12:21:58 +00:00
ruthra kumar
073a7a6ca6 Merge pull request #47096 from frappe/mergify/bp/version-15-hotfix/pr-47001 
fix: fetch exchange rate while creating inter-company order and invoice (backport #47001)
 2025-04-15 17:46:38 +05:30
Dany Robert
c8691b6516 fix: precision issue on qty_to_be_reserved 
(cherry picked from commit 860699ee7b)

# Conflicts:
#	erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
 2025-04-15 17:42:30 +05:30
venkat102
aa0b93d0b2 fix: fetch exchange rate while creating inter-company order and invoice 
(cherry picked from commit 145a6c5e2a)
 2025-04-15 12:07:54 +00:00
mergify[bot]
3f652bd4e1 fix: enabled allow on submit for asset name field (backport #47093) (#47094) 
fix: enabled allow on submit for asset name field (#47093)

(cherry picked from commit e41720f1a3)

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2025-04-15 17:33:58 +05:30
ruthra kumar
f816934a28 Merge pull request #47086 from frappe/mergify/bp/version-15-hotfix/pr-46640 
perf: refactored customer ledger summary for performance (backport #46640)
 2025-04-15 13:46:55 +05:30
ruthra kumar
1e340ccd9c chore: use correct Test class 2025-04-15 13:29:22 +05:30
ruthra kumar
21e94148db chore: resolve conflict 2025-04-15 13:20:56 +05:30
ruthra kumar
233a2c08a1 test: basic supplier ledger summary 
(cherry picked from commit 71f0f7a0b5)
 2025-04-15 13:20:56 +05:30
ruthra kumar
11566e20b5 test: basic output of customer ledger summary report 
(cherry picked from commit 9a3a80dfd3)
 2025-04-15 13:20:56 +05:30
ljain112
393d2459b9 fix: correct function name 
(cherry picked from commit 038355f87b)
 2025-04-15 13:20:56 +05:30
ljain112
537a8efe7a fix: child values for tree doctypes and query refactor 
(cherry picked from commit fca46e0b2d)

# Conflicts:
#	erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
 2025-04-15 13:20:56 +05:30
ljain112
50b2196020 perf: refactored customer ledger summary for performance 
(cherry picked from commit e84e49345a)

# Conflicts:
#	erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
 2025-04-15 13:20:56 +05:30
ruthra kumar
0ad8935f2c Merge pull request #47081 from frappe/mergify/bp/version-15-hotfix/pr-46789 
fix: map tax table while creating purchase order from sales order (backport #46789)
 2025-04-15 12:10:21 +05:30
ruthra kumar
148287d8a1 Merge pull request #46935 from frappe/mergify/bp/version-15-hotfix/pr-46171 
Fix validation mismatch in inventory dimension fields (backport #46171)
 2025-04-15 11:54:24 +05:30
ruthra kumar
f4854a9a02 Merge pull request #46816 from frappe/mergify/bp/version-15-hotfix/pr-46737 
feat(regional): Address Template for Germany & Add Switzerland Template (backport #46737)
 2025-04-15 11:51:17 +05:30
ruthra kumar
b7cbc66a28 chore: resolve conflict 2025-04-15 11:45:17 +05:30
Sugesh393
5a20b9e94f test: add unit test to validate tax values in Purchase Order from Sales Order 
(cherry picked from commit a393195866)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
 2025-04-15 06:13:11 +00:00
Sugesh393
127c7b93ac fix: map tax table while creating purchase order from sales order 
(cherry picked from commit 1e18569be7)
 2025-04-15 06:13:11 +00:00
mergify[bot]
c77f7f4ff0 test(Payment Entry): account type is set (backport #47071) (#47073) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-04-14 19:26:11 +02:00
mergify[bot]
8e02a9bc28 fix(Payment Entry): set account type if missing (backport #47069) (#47070) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(Payment Entry): set account type if missing (#47069)
 2025-04-14 18:54:12 +02:00
rohitwaghchaure
640012429e Merge pull request #47063 from frappe/mergify/bp/version-15-hotfix/pr-47058 
fix: consider negative stock qty in stock reconciliation (backport #47058)
 2025-04-14 20:30:25 +05:30
Rohit Waghchaure
603f737c99 fix: consider negative stock qty in stock reco 
(cherry picked from commit 15272d0e56)
 2025-04-14 12:39:35 +00:00
ruthra kumar
4fd99ed763 Merge pull request #46773 from frappe/mergify/bp/version-15-hotfix/pr-46683 
fix: Set complete contact details for `Employee` in PE (backport #46683)
 2025-04-14 17:30:51 +05:30
ruthra kumar
77bbaef5a6 Merge pull request #47055 from frappe/mergify/bp/version-15-hotfix/pr-47049 
Revert "fix: remove against_voucher and against_voucher_type column from General Ledger Report" (backport #47049)
 2025-04-14 13:52:05 +05:30
Mihir Kandoi
c58800a929 fix: linter 2025-04-14 13:33:48 +05:30
Mihir Kandoi
924e9b94b6 fix: import error 2025-04-14 13:28:06 +05:30
ruthra kumar
6bfb3c6905 chore: resolve conflict 2025-04-14 13:26:32 +05:30
ruthra kumar
da65f44a47 fix: revert #46900 - against_voucher filter in general ledger 
(cherry picked from commit adb331ef71)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.py
 2025-04-14 07:50:28 +00:00
Mihir Kandoi
13d3b27a1f fix: test cases error 
(cherry picked from commit 8df18762a9)
 2025-04-14 06:41:28 +00:00
Mihir Kandoi
dedb19e3e9 fix: test cases 
(cherry picked from commit a7394329ca)
 2025-04-14 06:41:27 +00:00
Mihir Kandoi
b3e852adfc fix: logic and added test case 
(cherry picked from commit f071255340)
 2025-04-14 06:41:27 +00:00
Mihir Kandoi
73683b2754 fix: group sub assemblies in production plan 
(cherry picked from commit f58abed935)
 2025-04-14 06:41:27 +00:00
Deepesh Garg
f1254e51e5 Merge pull request #47044 from frappe/mergify/bp/version-15-hotfix/pr-47043 
fix: Group GLs by account for TB generation (backport #47043)
 2025-04-13 19:31:29 +05:30
Deepesh Garg
416d9bce2c fix: Group GLs by account for TB generation 
(cherry picked from commit f894c6d275)
 2025-04-13 13:57:23 +00:00