nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 03:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,216 Commits 432 Branches 1,737 Tags
3af5b67e43e5df4189e81dc35b2e092dfe3b7380
Commit Graph

57216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
3af5b67e43 Merge pull request #53905 from frappe/mergify/bp/version-16-hotfix/pr-53902 
fix: item-wh reposting, code cleanup (backport #53902)
 2026-03-30 14:22:35 +05:30
Rohit Waghchaure
8d2c4da931 fix: item-wh reposting, code cleanup 
(cherry picked from commit e0ca34ae39)
 2026-03-30 08:31:48 +00:00
mergify[bot]
f01f7e7974 fix(warehouse_capacity_dashboard): escaping warehouse, item_code and company on get_data (backport #53894) (#53900) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(warehouse_capacity_dashboard): escaping `warehouse`, `item_code` and `company` on `get_data` (#53894)
 2026-03-30 13:48:25 +05:30
mergify[bot]
ad3c1e520e fix(stock): add warehouse filter to pick work order raw materials (backport #53748) (#53898) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(stock): add warehouse filter to pick work order raw materials (#53748)
 2026-03-30 08:12:48 +00:00
mergify[bot]
319ba31b77 fix(stock): ignore qty validation for pick list (backport #53871) (#53892) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(stock): ignore qty validation for pick list (#53871)
 2026-03-30 06:59:29 +00:00
rohitwaghchaure
68d93a2dae Merge pull request #53810 from frappe/mergify/bp/version-16-hotfix/pr-53216 
fix(stock): handle legacy single sle recon entries (backport #53216)
 2026-03-30 11:34:36 +05:30
mergify[bot]
b2cba0286e refactor: setup wizard stages and demo data creation (backport #53866) (#53868) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-03-29 17:05:36 +00:00
mergify[bot]
f6fa9726f9 fix(manufacturing): update the qty precision (backport #53874) (#53885) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(manufacturing): update the qty precision (#53874)
 2026-03-29 16:43:26 +00:00
MochaMind
83cac15755 chore: update POT file (#53875) 2026-03-29 14:55:38 +02:00
rohitwaghchaure
e3f144cb28 Merge pull request #53880 from frappe/mergify/bp/version-16-hotfix/pr-53878 
fix: maintain state during reposting (backport #53878)
 2026-03-29 16:32:07 +05:30
Rohit Waghchaure
544c91441b fix: maintain state during reposting 
(cherry picked from commit f8738a791b)
 2026-03-29 10:43:06 +00:00
mergify[bot]
2907c411f3 fix: change shipment parcel dimension fields from Int to Float (backport #53867) (#53873) 
Co-authored-by: Kaushal Shriwas <64089478+kaulith@users.noreply.github.com>
fix: change shipment parcel dimension fields from Int to Float (#53867)
 2026-03-29 07:10:14 +00:00
rohitwaghchaure
0b324b2892 Merge pull request #53856 from frappe/mergify/bp/version-16-hotfix/pr-53853 
fix: corrected logic to retry reposting if timeout occurs after dependant SLE processing  (backport #53853)
 2026-03-27 22:35:42 +05:30
Rohit Waghchaure
8fbb86d53e fix: corrected logic to retry reposting if timeout occurs after dependent SLE processing 
(cherry picked from commit 90b9ab0bc8)
 2026-03-27 15:56:46 +00:00
mergify[bot]
1c1369fea8 fix: invalid dynamic link filter for address doctype (backport #53849) (#53852) 2026-03-27 12:45:50 +00:00
mergify[bot]
9a2851f221 fix: validate if quantity greater than 0 in item dashboard (backport #53846) (#53848) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: validate if quantity greater than 0 in item dashboard (#53846)
 2026-03-27 10:34:18 +00:00
mergify[bot]
c9953580b2 ci: semgrep to prevent test regression (backport #53837) (#53840) 
ci: semgrep to prevent test regression

(cherry picked from commit be4496e4ab)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2026-03-27 08:32:29 +00:00
mergify[bot]
675b94b7a2 fix: support translated search in get_party_type and refactor raw sql to qb (backport #53191) (#53832) 
* fix: support translated search in get_party_type and refactor raw sql to qb

(cherry picked from commit d987688058)

# Conflicts:
#	erpnext/setup/doctype/party_type/party_type.py

* fix: resolve merge conflicts in party_type.py

---------

Co-authored-by: Shllokkk <140623894+Shllokkk@users.noreply.github.com>
 2026-03-27 13:42:46 +05:30
rohitwaghchaure
bec83c1944 Merge pull request #53805 from frappe/mergify/bp/version-16-hotfix/pr-52152 
Refactor reposting feature (backport #52152)
 2026-03-27 12:36:22 +05:30
Nishka Gosalia
fbd72ff232 Merge pull request #53835 from frappe/mergify/bp/version-16-hotfix/pr-53704 2026-03-27 12:27:28 +05:30
Rohit Waghchaure
15739b5d81 fix: pick correct dependant sle during reposting 2026-03-27 12:10:45 +05:30
Rohit Waghchaure
f663f9b27e refactor: storing of current status of reposting 
(cherry picked from commit daa2420996)
 2026-03-27 12:10:45 +05:30
Rohit Waghchaure
5bbecbf7c4 refactor: reposting for better peformance 
(cherry picked from commit 20787ef5da)
 2026-03-27 12:10:45 +05:30
nishkagosalia
3a8e1e3faa fix: test file deletion 2026-03-27 12:03:20 +05:30
Ravibharathi
c78a5af073 Merge pull request #53820 from frappe/mergify/bp/version-16-hotfix/pr-53710 
fix(accounts): set supplier name as title field in Purchase Invoice (backport #53710)
 2026-03-27 11:59:39 +05:30
kavin-114
dd0613a4a8 fix(stock): handle legacy single sle recon entries 
(cherry picked from commit 7e6bbcc3fb)
 2026-03-27 11:49:45 +05:30
nishkagosalia
5039f896bf fix: test case 
(cherry picked from commit 3a78af7f42)
 2026-03-27 06:09:18 +00:00
nishkagosalia
d1a3571918 chore: Dropping bom stock report and bom stock calculated report 
(cherry picked from commit 3bedc6cf7e)

# Conflicts:
#	erpnext/manufacturing/report/bom_stock_calculated/test_bom_stock_calculated.py
 2026-03-27 06:09:17 +00:00
nishkagosalia
6d92792634 fix: change in functionality 
(cherry picked from commit c1874cb7d5)
 2026-03-27 06:09:17 +00:00
nishkagosalia
8a5e2cc0a6 feat: Bom stock analysis report 
(cherry picked from commit 5d088350dc)
 2026-03-27 06:09:17 +00:00
ravibharathi656
d12b54c50a chore: resolve conflict 2026-03-27 11:24:35 +05:30
rohitwaghchaure
d7237519a2 Merge pull request #53826 from rohitwaghchaure/fixed-test-case-for-process-loss 
test: fixed test case
 2026-03-27 11:17:13 +05:30
ruthra kumar
f1af745932 Merge pull request #53830 from frappe/mergify/bp/version-16-hotfix/pr-53429 
feat(report): add service start/end date and amount with roll-ups in deferred revenue/expense report (backport #53429)
 2026-03-27 10:59:54 +05:30
ruthra kumar
610052d487 Merge pull request #53828 from frappe/mergify/bp/version-16-hotfix/pr-53343 
fix(email_campaign): prevent unsubscribing entire campaign when email group member unsubscribes (backport #53343)
 2026-03-27 10:48:46 +05:30
Shllokkk
407c3cd575 feat(report): add service start/end date and amount with roll-ups in deferred revenue/expense report 
(cherry picked from commit 8e5692d8a3)
 2026-03-27 05:00:50 +00:00
Shllokkk
00bb07aaa3 fix(email_campaign): prevent unsubscribing entire campaign when email group member unsubscribes 
(cherry picked from commit 56f597f5ad)
 2026-03-27 04:57:50 +00:00
Rohit Waghchaure
10f58112ae test: fixed test case 2026-03-27 10:04:55 +05:30
mergify[bot]
3d79dce8b3 fix: flaky currency exchange test (backport #53813) (#53817) 2026-03-26 15:09:13 +00:00
Pandiyan P
f2195fa67d fix(accounts): set supplier name as title field in Purchase Invoice (#53710) 
fix(accounts): update title field in purchase order and purchase invoice

(cherry picked from commit 5b1fa81451)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
 2026-03-26 13:30:44 +00:00
mergify[bot]
09a4f630e1 fix: keep from and to time blank until added explicitly (backport #53798) (#53801) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: keep from and to time blank until added explicitly (#53798)
 2026-03-26 07:42:54 +00:00
mergify[bot]
72efbc2b42 fix: purchase invoice for internal transfers should not require PO (backport #53791) (#53793) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: purchase invoice for internal transfers should not require PO (#53791)
 2026-03-26 04:24:43 +05:30
mergify[bot]
737cb371d7 fix(contract_template): restrict create, write and delete access only to System Manager (backport #53787) (#53789) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(contract_template): restrict `create`, `write` and `delete` access only to `System Manager` (#53787)
 2026-03-25 15:26:34 +00:00
Khushi Rawat
b072dd4497 Merge pull request #53728 from frappe/mergify/bp/version-16-hotfix/pr-53646 
feat: default print format for Request for Quotation (backport #53646)
 2026-03-25 17:32:17 +05:30
diptanilsaha
62dc3ce6d8 Merge pull request #53781 from frappe/mergify/bp/version-16-hotfix/pr-53779 
fix(template): escape attachment `file_url` and `file_name` and jinja syntax (backport #53779)
 2026-03-25 15:20:20 +05:30
diptanilsaha
c3cb9cc003 fix(templates): using correct syntax of include in projects.html 
(cherry picked from commit bc6561cdd0)
 2026-03-25 09:28:37 +00:00
diptanilsaha
38bc5d69cd fix(templates): escape attachment file_url and file_name in order.html and projects.html 
(cherry picked from commit d9760bbf4f)
 2026-03-25 09:28:36 +00:00
mergify[bot]
a93d715916 fix(manufacturing): update condition for base hour rate calculation (backport #53753) (#53771) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(manufacturing): update condition for base hour rate calculation (#53753)
 2026-03-25 06:29:08 +00:00
mergify[bot]
37b68a07aa fix(manufacturing): apply work order status filter in job card (backport #53766) (#53768) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
fix(manufacturing): apply work order status filter in job card (#53766)
 2026-03-25 05:52:27 +00:00
mergify[bot]
1872dccb0a fix: do not check for sub assembly reference for rm of fg (backport #53758) (#53759) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: do not check for sub assembly reference for rm of fg (#53758)
 2026-03-25 11:10:16 +05:30
ruthra kumar
47438a44d3 Merge pull request #53752 from frappe/mergify/bp/version-16-hotfix/pr-53657 
refactor(test): move remaining commits inside test guard (backport #53657)
 2026-03-24 18:24:58 +05:30