Asmita Hase
|
8a3fdb4ec2
|
fix: added a flag on journal entry to ignore party account type validation if required
(cherry picked from commit 0665d13fd3)
|
2025-08-07 12:30:05 +00:00 |
|
rohitwaghchaure
|
96e467670a
|
Merge pull request #49035 from frappe/mergify/bp/version-15-hotfix/pr-49022
fix: zero valuation rate for the batch (backport #49022)
|
2025-08-07 14:34:46 +05:30 |
|
rohitwaghchaure
|
105838091e
|
chore: fix conflicts
|
2025-08-07 14:10:21 +05:30 |
|
Rohit Waghchaure
|
90a0873044
|
fix: zero valuation rate for the batch
(cherry picked from commit c8410cb5ca)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
|
2025-08-07 08:25:51 +00:00 |
|
rohitwaghchaure
|
965de96251
|
Merge pull request #49012 from rohitwaghchaure/fixed-support-43860
fix: stock reservation Delivered Qty against the batch
|
2025-08-07 12:27:54 +05:30 |
|
ruthra kumar
|
1a57f603fb
|
Merge pull request #49031 from frappe/mergify/bp/version-15-hotfix/pr-48208
feat: added chart of accounts and tax template for australian localisation (backport #48208)
|
2025-08-07 10:36:52 +05:30 |
|
Jeba Jebas
|
36cb5b6589
|
feat: added chart of accounts and tax template for australian localisation (#48208)
* Add Australian Localisation Setup
* feat: added chart of accounts and tax template for australian localisation
* chore: linter fix
---------
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit bb62a01c0d)
|
2025-08-07 04:39:17 +00:00 |
|
Diptanil Saha
|
f4f1fdedee
|
Merge pull request #49025 from frappe/mergify/bp/version-15-hotfix/pr-49023
fix: NoneType error on applying presentation_currency filter on financial statements and trial balance report (backport #49023)
|
2025-08-07 02:27:43 +05:30 |
|
diptanilsaha
|
24ca7bb64f
|
fix: nonetype error on applying presentation_currency filter on financial statements and trial balance report
(cherry picked from commit d7e22de44c)
|
2025-08-06 20:41:36 +00:00 |
|
Rohit Waghchaure
|
849f646bd2
|
fix: stock reservation Delivered Qty against the batch
|
2025-08-06 22:29:45 +05:30 |
|
rohitwaghchaure
|
e19c4c6452
|
Merge pull request #49019 from frappe/mergify/bp/version-15-hotfix/pr-49010
fix: timeout while submitting purchase receipt (backport #49010)
|
2025-08-06 22:24:17 +05:30 |
|
Rohit Waghchaure
|
e693ab76fa
|
fix: timeout while submitting purchase receipt
(cherry picked from commit c433943c46)
|
2025-08-06 14:36:34 +00:00 |
|
Khushi Rawat
|
639c75312d
|
Merge pull request #49013 from frappe/mergify/bp/version-15-hotfix/pr-49011
fix: fetch revaluated asset value for fixed asset register (backport #49011)
|
2025-08-06 17:36:09 +05:30 |
|
khushi8112
|
e1121d1c68
|
chore: format code
(cherry picked from commit a33bcb47b3)
|
2025-08-06 11:44:55 +00:00 |
|
khushi8112
|
5224b6677d
|
fix: fetch revaluated asset value for all the assets
(cherry picked from commit 67ec4fa477)
|
2025-08-06 11:44:55 +00:00 |
|
Asmita Hase
|
ad3d6a7c91
|
Merge pull request #49006 from frappe/mergify/bp/version-15-hotfix/pr-49003
|
2025-08-06 12:14:59 +05:30 |
|
Asmita Hase
|
2d420ed661
|
chore: removed uncessary comment
(cherry picked from commit b4f831a931)
|
2025-08-06 06:16:55 +00:00 |
|
Asmita Hase
|
4cc9061990
|
chore: add account type to employee advance account in standard chart of accounts
(cherry picked from commit a273147b6e)
|
2025-08-06 06:16:54 +00:00 |
|
Asmita Hase
|
5266690cd8
|
refactor: get advance payment doctypes from hooks
(cherry picked from commit 2cb2e05b19)
|
2025-08-06 06:16:54 +00:00 |
|
ruthra kumar
|
373a17e3de
|
Merge pull request #49002 from ruthra-kumar/fix_linter_issue
chore: resolve linting issue
|
2025-08-06 09:57:40 +05:30 |
|
ruthra kumar
|
2af2002431
|
chore: resolve linting issue
|
2025-08-06 09:56:39 +05:30 |
|
ruthra kumar
|
1070322695
|
Merge branch 'version-15' into version-15-hotfix
|
2025-08-05 21:41:58 +05:30 |
|
ruthra kumar
|
3ea6278eb9
|
Merge pull request #48997 from frappe/mergify/bp/version-15-hotfix/pr-48901
fix: do not split round off when there is a cost center allocation (backport #48901)
|
2025-08-05 20:46:12 +05:30 |
|
ravibharathi656
|
e822a74479
|
test: add test for cost center allocation commercial rounding
(cherry picked from commit dd24cce509)
# Conflicts:
# erpnext/accounts/doctype/cost_center_allocation/test_cost_center_allocation.py
|
2025-08-05 20:29:25 +05:30 |
|
venkat102
|
e36e5027d7
|
fix: do not split round off when there is a cost center allocation
(cherry picked from commit f0df41d521)
|
2025-08-05 14:47:51 +00:00 |
|
ruthra kumar
|
f97e29058c
|
Merge pull request #48993 from frappe/mergify/bp/version-15-hotfix/pr-48947
fix(process statement of accounts): make date fields mandatory (backport #48947)
|
2025-08-05 17:08:55 +05:30 |
|
mergify[bot]
|
964f9275dc
|
feat: add non-negative constraint to batch size and sub operation time fields (backport #48948) (#48991)
* feat: add non-negative constraint to batch size and sub operation time fields
(cherry picked from commit f4722d3b24)
# Conflicts:
# erpnext/manufacturing/doctype/operation/operation.json
# erpnext/manufacturing/doctype/sub_operation/sub_operation.json
* chore: resolve conflicts
* chore: resolve conflicts
* chore: resolve conflicts
---------
Co-authored-by: KerollesFathy <kerolles.f@outlook.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
|
2025-08-05 11:19:46 +00:00 |
|
Mihir Kandoi
|
f3895e9dc9
|
Merge pull request #48992 from frappe/mergify/bp/version-15-hotfix/pr-48949
feat: add Manufacture section to project dashboard to show linked Work Orders (backport #48949)
|
2025-08-05 16:48:33 +05:30 |
|
ravibharathi656
|
3e8deeed07
|
fix(process statement of accounts): make date fields mandatory
(cherry picked from commit 23bc180d98)
|
2025-08-05 11:06:47 +00:00 |
|
mergify[bot]
|
84e91e0c7c
|
feat: Add non-negative constraint to completed qty fields in job card and time log (backport #48946) (#48989)
* feat: Add non-negative constraint to completed qty fields in job card and time log
(cherry picked from commit c30665fda7)
# Conflicts:
# erpnext/manufacturing/doctype/job_card/job_card.json
# erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
* chore: resolve conflicts
* chore: resolve conflicts
---------
Co-authored-by: KerollesFathy <kerolles.f@outlook.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
|
2025-08-05 11:06:43 +00:00 |
|
KerollesFathy
|
83e9842dd3
|
feat: add 'Manufacture' section to project dashboard and show linked Work Orders
(cherry picked from commit 2729d7521d)
|
2025-08-05 10:59:44 +00:00 |
|
Khushi Rawat
|
3760ff8a7a
|
Merge pull request #48977 from frappe/mergify/bp/version-15-hotfix/pr-48968
fix: validate asset before submitting depreciation schedule (backport #48968)
|
2025-08-05 16:28:03 +05:30 |
|
Khushi Rawat
|
ddecce400a
|
Merge pull request #48987 from frappe/mergify/bp/version-15-hotfix/pr-48929
chore: add translation function on remarks in asset depreciation entry (backport #48929)
|
2025-08-05 16:27:47 +05:30 |
|
ruthra kumar
|
6367bd9561
|
Merge pull request #48985 from frappe/mergify/bp/version-15-hotfix/pr-48798
feat: add show_amount_in_company_currency in gl report (backport #48798)
|
2025-08-05 16:26:37 +05:30 |
|
ruthra kumar
|
104569318e
|
Merge pull request #48982 from frappe/mergify/bp/version-15-hotfix/pr-48909
fix(tax withholding details): avoid voucher duplication (backport #48909)
|
2025-08-05 16:25:48 +05:30 |
|
Khushi Rawat
|
4a8465df90
|
chore: resolved conflicts
|
2025-08-05 16:05:54 +05:30 |
|
Khushi Rawat
|
78857cd798
|
fix: add missing parentheses
(cherry picked from commit a60db40fd2)
|
2025-08-05 10:26:31 +00:00 |
|
Ernesto Ruiz
|
2c9ee7ae14
|
chore: add translation function on remark in setup_journal_entry_metadata in depreciation.py
(cherry picked from commit 803180d5de)
# Conflicts:
# erpnext/assets/doctype/asset/depreciation.py
|
2025-08-05 10:26:31 +00:00 |
|
Ernesto Ruiz
|
4a5e0b181f
|
chore: add translation function on remarks in make_journal_entry in asset.py
(cherry picked from commit 119904e44f)
|
2025-08-05 10:26:31 +00:00 |
|
Khushi Rawat
|
35f826c499
|
chore: remove duplicate code
|
2025-08-05 15:54:11 +05:30 |
|
Diptanil Saha
|
b565d4f0a8
|
Merge pull request #48983 from diptanilsaha/pos_grand_total_default_mop
refactor(pos): disable grand total to default mode of payment
|
2025-08-05 15:24:32 +05:30 |
|
l0gesh29
|
b964b122ed
|
feat: add show_amount_in_company_currency in gl report
(cherry picked from commit 468e5e9b2e)
|
2025-08-05 09:52:53 +00:00 |
|
ravibharathi656
|
cee9f200ad
|
fix(tax withholding details): avoid voucher duplication
(cherry picked from commit 8837016243)
|
2025-08-05 09:46:51 +00:00 |
|
ruthra kumar
|
214f15e700
|
Merge pull request #48972 from frappe/mergify/bp/version-15-hotfix/pr-48718
refactor: process subscriptions in batch wise (backport #48718)
|
2025-08-05 15:13:00 +05:30 |
|
ruthra kumar
|
0341941d3f
|
Merge pull request #48973 from frappe/mergify/bp/version-15-hotfix/pr-48774
perf: process auto bank reconciliation in batches (backport #48774)
|
2025-08-05 15:12:46 +05:30 |
|
diptanilsaha
|
8d1b599d5f
|
refactor(pos): disable grand total to default mode of payment
|
2025-08-05 15:09:55 +05:30 |
|
Khushi Rawat
|
4022fcb0d9
|
Merge pull request #48976 from frappe/mergify/bp/version-15-hotfix/pr-48974
fix: use maintenance_status filter for indicators (backport #48974)
|
2025-08-05 15:07:50 +05:30 |
|
Khushi Rawat
|
4f14651a42
|
chore: resolved conflicts
|
2025-08-05 15:06:57 +05:30 |
|
khushi8112
|
497247d89a
|
chore: fetch docstatus to validate
(cherry picked from commit d6fb99916e)
|
2025-08-05 09:32:29 +00:00 |
|
khushi8112
|
137d2d4044
|
chore: add mistakenly removed test records
(cherry picked from commit f5a71c6b88)
|
2025-08-05 09:32:28 +00:00 |
|