nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-12 22:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,422 Commits 595 Branches 1,797 Tags
52d04ad8341fa5653de593feb7c0dbb4f1ecf6b5
Commit Graph

55422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
52d04ad834 fix: Use correct doctype name for PCV perm-check (backport #56606) (#56610) 
fix: Use correct doctype name for PCV perm-check (#56606)

closes https://github.com/frappe/erpnext/issues/56593

(cherry picked from commit 747374e767)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2026-06-29 19:04:44 +05:30
rohitwaghchaure
f50e529f8a fix: update_qty_in_future_sle skips SLEs with same posting datetime (#56615) 2026-06-29 17:21:17 +05:30
rohitwaghchaure
ab98d19f26 fix: negative stock issue (#56616) 2026-06-29 17:20:12 +05:30
Mihir Kandoi
926e4cfba6 Merge pull request #56613 from frappe/backport/55774-stock-balance 
fix: backport stock balance changes from #55774
 2026-06-29 15:23:56 +05:30
Mihir Kandoi
8abc27863a fix: extract stock ageing data helper in stock balance (backport #55774) 
The v15 backport (#55776) of #55774 dropped the stock_balance.py changes.
A separate backport left an inline version that sorts/filters the FIFO queue
by itemgetter(1) *before* normalizing, so for batchwise valuation slots
itemgetter(1) reads the count flag instead of the posting date. The queue is
then ordered wrong and earliest_age/latest_age come out swapped.

Extract get_stock_ageing_data, which normalizes before sorting/filtering so
itemgetter(1) is always the posting date, and add the regression test.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-29 15:06:21 +05:30
Mihir Kandoi
43496ac3ca Merge pull request #56434 from aerele/backport-56375 
fix: skip over-allowance qty validation for non-stock items (backport #56335)
 2026-06-28 19:39:20 +05:30
mergify[bot]
562563553c fix: sync Stock Reconciliation difference amount with GL after reposting (backport #56574) (#56584) 
* fix: sync Stock Reconciliation difference amount with GL after reposting (#56574)

* fix: sync Stock Reconciliation difference amount with GL after reposting

* fix: placement of recalculate differece amount function

(cherry picked from commit c7ef42ef98)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

Removed unused imports and fixed import structure.

* chore: fix conflicts

Refactor update_rate_on_stock_reconciliation method to use recalculation from ledger instead of manual updates for stock reconciliation items.

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-06-28 12:16:40 +05:30
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
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
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
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
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
mergify[bot]
506658c3a6 fix: attribute error because of missing margin_type field in Supplier Quotation (backport #48089) 
* fix: add missing margin related fields

(cherry picked from commit 67f96c66e4)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json

* chore: fix conflict

---------

Co-authored-by: iamkhanraheel <raheel@frappe.io>
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
 2026-06-23 14:49:58 +05:30
Lakshit Jain
4048f0666e Merge pull request #55770 from frappe/mergify/bp/version-15-hotfix/pr-55758 
fix: update round off account functions to accept document context for regional overrides (backport #55758)
 2026-06-22 18:13:50 +05:30
ljain112
42121f2e36 fix: simplify get_round_off_applicable_accounts function signature 2026-06-22 17:40:57 +05:30