nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 05:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,829 Commits 483 Branches 1,768 Tags
af97849c7b9fe838e4b4f102b2f599f4382a7651
Commit Graph

57829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Khushi Rawat
af97849c7b Merge pull request #55566 from frappe/mergify/bp/version-16-hotfix/pr-55562 
fix: aggregate child cost center data in Budget Variance Report (backport #55562)
 2026-06-03 03:37:27 +05:30
khushi8112
a7d42a4edd refactor: replace db.sql with frappe.qb 
(cherry picked from commit 41884cfd2a)
 2026-06-02 21:49:17 +00:00
khushi8112
4f2611cbe8 fix: aggregate child cost center data in Budget Variance Report 
(cherry picked from commit cd7fa56ec4)
 2026-06-02 21:49:17 +00:00
Khushi Rawat
91a64692f9 Merge pull request #55565 from frappe/mergify/bp/version-16-hotfix/pr-54840 
fix: add company filter to Budget Against dimension options (backport #54840)
 2026-06-03 02:50:01 +05:30
khushi8112
3fb6437d26 fix: move Company filter at the start 
(cherry picked from commit c34eeee096)
 2026-06-02 21:01:53 +00:00
HemilSangani
bfc6f44fb0 fix: add company filter to Budget Against dimension options 
(cherry picked from commit bdf0136fc5)
 2026-06-02 21:01:53 +00:00
mergify[bot]
fffba84868 fix(item): format integer numeric variant attributes without decimals (backport #55561) (#55564) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(item): format integer numeric variant attributes without decimals (#55561)
 2026-06-02 23:00:04 +02:00
mergify[bot]
6a1c384f9b perf(transaction): exit early before backend query (backport #55556) (#55558) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-06-02 20:51:01 +02:00
Khushi Rawat
d57e86362a Merge pull request #55549 from frappe/mergify/bp/version-16-hotfix/pr-55484 
fix: use fiscal year instead of calendar year in accounting dashboard number cards (backport #55484)
 2026-06-02 17:55:57 +05:30
khushi8112
1521410125 fix: set a fallback value if no fiscal year set 
(cherry picked from commit c68918bc18)
 2026-06-02 11:26:28 +00:00
khushi8112
81d10d32f2 fix: use fiscal year instead of calendar year in accounting dashboard number cards 
(cherry picked from commit e8fff2fdad)
 2026-06-02 11:26:28 +00:00
ruthra kumar
2213c1ffad Merge pull request #55545 from frappe/mergify/bp/version-16-hotfix/pr-54979 
fix(ppr): make default_advance_account optional (backport #54979)
 2026-06-02 16:48:36 +05:30
Diptanil Saha
37814bf6cd ci: fix for pull request finding 'CodeQL / Workflow does not contain permissions' 
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
 2026-06-02 16:36:50 +05:30
mergify[bot]
ceb10422ae fix: unable to submit subcontracted job card (backport #55537) (#55540) 
* fix: unable to submit subcontracted job card (#55537)

(cherry picked from commit 0a49403838)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-02 10:47:30 +00:00
Khushi Rawat
072a853fad Merge pull request #55543 from frappe/mergify/bp/version-16-hotfix/pr-55539 
feat(payment-entry): warn user before cancelling reconciled payment entry (backport #55539)
 2026-06-02 15:54:59 +05:30
Dany Robert
0bbc493213 fix: update default_advance_account type 
(cherry picked from commit 30b9e11303)
 2026-06-02 10:07:02 +00:00
Dany Robert
7a7cc31523 fix(ppr): make default_advance_account optional 
(cherry picked from commit 4b1d369ac6)
 2026-06-02 10:07:02 +00:00
khushi8112
61d6d2f344 feat(payment-entry): warn user before cancelling reconciled payment entry 
(cherry picked from commit f0ba54d957)
 2026-06-02 10:00:28 +00:00
rohitwaghchaure
b89a34970b Merge pull request #55519 from frappe/mergify/bp/version-16-hotfix/pr-55415 
fix(stock): allow to create quality inspection after purchase/delivery (backport #55415)
 2026-06-02 11:51:45 +05:30
Rushabh Mehta
0fe44e1a67 Merge pull request #55534 from rmehta/feat/build-and-upload-assets-v16 
feat: build and upload assets to GitHub Releases
 2026-06-02 07:38:15 +05:30
Rushabh Mehta
4c05ebc21e feat: build and upload assets to GitHub Releases 2026-06-02 06:45:25 +05:30
mergify[bot]
224426e06b fix(pos): escape html output in pos page templates (backport #55527) (#55529) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
fix(pos): escape html output in pos page templates (#55527)
 2026-06-02 00:46:54 +05:30
rohitwaghchaure
980cefa169 chore: fixed conflicts 2026-06-01 22:10:06 +05:30
rohitwaghchaure
8d12a89558 chore: fixed conflicts 2026-06-01 22:07:42 +05:30
mergify[bot]
d1b2425b2b chore(serial_and_batch_bundle): remove update_serial_or_batch method (backport #55481) (#55516) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-01 16:15:54 +00:00
Sudharsanan11
1679680d8e fix(stock): add warning message to notify the user to configure the inspection 
(cherry picked from commit e003fe4de0)
 2026-06-01 16:14:11 +00:00
Sudharsanan11
51a140a2bd fix(stock): allow to create quality inspection after purchase/delivery 
(cherry picked from commit c6a88ab1d2)

# Conflicts:
#	erpnext/controllers/stock_controller.py
 2026-06-01 16:14:11 +00:00
rohitwaghchaure
13e1159c41 Merge pull request #55412 from frappe/mergify/bp/version-16-hotfix/pr-55377 
refactor(sales_invoice): replace sql with qb in get_all_mode_of_payments (backport #55377)
 2026-06-01 21:41:40 +05:30
MochaMind
056f622634 chore: sync translations to version-16-hotfix (#55426) 2026-06-01 21:38:27 +05:30
mergify[bot]
fe585dc225 fix(je): preserve account on duplicate row when party row exists (backport #55180) (#55512) 
fix(je): preserve account on duplicate row when party row exists (#55180)

(cherry picked from commit 57dbac712f)

Co-authored-by: Gajendra Nishad <75714258+gajjug004@users.noreply.github.com>
 2026-06-01 18:46:07 +05:30
mergify[bot]
5393c93675 fix(pos): escape item data on pos item selector (backport #55503) (#55508) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(pos): escape item data on pos item selector (#55503)
 2026-06-01 18:27:30 +05:30
ruthra kumar
fdf5439ece Merge pull request #55499 from frappe/mergify/bp/version-16-hotfix/pr-55495 
fix: opening bal double counting in Process Period Closing Voucher (backport #55495)
 2026-06-01 15:51:29 +05:30
ruthra kumar
de1256467f test: prevent double counting of opening balances 
(cherry picked from commit 7f2af123ee)
 2026-06-01 09:33:09 +00:00
ruthra kumar
1029ef46a7 refactor: color coded status in list view 
(cherry picked from commit cfeffbb354)
 2026-06-01 09:33:08 +00:00
ruthra kumar
c59dc684fe refactor: tabbed view for process period closing voucher 
(cherry picked from commit 1960c81619)
 2026-06-01 09:33:08 +00:00
ruthra kumar
d2bbf6d32b refactor: only consider non-opening balance for Balance sheet accounts 
(cherry picked from commit a2b8334046)
 2026-06-01 09:33:08 +00:00
mergify[bot]
0c946f2420 fix: check perm for account (backport #55479) (#55483) 
fix: check perm for account (#55479)

(cherry picked from commit dd1d2925d5)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2026-06-01 14:29:16 +05:30
mergify[bot]
fc842fb45f fix: pick correct name when creating user from RFQ (backport #55468) (#55472) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: pick correct name when creating user from RFQ (#55468)
 2026-06-01 05:58:12 +00:00
mergify[bot]
ef2700bec6 fix(pos): preserve contacts and enforce permissions in set_customer_info (backport #55463) (#55466) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(pos): preserve contacts and enforce permissions in set_customer_info (#55463)
 2026-06-01 05:12:48 +05:30
mergify[bot]
7c5d617049 fix(issue): check permission before issue status modification (backport #55458) (#55460) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(issue): check permission before issue status modification (#55458)
 2026-06-01 00:57:21 +05:30
mergify[bot]
2f51c48fd8 refactor: task_info portal pages (backport #55448) (#55454) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-05-31 22:06:47 +05:30
mergify[bot]
aa5dfde23b fix(book_appointment): when scheduling is disabled, block API endpoints (backport #55455) (#55457) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(book_appointment): when scheduling is disabled, block API endpoints (#55455)
 2026-05-31 16:10:20 +00:00
MochaMind
ad267ec295 chore: update POT file (#55451) 2026-05-31 15:05:47 +02:00
mergify[bot]
5c51145984 refactor(pos_profile): migrating raw sql to qb in set_defaults (backport #55447) (#55450) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-05-31 09:45:28 +00:00
mergify[bot]
277a0723ef fix(stock): change qb to qb get_query to fix filter issues (backport #55443) (#55445) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(stock): change qb to qb get_query to fix filter issues (#55443)
 2026-05-31 07:09:40 +00:00
mergify[bot]
36a54ca40b chore: mark as out of beta (backport #55439) (#55441) 
* chore: mark as out of beta (#55439)

(cherry picked from commit aed957e7d1)

* chore: remove newer property allow_bulk_edit

not supported on v16

* chore(Bank Statement Import): mark as out of beta

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-05-30 19:28:31 +00:00
mergify[bot]
7426aaf1e2 fix(regional): Japanese CT Rate (backport #54998) (#55438) 
Co-authored-by: mh35 <mh35jp@gmail.com>
fix(regional): Japanese CT Rate (#54998)
 2026-05-30 22:00:04 +05:30
mergify[bot]
2feb8eb370 fix(quotation): made customer contact column visible (backport #55433) (#55435) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(quotation): made customer contact column visible (#55433)
 2026-05-30 19:33:01 +05:30
rohitwaghchaure
22c26f42e9 Merge pull request #55425 from frappe/mergify/bp/version-16-hotfix/pr-55417 
fix: billing address does not belongs to the company error (backport #55417)
 2026-05-30 12:43:06 +05:30
MochaMind
75465035ae chore: sync translations to version-16-hotfix (#55420) 2026-05-29 23:04:48 +05:30