nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-09 09:55:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,197 Commits 435 Branches 1,733 Tags
bec83c19444955b1be596dd4679bae0a5d6ff2c9
Commit Graph

57197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
ruthra kumar
e91cbd94b4 refactor(test): process statement of acc remove commit 
(cherry picked from commit bc2b8da597)
 2026-03-24 17:52:41 +05:30
ruthra kumar
7f29245eb6 refactor(test): move location creation to bootstrap in asset movement 
(cherry picked from commit fd2b76a4d2)
 2026-03-24 17:52:41 +05:30
ruthra kumar
f0aa82cc6d refactor(test): make stock entry deterministic 
(cherry picked from commit 8fd65d7afa)
 2026-03-24 17:52:41 +05:30
ruthra kumar
37ad0665c6 refactor(test): make asset capitalization deterministic 
(cherry picked from commit 2c53cf3902)
 2026-03-24 17:52:41 +05:30
ruthra kumar
8ea9133caa refactor(test): make ledger merge deterministic 
(cherry picked from commit d3cf8cb851)
 2026-03-24 17:52:41 +05:30
ruthra kumar
0ba03ce851 refactor(test): SLA move company creation to bootstrap 
(cherry picked from commit 77f41e120d)
 2026-03-24 17:52:41 +05:30
ruthra kumar
ad2cf0624f refactor(test): move webform custom dt creation to boostrap 
(cherry picked from commit 426b7db3c8)
 2026-03-24 17:52:41 +05:30
ruthra kumar
cdc77caf6a refactor(test): move custom doctype data setup to bootstrap 
(cherry picked from commit 934740205a)
 2026-03-24 17:52:41 +05:30
ruthra kumar
d41e7098bd refactor(test): move tax category custom field creation to bootstrap 
(cherry picked from commit 4454af8efd)
 2026-03-24 17:52:41 +05:30
ruthra kumar
ebe45add4c refactor(test): move trial company creation to bootstrap 
(cherry picked from commit 11fb00c21d)
 2026-03-24 17:52:41 +05:30
ruthra kumar
bb42d3ddbe refactor(test): move purchase invoice dimension setup to bootstrap 
(cherry picked from commit 31ce09204f)
 2026-03-24 17:52:41 +05:30
ruthra kumar
ee72ed94d5 refactor(test): move company setup to bootstrap 
(cherry picked from commit 9ed072ac83)
 2026-03-24 17:52:41 +05:30
ruthra kumar
941375877e refactor(test): move dimension setup to test data bootstrap 
and remove create_dimension() and disable_dimension()

(cherry picked from commit 342ce65401)
 2026-03-24 17:52:37 +05:30
ruthra kumar
4148d7d414 Merge pull request #53750 from frappe/mergify/bp/version-16-hotfix/pr-52285 
fix(Payment Entry): split orders as per the schedules in the reference table (backport #52285)
 2026-03-24 17:49:48 +05:30
ruthra kumar
9669a2c56f refactor(test): move commits inside test guard clause 
(cherry picked from commit ed76d6699a)
 2026-03-24 12:14:03 +00:00
Jatin3128
2693ffe680 fix(Payment Entry): split orders as per the schedules in the refrence table 
(cherry picked from commit a9e52833fe)
 2026-03-24 11:59:33 +00:00
Nishka Gosalia
f9bbf7bee4 Merge pull request #53747 from frappe/mergify/bp/version-16-hotfix/pr-53738 2026-03-24 16:48:34 +05:30
nishkagosalia
0571830720 refactor: item master ux improvements 
(cherry picked from commit be55082751)
 2026-03-24 10:59:06 +00:00
Khushi Rawat
6239e336ae Merge pull request #53729 from frappe/mergify/bp/version-16-hotfix/pr-53680 
fix(UX): improve party selection UX with party name field (backport #53680)
 2026-03-24 12:03:37 +05:30