Commit Graph

51647 Commits

Author SHA1 Message Date
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
Diptanil Saha
a944853b56 fix: configuration to accept partial payment in pos invoice (#47052) 2025-04-15 19:03:55 +05:30
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
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
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
ruthra kumar
f5fd255e82 Merge pull request #47033 from frappe/mergify/bp/version-15-hotfix/pr-47012
fix: correct doctype in item_wise_purchase register (backport #47012)
2025-04-12 07:29:14 +05:30
ljain112
b2fb4fba51 fix: correct doctype in item_wise_purchase register
(cherry picked from commit b8b8dce733)
2025-04-12 01:42:25 +00:00
rohitwaghchaure
1b8a317de9 Merge pull request #47027 from frappe/mergify/bp/version-15-hotfix/pr-47026
fix: batchwise valuation for MA item (backport #47026)
2025-04-11 22:56:25 +05:30
Rohit Waghchaure
debfcdc61f fix: batchwise valuation for MA item
(cherry picked from commit 504b8c0a68)
2025-04-11 16:27:52 +00:00
rohitwaghchaure
706092061b Merge pull request #47021 from frappe/mergify/bp/version-15-hotfix/pr-47020
fix: removed display depends on (backport #47020)
2025-04-11 19:53:43 +05:30
rohitwaghchaure
c6c8aa02eb Merge pull request #47023 from frappe/mergify/bp/version-15-hotfix/pr-47022
fix: condition for use_batchwise_valuation (backport #47022)
2025-04-11 19:53:22 +05:30
Rohit Waghchaure
0ff7465e27 fix: condition for use_batchwise_valuation
(cherry picked from commit cc171d9706)
2025-04-11 14:06:08 +00:00
Rohit Waghchaure
00b25537f4 fix: removed display depends on
(cherry picked from commit e0bf45e03b)
2025-04-11 13:46:39 +00:00
rohitwaghchaure
6dee592ba7 Merge pull request #47004 from frappe/mergify/bp/version-15-hotfix/pr-47002
feat: Allow to Make Quality Inspection after Purchase / Delivery (backport #47002)
2025-04-11 17:26:53 +05:30
rohitwaghchaure
8233aadd50 Merge pull request #47017 from frappe/mergify/bp/version-15-hotfix/pr-47015
fix: allow to use batch-wise valuation for moving average items (backport #47015)
2025-04-11 17:25:29 +05:30
Rohit Waghchaure
e479975f54 fix: allow to use batchwise valuation for moving average items
(cherry picked from commit 65ba79bb85)
2025-04-11 11:38:32 +00:00
rohitwaghchaure
5e1d3f77bb chore: fix conflicts 2025-04-11 15:35:36 +05:30
rohitwaghchaure
00ac8597b0 chore: fix conflicts 2025-04-11 15:34:45 +05:30
rohitwaghchaure
4163b18ec3 Merge pull request #47005 from frappe/mergify/bp/version-15-hotfix/pr-46997
fix: update the modified date in for SLEs and GLs after rename (backport #46997)
2025-04-11 14:43:02 +05:30
Rohit Waghchaure
21f0dcbcc3 fix: update the modified date in for SLEs and GLs after rename
(cherry picked from commit dc5a5ef258)
2025-04-10 12:10:48 +00:00
Rohit Waghchaure
2e6ba91589 feat: Allow to Make Quality Inspection after Purchase / Delivery
(cherry picked from commit 8eaa2afeb7)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
2025-04-10 12:10:47 +00:00
rohitwaghchaure
14a502c956 Merge pull request #46998 from frappe/mergify/bp/version-15-hotfix/pr-46831
fix: current batch qty showing zero in the stock reconciliation (backport #46831)
2025-04-10 15:39:34 +05:30
Rohit Waghchaure
24c8a06520 fix: current batch qty showing zero in the stock reconciliation
(cherry picked from commit a5c62f8623)
2025-04-10 08:30:28 +00:00
rohitwaghchaure
13f73b59df Merge pull request #46988 from frappe/mergify/bp/version-15-hotfix/pr-46978
fix: bypass validation during reposting (backport #46978)
2025-04-10 12:21:36 +05:30
rohitwaghchaure
b4efba80a7 Merge pull request #46989 from frappe/mergify/bp/version-15-hotfix/pr-46965
fix: Recreate Stock Ledgers issue (backport #46965)
2025-04-10 12:21:00 +05:30