nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-25 13:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,581 Commits 606 Branches 1,802 Tags
fb2a4e5f98c8e900648dd4d55de8b91b41a0dab3
Commit Graph

55581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pandiyan
3f00a0ffa9 test: add tests for non stock item over billing against so/po 2026-06-28 00:23:04 +05:30
pandiyan
bba7fe9831 fix: skip qty over-allowance check for non-stock items only 2026-06-28 00:23:04 +05:30
pandiyan
b39024e0e3 test: update cascading test to assert zero-qty reservation for stock-covered items 2026-06-27 23:59:31 +05:30
pandiyan
d3df0bf387 fix: reserve projected stock for production plan based on BOM qty 2026-06-27 23:20:11 +05:30
mergify[bot]
d992f6f5c8 chore(crm_settings): remove unused delete_custom_fields import (backport #56558) (#56582) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-27 11:13:07 +00:00
mergify[bot]
54fcd09995 fix: do not allow closing the accounting period for future dates (backport #56551) (#56576) 
fix: do not allow closing the accounting period for future dates (#56551)

(cherry picked from commit 5e60e4faa7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-06-27 12:04:38 +05:30
mergify[bot]
afddf70905 fix(lead): added missing read permission check on get_lead_details (backport #56272) (#56273) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(lead): added missing read permission check on `get_lead_details` (#56272)
 2026-06-27 02:37:22 +05:30
Diptanil Saha
257b4225ec ci: separate job for semgrep (#56580) 2026-06-26 21:04:24 +00:00
mergify[bot]
af05b8a30d chore: removing controllers from pre-commit eslint hooks exclude list (backport #56575) (#56578) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-27 02:31:22 +05:30
Mihir Kandoi
99a1ad1706 Merge pull request #56564 from frappe/mergify/bp/version-15-hotfix/pr-56559 
fix: remove dead bundle helper call from purchase receipt print format (backport #56559)
 2026-06-26 21:02:42 +05:30
mergify[bot]
5ed946b3b9 fix: ignored posting time 00:00:00 in RIV (backport #56571) (#56572) 
fix: ignored posting time 00:00:00 in RIV (#56571)

(cherry picked from commit 31f89b72b4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-06-26 19:42:28 +05:30
mergify[bot]
4aedf98c7c ci: bump pre-commit actions to v3.0.1 (backport #56562) (#56566) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-26 17:06:34 +05:30
Shllokkk
0f9429fd3d fix: remove dead bundle helper call from purchase receipt print format 
(cherry picked from commit b9f5a77fa7)
 2026-06-26 16:44:42 +05:30
Shllokkk
43ff69429f Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-55627 2026-06-26 14:41:07 +05:30
Mihir Kandoi
b95c8584bd Merge pull request #56549 from frappe/mergify/bp/version-15-hotfix/pr-56127 
fix: allow rename for Quality Inspection Parameter (backport #56127)
 2026-06-26 14:18:45 +05:30
Mihir Kandoi
f2b7319462 chore: resolve conflicts 2026-06-26 13:46:30 +05:30
Mohd Haris
9e6edea818 fix: allow rename for Quality Inspection Parameter 
The Quality Inspection Parameter DocType did not have `allow_rename`
enabled, so the "Rename" action was hidden from the form's menu
(the 3-dots / ⋮ options). Since the DocType is auto-named from the
`parameter` field (`autoname: field:parameter`), users had no way to
correct or change a parameter's name once created.

Enable `allow_rename` so users can rename a Quality Inspection
Parameter from the form menu.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
(cherry picked from commit adfef48a65)

# Conflicts:
#	erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json
 2026-06-26 08:14:57 +00:00
Mihir Kandoi
b982935c56 Merge pull request #56511 from frappe/revert-56499-mergify/bp/version-15-hotfix/pr-56497 
Revert "fix: handle missing serial and batch bundle in print format (backport #56497)"
 2026-06-26 10:25:38 +05:30
Mihir Kandoi
3365373ec9 Revert "fix: handle missing serial and batch bundle in print format (backport #56497)" 2026-06-26 10:08:10 +05:30
Shllokkk
29d8a67619 Merge pull request #56462 from frappe/mergify/bp/version-15-hotfix/pr-56460 
fix: remove frappe.utils from jinja context in process statement of accounts (backport #56460)
 2026-06-25 20:48:42 +05:30
Shllokkk
339e11ef18 Merge pull request #56499 from frappe/mergify/bp/version-15-hotfix/pr-56497 
fix: handle missing serial and batch bundle in print format (backport #56497)
 2026-06-25 19:51:34 +05:30
Shllokkk
9adfab19dc fix: handle missing serial and batch bundle in print format 
(cherry picked from commit 548d90df4f)
 2026-06-25 13:52:55 +00:00
mergify[bot]
28e4bca4f2 fix(crm): using get_list instead of get_all in get_opportunities (backport #56463) (#56465) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(crm): using `get_list` instead of `get_all` in `get_opportunities` (#56463)
 2026-06-25 10:41:41 +00:00
Shllokkk
b176fb292b fix: remove frappe.utils from jinja context in process statement of accounts 
(cherry picked from commit 37ec2d0edd)
 2026-06-25 09:48:03 +00:00
Diptanil Saha
414b3665c1 fix(company): using String.prototype.bold method instead of frappe.utils.bold on company deletion prompt (#56441) 2026-06-25 00:49:27 +05:30
mergify[bot]
db8a26a3af fix: precision issue causing COGS in inter transfer PR (backport #56420) (#56424) 
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:14 +05:30
Mihir Kandoi
b80fb47d6e Merge pull request #56429 from frappe/mergify/bp/version-15-hotfix/pr-55191 
refactor(sales_person_wise_transaction_summary): Replace SQL with que… (backport #55191)
 2026-06-24 16:43:17 +05:30
Loic Oberle
2585712500 refactor(sales_person_wise_transaction_summary): Replace SQL with que… (#55191) 
(cherry picked from commit df3d0859a1)
 2026-06-24 10:44:17 +00:00
Frappe PR Bot
25ee3695f0 chore(release): Bumped to Version 15.114.0 
# [15.114.0](https://github.com/frappe/erpnext/compare/v15.113.0...v15.114.0) (2026-06-24)

### Features

* **accounts:** add configurable job timeout for Process Period Closing Voucher ([82a8581](82a85818c2))
v15.114.0 		2026-06-24 10:25:43 +00:00
ruthra kumar
ff205da810 Merge pull request #56426 from frappe/mergify/bp/version-15/pr-56418 
refactor: configurable timeout on process pcv (backport #56417) (backport #56418)
 2026-06-24 15:48:58 +05:30
ruthra kumar
2980171007 chore: resolve conflicts 
(cherry picked from commit df3c821f98)
 2026-06-24 09:56:59 +00:00
ruthra kumar
c6c4815e8d 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)
 2026-06-24 09:56:59 +00:00
ruthra kumar
82a85818c2 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)
 2026-06-24 09:56:58 +00:00
ruthra kumar
6d12a2aaf7 Merge pull request #56418 from frappe/mergify/bp/version-15-hotfix/pr-56417 
refactor: configurable timeout on process pcv (backport #56417)
 2026-06-24 15:26:17 +05:30
ruthra kumar
df3c821f98 chore: resolve conflicts 2026-06-24 15:05:41 +05:30
ruthra kumar
c33d7e5d7b 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:30 +00:00
ruthra kumar
c97be8abe1 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
 2026-06-24 07:58:30 +00:00
Frappe PR Bot
57a2be6b56 chore(release): Bumped to Version 15.113.0 
# [15.113.0](https://github.com/frappe/erpnext/compare/v15.112.0...v15.113.0) (2026-06-23)

### Bug Fixes

* add dynamic links for customer and supplier dashboards ([690adf1](690adf1051))
* Add likely missing escapes (backport [#55574](https://github.com/frappe/erpnext/issues/55574)) ([#55580](https://github.com/frappe/erpnext/issues/55580)) ([ce8fce7](ce8fce78f1))
* add partially transferred status and fix button visibility for partial material transfer on job card ([1f5283d](1f5283da58))
* add validation and tests for set_status ([7bea925](7bea925230))
* apply docstatus filter to exclude cancelled Work Orders in Serial No ([90fd057](90fd057fb3))
* attribute error because of missing margin_type field in Supplier Quotation (backport [#48089](https://github.com/frappe/erpnext/issues/48089))  ([506658c](506658c3a6))
* **budget:** ambiguous error message for budget assignment validation (backport [#56390](https://github.com/frappe/erpnext/issues/56390)) ([#56391](https://github.com/frappe/erpnext/issues/56391)) ([53a1122](53a11229ec))
* 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)) ([#56169](https://github.com/frappe/erpnext/issues/56169)) ([37d2622](37d26222d7))
* disable is_debit_note while creating credit note ([e4370ab](e4370ab332))
* **err:** add missing permission check on `get_account_details` ([041a9ad](041a9adbbf))
* escape user image url on various templates (backport [#56269](https://github.com/frappe/erpnext/issues/56269)) ([#56270](https://github.com/frappe/erpnext/issues/56270)) ([42af4ce](42af4ce7b0))
* **manufacturing:** make item_code mandatory in Job Card Item ([1b4da9d](1b4da9dc96))
* **payment_entry:** recompute base amount when exchange rate changes (backport [#56136](https://github.com/frappe/erpnext/issues/56136)) ([#56397](https://github.com/frappe/erpnext/issues/56397)) ([cef608d](cef608d043))
* **pos:** remove redundant opening balance dialog onchange handler (backport [#54591](https://github.com/frappe/erpnext/issues/54591)) ([#56402](https://github.com/frappe/erpnext/issues/56402)) ([334a0b2](334a0b2137))
* preserve stock ageing on non-serial reconciliation ([1991312](19913127a7))
* **report_utils:** remove unnecessary whitelist decorator on `get_invoiced_item_gross_margin` ([0efebf5](0efebf5d8c))
* resolve backport conflict in accounting dashboard number cards ([f106513](f106513005)), closes [#55548](https://github.com/frappe/erpnext/issues/55548) [#55484](https://github.com/frappe/erpnext/issues/55484)
* set a fallback value if no fiscal year set ([da1ccc2](da1ccc2b62))
* show contextual balance label on party dashboard for net balances ([9b6adc4](9b6adc42b6))
* simplify get_round_off_applicable_accounts function signature ([42121f2](42121f2e36))
* **stock:** allow partial raw material picking/transfer from work order ([a858d77](a858d77461))
* **stock:** apply precision to the additional cost amount in stock entry ([acc1444](acc1444c03))
* **stock:** propagate renamed attribute values to variant items ([27d574d](27d574dad5))
* **stock:** update transfer status for mixed transfer flows ([3f9a88a](3f9a88a5e2))
* **stock:** update variant attributes on value rename ([c7acd88](c7acd88742))
* **stock:** update voucher valuaion rate in sle (backport [#55960](https://github.com/frappe/erpnext/issues/55960)) ([#56262](https://github.com/frappe/erpnext/issues/56262)) ([37f847e](37f847e730))
* tax.base_tax_amount as none when payment entry created using API ([37dffa7](37dffa7273))
* update reference doctype mapping and field visibility in bank guarantee ([e556cbb](e556cbbe6a))
* update round off account functions to accept document context for regional overrides ([#55758](https://github.com/frappe/erpnext/issues/55758)) ([eef075a](eef075a2ba))
* use fiscal year instead of calendar year in accounting dashboard number cards ([81ce5fb](81ce5fbee9))

### Features

* add batch-level option to allow negative stock for batch ([5c4f19e](5c4f19ebdc))
v15.113.0 		2026-06-23 21:37:17 +00:00
Diptanil Saha
47f54a4725 Merge pull request #56360 from frappe/version-15-hotfix 
chore: release v15
 2026-06-24 03:05:42 +05:30
Diptanil Saha
a38da57c9e Merge branch 'version-15' into version-15-hotfix 2026-06-24 02:41:55 +05:30
mergify[bot]
334a0b2137 fix(pos): remove redundant opening balance dialog onchange handler (backport #54591) (#56402) 
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:29 +05:30
mergify[bot]
cef608d043 fix(payment_entry): recompute base amount when exchange rate changes (backport #56136) (#56397) 
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:10:54 +05:30
mergify[bot]
53a11229ec fix(budget): ambiguous error message for budget assignment validation (backport #56390) (#56391) 
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(budget): ambiguous error message for budget assignment validation (#56390)
 2026-06-23 19:49:07 +00:00
Shllokkk
094bdf2d3e Merge pull request #56385 from frappe/mergify/bp/version-15-hotfix/pr-56337 
fix: show contextual balance label on party dashboard for net balances (backport #56337)
 2026-06-23 23:31:19 +05:30
mergify[bot]
66d0a60140 feat(crm_settings)!: enable frappe crm data synchronization (backport #56268) (#56383) 
* feat(crm_settings): enable frappe crm data synchronization (#56268)

(cherry picked from commit 0ab812c3ec)

# Conflicts:
#	erpnext/crm/frappe_crm_api.py

* chore: resolve conflicts

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-23 22:02:47 +05:30
Shllokkk
9b6adc42b6 fix: show contextual balance label on party dashboard for net balances 
(cherry picked from commit 3251b40365)
 2026-06-23 15:53:02 +00:00
Mihir Kandoi
e5894b67bc Merge pull request #56373 from frappe/mergify/bp/version-15-hotfix/pr-56364 
fix(manufacturing): make item_code mandatory in Job Card Item (backport #56364)
 2026-06-23 19:36:33 +05:30
pandiyan
1b4da9dc96 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:32:41 +00:00
Khushi Rawat
f75e7a3dc8 Merge pull request #55548 from frappe/mergify/bp/version-15-hotfix/pr-55484 
fix: use fiscal year instead of calendar year in accounting dashboard number cards (backport #55484)
 2026-06-23 16:50:55 +05:30
khushi8112
f106513005 fix: resolve backport conflict in accounting dashboard number cards 
Resolved Mergify backport conflicts (PR #55548 / backport of #55484) by
taking the final upstream state: fiscal-year posting_date Between filter
with calendar-year fallback, Timespan filter removed.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-23 16:32:16 +05:30