nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-30 12:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,582 Commits 439 Branches 1,726 Tags
2495cb8b2aca77eae8973bd2d3d5da3946b238f2
Commit Graph

56582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ljain112
2495cb8b2a fix: ensure cache is cleared on fiscal year update and trash 
(cherry picked from commit 39b0e3522a)
 2026-02-25 14:36:08 +00:00
rohitwaghchaure
a864ca5c17 Merge pull request #52962 from frappe/mergify/bp/version-16-hotfix/pr-52957 
fix: reposting creation slow for GL entries (backport #52957)
 2026-02-25 18:09:10 +05:30
ruthra kumar
cd465e1dbd refactor: Journal Entry form cleanup (backport #52780) (#52961) 
refactor: Journal Entry form cleanup

(cherry picked from commit 73d5aa35a1)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2026-02-25 16:27:03 +05:30
Rohit Waghchaure
ab7e33f83d fix: reposting creation slow for GL entries 
(cherry picked from commit d9ac198bad)
 2026-02-25 10:34:25 +00:00
ruthra kumar
0f59da89cf refactor: Journal Entry form cleanup 
(cherry picked from commit 73d5aa35a1)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
 2026-02-25 15:51:58 +05:30
ruthra kumar
5cc95a32c2 Merge pull request #52959 from frappe/mergify/bp/version-16-hotfix/pr-51558 
fix(postgres): avoid UNSIGNED cast in customer autoname (backport #51558)
 2026-02-25 15:10:50 +05:30
ruthra kumar
c98263cd77 Merge pull request #52950 from frappe/mergify/bp/version-16-hotfix/pr-52507 
refactor: toggle for UTM parameters (backport #52507)
 2026-02-25 15:10:30 +05:30
Matt Howard
d922213dd7 fix(postgres): avoid UNSIGNED cast in customer autoname 
(cherry picked from commit 323636b396)
 2026-02-25 09:21:10 +00:00
ruthra kumar
270b09f936 chore: resolve conflicts 2026-02-25 14:42:52 +05:30
ruthra kumar
4acf404ae5 refactor: better description on toggle 
(cherry picked from commit 20af546b26)
 2026-02-25 06:54:16 +00:00
ruthra kumar
0433f73b03 refactor: utm analytics section delivery note 
(cherry picked from commit 578783af8e)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.json
 2026-02-25 06:54:16 +00:00
ruthra kumar
2bb8c7c74e refactor: utm section in opportunity 
(cherry picked from commit 223d560b32)
 2026-02-25 06:54:16 +00:00
ruthra kumar
3a8967b2a7 refactor: utm analytics section in lead 
(cherry picked from commit 71e8941285)
 2026-02-25 06:54:16 +00:00
ruthra kumar
fc0a07b3b1 refactor: utm analytics section in pos profile 
(cherry picked from commit 7de0ca164d)

# Conflicts:
#	erpnext/accounts/doctype/pos_profile/pos_profile.json
 2026-02-25 06:54:15 +00:00
ruthra kumar
08df2a755e refactor: utm section pos invoice 
(cherry picked from commit 0bafa347a5)
 2026-02-25 06:54:15 +00:00
ruthra kumar
964d75bd3e refactor: utm section in sales invoice 
(cherry picked from commit 678d261f40)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 2026-02-25 06:54:15 +00:00
ruthra kumar
774aa2b78f refactor: utm section in sales order 
(cherry picked from commit c00bf7df6a)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.json
 2026-02-25 06:54:14 +00:00
ruthra kumar
6539e443a5 refactor: hide UTM parameters 
(cherry picked from commit aaf5f923b0)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.json
 2026-02-25 06:54:14 +00:00
Mihir Kandoi
16e29d8571 Merge pull request #52944 from frappe/mergify/bp/version-16-hotfix/pr-52942 2026-02-25 11:04:43 +05:30
Mihir Kandoi
5db413d802 Merge pull request #52946 from frappe/mergify/bp/version-16-hotfix/pr-52945 
fix: item code shows undefined (backport #52945)
 2026-02-25 10:49:46 +05:30
Mihir Kandoi
0fd9fc48f3 fix: item code shows undefined 
(cherry picked from commit 9ef7f05712)
 2026-02-25 04:55:59 +00:00
Mihir Kandoi
265342d40a chore: clearer description for internal transfer at arms length 
(cherry picked from commit bd9e5e97d7)
 2026-02-25 04:43:22 +00:00
Khushi Rawat
cc604d4921 Merge pull request #52938 from frappe/mergify/bp/version-16-hotfix/pr-52889 
feat: default letterhead and print format (backport #52889)
 2026-02-25 00:39:54 +05:30
Khushi Rawat
1311664f52 Merge pull request #52939 from frappe/mergify/bp/version-16-hotfix/pr-52861 
feat: standard print format for Sales Order and Purchase Invoice (backport #52861)
 2026-02-25 00:37:37 +05:30
khushi8112
f4ec356dfb refactor: add translation and fix typo 
(cherry picked from commit cbea4493c1)
 2026-02-24 15:53:41 +00:00
khushi8112
222f51b4d0 feat: standard print format for Sales Order and Purchase Invoice 
(cherry picked from commit 371efce88a)
 2026-02-24 15:53:41 +00:00
khushi8112
1e64dea6a0 fix: test cases related to default letterhead change 
(cherry picked from commit 8a2cb96c2a)
 2026-02-24 15:52:54 +00:00
khushi8112
b21acec711 test: debugging the issue 
(cherry picked from commit 570f574758)
 2026-02-24 15:52:54 +00:00
khushi8112
dd41f2ceb7 fix: add missing property_type 
(cherry picked from commit fbf5529ddd)
 2026-02-24 15:52:54 +00:00
khushi8112
4adcc1c521 feat: default letterhead and print format 
(cherry picked from commit 0ea22f9796)
 2026-02-24 15:52:53 +00:00
Mihir Kandoi
6975fa185c Merge pull request #52937 from frappe/mergify/bp/version-16-hotfix/pr-52724 2026-02-24 20:57:08 +05:30
ljain112
6902fd6b33 refactor: use postprocess in mapped_doc to update items in subcontracting controller 
(cherry picked from commit 1d3d09f48c)
 2026-02-24 15:07:59 +00:00
ruthra kumar
9336f1f9a4 Merge pull request #52934 from frappe/mergify/bp/version-16-hotfix/pr-51777 
feat: making payment requests based on payment schedule (backport #51777)
 2026-02-24 18:55:13 +05:30
ruthra kumar
aaba93bd03 Merge pull request #52933 from frappe/mergify/bp/version-16-hotfix/pr-52824 
refactor: separate construction of chart related data from `get_columns()` (backport #52824)
 2026-02-24 18:46:27 +05:30
Jatin3128
751a081253 feat(payment request): create payment request as per payment schedules 
(cherry picked from commit e476dff842)
 2026-02-24 13:09:27 +00:00
Jatin3128
298ea33922 feat(payment_request): add option to calculate request amount using payment schedule 
(cherry picked from commit 60108590b0)
 2026-02-24 13:09:26 +00:00
ruthra kumar
807463e90c Merge pull request #52929 from frappe/mergify/bp/version-16-hotfix/pr-52029 
fix: prevent precision errors in  discount distribution with inclusive tax (backport #52029)
 2026-02-24 18:39:16 +05:30
Harsh Patadia
27c03fee1c refactor: separate construction of chart related data from get_columns() (#52824) 
* fix: avoid hardcoded column slicing for Profit & Loss chart data

* refactor: improve parameter naming and reduce code repetion by using same function get_period_columns()

* refactor: improved parameter naming in get_data() and get_chart_data()

(cherry picked from commit bdcb2c1512)
 2026-02-24 12:37:51 +00:00
rohitwaghchaure
ffe77ba1e7 Merge pull request #52931 from frappe/mergify/bp/version-16-hotfix/pr-52930 
fix: remove form tour for sales and purchase order (backport #52930)
 2026-02-24 17:45:33 +05:30
Rohit Waghchaure
aac7fc30d5 fix: remove form tour for sales and purchase order 
(cherry picked from commit ed7315d78e)
 2026-02-24 11:53:56 +00:00
ljain112
0e2e89c355 fix: prevent precision errors in discount distribution with inclusive tax 
(cherry picked from commit 2068299766)
 2026-02-24 11:29:05 +00:00
rohitwaghchaure
d8f6a007a0 Merge pull request #52922 from frappe/mergify/bp/version-16-hotfix/pr-52839 
feat: module onboarding (backport #52839)
 2026-02-24 16:09:40 +05:30
Rohit Waghchaure
858119f907 feat: module onboarding 
(cherry picked from commit 792a1a7ab7)
 2026-02-24 07:20:09 +00:00
ruthra kumar
033c9fc57d Merge pull request #52920 from frappe/mergify/bp/version-16-hotfix/pr-52363 
fix: unhide book_advance_payments_in_separate_party_account check fie… (backport #52363)
 2026-02-24 12:21:48 +05:30
ruthra kumar
d743ee9e1c Merge pull request #52919 from frappe/mergify/bp/version-16-hotfix/pr-52822 
fix(sales-order): update quotation status while cancelling sales order (backport #52822)
 2026-02-24 12:11:58 +05:30
Shllokkk
13d153c196 fix: unhide book_advance_payments_in_separate_party_account check field in Payment Entry doctype 
(cherry picked from commit 5793322c30)
 2026-02-24 06:26:55 +00:00
Sowmya
3a0f90c433 fix(sales-order): update quotation status while cancelling sales order (#52822) 
* fix(sales-order): update quotation status while cancelling sales order

* test: validate quotation status

* chore: remove submit

(cherry picked from commit d638f3e033)
 2026-02-24 06:18:37 +00:00
mergify[bot]
217709836b fix: sales and purchase modules forms clean-up (backport #52875) (#52911) 
* fix: sales and purchase modules forms clean-up

(cherry picked from commit 0e356dc2e3)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json

* chore: fix conflicts

* chore: fix conflicts

Removed unnecessary fields and updated the modified date.

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

Removed UTM Analytics section and column break from delivery note JSON configuration. Updated the modified timestamp.

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2026-02-24 11:28:34 +05:30
ruthra kumar
3663fc4f64 Merge pull request #52908 from frappe/mergify/bp/version-16-hotfix/pr-52896 
fix: skip empty dimension values in exchange gain loss (backport #52896)
 2026-02-23 21:24:31 +05:30
ravibharathi656
780b626ae5 fix: skip empty dimension values in exchange gain loss 
(cherry picked from commit 7df9d951c6)
 2026-02-23 15:36:47 +00:00