nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 07:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,882 Commits 493 Branches 1,768 Tags
a9926871d651a11791286fb464042094985ee8ec
Commit Graph

57882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
a9926871d6 chore: remove unused whitelisted method from project (backport #55648) (#55673) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-07 23:16:02 +05:30
Nabin Hait
0785fa0257 Merge pull request #55698 from frappe/mergify/bp/version-16-hotfix/pr-55101 
fix: handle blank rows in financial statement formatter (backport #55101)
 2026-06-07 22:55:44 +05:30
Nabin Hait
86ee17614c Merge pull request #55697 from frappe/mergify/bp/version-16-hotfix/pr-54684 
fix(profit-loss-report): handle zero base values and prevent null% display (backport #54684)
 2026-06-07 22:55:34 +05:30
Abdeali Chharchhoda
f657503ea3 fix: update formatter to handle blank rows in financial statements 
(cherry picked from commit 814c11200a)
 2026-06-07 16:58:49 +00:00
Abdeali Chharchhoda
e8a6933ff3 fix: update add_total_row_account to control blank row addition 
(cherry picked from commit f7c744350c)
 2026-06-07 16:58:49 +00:00
Abdeali Chharchhoda
d8afc00ab5 fix: handle separator rows in financial statement formatter 
(cherry picked from commit cf597361f6)
 2026-06-07 16:58:49 +00:00
Ahmed Reda Abukhatwa
18afcf0c01 fix: skip empty spacer rows in compute_growth_view_data (P&L growth view) 
(cherry picked from commit 3592c3086d)
 2026-06-07 16:56:54 +00:00
Ahmed Reda Abukhatwa
90ac065930 fix(profit-loss-report): handle zero base values and prevent null% display 
(cherry picked from commit 7335011814)
 2026-06-07 16:56:54 +00:00
Ahmed Reda Abukhatwa
b3d3f13fc5 fix(profit-and-loss-statement): margin calculation the report showing null% for empty cell 
(cherry picked from commit 671555edbc)
 2026-06-07 16:56:54 +00:00
Ahmed Reda Abukhatwa
04fe76bf83 fix(profit-and-loss-statement-report): margin calculation the report showing null% for empty cell 
(cherry picked from commit df6fd782b7)
 2026-06-07 16:56:53 +00:00
rohitwaghchaure
a403e85918 Merge pull request #55664 from frappe/mergify/bp/version-16-hotfix/pr-55661 
fix: naming series issue (backport #55661)
 2026-06-05 21:06:00 +05:30
rohitwaghchaure
7c46298fb6 chore: fix conflicts 
Removed unused import of DateTimeLikeObject from frappe.utils.data.
 2026-06-05 20:46:59 +05:30
Rohit Waghchaure
6eecf0701e fix: naming series issue 
(cherry picked from commit 3a50056968)

# Conflicts:
#	erpnext/stock/doctype/batch/batch.py
 2026-06-05 15:14:22 +00:00
Mihir Kandoi
cfe5d07b4c [codex] Show in-transit status for add-to-transit Stock Entries (backport #55644 to version-16-hotfix) (#55658) 
[codex] Show in-transit status for add-to-transit Stock Entries (#55644)

(cherry picked from commit df03524b19)
 2026-06-05 11:32:21 +00:00
Khushi Rawat
e7a4d6451e Merge pull request #55653 from frappe/mergify/bp/version-16-hotfix/pr-54853 
feat: item prices list view (backport #54853)
 2026-06-05 16:26:50 +05:30
Khushi Rawat
12c1940e0b feat: item prices list view (#54853) 
* feat: add item prices tab to Item doctype

* feat: item form pricing tab

* fix: remove action button for edit item price

* fix: prevent stale item price rendering after form navigation

* fix: remove stale call to deleted edit_prices_button function

* fix: item price list fixes

* fix: show filtered price list

* fix: show filtered price list

(cherry picked from commit 5873f55cf0)
 2026-06-05 10:12:58 +00:00
Mihir Kandoi
32011c3364 fix: work order status should be in process if material transfer is skipped (backport #55641 to version-16-hotfix) (#55642) 
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-05 05:37:45 +00:00
mergify[bot]
3f983c9e4d feat: show non stock items and secondary items in work order (backport #55631) (#55636) 
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-05 05:06:50 +00:00
shahzeelahmed
bda915a201 Merge pull request #55619 from frappe/mergify/bp/version-16-hotfix/pr-55536 
fix: allow CRM Deal as Quotation To for CRM integration (backport #55536)
 2026-06-05 00:01:31 +05:30
Mihir Kandoi
743afc972d feat: create sales invoice from pick list (backport #55594) (#55635) 2026-06-04 17:17:26 +00:00
mergify[bot]
84d205f553 fix: prevent selling items from sample retention warehouse (backport #55613) (#55634) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: prevent selling items from sample retention warehouse (#55613)
 2026-06-04 16:50:34 +00:00
mergify[bot]
1823fbea37 refactor: convert rfq_transaction_list to query builder (backport #55497) (#55630) 
Co-authored-by: Shllokkk <140623894+Shllokkk@users.noreply.github.com>
 2026-06-04 14:26:37 +00:00
shahzeelahmed
f7e6542bcd fix: include CRM Deal in quotation to filters 
(cherry picked from commit 519dc0b958)
 2026-06-04 06:22:26 +00:00
mergify[bot]
3917415368 fix(UX): Accounts settings cleanup (backport #55470) (#55603) 
fix(UX): Accounts settings cleanup (backport #55470)
 2026-06-04 11:38:58 +05:30
mergify[bot]
dee7bd8d64 fix(subscription): correct billing/deferred bugs and tighten guards (backport #55554) (#55610) 
fix(subscription): correct billing/deferred bugs and tighten guards (#55554)

(cherry picked from commit d54db2e0ca)

Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-06-04 05:22:02 +05:30
Khushi Rawat
e112a1933a Merge pull request #55611 from frappe/mergify/bp/version-16-hotfix/pr-55151 
fix: minor fixes in report print formats (backport #55151)
 2026-06-03 23:24:47 +05:30
Shllokkk
80f7aff3f9 fix: minor fixes in report print formats (#55151) 
(cherry picked from commit a75693a81f)
 2026-06-03 16:56:11 +00:00
mergify[bot]
808e51db19 fix: duplicating a Customer/Supplier shouldn't inherit the source's primary contact and address (backport #55421) (#55609) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Antoine Maas <antoine.maas@okte.io>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: duplicating a Customer/Supplier shouldn't inherit the source's primary contact and address (#55421)
 2026-06-03 16:03:59 +00:00
mergify[bot]
0274afe560 perf: batch status check for on-hold/closed documents, remove N+1 queries (backport #54798) (#55573) 
* perf: batch status check for on-hold/closed documents, remove N+1 queries (#54798)

(cherry picked from commit 5074597d00)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflicts

---------

Co-authored-by: Shubh Doshi <124681920+shubhdoshi21@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-03 16:00:54 +00:00
mergify[bot]
6a503f834c fix: Add likely missing escapes (backport #55574) (#55581) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: Add likely missing escaps (#55574)
 2026-06-03 15:53:43 +00:00
mergify[bot]
7de77a8916 fix(stock): add validation for work order seial nos and batch nos (backport #55604) (#55605) 
* fix(stock): add validation for work order seial nos and batch nos

(cherry picked from commit 6d3f9d3c6f)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: pandiyan <pandiyanpalani37@gmail.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-03 15:50:50 +00:00
mergify[bot]
142ab3ce2a fix(selling): consider delivered qty (backport #55597) (#55607) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
fix(selling): consider delivered qty (#55597)
 2026-06-03 15:37:29 +00:00
mergify[bot]
9a2549dc32 refactor: minor problems in production plan (backport #55577) (#55595) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-03 21:02:31 +05:30
mergify[bot]
40cf77e7f0 fix: spelling of Payment Reconciliation in sidebar (backport #55599) (#55602) 
fix: spelling of Payment Reconciliation in sidebar (#55599)

(cherry picked from commit 371b5c7593)

Co-authored-by: Nikhil Kothari <nik.kothari22@live.com>
 2026-06-03 19:48:34 +05:30
Nishka Gosalia
6ff9685881 Merge pull request #55598 from frappe/mergify/bp/version-16-hotfix/pr-55309 
fix(UX):stock settings form cleanup (backport #55309)
 2026-06-03 16:45:52 +05:30
nishkagosalia
f6f542fadc fix(UX): stock settings form cleanup 
(cherry picked from commit 0b4e20ae98)
 2026-06-03 10:34:43 +00:00
Nishka Gosalia
19c47abb79 Merge pull request #55592 from frappe/mergify/bp/version-16-hotfix/pr-55591 
fix: item report view (backport #55591)
 2026-06-03 15:08:59 +05:30
nishkagosalia
7dfae51044 fix: item report view 
(cherry picked from commit bca917380d)
 2026-06-03 09:35:48 +00:00
mergify[bot]
a563d01425 regional(setup): add 0% and 6% VAT rates for Belgium (backport #54719) (#55583) 
Co-authored-by: Antoine Maas <antoine.maas@okte.io>
 2026-06-03 14:20:44 +05:30
mergify[bot]
5d7e69d8cf fix: add custom dimensions filters in Gross and Net profit report (backport #55110) (#55584) 
Co-authored-by: Abdeali Chharchhodawala <99460106+Abdeali099@users.noreply.github.com>
fix: add custom dimensions filters in Gross and Net profit report (#55110)
 2026-06-03 14:20:19 +05:30
Khushi Rawat
6c05625e65 Merge pull request #55586 from frappe/mergify/bp/version-16-hotfix/pr-55149 
fix(stock): set stock received but not billed account for purchase (backport #55149)
 2026-06-03 14:19:07 +05:30
Khushi Rawat
eaadb15bd5 Merge pull request #55588 from frappe/mergify/bp/version-16-hotfix/pr-55150 
fix(accounts): include asset items in purchase receipt validation (backport #55150)
 2026-06-03 14:18:43 +05:30
mergify[bot]
8f9db3c72d Avoid status updation for purchase invoice from paid to unpaid by issuing a paid debit note against it (backport #54382) (#55576) 
Co-authored-by: Shllokkk <140623894+Shllokkk@users.noreply.github.com>
 2026-06-03 14:11:25 +05:30
mergify[bot]
37b61f06ae fix: prevent double rounding in inclusive tax calculations (backport #52512) (#55570) 
Co-authored-by: Luis Mendoza <mendozal@gmail.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix: prevent double rounding in inclusive tax calculations (#52512)
 2026-06-03 14:10:32 +05:30
mergify[bot]
201e62195f fix payment schedule discount date when no discount is applied (backport #55462) (#55568) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
fix payment schedule discount date when no discount is applied (#55462)
 2026-06-03 14:10:12 +05:30
mergify[bot]
20af7093ac feat: added cost of goods sold (backport #54974) (#55552) 
Co-authored-by: soham7117 <sohampawar626@gmail.com>
Signed-off-by: soham7117 <sohampawar626@gmail.com>
 2026-06-03 14:09:37 +05:30
mergify[bot]
44adfbea33 refactor(sales_invoice): replace sql with qb in update_billing_status… (backport #55380) (#55411) 
Co-authored-by: Loic Oberle <loic@dokos.io>
 2026-06-03 14:09:15 +05:30
mergify[bot]
9eb0e3c82e fix: prevent negative amounts in common party JE on return invoices (backport #55034) (#55064) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
fix: prevent negative amounts in common party JE on return invoices (#55034)
 2026-06-03 14:08:49 +05:30
Pandiyan P
0984c86583 fix(accounts): include asset items in purchase receipt validation (#55150) 
(cherry picked from commit d0d9411700)
 2026-06-03 07:43:31 +00:00
Pandiyan P
90667b2de2 fix(stock): set stock received but not billed account for purchase (#55149) 
(cherry picked from commit c4d28a2612)
 2026-06-03 07:41:56 +00:00