mergify[bot]
|
bab2e86c01
|
chore: remove wrongly configured 'pos*' assignment from CODEOWNERS (backport #48954) (#48955)
chore: remove wrongly configured 'pos*' assignment from CODEOWNERS (#48954)
(cherry picked from commit cc26d5da14)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-08-05 00:10:09 +05:30 |
|
ruthra kumar
|
fc462d4526
|
Merge pull request #48937 from frappe/mergify/bp/version-15-hotfix/pr-48926
fix: provide missing `company` in report records that require reference to `Company:company:default_currency` (backport #48926)
|
2025-08-04 11:02:53 +05:30 |
|
Devin Slauenwhite
|
5b0486ca26
|
fix: payment ledger voucher seperator row currencies
(cherry picked from commit c03f1c25cf)
|
2025-08-04 05:00:08 +00:00 |
|
Devin Slauenwhite
|
dc4b236951
|
fix: provide company for outstanding record.
(cherry picked from commit 97959dbe75)
|
2025-08-04 05:00:08 +00:00 |
|
Devin Slauenwhite
|
070190d07b
|
fix: provide missing company in report records that require reference to Company:company:default_currency
(cherry picked from commit 7f3905185c)
|
2025-08-04 05:00:08 +00:00 |
|
Devin Slauenwhite
|
03550066a7
|
Revert "fix: set proper currency format"
This reverts PR https://github.com/frappe/erpnext/pull/42458
This reverts commit 2533808f1e.
(cherry picked from commit 316470eee4)
|
2025-08-04 05:00:07 +00:00 |
|
ruthra kumar
|
b93cfc5d83
|
Merge pull request #48936 from frappe/mergify/bp/version-15-hotfix/pr-48136
fix(accounts):enable allow_on_submit for accounting dimensions in repost settings allowed doctypes (backport #48136)
|
2025-08-04 09:34:13 +05:30 |
|
ravibharathi656
|
ad56177234
|
fix: include child doctypes in allow_on_submit patch for accounting dimensions
(cherry picked from commit 1e37fd8991)
|
2025-08-04 09:14:13 +05:30 |
|
ravibharathi656
|
e22f93f1fb
|
fix: enable allow_on_submit for accounting dimensions in allowed doctypes
(cherry picked from commit 55e79c4dfd)
|
2025-08-04 03:35:35 +00:00 |
|
ravibharathi656
|
56dca02cab
|
fix: include child doctypes in repostable accounting types
(cherry picked from commit fbd8fd7d22)
|
2025-08-04 03:35:34 +00:00 |
|
Mihir Kandoi
|
c7db277aa8
|
Merge pull request #48928 from frappe/mergify/bp/version-15-hotfix/pr-48748
fix: account currency validation to exclude cancelled entries (backport #48748)
|
2025-08-02 22:34:05 +05:30 |
|
Dev Dusija
|
4ce4d345e7
|
fix: account currency validation to exclude cancelled entries
(cherry picked from commit c9c45fe89f)
|
2025-08-02 16:48:31 +00:00 |
|
Mihir Kandoi
|
f714888d48
|
Merge pull request #48924 from frappe/mergify/bp/version-15-hotfix/pr-48915
fix: set use_serial_batch_fields when creating PR from PO (backport #48915)
|
2025-08-02 20:57:46 +05:30 |
|
Kavin
|
0207b82f82
|
fix: set use_serial_batch_fields when creating PR from PO
(cherry picked from commit a384c96617)
|
2025-08-02 15:12:26 +00:00 |
|
rohitwaghchaure
|
7f1dbeee8b
|
Merge pull request #48914 from rohitwaghchaure/fixed-support-45378
perf: process_gl_map causing performance issues in the reposting
|
2025-08-02 19:01:40 +05:30 |
|
Rohit Waghchaure
|
a96fa55704
|
perf: process_gl_map causing performance issues in the reposting
|
2025-08-02 18:44:32 +05:30 |
|
Mihir Kandoi
|
4488b27fe3
|
Merge pull request #48910 from frappe/mergify/bp/version-15-hotfix/pr-48908
fix: include Sales Invoice in SABB validation for packed items (backport #48908)
|
2025-08-01 17:34:59 +05:30 |
|
Mihir Kandoi
|
d862a742b0
|
fix: include Sales Invoice in SABB validation for packed items
(cherry picked from commit 2ce297aff8)
|
2025-08-01 11:50:21 +00:00 |
|
mergify[bot]
|
cb0addc122
|
fix: multiple fixes for advance payment accounting (backport #48341) (#48896)
* fix: multiple fixes for advance payment accounting
(cherry picked from commit e70caedddc)
# Conflicts:
# erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
# erpnext/accounts/doctype/payment_entry/payment_entry.py
# erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
# erpnext/accounts/utils.py
# erpnext/controllers/accounts_controller.py
# erpnext/patches/v15_0/create_advance_payment_ledger_records.py
* chore: resolve conflicts
* fix: do not execute patch if no advance doctypes
---------
Co-authored-by: Lakshit Jain <108322669+ljain112@users.noreply.github.com>
Co-authored-by: ljain112 <ljain112@gmail.com>
|
2025-08-01 15:30:30 +05:30 |
|
mergify[bot]
|
5de5a8bfd5
|
fix: prevent negative values in BOM fields (#48520, #48662) (backport #48696) (#48897)
* fix: prevent negative values in BOM fields (#48520, #48662) (#48696)
* fix: prevent negative values in BOM fields (#48520, #48662)
* fix: applied non_negative validation using Desk UI for BOM fields
(cherry picked from commit 3a80e116e8)
# Conflicts:
# erpnext/manufacturing/doctype/bom_operation/bom_operation.json
# erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
* chore: resolve conflicts
* chore: resolve conflicts
---------
Co-authored-by: Vishist16 <101823906+Vishist16@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
|
2025-07-31 15:42:23 +00:00 |
|
Mihir Kandoi
|
5291c66ea1
|
Merge pull request #48888 from frappe/mergify/bp/version-15-hotfix/pr-48887
fix: failing subcontracting patch (backport #48887)
|
2025-07-31 16:15:15 +05:30 |
|
Mihir Kandoi
|
ed927a2147
|
chore: add date so patch can rerun
|
2025-07-31 16:00:35 +05:30 |
|
Mihir Kandoi
|
2f4a9f283d
|
fix: failing subcontracting patch
(cherry picked from commit bb43419944)
|
2025-07-31 10:10:40 +00:00 |
|
Mihir Kandoi
|
79bfcbf424
|
Merge pull request #48885 from mihir-kandoi/version-15-hotfix
fix: permission error on tests
|
2025-07-31 14:52:34 +05:30 |
|
Mihir Kandoi
|
c9d69d9629
|
fix: use checkout@v2 instead of v4
|
2025-07-31 14:19:44 +05:30 |
|
Mihir Kandoi
|
6f12029477
|
fix: permission error on tests
|
2025-07-31 14:04:02 +05:30 |
|
mergify[bot]
|
7bb127de63
|
Merge pull request #48876 from frappe/mergify/bp/version-15-hotfix/pr-48873
fix: return conversion factor of variant and not template (backport #48873)
|
2025-07-31 07:03:15 +00:00 |
|
Diptanil Saha
|
87de70f4fd
|
Merge pull request #48877 from frappe/mergify/bp/version-15-hotfix/pr-48619
fix(accounts): allow default bank account per company (backport #48619)
|
2025-07-31 12:21:04 +05:30 |
|
Khushi Rawat
|
782fecca46
|
Merge pull request #48857 from khushi8112/asset-depreciation-on-cancel-of-sales-invoice
fix: do not recalculate depreciation on sale invoice cancellation for fully depreciated asset
|
2025-07-31 12:11:02 +05:30 |
|
Nikhil Kothari
|
8cd90de70b
|
fix(accounts): allow default bank account per company
(cherry picked from commit 982550b92c)
|
2025-07-31 06:34:31 +00:00 |
|
Diptanil Saha
|
0b9a8ee67c
|
Merge pull request #48859 from frappe/mergify/bp/version-15-hotfix/pr-48858
fix: server error on opportunity summary by sales stage report (backport #48858)
|
2025-07-30 16:04:47 +05:30 |
|
diptanilsaha
|
652589f636
|
fix: server error on opportunity summary by sales stage report
(cherry picked from commit 830b3ba1e5)
|
2025-07-30 10:20:05 +00:00 |
|
khushi8112
|
106f7ea112
|
test: test asset status after sales invoice creation and cancellation
|
2025-07-30 13:51:34 +05:30 |
|
khushi8112
|
db41b14317
|
fix: do not recalculate depreciation on sale invoice cancellation for fully depreciated asset
|
2025-07-30 13:50:32 +05:30 |
|
Mihir Kandoi
|
609191c3a5
|
Merge pull request #48852 from frappe/mergify/bp/version-15-hotfix/pr-48851
|
2025-07-29 22:37:58 +05:30 |
|
Mihir Kandoi
|
7489c9159d
|
chore: resolve conflicts
|
2025-07-29 22:22:25 +05:30 |
|
Mihir Kandoi
|
b48619078d
|
Update CODEOWNERS
(cherry picked from commit b9b3302b69)
# Conflicts:
# CODEOWNERS
|
2025-07-29 16:49:03 +00:00 |
|
Diptanil Saha
|
523007588d
|
Merge pull request #48850 from frappe/mergify/bp/version-15-hotfix/pr-48839
fix: change modified timestamp so migrations work (backport #48839)
|
2025-07-29 21:18:48 +05:30 |
|
Diptanil Saha
|
184cabdcb0
|
chore: resolve conflict
|
2025-07-29 21:02:04 +05:30 |
|
Ayush Chaudhari
|
f8ea431551
|
fix: change modified timestamp so migrations work
(cherry picked from commit c18d565d3e)
# Conflicts:
# erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
|
2025-07-29 15:30:28 +00:00 |
|
ruthra kumar
|
9732973b73
|
Merge pull request #48849 from frappe/mergify/bp/version-15-hotfix/pr-48534
fix: update advance paid amount on unreconcile (backport #48534)
|
2025-07-29 20:52:07 +05:30 |
|
Ravibharathi
|
074a7065be
|
fix: update advance paid amount on unreconcile
(cherry picked from commit 99f7eb38d3)
|
2025-07-29 15:06:20 +00:00 |
|
ruthra kumar
|
9f36531f2a
|
Merge pull request #48847 from frappe/mergify/bp/version-15-hotfix/pr-48835
fix: include empty values in user permission (backport #48835)
|
2025-07-29 20:17:23 +05:30 |
|
l0gesh29
|
cfcd21d5c6
|
fix: include empty values in user permission
(cherry picked from commit f13d98fc7c)
|
2025-07-29 14:26:35 +00:00 |
|
rohitwaghchaure
|
5c34299b1e
|
Merge pull request #48843 from frappe/mergify/bp/version-15-hotfix/pr-48743
fix(pick list): make warehouse editable (backport #48743)
|
2025-07-29 18:42:43 +05:30 |
|
rohitwaghchaure
|
4fda27fdba
|
Merge pull request #48842 from frappe/mergify/bp/version-15-hotfix/pr-48841
fix: serial no warehouse for backdated stock reco (backport #48841)
|
2025-07-29 18:32:45 +05:30 |
|
ravibharathi656
|
6a5041042e
|
fix(pick list): make warehouse editable
(cherry picked from commit f5beda48dc)
|
2025-07-29 12:55:17 +00:00 |
|
Rohit Waghchaure
|
b82aea4a87
|
fix: serial no warehouse for backdated stock reco
(cherry picked from commit 1deedc766c)
|
2025-07-29 12:46:52 +00:00 |
|
Khushi Rawat
|
21bdf6ef14
|
Merge pull request #48840 from khushi8112/finance-books-issue-when-asset-splitting
fix: finance books issue when asset splitting
|
2025-07-29 18:01:37 +05:30 |
|
khushi8112
|
bc1d3ea017
|
chore: remove print statement
|
2025-07-29 17:43:21 +05:30 |
|