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 |
|
khushi8112
|
1be071683a
|
test: test assets after split
|
2025-07-29 17:39:48 +05:30 |
|
khushi8112
|
36f22f929d
|
fix: append finance book row only when calculate depreciation is checked
|
2025-07-29 17:39:04 +05:30 |
|
ruthra kumar
|
1d85da43a6
|
Merge pull request #48838 from frappe/mergify/bp/version-15-hotfix/pr-48837
fix: unable to cancel PO if unreconciliation is done (backport #48837)
|
2025-07-29 17:17:35 +05:30 |
|
ruthra kumar
|
424baed077
|
fix: ignore is overridden by transaction.js upon clicking cancel
which overrides with 'Serial and Batch Bundle'
(cherry picked from commit cf70147c0d)
|
2025-07-29 11:34:31 +00:00 |
|
ruthra kumar
|
9508ae5044
|
Merge pull request #48836 from frappe/mergify/bp/version-15-hotfix/pr-48782
fix: attribute error in payment entry (backport #48782)
|
2025-07-29 17:03:55 +05:30 |
|
ljain112
|
1697ac0b57
|
chore: added test case for reconciliation_effect_date
(cherry picked from commit f7ee9ee967)
|
2025-07-29 11:13:12 +00:00 |
|
ljain112
|
3739e2ca5a
|
fix: attribute error in payment entry
(cherry picked from commit dc841fe661)
|
2025-07-29 11:13:12 +00:00 |
|
Khushi Rawat
|
ec9747cc99
|
Merge pull request #48833 from khushi8112/bp-v15-pr-48649
fix: post gl entry on completion date of asset repair
|
2025-07-29 15:36:43 +05:30 |
|
Khushi Rawat
|
21f5541158
|
Merge pull request #48629 from khushi8112/update-value-after-depreciation-after-revaluation
fix: update asset value after revaluation cancellation
|
2025-07-29 15:33:33 +05:30 |
|
khushi8112
|
5a82b723c2
|
fix: post gl entry on completion date of asset repair
|
2025-07-29 15:17:30 +05:30 |
|
Mihir Kandoi
|
d7a9c7b161
|
Merge pull request #48828 from frappe/mergify/bp/version-15-hotfix/pr-48700
fix: prevent negative scrap quantity in Job Card (#48545) (backport #48700)
|
2025-07-29 14:26:05 +05:30 |
|
mergify[bot]
|
e1d7ec906f
|
feat: Add non-negative constraint to workstation cost fields (backport #48557) (#48826)
* feat: Add non-negative constraint to workstation cost fields
(cherry picked from commit a2bb557570)
# Conflicts:
# erpnext/manufacturing/doctype/workstation/workstation.json
* fix: Add non-negative constraint to job capacity field in workstation
(cherry picked from commit 92a12d7fea)
# Conflicts:
# erpnext/manufacturing/doctype/workstation/workstation.json
* chore: resolve conflicts
---------
Co-authored-by: KerollesFathy <kerolles.f@outlook.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
|
2025-07-29 08:53:25 +00:00 |
|
ruthra kumar
|
fe1292e3fa
|
Merge pull request #48829 from frappe/mergify/bp/version-15-hotfix/pr-48593
fix(sales-order): disallow address edits after sales order is submitted (backport #48593)
|
2025-07-29 14:19:38 +05:30 |
|
Diptanil Saha
|
61e5c52419
|
Merge pull request #48830 from frappe/mergify/bp/version-15-hotfix/pr-48769
fix: set letter head from company if exists (backport #48769)
|
2025-07-29 13:56:33 +05:30 |
|
ravibharathi656
|
d4fae00b80
|
fix: set letter head from company if exists
(cherry picked from commit d163da171f)
|
2025-07-29 08:23:11 +00:00 |
|
Bhavan23
|
2073e98613
|
fix(sales-order): disallow address edits after sales order is submitted
(cherry picked from commit daac7c589b)
|
2025-07-29 08:10:07 +00:00 |
|
Vishist Singh Solanki
|
ae945b2e6f
|
fix: prevent negative scrap quantity in Job Card (#48545)
(cherry picked from commit 94ec76545c)
|
2025-07-29 07:57:54 +00:00 |
|
ruthra kumar
|
84c0321785
|
Merge pull request #48827 from frappe/mergify/bp/version-15-hotfix/pr-47877
feat(cashflow): show opening/closing balance (backport #47877)
|
2025-07-29 13:25:18 +05:30 |
|
Mihir Kandoi
|
f0f8666baa
|
Merge pull request #48682 from frappe/mergify/bp/version-15-hotfix/pr-48680
fix: patch to set default buying price list in material request (backport #48680)
|
2025-07-29 13:23:16 +05:30 |
|
Mihir Kandoi
|
5d7b8200fa
|
Merge pull request #48681 from frappe/mergify/bp/version-15-hotfix/pr-48653
feat: button to recalculate costing and billing fields in project (backport #48653)
|
2025-07-29 13:22:59 +05:30 |
|
Logesh Periyasamy
|
7fd5b2b26a
|
feat: show opening/closing balance in cash flow report (#47877)
* feat: add checkbox to carryforward opening balance
* fix: ignore period closing voucher
* chore: rename filter check box
* feat: add total for opening and closing balance
* fix: update section name
* fix: remove section rename
---------
Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com>
(cherry picked from commit 88b9f8d68c)
|
2025-07-29 07:35:55 +00:00 |
|
Mihir Kandoi
|
85f1efe67e
|
Merge pull request #48777 from frappe/mergify/bp/version-15-hotfix/pr-48773
fix: create job card for selected operations only (backport #48773)
|
2025-07-29 13:00:28 +05:30 |
|
ruthra kumar
|
d543a0c959
|
Merge pull request #48823 from frappe/mergify/bp/version-15-hotfix/pr-48757
fix: add patch for update subscription details (backport #48757)
|
2025-07-29 12:29:51 +05:30 |
|
l0gesh29
|
ebda396518
|
fix: update subscription details patch
(cherry picked from commit c7b1379a7f)
|
2025-07-29 06:38:09 +00:00 |
|
Mihir Kandoi
|
c086f43964
|
Merge pull request #48821 from frappe/mergify/bp/version-15-hotfix/pr-48820
fix: over billed purchase receipt status (backport #48820)
|
2025-07-29 12:03:28 +05:30 |
|
Mihir Kandoi
|
3336b5d55d
|
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-48820
|
2025-07-29 11:48:27 +05:30 |
|
mergify[bot]
|
18b007dbf2
|
Merge pull request #48805 from frappe/mergify/bp/version-15-hotfix/pr-48676
fix: missing account in GL entries (subcontracting) (backport #48676)
|
2025-07-29 11:48:12 +05:30 |
|
Mihir Kandoi
|
1efdff0ad1
|
fix: over billed purchase receipt status
(cherry picked from commit 15e354f76e)
|
2025-07-29 06:02:50 +00:00 |
|
Mihir Kandoi
|
92e315c4e1
|
Merge pull request #48811 from frappe/mergify/bp/version-15-hotfix/pr-48804
fix: sql error in quality inspection (backport #48804)
|
2025-07-29 11:18:46 +05:30 |
|
Mihir Kandoi
|
22e6ea41f7
|
Merge pull request #48819 from frappe/mergify/bp/version-15-hotfix/pr-39555
ci: Add fake passing tests when CI is skipped (backport #39555)
|
2025-07-29 11:18:02 +05:30 |
|
ruthra kumar
|
1c81b2c684
|
Merge pull request #48815 from frappe/mergify/bp/version-15-hotfix/pr-48797
fix: avoid auto_repeat on duplicate (backport #48797)
|
2025-07-29 09:18:28 +05:30 |
|
ruthra kumar
|
907358a356
|
Merge pull request #48814 from frappe/mergify/bp/version-15-hotfix/pr-48796
fix: remove alias for order by field (backport #48796)
|
2025-07-29 09:17:55 +05:30 |
|
Mihir Kandoi
|
9c3011cb9f
|
Potential fix for code scanning alert no. 9: Workflow does not contain permissions
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
|
2025-07-28 22:23:42 +05:30 |
|
Mihir Kandoi
|
5840a242a6
|
Potential fix for code scanning alert no. 13: Workflow does not contain permissions
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
|
2025-07-28 22:23:34 +05:30 |
|
Ankush Menat
|
4fd32fc3bd
|
ci: Add fake passing tests when CI is skipped (#39555)
(cherry picked from commit dfda5ad673)
|
2025-07-28 16:50:44 +00:00 |
|
Diptanil Saha
|
2d4419c9d5
|
Merge pull request #48818 from frappe/mergify/bp/version-15-hotfix/pr-48778
fix: fetch payment term template from order (backport #48778)
|
2025-07-28 20:41:42 +05:30 |
|
ravibharathi656
|
ee8eb368e7
|
fix: fetch payment term template from order
(cherry picked from commit 5ed34d6ff9)
|
2025-07-28 14:55:42 +00:00 |
|
Diptanil Saha
|
95470b4262
|
Merge pull request #48816 from diptanilsaha/backport_48675
feat(internal-transaction): fetch valuation rate for internal transaction (backport #48675, #48794)
|
2025-07-28 18:45:30 +05:30 |
|