nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-22 02:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,461 Commits 605 Branches 1,802 Tags
56bbca0203fe6bb63cd6937e2c10dd908cb4e443
Commit Graph

58461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Frappe PR Bot
e9a9224ec4 chore(release): Bumped to Version 16.25.0 
# [16.25.0](https://github.com/frappe/erpnext/compare/v16.24.0...v16.25.0) (2026-06-24)

### Features

* **accounts:** add configurable job timeout for Process Period Closing Voucher ([e71b066](e71b066eec))
v16.25.0 		2026-06-24 10:43:40 +00:00
ruthra kumar
b08de1f1e5 Merge pull request #56427 from frappe/mergify/bp/version-16/pr-56418 
refactor: configurable timeout on process pcv (backport #56417) (backport #56418)
 2026-06-24 16:12:00 +05:30
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
e46be25e9f chore: resolve conflicts 
(cherry picked from commit df3c821f98)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.py
#	erpnext/patches.txt
 2026-06-24 15:36:07 +05:30
ruthra kumar
570c67bb34 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
(cherry picked from commit c33d7e5d7b)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.py
#	erpnext/patches.txt
 2026-06-24 10:00:58 +00:00
ruthra kumar
e71b066eec 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)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
(cherry picked from commit c97be8abe1)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 2026-06-24 10:00:57 +00:00
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
Frappe PR Bot
e9a26b5086 chore(release): Bumped to Version 16.24.0 
# [16.24.0](https://github.com/frappe/erpnext/compare/v16.23.1...v16.24.0) (2026-06-23)

### Bug Fixes

