ruthra kumar
|
d14d09c286
|
Merge pull request #52361 from frappe/mergify/bp/version-15-hotfix/pr-51997
Add partially billed status indicator (backport #51997)
|
2026-02-03 17:19:21 +05:30 |
|
rohitwaghchaure
|
d479930bef
|
Merge pull request #52335 from aerele/v15/pr-52281
fix(stock): add stock recon opening stock condition
|
2026-02-03 16:40:22 +05:30 |
|
rohitwaghchaure
|
edd2814fc4
|
Merge branch 'version-15' into version-15-hotfix
|
2026-02-03 16:36:52 +05:30 |
|
Dharanidharan2813
|
e5e3b8a6ae
|
feat(delivery-note): add status indicator when document is partially billed
(cherry picked from commit 7767000ccf)
# Conflicts:
# erpnext/stock/doctype/delivery_note/delivery_note.json
|
2026-02-03 16:30:49 +05:30 |
|
rohitwaghchaure
|
a1b1011555
|
Merge pull request #52343 from rohitwaghchaure/fixed-negative-stock-error-for-purchase-return-v15
fix: negative stock for purchase return
|
2026-02-03 16:16:08 +05:30 |
|
Rohit Waghchaure
|
c30d76ae68
|
fix: negative stock for purchase return
|
2026-02-03 15:56:53 +05:30 |
|
ruthra kumar
|
2c9c5dcc85
|
Merge pull request #52336 from frappe/mergify/bp/version-15-hotfix/pr-52280
fix(stock): ignore packing slip while cancelling the sales invoice (backport #52280)
|
2026-02-03 13:59:09 +05:30 |
|
Sudharsanan11
|
e6083a57de
|
fix(stock): ignore packing slip while cancelling the sales invoice
(cherry picked from commit c58887b44a)
|
2026-02-03 08:24:45 +00:00 |
|
kavin-114
|
0cbb7f8714
|
fix(stock): add stock recon opening stock condition
|
2026-02-03 13:41:21 +05:30 |
|
ruthra kumar
|
fa01eefd89
|
Merge pull request #52329 from frappe/mergify/bp/version-15-hotfix/pr-51655
fix: include credit notes in project gross margin calculation (backport #51655)
|
2026-02-03 12:19:41 +05:30 |
|
ravibharathi656
|
d9d48da505
|
fix: include credit notes in project gross margin calculation
(cherry picked from commit a378fee8e0)
|
2026-02-03 06:07:34 +00:00 |
|
Mihir Kandoi
|
e1c71e0b8f
|
Merge pull request #52310 from frappe/mergify/bp/version-15-hotfix/pr-52246
fix: validation considers moving average by default instead of set va… (backport #52246)
|
2026-02-03 09:44:50 +05:30 |
|
Mihir Kandoi
|
a61ad15998
|
fix: add missing param
|
2026-02-03 09:29:46 +05:30 |
|
Mihir Kandoi
|
c114f8445b
|
Merge pull request #52323 from frappe/mergify/bp/version-15-hotfix/pr-52184
fix(subcontracting): include item bom in supplied items grouping key (backport #52184)
|
2026-02-03 09:27:55 +05:30 |
|
Mihir Kandoi
|
c6127575f5
|
chore: resolve conflicts
|
2026-02-03 09:12:14 +05:30 |
|
Mihir Kandoi
|
12a2e98751
|
chore: resolve conflicts
|
2026-02-03 09:10:41 +05:30 |
|
Sudharsanan11
|
1d7ba16caf
|
test(subcontracting): add test for consumed_qty calculation with similar finished goods
(cherry picked from commit 4d9412181c)
|
2026-02-03 03:39:49 +00:00 |
|
Sudharsanan11
|
3b12d60877
|
fix(subcontracting): include item bom in supplied items grouping key
(cherry picked from commit 0d372a62a1)
# Conflicts:
# erpnext/controllers/subcontracting_controller.py
|
2026-02-03 03:39:49 +00:00 |
|
mergify[bot]
|
ac1f29d5cb
|
fix: duplicate account number (Indonesia COA) (backport #52080) (#52316)
Co-authored-by: Apriliansyah Idris <apriliansyahidris@gmail.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix: duplicate account number (Indonesia COA) (#52080)
|
2026-02-02 19:37:52 +00:00 |
|
Solede
|
f5481dc7d5
|
fix: backport Switzerland VAT rates update to version-15 (#52244)
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-02-03 00:58:42 +05:30 |
|
Mihir Kandoi
|
5f60c0e85e
|
Merge pull request #52246 from mihir-kandoi/st58765
(cherry picked from commit 135a433018)
# Conflicts:
# erpnext/stock/doctype/delivery_note/test_delivery_note.py
|
2026-02-02 15:15:17 +00:00 |
|
Mihir Kandoi
|
7b059a9221
|
Merge pull request #52307 from frappe/mergify/bp/version-15-hotfix/pr-52304
fix: populate contact fields when creating quotation from customer (backport #52304)
|
2026-02-02 20:32:16 +05:30 |
|
Mihir Kandoi
|
78f8922a9c
|
fix: populate contact fields when creating quotation from customer
(cherry picked from commit 75b2c2c83d)
|
2026-02-02 14:46:21 +00:00 |
|
Mihir Kandoi
|
09c56abeb0
|
Merge pull request #52301 from frappe/mergify/bp/version-15-hotfix/pr-52286
fix: reset incoming rate in selling controller if there are changes i… (backport #52286)
|
2026-02-02 20:03:13 +05:30 |
|
Mihir Kandoi
|
c6937c8375
|
fix: reset incoming rate in selling controller if there are changes in item
(cherry picked from commit 2d6b43fd54)
|
2026-02-02 14:17:43 +00:00 |
|
rohitwaghchaure
|
99ad34d686
|
Merge pull request #52239 from frappe/mergify/bp/version-15-hotfix/pr-52232
fix: validation when more than one FG items in repack stock entry (backport #52232)
|
2026-02-02 14:10:48 +05:30 |
|
ruthra kumar
|
09ab2653d1
|
Merge pull request #52283 from frappe/mergify/bp/version-15-hotfix/pr-52200
fix(accounts): correct date in Journal Auditing Voucher print format (backport #52200)
|
2026-02-02 12:54:47 +05:30 |
|
Tamal Majumdar
|
6413ce467f
|
fix: journal auditing voucher print date to use posting_date
(cherry picked from commit 43e2495df8)
|
2026-02-02 07:21:21 +00:00 |
|
Mihir Kandoi
|
a5156f696c
|
Merge pull request #52275 from frappe/mergify/bp/version-15-hotfix/pr-52274
|
2026-02-02 11:06:19 +05:30 |
|
Mihir Kandoi
|
528a482240
|
fix: imports
|
2026-02-02 10:51:27 +05:30 |
|
Mihir Kandoi
|
d9d4b9b117
|
test: over ordering of quotation items
(cherry picked from commit 53e58f6678)
|
2026-02-02 10:51:27 +05:30 |
|
Mihir Kandoi
|
a4ad4e8279
|
Merge pull request #52277 from frappe/mihir-kandoi-patch-1
|
2026-02-02 10:49:30 +05:30 |
|
Mihir Kandoi
|
d516110572
|
chore: fix py error on v15
|
2026-02-02 10:34:23 +05:30 |
|
Rohit Waghchaure
|
6d14cb0c6b
|
chore: fix conflicts
|
2026-02-01 16:30:59 +05:30 |
|
Mihir Kandoi
|
d30dacce80
|
Merge pull request #52229 from frappe/mergify/bp/version-15-hotfix/pr-52222
|
2026-02-01 13:46:46 +05:30 |
|
Mihir Kandoi
|
7e01ae9e4a
|
fix: revert to old orm
|
2026-02-01 10:26:14 +05:30 |
|
Mihir Kandoi
|
42f94f1aba
|
chore: remove incorrect import
|
2026-01-31 20:36:46 +05:30 |
|
Mihir Kandoi
|
6a681557a9
|
fix: remove unneccessary check
|
2026-01-31 20:27:02 +05:30 |
|
Mihir Kandoi
|
7ab59aa094
|
chore: resolve conflicts
|
2026-01-31 20:25:00 +05:30 |
|
Mihir Kandoi
|
c3b92075f0
|
chore: resolve conflicts
Removed old patch entries and updated the list.
|
2026-01-31 20:20:36 +05:30 |
|
Mihir Kandoi
|
4017936bef
|
chore: resolve conflicts
|
2026-01-31 20:19:07 +05:30 |
|
Mihir Kandoi
|
6cecae288c
|
chore: resolve conflicts
|
2026-01-31 20:18:22 +05:30 |
|
Rohit Waghchaure
|
fec3a8b511
|
fix: validation when more than one FG items in repack stock entry
(cherry picked from commit 6423ce2fa7)
# Conflicts:
# erpnext/stock/doctype/stock_entry/stock_entry.py
|
2026-01-31 07:16:29 +00:00 |
|
Mihir Kandoi
|
2c74491eb6
|
fix: test cases
(cherry picked from commit 36f1e3572c)
|
2026-01-30 14:00:29 +00:00 |
|
Mihir Kandoi
|
0e60750bd8
|
fix: validate over ordering of quotation
(cherry picked from commit 4cc306d2d8)
# Conflicts:
# erpnext/controllers/status_updater.py
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.py
# erpnext/selling/doctype/quotation_item/quotation_item.json
|
2026-01-30 14:00:28 +00:00 |
|
Mihir Kandoi
|
4dfc5671b0
|
Merge pull request #52217 from frappe/mergify/bp/version-15-hotfix/pr-52209
fix: add precision to rejected batch no qty calculation (backport #52209)
|
2026-01-30 12:21:00 +05:30 |
|
Mihir Kandoi
|
003eb02e24
|
Merge pull request #52214 from frappe/mergify/bp/version-15-hotfix/pr-52213
fix: hide close button on WO if WO is completed (backport #52213)
|
2026-01-30 12:06:47 +05:30 |
|
Mihir Kandoi
|
d5570f83d2
|
fix: add precision to rejected batch no qty calculation
(cherry picked from commit 838d245215)
|
2026-01-30 06:35:43 +00:00 |
|
Mihir Kandoi
|
bd96868736
|
fix: hide close button on WO if WO is completed
(cherry picked from commit 6e17ccf499)
|
2026-01-30 06:29:12 +00:00 |
|
Mihir Kandoi
|
85f7196eb5
|
Merge pull request #52211 from frappe/mergify/bp/version-15-hotfix/pr-52210
fix(barcode): failing request when item has both batch and serial (backport #52210)
|
2026-01-30 11:52:42 +05:30 |
|