nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,805 Commits 484 Branches 1,768 Tags
4c05ebc21ec0188bffbf50069e8bfeee9c8871eb
Commit Graph

57805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Rohit Waghchaure
e1f29de078 fix: billing address does not belongs to the company error 
(cherry picked from commit 9df07b367a)
 2026-05-29 17:24:13 +00:00
mergify[bot]
26d94c5594 ci: configure upstream fetch refspec so git fetch creates tracking refs (backport #55422) (#55423) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-29 17:01:32 +00:00
mergify[bot]
542aff2677 ci: split sync into orchestrator + per-branch runners, generalise for any app (backport #55414) (#55418) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-29 20:37:33 +05:30
Loic Oberle
db4e459a5a refactor(sales_invoice): replace sql with qb in get_all_mode_of_payments (#55377) 
(cherry picked from commit 618045ec98)
 2026-05-29 12:05:16 +00:00
Khushi Rawat
e42c3961a9 Merge pull request #55409 from frappe/mergify/bp/version-16-hotfix/pr-55397 
fix: item master list view UI cleanup (backport #55397)
 2026-05-29 16:30:05 +05:30
Khushi Rawat
63aff0098c Merge pull request #55254 from frappe/mergify/bp/version-16-hotfix/pr-55126 
fix: asset scrap flow related changes (backport #55126)
 2026-05-29 15:48:03 +05:30
Khushi Rawat
6d747420a3 Merge pull request #55359 from frappe/mergify/bp/version-16-hotfix/pr-55137 
fix: use get_query instead of get_all for data fetching (backport #55137)
 2026-05-29 15:36:28 +05:30
Khushi Rawat
d82e03edb6 fix: import DateTimeLikeObject 2026-05-29 15:21:58 +05:30
khushi8112
2d554c05d6 fix: item master list view UI cleanup 
(cherry picked from commit 69ee7e93d8)
 2026-05-29 09:50:18 +00:00
mergify[bot]
876995a35f ci: fix branch base and per-language commits in sync-hotfix-translations (backport #55405) (#55407) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
fix branch base and per-language commits in sync-hotfix-translations (#55405)
 2026-05-29 15:10:40 +05:30
Khushi Rawat
abe19e1212 fix: resolve conflict 2026-05-29 15:05:41 +05:30
Nishka Gosalia
bfc8683e52 Merge pull request #55403 from frappe/mergify/bp/version-16-hotfix/pr-55400 
fix: Make Distributed Discount Amount field read only (backport #55400)
 2026-05-29 14:09:18 +05:30
Nishka Gosalia
84ce7c720e Merge pull request #55402 from frappe/mergify/bp/version-16-hotfix/pr-55399 
fix: over order allowance setting fix (backport #55399)
 2026-05-29 13:00:37 +05:30
nishkagosalia
29441b7249 fix: Make Distributed Discount Amount field read only 
(cherry picked from commit 512c95529e)
 2026-05-29 07:30:01 +00:00
nishkagosalia
41b2de35a9 fix: over order allowance setting fix 
(cherry picked from commit 30011963bc)
 2026-05-29 07:07:59 +00:00
mergify[bot]
faa15731cb fix(stock): get_actual_qty during cancellations (backport #55388) (#55392) 
Co-authored-by: archielister <archie.lister@lush.co.uk>
fix(stock): get_actual_qty during cancellations (#55388)
 2026-05-28 22:40:24 +05:30
Nishka Gosalia
0ce697b170 Merge pull request #55373 from frappe/mergify/bp/version-16-hotfix/pr-55367 
fix(UX): Move title field to More Info (backport #55367)
 2026-05-28 16:24:35 +05:30
mergify[bot]
933ac0108c fix: new bom version should not recalculate operations through routing (backport #55370) (#55372) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: new bom version should not recalculate operations through routing (#55370)
 2026-05-28 16:01:52 +05:30
nishkagosalia
b74e365421 fix: merge conflicts 2026-05-28 15:35:10 +05:30
nishkagosalia
20592fc25d fix(UX): Move title field to More Info 
(cherry picked from commit 34c24b86fa)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#	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/buying/doctype/request_for_quotation/request_for_quotation.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 2026-05-28 09:39:37 +00:00
Nishka Gosalia
4ac003a804 Merge pull request #55369 from frappe/mergify/bp/version-16-hotfix/pr-55340 
feat: over order allowance setting (backport #55340)
 2026-05-28 14:38:34 +05:30
nishkagosalia
08eaaa5b83 feat: over order allowance setting 
(cherry picked from commit 355d71dbd2)
 2026-05-28 08:49:11 +00:00
khushi8112
7cbef15596 fix: use get_query instead of get_all for data fetching 
(cherry picked from commit 1fd99337b3)
 2026-05-27 19:17:29 +00:00
mergify[bot]
3a7af0e59d ci: add node setup on sync translations to version 16 hotfix (backport #55355) (#55356) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix (#55355)
 2026-05-27 18:23:23 +00:00