* add customer type in the list view ([c788106](c788106011))
* add partially transferred status and fix button visibility for partial material transfer on job card ([570ef45](570ef45e46))
* add validation and tests for set_status ([bcd72a7](bcd72a7fec))
* address product bundle review comments ([c066880](c066880978))
* apply docstatus filter to exclude cancelled Work Orders in Serial No ([58d5f39](58d5f39e0a))
* **budget:** ambiguous error message for budget assignment validation (backport [#56390](https://github.com/frappe/erpnext/issues/56390)) ([#56392](https://github.com/frappe/erpnext/issues/56392)) ([2b6f2c2](2b6f2c2f9c))
* clear stale payment rows on non-POS returns so they don't surface in bank reconciliation (backport [#55903](https://github.com/frappe/erpnext/issues/55903)) ([#56171](https://github.com/frappe/erpnext/issues/56171)) ([d363186](d3631860db))
* **coa_importer:** allow importing COA through `import_coa` only for `Accounts Manager` (backport [#56132](https://github.com/frappe/erpnext/issues/56132)) ([#56140](https://github.com/frappe/erpnext/issues/56140)) ([e6e5591](e6e5591088))
* company default handling in purchase transactions made from project ([29323cb](29323cb0b1))
* customer master form cleanup ([8b56b7b](8b56b7ba0e))
* disable is_debit_note while creating credit note ([c7dbedb](c7dbedbfdc))
* disarding stock entry fix ([5372254](537225494c))
* **err:** add missing permission check on `get_account_details` ([88ce356](88ce356d62))
* escape user image url on various templates (backport [#56269](https://github.com/frappe/erpnext/issues/56269)) ([#56271](https://github.com/frappe/erpnext/issues/56271)) ([3b734f4](3b734f4d5d))
* fetch party types based on account type in journal entry and refactor SQL to query builder ([bbb3181](bbb3181c6e))
* honor account freezing date when cancelling vouchers ([f4b827c](f4b827cb3d))
* **journal entry:** validate opening entry against pcv on save ([f8aa4c7](f8aa4c730c))
* lock budget distribution table and guard against null distribution rows ([2b28b7e](2b28b7e694))
* **manufacturing:** make item_code mandatory in Job Card Item ([d40c36a](d40c36a4b1))
* party specific item doesnt work if there are 2 suppliers with same item ([3df7a28](3df7a28476))
* **payment_entry:** recompute base amount when exchange rate changes (backport [#56136](https://github.com/frappe/erpnext/issues/56136)) ([#56398](https://github.com/frappe/erpnext/issues/56398)) ([1d0edf1](1d0edf1b9a))
* placement of fields ([#56257](https://github.com/frappe/erpnext/issues/56257)) ([3f53af8](3f53af8b1f))
* **pos:** remove redundant opening balance dialog onchange handler (backport [#54591](https://github.com/frappe/erpnext/issues/54591)) ([#56403](https://github.com/frappe/erpnext/issues/56403)) ([4555c32](4555c323af))
* preserve stock ageing on non-serial reconciliation ([846e0a9](846e0a9f06))
* removing the document naming series dialog and moving to framework ([97279c7](97279c7e26))
* **report_utils:** remove unnecessary whitelist decorator on `get_invoiced_item_gross_margin` ([bf58393](bf58393fda))
* resolve backport merge conflicts in customer.json ([77121f2](77121f2a41))
* resolve backport merge conflicts in supplier.json ([a80de9b](a80de9bd01))
* **stock:** allow partial raw material picking/transfer from work order ([8e3fbab](8e3fbab94a))
* **stock:** apply precision to the additional cost amount in stock entry ([6ac699d](6ac699d3bb))
* **stock:** define qi exception classes in exceptions file ([42c121a](42c121a750))
* **stock:** enable quality inspection for all Stock Entry purposes ([a631035](a6310351fd))
* **stock:** propagate renamed attribute values to variant items ([dbc831e](dbc831e008))
* **stock:** update transfer status for mixed transfer flows ([84a1a51](84a1a51023))
* **stock:** update variant attributes on value rename ([3110ab1](3110ab1c57))
* **stock:** update voucher valuaion rate in sle (backport [#55960](https://github.com/frappe/erpnext/issues/55960)) ([#56263](https://github.com/frappe/erpnext/issues/56263)) ([82e1221](82e1221dc9))
* submittable product bundle issues ([7a1def0](7a1def07e9))
* supplier master form cleanup ([e5c9e7a](e5c9e7abdc))
* supplier status in list view ([2035fac](2035fac494))
* tax.base_tax_amount as none when payment entry created using API ([43b355e](43b355eaf6))
* type def in get_linked_payments ([#56100](https://github.com/frappe/erpnext/issues/56100)) ([8e21af0](8e21af0a63))
* update reference doctype mapping and field visibility in bank guarantee ([dc9ae20](dc9ae20db8))
* update round off account functions to accept document context for regional overrides (backport [#55758](https://github.com/frappe/erpnext/issues/55758)) ([#55771](https://github.com/frappe/erpnext/issues/55771)) ([f5d05b9](f5d05b969b))
* update weighted average rate calculation to consider returned and consumed quantities ([35e0604](35e06045bd))

### Features

* add batch-level option to allow negative stock for batch ([1f075d4](1f075d4bbf))
* allocate full actual charge to stock items only (e.g. Freight) (backport [#56102](https://github.com/frappe/erpnext/issues/56102)) ([#56222](https://github.com/frappe/erpnext/issues/56222)) ([9469889](9469889bd5))
* **opening invoice creation tool:** add project to opening invoice child row (backport [#54662](https://github.com/frappe/erpnext/issues/54662)) ([#56401](https://github.com/frappe/erpnext/issues/56401)) ([d54938f](d54938fa64))
* party aliases ([768425e](768425ebf1))

### Performance Improvements

* composite index on (serial_no, warehouse, posting_datetime) for Serial and Batch Entry (backport [#56032](https://github.com/frappe/erpnext/issues/56032)) ([#56166](https://github.com/frappe/erpnext/issues/56166)) ([c0dab55](c0dab55fcc))
v16.24.0 		2026-06-23 21:37:59 +00:00
Diptanil Saha
872c86e223 Merge pull request #56359 from frappe/version-16-hotfix 
chore: release v16
 2026-06-24 03:06:16 +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