nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-01 14:09:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,252 Commits 437 Branches 1,729 Tags
e230f72e0ba93e49c8564c6f2ffb84b1659eb596
Commit Graph

57252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
e230f72e0b fix: include rejected qty in tax (purchase receipt) (backport #53624) (#53972) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: include rejected qty in tax (purchase receipt) (#53624)
 2026-03-31 15:51:58 +00:00
Khushi Rawat
240d27274b Merge pull request #53957 from frappe/mergify/bp/version-16-hotfix/pr-53811 
fix: prevent selection of group type customer group in customer master (backport #53811)
 2026-03-31 18:13:29 +05:30
Nishka Gosalia
e55d0ce1f8 Merge pull request #53966 from frappe/mergify/bp/version-16-hotfix/pr-53965 
fix: Party Field only visibile when party type selected (backport #53965)
 2026-03-31 18:10:00 +05:30
nishkagosalia
f42a1e8a14 fix: Party Field only visibile when party type selected 
(cherry picked from commit e9e510a76e)
 2026-03-31 12:38:31 +00:00
khushi8112
8674aafc86 fix(test): do not use is_group enabled customer group in test 
(cherry picked from commit 75fa2b2277)
 2026-03-31 11:17:17 +00:00
khushi8112
04cced2fb5 fix: prevent selection of group type customer group in customer master 
(cherry picked from commit 6068dc959f)
 2026-03-31 11:17:17 +00:00
Khushi Rawat
16bd04dd97 Merge pull request #53943 from frappe/mergify/bp/version-16-hotfix/pr-53939 
fix: dynamic labels on invoice type change (backport #53939)
 2026-03-31 16:47:02 +05:30
ruthra kumar
d129e5f5bc Merge pull request #53948 from frappe/mergify/bp/version-16-hotfix/pr-53795 
refactor(test): enforce ERPNextTestSuite across repo (backport #53795)
 2026-03-31 16:30:56 +05:30
mergify[bot]
573a1a0dcb fix: do not show inv dimension unnecessarily in stock entry (backport #53946) (#53951) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: do not show inv dimension unnecessarily in stock entry (#53946)
 2026-03-31 16:29:29 +05:30
rohitwaghchaure
7c503b33f8 Merge pull request #53954 from frappe/mergify/bp/version-16-hotfix/pr-53953 
fix: rejected serial no field showing even if serial / batch feature disabled (backport #53953)
 2026-03-31 16:20:56 +05:30
Rohit Waghchaure
2c81f79df7 fix: rejected serial no field showing even if serial / batch feature not enabled 
(cherry picked from commit c2f419ac3d)
 2026-03-31 10:41:44 +00:00
ruthra kumar
05f47bbf6e refactor(test): remove AccountsTestMixin from Sales Order 
(cherry picked from commit 2aecf0103a)
 2026-03-31 15:05:19 +05:30
ruthra kumar
ee61d79631 refactor(test): remove AccountsTestMixin from reactivity 
(cherry picked from commit d2ee967383)
 2026-03-31 15:05:17 +05:30
ruthra kumar
85b08e4706 refactor(test): remove AccountsTestMixin from distributed discount 
(cherry picked from commit 0b6546ea06)
 2026-03-31 09:32:44 +00:00
ruthra kumar
013aea6b7e refactor(test): move logic from AccountsTestMixin to ERPNextTestSuite 
(cherry picked from commit 2b37d7514d)
 2026-03-31 09:32:44 +00:00
ruthra kumar
a8d0fb5ac9 refactor(test): erpnext testsuite should be primary superclass 
(cherry picked from commit f3148e052c)
 2026-03-31 09:32:44 +00:00
Lakshit Jain
924983794b Merge pull request #53933 from frappe/mergify/bp/version-16-hotfix/pr-53925 
fix(taxes): increase rounding threshold for tax breakup calculations (backport #53925)
 2026-03-31 12:34:33 +05:30
mergify[bot]
5ade905ee8 feat(Payment Request): Added a toggle for using the payment schedule (backport #53922) (#53928) 
* feat(Payment Request): Added a toggle for using the payment schedule

(cherry picked from commit 8ec15b537e)

---------

Co-authored-by: Jatin3128 <jatinsarna8@gmail.com>
Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-03-31 12:26:29 +05:30
khushi8112
4705f53d2c fix: dynamic labels on invoice type change 
(cherry picked from commit 820bd15e1e)
 2026-03-31 06:37:19 +00:00
mergify[bot]
8be7793f89 chore: remove inter warehouse transfer settings (backport #53860) (#53941) 
Co-authored-by: Nishka Gosalia <58264710+nishkagosalia@users.noreply.github.com>
 2026-03-31 06:09:44 +00:00
ljain112
0dcacad793 chore: resolve conflicts 2026-03-31 11:05:46 +05:30
mergify[bot]
a478fb7131 fix(warehouse_capacity_dashboard): removed escape from template (backport #53907) (#53909) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(warehouse_capacity_dashboard): removed `escape` from template (#53907)
 2026-03-30 23:33:22 +05:30
mergify[bot]
8cb8f66b22 fix(bank_account): added validation to fetch bank account details using get_bank_account_details (backport #53926) (#53930) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(bank_account): added validation to fetch bank account details using `get_bank_account_details` (#53926)
 2026-03-30 20:56:31 +05:30
ljain112
5922d25210 test: update item-wise tax detail test for high conversion rates 
(cherry picked from commit fc8437c499)

# Conflicts:
#	erpnext/controllers/tests/test_item_wise_tax_details.py
 2026-03-30 15:17:09 +00:00
Smit Vora
6ad5e89607 fix(taxes): improve tax calculation accuracy and update test assertions 
(cherry picked from commit a18196f584)
 2026-03-30 15:17:09 +00:00
ljain112
6689b17b88 fix(tests): update item code and quantity in tax detail test case 
(cherry picked from commit 3449ab063a)
 2026-03-30 15:17:09 +00:00
ljain112
3592637b5c fix(taxes): increase rounding threshold for tax breakup calculations 
(cherry picked from commit 7f87a5e5c6)
 2026-03-30 15:17:08 +00:00
Lakshit Jain
63828dfc00 Merge pull request #53932 from frappe/mergify/bp/version-16-hotfix/pr-53406 
fix: correct item valuation when "Deduct" is used in Purchase Invoice and Receipt. (backport #53406)
 2026-03-30 20:37:24 +05:30
ljain112
c6fe5be95a fix: correct item valuation when "Deduct" is used in Purchase Invoice and Receipt. 
(cherry picked from commit e68f149d3a)
 2026-03-30 14:24:46 +00:00
mergify[bot]
8c35a939cb fix(opening_invoice_creation_tool): sanitize summary content for dashboard (backport #53917) (#53924) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(opening_invoice_creation_tool): sanitize summary content for dashboard (#53917)
 2026-03-30 12:47:25 +00:00
mergify[bot]
4ac6347cc5 fix(item_dashboard): escaping warehouse, item_code, stock_uom and item_name on get_data (backport #53904) (#53914) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(item_dashboard): escaping `warehouse`, `item_code`, `stock_uom` and `item_name` on `get_data` (#53904)
 2026-03-30 09:52:17 +00:00
rohitwaghchaure
e85919478e Merge pull request #53911 from frappe/mergify/bp/version-16-hotfix/pr-53906 
fix: purchase invoice missing item (backport #53906)
 2026-03-30 15:08:56 +05:30
rohitwaghchaure
6ffd716ee2 Merge pull request #53896 from frappe/mergify/bp/version-16-hotfix/pr-53799 
fix(stock): update company validation for expense account in lcv (backport #53799)
 2026-03-30 14:45:49 +05:30
Rohit Waghchaure
bfb51326ed fix: purchase invoice missing item 
(cherry picked from commit af994c1a22)
 2026-03-30 09:15:18 +00:00
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
Sudharsanan11
ad966468b1 fix(test): enable perpetual inventory 
(cherry picked from commit 875a2e4947)
 2026-03-30 07:34:51 +00:00
Sudharsanan11
9d46d8151a fix(stock): update company validation for expense account in lcv 
(cherry picked from commit 913168e8b6)
 2026-03-30 07:34:51 +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