rohitwaghchaure
|
7cc0436083
|
chore: fix conflicts
|
2025-12-08 19:08:45 +05:30 |
|
rohitwaghchaure
|
f8eb48472e
|
chore: fix conflicts
|
2025-12-08 19:07:13 +05:30 |
|
rohitwaghchaure
|
8074d396d0
|
chore: fix conflicts
Removed posting_datetime and type_of_transaction from the query.
|
2025-12-08 19:05:51 +05:30 |
|
Rohit Waghchaure
|
cfbd71693b
|
fix: inward same serial / batches in disassembly which were used
(cherry picked from commit 95e6c72539)
# Conflicts:
# erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
# erpnext/stock/doctype/stock_entry/stock_entry.py
|
2025-12-08 12:57:58 +00:00 |
|
Diptanil Saha
|
3a2d7d18a3
|
Merge pull request #50946 from frappe/mergify/bp/version-15-hotfix/pr-50931
fix(bulk transaction process): skip records creation if original records are marked 'On Hold' or 'Closed' (backport #50931)
|
2025-12-05 16:56:52 +05:30 |
|
Diptanil Saha
|
b55cefc54f
|
Merge pull request #50945 from frappe/mergify/bp/version-15-hotfix/pr-50943
fix(sales invoice): 100% additional discount gl issue with discount accounting (backport #50943)
|
2025-12-05 16:48:44 +05:30 |
|
Diptanil Saha
|
05778bb81a
|
chore: resolve conflict
|
2025-12-05 16:40:57 +05:30 |
|
Diptanil Saha
|
a70296e9b5
|
Merge pull request #50931 from diptanilsaha/gh-49357
(cherry picked from commit 31d55248e4)
# Conflicts:
# erpnext/utilities/bulk_transaction.py
|
2025-12-05 11:03:16 +00:00 |
|
diptanilsaha
|
bd6210a212
|
fix(sales invoice): 100% additional discount gl issue with discount accounting
(cherry picked from commit d6bdbfe266)
|
2025-12-05 11:02:16 +00:00 |
|
Khushi Rawat
|
944c9ad0b3
|
Merge pull request #50924 from frappe/mergify/bp/version-15-hotfix/pr-50879
fix: remove set_only_once from is_fixed_asset field (backport #50879)
|
2025-12-04 13:04:50 +05:30 |
|
Khushi Rawat
|
bd00a484ea
|
fix: conflicts
|
2025-12-04 12:48:50 +05:30 |
|
Khushi Rawat
|
1427b4ac3f
|
fix: conflicts
|
2025-12-04 12:48:07 +05:30 |
|
ravibharathi656
|
fd6e42e15e
|
fix: remove set_only_once from is_fixed_asset
(cherry picked from commit 70521fb9bf)
# Conflicts:
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/item/item.py
|
2025-12-04 06:44:46 +00:00 |
|
rohitwaghchaure
|
8b071c0d22
|
Merge pull request #50922 from frappe/mergify/bp/version-15-hotfix/pr-50913
fix: variant items not fetched while making BOM for Variant Item (backport #50913)
|
2025-12-04 11:43:57 +05:30 |
|
Rohit Waghchaure
|
176ce0d4d6
|
fix: variant items not fetched while making BOM for Variant Item
(cherry picked from commit a0256bd798)
|
2025-12-04 04:38:17 +00:00 |
|
rohitwaghchaure
|
dd888fc30a
|
Merge pull request #50909 from frappe/mergify/bp/version-15-hotfix/pr-50905
fix: LCV is not changing the valuation of the repacked item (backport #50905)
|
2025-12-04 10:06:31 +05:30 |
|
Mihir Kandoi
|
789adaeabe
|
Merge pull request #50908 from frappe/mergify/bp/version-15-hotfix/pr-50906
fix: untranslated string in job card (backport #50906)
|
2025-12-03 20:05:11 +05:30 |
|
rohitwaghchaure
|
2342f8d710
|
chore: fix conflicts
Removed test for purchase expense account and repost GL entries.
|
2025-12-03 18:38:40 +05:30 |
|
Rohit Waghchaure
|
8b22d9d95e
|
fix: LCV is not changing the valuation of the repacked item
(cherry picked from commit ccbbc60585)
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
|
2025-12-03 12:58:22 +00:00 |
|
rohitwaghchaure
|
626c799b60
|
Merge pull request #50907 from frappe/mergify/bp/version-15-hotfix/pr-50902
fix: fg qty uom in manufacture entry (backport #50902)
|
2025-12-03 18:22:15 +05:30 |
|
Mihir Kandoi
|
b2f6d07c25
|
fix: untranslated string in job card
(cherry picked from commit ec06f4a71b)
|
2025-12-03 12:40:35 +00:00 |
|
Mihir Kandoi
|
70d57260d6
|
fix: fg qty uom in manufacture entry
(cherry picked from commit d9a377108c)
|
2025-12-03 12:37:19 +00:00 |
|
Khushi Rawat
|
9062b90237
|
Merge pull request #50887 from 0xD0M1M0/patch-1
fix: Reduce asset value on asset capitalization cancelation
|
2025-12-03 15:01:41 +05:30 |
|
rohitwaghchaure
|
40467bc26c
|
Merge pull request #50901 from frappe/mergify/bp/version-15-hotfix/pr-50896
fix: quality inspection showing Not Saved (backport #50896)
|
2025-12-03 14:52:51 +05:30 |
|
Rohit Waghchaure
|
abe599a49d
|
fix: quality inspection showing Not Saved
(cherry picked from commit 3f78d6afed)
|
2025-12-03 08:08:37 +00:00 |
|
rohitwaghchaure
|
9975f5fe69
|
Merge pull request #50889 from frappe/mergify/bp/version-15-hotfix/pr-50888
fix: cost center not reset (backport #50888)
|
2025-12-02 22:37:08 +05:30 |
|
Rohit Waghchaure
|
8a3148eee6
|
fix: cost center not reset
(cherry picked from commit 29f2ecbd6f)
|
2025-12-02 16:30:41 +00:00 |
|
Diptanil Saha
|
3f673a6848
|
Merge pull request #50886 from frappe/mergify/bp/version-15-hotfix/pr-50882
fix: mandatory depends on for the rejected inventory dimension field (backport #50882)
|
2025-12-02 21:26:26 +05:30 |
|
Diptanil Saha
|
293f114c9d
|
Merge pull request #50847 from barredterra/rm-unused-translations
|
2025-12-02 21:19:55 +05:30 |
|
Diptanil Saha
|
252cc89ec7
|
Merge pull request #50871 from frappe/mergify/bp/version-15-hotfix/pr-50846
|
2025-12-02 21:19:40 +05:30 |
|
Diptanil Saha
|
3eaccfe201
|
Merge pull request #50873 from frappe/mergify/bp/version-15-hotfix/pr-50773
fix: add validation for cancelled reposting entries (backport #50773)
|
2025-12-02 21:15:56 +05:30 |
|
Diptanil Saha
|
653bb1072f
|
Merge pull request #50885 from frappe/mergify/bp/version-15-hotfix/pr-50864
fix: exclude is_group records (backport #50864)
|
2025-12-02 21:14:35 +05:30 |
|
Diptanil Saha
|
0a64e43e92
|
chore: resolve linter issue
|
2025-12-02 21:04:00 +05:30 |
|
diptanilsaha
|
020db922b7
|
chore: resolve conflicts
|
2025-12-02 20:56:54 +05:30 |
|
rohitwaghchaure
|
a67a11e933
|
Merge pull request #50884 from rohitwaghchaure/fixed-donot-override-source
fix: do not override source document in serial no
|
2025-12-02 20:55:22 +05:30 |
|
Rohit Waghchaure
|
8c620802f0
|
fix: mandatory depends on for the rejected inventory dimension field
(cherry picked from commit 5daa625fe8)
|
2025-12-02 15:10:40 +00:00 |
|
0xD0M1M0
|
a31fb2ac6c
|
fix: Adjust asset purchase amounts based on docstatus
allows cancelation
|
2025-12-02 16:09:56 +01:00 |
|
ravibharathi656
|
a444325bd1
|
fix: exclude is_group records
(cherry picked from commit e08805128b)
# Conflicts:
# erpnext/setup/doctype/customer_group/customer_group.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/setup/doctype/supplier_group/supplier_group.json
# erpnext/setup/doctype/territory/territory.json
|
2025-12-02 15:07:39 +00:00 |
|
rohitwaghchaure
|
2f4b1341d2
|
Merge pull request #50878 from frappe/mergify/bp/version-15-hotfix/pr-50808
fix(stock entry): use fg item expense account for direct manufacturing entry (backport #50808)
|
2025-12-02 20:37:39 +05:30 |
|
Diptanil Saha
|
7640944bb9
|
Merge pull request #50881 from frappe/mergify/bp/version-15-hotfix/pr-50372
fix: add validation for company linked address field (backport #50372)
|
2025-12-02 20:36:22 +05:30 |
|
Rohit Waghchaure
|
69c6b2f463
|
fix: do not override source document in serial no
|
2025-12-02 20:34:55 +05:30 |
|
Pugazhendhi Velu
|
ef6f2389a0
|
test: add minimal test case
(cherry picked from commit e64b6db2eb)
|
2025-12-02 14:45:03 +00:00 |
|
Pugazhendhi Velu
|
1d4b97c619
|
test: add test for company linked address fields
(cherry picked from commit e10007c646)
|
2025-12-02 14:45:02 +00:00 |
|
Pugazhendhi Velu
|
0aed8c04c6
|
fix: add validation for company linked address fields
(cherry picked from commit 800a44a65f)
|
2025-12-02 14:45:02 +00:00 |
|
rohitwaghchaure
|
b1b6953aed
|
chore: fix conflicts
|
2025-12-02 17:44:17 +05:30 |
|
rohitwaghchaure
|
b2ea5620b2
|
chore: fix conflicts
Removed the expense account assignment for subcontracting delivery.
|
2025-12-02 17:42:18 +05:30 |
|
rohitwaghchaure
|
743b179b08
|
Merge pull request #50877 from frappe/mergify/bp/version-15-hotfix/pr-50850
fix(barcode_scanner): set serial and batch before item to prevent FIFO override (backport #50850)
|
2025-12-02 17:41:31 +05:30 |
|
Pugazhendhi Velu
|
4553d04c38
|
test: add test for fg item expense account in direct manufacturing
(cherry picked from commit ba2411b4ee)
# Conflicts:
# erpnext/stock/doctype/stock_entry/test_stock_entry.py
|
2025-12-02 12:03:37 +00:00 |
|
Pugazhendhi Velu
|
4ca5e9eef8
|
fix(stock entry): use fg item expense account for direct manufacturing entry
(cherry picked from commit ce1312764f)
# Conflicts:
# erpnext/stock/doctype/stock_entry/stock_entry.py
|
2025-12-02 12:03:37 +00:00 |
|
Pugazhendhi Velu
|
7d7f929cfc
|
fix(barcode_scanner): set serial and batch before item to prevent FIFO override
(cherry picked from commit 92ec633a5c)
|
2025-12-02 12:02:36 +00:00 |
|