Diptanil Saha
|
cd7e9e48de
|
chore: resolve conflict
(cherry picked from commit 31142b2f47)
|
2025-12-22 07:38:16 +00:00 |
|
Sherin KR
|
797b6937f2
|
fix: item price not considering based on valid_upto
(cherry picked from commit dfda8e6241)
# Conflicts:
# erpnext/selling/page/point_of_sale/point_of_sale.py
(cherry picked from commit c5d92d7999)
|
2025-12-22 07:38:16 +00:00 |
|
ruthra kumar
|
0507dae04a
|
Merge pull request #51107 from frappe/mergify/bp/version-16-beta/pr-50837
feat(accounting-period): add role-based bypass for accounting period restrictions (backport #50837)
|
2025-12-15 20:52:11 +05:30 |
|
Jatin3128
|
fb96bbb8f8
|
feat(accounting-period): add role-based bypass for accounting period restrictions
(cherry picked from commit cfdbeb6a1a)
|
2025-12-15 12:07:08 +00:00 |
|
Smit Vora
|
a18ef85283
|
Merge pull request #51104 from frappe/mergify/bp/version-16-beta/pr-50782
fix: only show net balance as opening in general ledger (backport #50782)
|
2025-12-15 15:50:33 +05:30 |
|
Smit Vora
|
4d8ba5cca4
|
fix: only show net gl balance as opening in general ledger
(cherry picked from commit b7c7e0746e)
|
2025-12-15 10:00:47 +00:00 |
|
Sagar Vora
|
e930702faa
|
Merge pull request #51060 from frappe/mergify/bp/version-16-beta/pr-51057
fix: re-calculate outstanding / write-off amount during submission (backport #51057)
|
2025-12-11 23:26:22 +05:30 |
|
Sagar Vora
|
16fe099317
|
fix: re-calculate outstanding / write-off amount during submission
(cherry picked from commit 09c9ac1b66)
|
2025-12-11 17:35:30 +00:00 |
|
Sagar Vora
|
626eb0d28e
|
Merge pull request #51054 from frappe/mergify/bp/version-16-beta/pr-51051
fix: ensure fresh `grand_total_diff` is used for each calculation (backport #51051)
|
2025-12-11 18:07:57 +05:30 |
|
Sagar Vora
|
857574be69
|
fix: ensure fresh grand_total_diff is used for each calculation
(cherry picked from commit b3fdef8d19)
|
2025-12-11 12:35:29 +00:00 |
|
Khushi Rawat
|
f9ff06d926
|
Merge pull request #51008 from frappe/mergify/bp/version-16-beta/pr-50804
fix: correct logic for repair cost in asset repair (backport #50804)
|
2025-12-10 14:03:34 +05:30 |
|
ljain112
|
af9f4c7dd1
|
chore: remove unused import for depreciation schedule
(cherry picked from commit e1fd90f731)
|
2025-12-10 07:28:53 +00:00 |
|
ljain112
|
b81e1f8fe9
|
chore: remove unwanted strings
(cherry picked from commit 8ee2cbf259)
|
2025-12-10 07:28:53 +00:00 |
|
ljain112
|
5279bec1b2
|
refactor: linters
(cherry picked from commit 2a0ba84f69)
|
2025-12-10 07:28:52 +00:00 |
|
ljain112
|
0257fc42bb
|
fix: add permission check
(cherry picked from commit 0c1df30771)
|
2025-12-10 07:28:52 +00:00 |
|
ljain112
|
fef76907c3
|
fix: add duplicate purchase invoice validation in asset repair
(cherry picked from commit ff9b392024)
|
2025-12-10 07:28:52 +00:00 |
|
ljain112
|
f12319b123
|
perf: enhance validation for purchase invoices to check submission status for all invoices
(cherry picked from commit 0b84d11600)
|
2025-12-10 07:28:52 +00:00 |
|
ljain112
|
945568183c
|
perf: replace get_doc with get_lazy_doc for asset retrieval and optimize stock entry fetching
(cherry picked from commit c2810ea799)
|
2025-12-10 07:28:51 +00:00 |
|
ljain112
|
8fa785a45b
|
fix: update repair cost logic to set value only for positive amounts
(cherry picked from commit 00ffdee928)
|
2025-12-10 07:28:51 +00:00 |
|
ljain112
|
e50ba37108
|
fix: remove unnecessary filtering by search text in get_expense_accounts
(cherry picked from commit b9aaae6343)
|
2025-12-10 07:28:51 +00:00 |
|
ljain112
|
c06e121cda
|
fix: correct logic for repair cost in asset repair
(cherry picked from commit e6160d1b63)
|
2025-12-10 07:28:51 +00:00 |
|
Khushi Rawat
|
b4da06459d
|
Merge pull request #51006 from frappe/mergify/bp/version-16-beta/pr-50999
fix: better manual budget distribution (backport #50999)
|
2025-12-10 12:20:29 +05:30 |
|
Khushi Rawat
|
b84531d4ea
|
fix: conflicts
|
2025-12-10 11:59:14 +05:30 |
|
khushi8112
|
07c83246d0
|
fix: patch to set budget distribution total
(cherry picked from commit ed4c17d3a2)
# Conflicts:
# erpnext/patches.txt
|
2025-12-10 06:27:36 +00:00 |
|
khushi8112
|
e1d46d4dad
|
feat: show budget distribution total
(cherry picked from commit f194ac093c)
|
2025-12-10 06:27:35 +00:00 |
|
khushi8112
|
341ea89d16
|
fix: better manual budget distribution on update
(cherry picked from commit 1c82f42fa8)
|
2025-12-10 06:27:35 +00:00 |
|
khushi8112
|
88af49f6c0
|
fix: remove revise budget permission
(cherry picked from commit d42aad18a7)
|
2025-12-10 06:27:35 +00:00 |
|
khushi8112
|
7ea82ce2f0
|
fix: add company-based filter to account field
(cherry picked from commit 6a03fc6ede)
|
2025-12-10 06:27:35 +00:00 |
|
khushi8112
|
77f70b4c26
|
fix: make amount and percent field read only when distribute equally is enabled
(cherry picked from commit 75999a7ae4)
|
2025-12-10 06:27:34 +00:00 |
|
Smit Vora
|
a0c768d55d
|
Merge pull request #50866 from frappe/mergify/bp/version-16-beta/pr-50733
|
2025-12-02 15:15:36 +05:30 |
|
Smit Vora
|
79181e307c
|
fix: use ValueWrapper consistently
(cherry picked from commit a2fadd9347)
|
2025-12-02 09:13:52 +00:00 |
|
Smit Vora
|
9f07579a05
|
refactor: further changes to adapt to query builder changes
(cherry picked from commit 8235a551f0)
|
2025-12-02 09:13:52 +00:00 |
|
Khushi Rawat
|
7bfdd4b0a8
|
Merge pull request #50861 from frappe/mergify/bp/version-16-beta/pr-50794
fix: use asset in against_voucher while posting gl entries for capitalised asset repairs (backport #50794)
|
2025-12-02 12:46:09 +05:30 |
|
Khushi Rawat
|
a2242439c8
|
Merge pull request #50859 from frappe/mergify/bp/version-16-beta/pr-50793
fix: include accounting dimensions in stock entries created during asset repair. (backport #50793)
|
2025-12-02 12:23:37 +05:30 |
|
Navin-S-R
|
8440a5c68d
|
chore: reload asset doc before assertEqual
(cherry picked from commit 8c35a6ecdd)
|
2025-12-02 06:37:52 +00:00 |
|
Navin-S-R
|
665a092cd0
|
test: add unit test to validate capitalized asset repair gl entries being booked against the asset
(cherry picked from commit bcf6deec9a)
|
2025-12-02 06:37:52 +00:00 |
|
Navin S R
|
a6b7985eb2
|
fix: use asset in against_voucher while posting gl entries for capitalized asset repairs
(cherry picked from commit a7e43eddad)
|
2025-12-02 06:37:52 +00:00 |
|
ljain112
|
30f368c4c0
|
refactor: show_general ledger for consistency with other doctyoes
(cherry picked from commit cdbe8b909b)
|
2025-12-02 06:27:36 +00:00 |
|
ljain112
|
be37d44d4c
|
fix: include accounting dimensions in stock entries created during asset repair.
(cherry picked from commit 147a5ee953)
|
2025-12-02 06:27:36 +00:00 |
|
ruthra kumar
|
7ecf86af18
|
Merge pull request #50806 from frappe/mergify/bp/version-16-beta/pr-50802
fix(accounts-payable-summary): add Show GL Balance check similar to A… (backport #50802)
|
2025-11-29 12:06:33 +05:30 |
|
Jatin3128
|
895694f870
|
fix(accounts-payable-summary): add Show GL Balance check similar to Accounts Receivable Summary
(cherry picked from commit 8a7e5d0626)
|
2025-11-29 06:04:29 +00:00 |
|
Khushi Rawat
|
370ddb181b
|
Merge pull request #50801 from frappe/mergify/bp/version-16-beta/pr-50792
fix: add Stock Entry link to Asset Repair doctype. (backport #50792)
|
2025-11-29 00:27:53 +05:30 |
|
ljain112
|
db446f33ad
|
fix: add Stock Entry link to Asset Repair doctype.
(cherry picked from commit da7f28a3c3)
|
2025-11-28 12:05:40 +00:00 |
|
mergify[bot]
|
b7d831cc47
|
fix: incorrect positional param for get_field_precision util (backport #50764) (#50796)
|
2025-11-28 14:18:33 +05:30 |
|
Smit Vora
|
b8e5f3f996
|
fix: restore missing account number for Indirect Expenses in standard COA with Numbers (backport #50767) (#50784)
Co-authored-by: Aadhil <36843795+aadhilpm@users.noreply.github.com>
fix: restore missing account number for Indirect Expenses in standard COA with Numbers (#50767)
|
2025-11-27 19:41:58 +05:30 |
|
Aadhil
|
b8ab6403ab
|
fix: restore missing account number for Indirect Expenses in standard COA with Numbers (#50767)
(cherry picked from commit 9145bf5563)
|
2025-11-27 13:54:25 +00:00 |
|
Smit Vora
|
0ade33e46a
|
feat: add Account Category field to Account (Chart of Accounts) (backport #50766) (#50783)
Co-authored-by: Aadhil <36843795+aadhilpm@users.noreply.github.com>
|
2025-11-27 19:19:09 +05:30 |
|
Aadhil
|
6b877af91d
|
feat: add Account Category field to Account (Chart of Accounts) (#50766)
(cherry picked from commit 355aa52cb8)
|
2025-11-27 13:11:14 +00:00 |
|
Rohit Waghchaure
|
4bf4df0f1d
|
Merge branch 'develop' into version-16-beta
v16.0.0-beta.2
|
2025-11-21 22:08:39 +05:30 |
|
Lakshit Jain
|
1b32889eed
|
Merge pull request #50682 from frappe/mergify/bp/version-16-beta/pr-50609
fix: handle empty item_tax_rate in ItemTax class (backport #50609)
|
2025-11-21 18:46:38 +05:30 |
|