CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-08 21:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,560 Commits 411 Branches 1,714 Tags
cc604d49218512757443bb63cde8bce13a4feeeb
Commit Graph

56560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mihir Kandoi
bbf1a94024 Merge pull request #52906 from frappe/mergify/bp/version-16-hotfix/pr-52544 
fix(stock): improve error message when serial no is reserved via SRE (backport #52544)
 2026-02-23 21:03:12 +05:30
Mihir Kandoi
8a44638939 Merge pull request #52904 from frappe/mergify/bp/version-16-hotfix/pr-52764 
fix: populate doctypes to be ignored table in validate (backport #52764)
 2026-02-23 20:45:09 +05:30
Imesha Sudasingha
fb8f085885 Merge pull request #52544 from one-highflyer/fix/improve-reserved-serial-no-error-message 
fix(stock): improve error message when serial no is reserved via SRE

(cherry picked from commit 71248ff40b)
 2026-02-23 15:13:17 +00:00
l0gesh29
237e4583e2 fix: populate doctypes to be ignored table in validate 
(cherry picked from commit 60d2f2d304)
 2026-02-23 14:51:15 +00:00
Diptanil Saha
d71a0d76e6 Merge pull request #52902 from frappe/mergify/bp/version-16-hotfix/pr-52891 
fix: notifications (backport #52891)
 2026-02-23 19:53:07 +05:30
diptanilsaha
e8c5d5710d fix: fiscal year notification subject 
(cherry picked from commit 3e87059939)
 2026-02-23 14:08:13 +00:00
diptanilsaha
785773b0ac fix: material request on receive notification condition 
(cherry picked from commit 96aa37eff5)
 2026-02-23 14:08:13 +00:00
Mihir Kandoi
c51bc69d58 Merge pull request #52901 from frappe/mergify/bp/version-16-hotfix/pr-52892 
fix: link field displays incorrect value when empty (backport #52892)
 2026-02-23 19:11:48 +05:30
Mihir Kandoi
b67d42ee58 fix: link field displays incorrect value when empty 
(cherry picked from commit db00860662)
 2026-02-23 13:37:44 +00:00
Mihir Kandoi
62f587318c Merge pull request #52898 from frappe/mergify/bp/version-16-hotfix/pr-52878 
fix: standalone sales invoice return should not fallback to item mast… (backport #52878)
 2026-02-23 19:07:01 +05:30
Mihir Kandoi
6e1a8083a5 fix: standalone sales invoice return should not fallback to item master for valuation rate 
(cherry picked from commit a85a0aef52)
 2026-02-23 13:19:55 +00:00
ruthra kumar
407bf7ec2e Merge pull request #52895 from frappe/mergify/bp/version-16-hotfix/pr-52812 
fix: bank account mismatch error on reverse transaction reconciliation (backport #52812)
 2026-02-23 18:28:38 +05:30
Diptanil Saha
4ac4292de4 Merge pull request #52893 from frappe/mergify/bp/version-16-hotfix/pr-50301 
refactor:  fetch employee contact details in realtime in Payment Entry (backport #50301)
 2026-02-23 18:11:21 +05:30
ervishnucs
746b5d96de fix: check gl account of an associated bank account in bank transaction 
(cherry picked from commit 8fe0bf4ba3)
 2026-02-23 12:36:45 +00:00
Abdeali Chharchhoda
5c9f9517d6 refactor: method to get employee contact without permission check 
(cherry picked from commit 58cdb9503b)
 2026-02-23 12:22:57 +00:00
Abdeali Chharchhoda
63975c8c00 refactor: use common method to get employee contacts 
(cherry picked from commit ec1eb6d222)
 2026-02-23 12:22:57 +00:00
Abdeali Chharchhoda
116361c1dc fix: get employee email with priority if preferred is not set 
(cherry picked from commit 7b89c12470)
 2026-02-23 12:22:57 +00:00
Abdeali Chharchhoda
0f8f8c2066 refactor: add validation for missing employee parameter 
(cherry picked from commit b8e06b9636)
 2026-02-23 12:22:56 +00:00
Abdeali Chharchhoda
123b7191fc refactor: fetch employee contact details in realtime 
(cherry picked from commit 2ea6508fa5)
 2026-02-23 12:22:56 +00:00
Abdeali Chharchhoda
94f9f8b30a feat: retrieve employee contact details 
(cherry picked from commit a41297d841)
 2026-02-23 12:22:56 +00:00
Abdeali Chharchhoda
f701407e23 feat: retrieve employee basic contact information 
(cherry picked from commit 4ad1474e32)
 2026-02-23 12:22:56 +00:00
Abdeali Chharchhoda
2b9af6a641 chore: Removing unused import 
(cherry picked from commit 87c59f471c)
 2026-02-23 12:22:55 +00:00