kavin-114
|
31aa11675b
|
fix(stock): add stock recon opening stock condition
(cherry picked from commit f3eb6c7078)
# Conflicts:
# erpnext/stock/report/stock_balance/stock_balance.py
|
2026-02-02 14:37:18 +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 |
|
Mihir Kandoi
|
19e0d75c22
|
fix(barcode): failing request when item has both batch and serial
(cherry picked from commit 89f6f0f46f)
|
2026-01-30 06:17:25 +00:00 |
|
rohitwaghchaure
|
3570ab8868
|
Merge pull request #52191 from frappe/mergify/bp/version-15-hotfix/pr-52158
Add Landed Cost Voucher Amount in Internal Purchase Receipt (backport #52158)
|
2026-01-29 17:56:11 +05:30 |
|
kavin-114
|
3ccd1b4a6c
|
test: add unit test to check internal purchase with lcv
(cherry picked from commit dd4fd89ef8)
|
2026-01-29 12:02:34 +00:00 |
|
kavin-114
|
41c592a1a8
|
fix(stock): set incoming_rate with lcv rate for internal purchase
(cherry picked from commit f0dccc3cd7)
|
2026-01-29 12:02:34 +00:00 |
|
mergify[bot]
|
ad8c8cb0e8
|
Merge pull request #52140 from frappe/mergify/bp/version-15-hotfix/pr-52007
Fix: Set Zero Rate for Standalone Credit Note with Expired Batch (backport #52007)
|
2026-01-29 14:30:22 +05:30 |
|
Mihir Kandoi
|
7417432ddb
|
Merge pull request #52167 from frappe/mergify/bp/version-15-hotfix/pr-52166
fix: production plan not considering planning datetime when creating WO (backport #52166)
|
2026-01-29 11:05:39 +05:30 |
|
Mihir Kandoi
|
7b6c7c3e27
|
fix: production plan not considering planning datetime when creating WO
(cherry picked from commit 4e19c7e8bd)
|
2026-01-29 05:20:41 +00:00 |
|
Aarol D'Souza
|
df857f8177
|
Merge pull request #52163 from frappe/mergify/bp/version-15-hotfix/pr-52092
fix(RFQ): render email templates for preview and sending (backport #52092)
|
2026-01-29 09:22:32 +05:30 |
|
AarDG10
|
43fc1ae4bf
|
ci: minor text correction
(cherry picked from commit 37cdae2f34)
|
2026-01-29 03:37:44 +00:00 |
|
AarDG10
|
07c56221a5
|
fix(RFQ): render email templates for preview and sending
(cherry picked from commit 525b3960e1)
|
2026-01-29 03:37:44 +00:00 |
|
mergify[bot]
|
f48b4cda50
|
feat: filter to display trial balance report without group account (backport #48486) (#52146)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2026-01-28 11:40:18 +00:00 |
|
mergify[bot]
|
7226066772
|
fix(bank_account): is_company_account related validations (backport #51887) (#51921)
Co-authored-by: diptanilsaha <diptanil@frappe.io>
|
2026-01-28 10:22:09 +00:00 |
|
aymenit2008
|
afc4c856f8
|
fix: add docstatus condition to get_sales_invoice_item function (#51517)
|
2026-01-28 15:43:33 +05:30 |
|
mergify[bot]
|
22869b6f9d
|
fix(mode of payment): use valid syntax (backport #51542) (#52134)
Co-authored-by: ervishnucs <ervishnucs369@gmail.com>
|
2026-01-28 15:10:31 +05:30 |
|
Mihir Kandoi
|
0c395725b7
|
Merge pull request #52123 from frappe/mergify/bp/version-15-hotfix/pr-51961
fix(sales order): set project at item level from parent (backport #51961)
|
2026-01-27 21:55:31 +05:30 |
|
SowmyaArunachalam
|
7146c0385c
|
fix: handle parent level project change
(cherry picked from commit 543b6e51c0)
|
2026-01-27 16:24:06 +00:00 |
|
SowmyaArunachalam
|
e12564daa6
|
chore: use frappe.model.set_value
(cherry picked from commit 3b27f49d79)
|
2026-01-27 16:24:06 +00:00 |
|
SowmyaArunachalam
|
a09b73e65d
|
fix(sales order): set project at item level from parent
(cherry picked from commit 9e51701e2a)
|
2026-01-27 16:24:05 +00:00 |
|
Mihir Kandoi
|
654a55260d
|
Merge pull request #52121 from frappe/mergify/bp/version-15-hotfix/pr-52084
fix(shipment): user contact validation to use full name (backport #52084)
|
2026-01-27 21:28:34 +05:30 |
|
harrishragavan
|
90dc22a57d
|
fix(shipment): user contact validation to use full name
(cherry picked from commit 3c6eb9a531)
|
2026-01-27 15:57:05 +00:00 |
|
Khushi Rawat
|
e826e03f9a
|
Merge pull request #52073 from aerele/update-asset-purchase-amt
fix(asset capitalization): update asset values using db_set
|
2026-01-27 17:06:17 +05:30 |
|
ruthra kumar
|
de4e62e308
|
Merge pull request #52107 from frappe/mergify/bp/version-15-hotfix/pr-51823
fix: check the payment ledger entry has the dimension (backport #51823)
|
2026-01-27 16:27:32 +05:30 |
|