CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-12 17:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,281 Commits 397 Branches 1,698 Tags
60286bd0756ae9f3d4257d95ec5e226ae8eec2f2
Commit Graph

54281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
UmakanthKaspa
60286bd075 fix: item code not showing in report view 
(cherry picked from commit b20f57321f)

# Conflicts:
#	erpnext/public/js/utils.js
 2026-01-30 16:46:10 +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
Vishnu Priya Baskaran
468ec805f1 fix: check the payment ledger entry has the dimension (#51823) 
* fix: check the payment ledger entry has the dimension

* fix: add project in payment ledger entry

(cherry picked from commit efa3973b77)
 2026-01-27 10:26:52 +00:00
Mihir Kandoi
cd8c6eac7c Merge pull request #52096 from frappe/mergify/bp/version-15-hotfix/pr-52088 
fix: show message if image is removed from item description (backport #52088)
 2026-01-27 14:56:03 +05:30
Mihir Kandoi
90d6bb34dc chore: resolve conflicts 2026-01-27 14:38:19 +05:30
Mihir Kandoi
1545904693 Merge pull request #52099 from aerele/support/fix--58134 2026-01-27 12:50:11 +05:30
Pandiyan37
dadd4b1f95 fix(stock): use purchase UOM in Supplier Quotation items 2026-01-27 12:28:07 +05:30
Mihir Kandoi
0c89cd5524 fix: show message if image is removed from item description 
(cherry picked from commit b49c679a50)

# Conflicts:
#	erpnext/stock/doctype/item/item.py
 2026-01-27 06:50:16 +00:00
mergify[bot]
934b5494f0 fix(payment entry): update currency symbol (backport #51956) (#52093) 
Co-authored-by: NaviN <118178330+Navin-S-R@users.noreply.github.com>
fix(payment entry): update currency symbol (#51956)
 2026-01-27 06:32:59 +00:00
mergify[bot]
72a9b58b14 fix(journal-entry): prevent submit failure due to double background queuing (backport #52083) (#52086) 
Co-authored-by: V Shankar <shankarv292002@gmail.com>
fix(journal-entry): prevent submit failure due to double background queuing (#52083)
 2026-01-27 05:52:23 +00:00
Navin-S-R
5cfd8d1930 refactor: avoid multiple db_set 2026-01-26 23:06:37 +05:30
Navin-S-R
74bf61e0c1 fix(asset capitalization): update asset values using db_set 2026-01-26 21:17:06 +05:30
Mihir Kandoi
c4b135e1a2 Merge pull request #52065 from frappe/mergify/bp/version-15-hotfix/pr-52064 
fix: strip whitespace in customer_name (backport #52064)
 2026-01-26 15:30:50 +05:30
Shankarv19bcr
853facad96 fix: strip whitespace in customer_name 
(cherry picked from commit e5ba0e6401)
 2026-01-26 09:46:51 +00:00
ruthra kumar
636e1ac1f1 Merge pull request #52039 from frappe/mergify/bp/version-15-hotfix/pr-51670 
fix: handle undefined bank_transaction_mapping in quick entry (backport #51670)
 2026-01-25 13:11:45 +05:30
ruthra kumar
df996b8fd3 Merge pull request #52054 from frappe/mergify/bp/version-15-hotfix/pr-52050 
fix: swedish_address_template (backport #52050)
 2026-01-25 13:09:18 +05:30
mahsem
5e6192249e fix: swedish_address_template 
(cherry picked from commit 334e8ada30)
 2026-01-25 05:22:25 +00:00
rohitwaghchaure
398e8d00ec Merge pull request #52052 from frappe/mergify/bp/version-15-hotfix/pr-52043 
fix: UOM of item not fetching in BOM (backport #52043)
 2026-01-25 10:50:52 +05:30
rohitwaghchaure
6be30bbd71 Merge pull request #51904 from frappe/mergify/bp/version-15-hotfix/pr-51900 
fix: validation to check at-least one raw material for manufacture entry (backport #51900)
 2026-01-25 10:45:52 +05:30
Rohit Waghchaure
14de520ebb fix: UOM of item not fetching in BOM 
(cherry picked from commit ba8eadda52)
 2026-01-25 05:14:50 +00:00
rohitwaghchaure
770d0e7f7f Merge pull request #52030 from frappe/mergify/bp/version-15-hotfix/pr-52024 
fix: Bin reserved qty for production for extra material transfer (backport #52024)
 2026-01-25 10:43:48 +05:30
rohitwaghchaure
c351d6b1c0 chore: fix conflicts 
Removed old implementation of make_serialized_item function and updated its definition.
 2026-01-24 13:51:54 +05:30
rohitwaghchaure
a4b099e481 chore: fix conflicts 
Removed subcontracting order validation methods from stock entry.
 2026-01-24 13:50:33 +05:30
rohitwaghchaure
624ec19305 chore: fix conflicts 
Remove test for reserved serial and batch items and clean up related code.
 2026-01-24 13:42:04 +05:30