nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-14 15:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,163 Commits 601 Branches 1,799 Tags
831d25bed7e63efd71d9ecf368e536ef1c7f3286
Commit Graph

58163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
831d25bed7 ci: bump po review action (backport #56454) (#56461) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-06-25 09:42:32 +00:00
Khushi Rawat
85ba1231f8 Merge pull request #56444 from frappe/mergify/bp/version-16-hotfix/pr-56432 
fix(letter-head): guard company lookups when doc has no company field (backport #56432)
 2026-06-25 14:38:08 +05:30
Mihir Kandoi
a24b690a14 Merge pull request #56452 from mihir-kandoi/mariadb-ci-fanout-v16 
ci(mariadb): self-hosted fan-out MariaDB CI (v16 backport of #56410)
 2026-06-25 14:25:43 +05:30
Mihir Kandoi
8dd37b6df0 ci(mariadb): self-hosted fan-out MariaDB CI 
Backport of #56410 to version-16-hotfix. v16 matches develop on Python 3.14 /
Node 24 / --lightmode / payments branch and the
ghcr.io/frappe/erpnext-ci-mariadb:py3.14-node24 image, so the fan-out workflow
and helpers (start-db.sh, hydrate.sh) apply verbatim; the frappe framework
branch resolves automatically from GITHUB_BASE_REF.
 2026-06-25 14:15:18 +05:30
Mihir Kandoi
de70f2cceb Merge pull request #56307 from frappe/mergify/bp/version-16-hotfix/pr-56306 
fix: link portal address rows to web form (backport #56306)
 2026-06-25 13:51:07 +05:30
Ejaaz Khan
89059a990f fix(letter-head): guard company lookups when doc has no company field 
(cherry picked from commit 7cb03a427a)

# Conflicts:
#	erpnext/accounts/letter_head/company_letterhead/company_letterhead.json
#	erpnext/accounts/letter_head/company_letterhead___grey/company_letterhead___grey.json
#	erpnext/accounts/letter_head/company_letterhead_report/company_letterhead_report.json
 2026-06-25 05:42:22 +00:00
Mihir Kandoi
a9a371e4a4 Merge pull request #56433 from aerele/backport-56376 
fix: skip over-allowance qty validation for non-stock items (backport #56335)
 2026-06-24 20:03:15 +05:30
mergify[bot]
bd54c7fea8 fix(lead): added missing read permission check on get_lead_details (backport #56272) (#56274) 
fix(lead): added missing read permission check on `get_lead_details` (backport #56272)
 2026-06-24 19:42:20 +05:30
pandiyan
0c502eaa18 test: add tests for non stock item over billing against so/po 2026-06-24 18:47:59 +05:30
mergify[bot]
e3958ad7bb fix: precision issue causing COGS in inter transfer PR (backport #56420) (#56425) 
fix: precision issue causing COGS in inter transfer PR (#56420)

(cherry picked from commit 9b0e1b61f2)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-06-24 18:30:32 +05:30
pandiyan
bc313dc09d fix: skip qty over-allowance check for non-stock items only 2026-06-24 18:12:42 +05:30
Mihir Kandoi
5c716b0547 Merge pull request #56430 from frappe/mergify/bp/version-16-hotfix/pr-55191 
refactor(sales_person_wise_transaction_summary): Replace SQL with que… (backport #55191)
 2026-06-24 16:43:29 +05:30
Loic Oberle
b3871a212c refactor(sales_person_wise_transaction_summary): Replace SQL with que… (#55191) 
(cherry picked from commit df3d0859a1)
 2026-06-24 10:44:33 +00:00
Mihir Kandoi
18400b58ce Merge pull request #56423 from frappe/mergify/bp/version-16-hotfix/pr-56421 
fix: exclude virtual child doctypes from deletion in transaction dele… (backport #56421)
 2026-06-24 15:37:18 +05:30
ruthra kumar
eee826dfb6 Merge pull request #56419 from frappe/mergify/bp/version-16-hotfix/pr-56417 
refactor: configurable timeout on process pcv (backport #56417)
 2026-06-24 15:30:14 +05:30
Mihir Kandoi
8a665709d2 fix: exclude virtual child doctypes from deletion in transaction deletion record 
(cherry picked from commit 8bd8b28207)
 2026-06-24 09:48:25 +00:00
ruthra kumar
267086153b chore: resolve conflicts 2026-06-24 15:08:04 +05:30
ruthra kumar
66b28cf456 refactor: patch, display depends on and json changes 
(cherry picked from commit 3da7eefebb)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.py
#	erpnext/patches.txt
 2026-06-24 07:58:49 +00:00
ruthra kumar
d389014e57 feat(accounts): add configurable job timeout for Process Period Closing Voucher 
Adds a `pcv_job_timeout` Int field (default 3600s) to Accounts Settings
so admins can tune the enqueue timeout for PCV background jobs without
a code change. All three `frappe.enqueue` calls in
`process_period_closing_voucher.py` now read this value at runtime.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 13b6c4a165)
 2026-06-24 07:58:48 +00:00
mergify[bot]
54c45d7b22 fix: job card timer issue (backport #56405) (#56406) 
fix: job card timer issue (#56405)

(cherry picked from commit 21541e3ad3)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-06-24 09:21:02 +05:30
mergify[bot]
d54938fa64 feat(opening invoice creation tool): add project to opening invoice child row (backport #54662) (#56401) 
Co-authored-by: Ravibharathi <131471282+ravibharathi656@users.noreply.github.com>
 2026-06-23 21:07:26 +00:00
mergify[bot]
4555c323af fix(pos): remove redundant opening balance dialog onchange handler (backport #54591) (#56403) 
Co-authored-by: Ravibharathi <131471282+ravibharathi656@users.noreply.github.com>
fix(pos): remove redundant opening balance dialog onchange handler (#54591)
 2026-06-24 02:24:23 +05:30
mergify[bot]
1d0edf1b9a fix(payment_entry): recompute base amount when exchange rate changes (backport #56136) (#56398) 
Co-authored-by: Ravibharathi <131471282+ravibharathi656@users.noreply.github.com>
Co-authored-by: ervishnucs <ervishnucs369@gmail.com>
fix(payment_entry): recompute base amount when exchange rate changes (#56136)
 2026-06-24 02:11:35 +05:30
mergify[bot]
2b6f2c2f9c fix(budget): ambiguous error message for budget assignment validation (backport #56390) (#56392) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
fix(budget): ambiguous error message for budget assignment validation (#56390)
 2026-06-24 01:03:05 +05:30
mergify[bot]
00ba64baae feat(crm_settings)!: enable frappe crm data synchronization (backport #56268) (#56384) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-23 22:02:23 +05:30
Mihir Kandoi
3dc128881c Merge pull request #56374 from frappe/mergify/bp/version-16-hotfix/pr-56364 
fix(manufacturing): make item_code mandatory in Job Card Item (backport #56364)
 2026-06-23 19:36:44 +05:30
pandiyan
d40c36a4b1 fix(manufacturing): make item_code mandatory in Job Card Item 
The item_code field in the Job Card Item child table was optional,
allowing job cards to be saved without a raw material item linked.
Set reqd=1 in the JSON and update the Python type annotation accordingly.

(cherry picked from commit d7e9a97f8a)
 2026-06-23 13:33:00 +00:00
Khushi Rawat
7b50f67b55 Merge pull request #56317 from frappe/mergify/bp/version-16-hotfix/pr-55341 
fix: customer master form cleanup (backport #55341)
 2026-06-23 16:44:22 +05:30
Khushi Rawat
b40445fe44 Merge pull request #56316 from frappe/mergify/bp/version-16-hotfix/pr-55461 
fix: supplier master form cleanup (backport #55461)
 2026-06-23 16:37:47 +05:30
khushi8112
77121f2a41 fix: resolve backport merge conflicts in customer.json 
Keep both customer_type (list view) and the hotfix-only alias field in
field_order; take the newest modified timestamp.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-23 16:14:24 +05:30
khushi8112
a80de9bd01 fix: resolve backport merge conflicts in supplier.json 
Apply form-cleanup label changes while preserving the hotfix-only
no_copy flags and the alias field. Drop removed column_break_44 and
the duplicate is_frozen field_order entry.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-23 16:10:11 +05:30
Nishka Gosalia
be605adbc1 Merge pull request #56351 from frappe/mergify/bp/version-16-hotfix/pr-56350 
fix: handling default company in purchase transactions created from project (backport #56350)
 2026-06-23 12:40:38 +05:30
nishkagosalia
29323cb0b1 fix: company default handling in purchase transactions made from project 
(cherry picked from commit 359717115f)
 2026-06-23 07:08:07 +00:00
MochaMind
17324ec45b chore: sync translations to version-16-hotfix (#56321) 2026-06-23 02:16:25 +05:30
mergify[bot]
f5d05b969b fix: update round off account functions to accept document context for regional overrides (backport #55758) (#55771) 
Co-authored-by: Lakshit Jain <ljain112@gmail.com>
fix: update round off account functions to accept document context for regional overrides (#55758)
 2026-06-22 12:30:09 +00:00
khushi8112
c788106011 fix: add customer type in the list view 
(cherry picked from commit 059f560017)

# Conflicts:
#	erpnext/selling/doctype/customer/customer.json
 2026-06-22 11:42:59 +00:00
khushi8112
8b56b7ba0e fix: customer master form cleanup 
(cherry picked from commit 6f6e17188f)

# Conflicts:
#	erpnext/selling/doctype/customer/customer.json
 2026-06-22 11:42:59 +00:00
khushi8112
2035fac494 fix: supplier status in list view 
(cherry picked from commit 515983e016)
 2026-06-22 11:42:29 +00:00
khushi8112
e5c9e7abdc fix: supplier master form cleanup 
(cherry picked from commit 820c0caf88)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
 2026-06-22 11:42:29 +00:00
Mihir Kandoi
b4f2b6cab2 Merge pull request #56313 from mihir-kandoi/backport-55802-version-16-hotfix 
fix: backport product bundle issue fixes to v16
 2026-06-22 17:04:30 +05:30
Mihir Kandoi
373476042e Merge pull request #56285 from aerele/backport-56204 
fix: add partially transferred status and fix button visibility for partial material transfer on job card
 2026-06-22 16:47:24 +05:30
Mihir Kandoi
c066880978 fix: address product bundle review comments 
(cherry picked from commit d48a1e0d16)
 2026-06-22 16:32:42 +05:30
Mihir Kandoi
7a1def07e9 fix: submittable product bundle issues 
(cherry picked from commit a218b8db8c)
 2026-06-22 16:32:10 +05:30
Nishka Gosalia
0051950afb Merge pull request #56311 from frappe/mergify/bp/version-16-hotfix/pr-56309 
fix: Removing the document naming series dialog and moving to framework (backport #56309)
 2026-06-22 16:23:42 +05:30
nishkagosalia
97279c7e26 fix: removing the document naming series dialog and moving to framework 
(cherry picked from commit aa7402b1e3)
 2026-06-22 10:37:41 +00:00
Mihir Kandoi
0be5ba6bac Merge pull request #56305 from frappe/mergify/bp/version-16-hotfix/pr-56300 
fix: party specific item doesnt work if there are 2 suppliers with sa… (backport #56300)
 2026-06-22 15:54:59 +05:30
Mihir Kandoi
3a480c08b1 fix: link portal address rows to web form 
(cherry picked from commit 5008b82f90)
 2026-06-22 09:59:53 +00:00
Mihir Kandoi
a67b489d17 test: add test case 
(cherry picked from commit 7d205c89ea)
 2026-06-22 09:27:41 +00:00
Mihir Kandoi
3df7a28476 fix: party specific item doesnt work if there are 2 suppliers with same item 
(cherry picked from commit 98f5116a09)
 2026-06-22 09:27:40 +00:00
ruthra kumar
694ebb53ec Merge pull request #56299 from frappe/mergify/bp/version-16-hotfix/pr-55488 
fix: add validation and tests for set_status (backport #55488)
 2026-06-22 14:09:16 +05:30