nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-12 14:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,194 Commits 595 Branches 1,797 Tags
490e12526711c74ebc58ea25affe935346ab95d3
Commit Graph

58194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
490e125267 fix: manual backport of #55896 2026-06-29 11:09:23 +05:30
ruthra kumar
93b28f3337 refactor(test): update assertion for new test records 
(cherry picked from commit afeaba5142)
 2026-06-29 09:41:48 +05:30
ruthra kumar
1a9fcfb0cc refactor(test): broken test case in accounts controller 
(cherry picked from commit 59a69fc497)
 2026-06-29 09:41:48 +05:30
ruthra kumar
a8aa73baae refactor(test): remove even more dead code 
(cherry picked from commit 3d109571ee)
 2026-06-29 09:41:48 +05:30
ruthra kumar
65202d2be1 refactor(tests): reuse persistent master data instead of creating company per test 
Replace per-test company creation in setUp() with persistent master data
from BootStrapTestData. Add Test PCV Company to test_records.json so it
becomes a persistent fixture rather than a throwaway created per test run.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 6e62750c2f)

# Conflicts:
#	erpnext/accounts/report/financial_ratios/test_financial_ratios.py
 2026-06-29 09:41:47 +05:30
MochaMind
1cc2890f3e chore: update POT file (#56591) 2026-06-28 21:26:46 +02:00
mergify[bot]
e834098c28 fix: sync Stock Reconciliation difference amount with GL after reposting (backport #56574) (#56585) 
* 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 import and fixed import order.

* chore: fix conflicts

Refactor update_rate_on_stock_reconciliation to use recalculation method for difference amount.

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-06-27 17:08:54 +05:30
Mihir Kandoi
655d6dac87 Merge pull request #56587 from frappe/mergify/bp/version-16-hotfix/pr-56586 
fix: party aliases should be no copy (backport #56586)
 2026-06-27 16:44:33 +05:30
Shllokkk
36a9c7a0d3 Merge pull request #56386 from frappe/mergify/bp/version-16-hotfix/pr-56337 
fix: show contextual balance label on party dashboard for net balances (backport #56337)
 2026-06-27 16:36:07 +05:30
Mihir Kandoi
b35c5c1568 chore: resolve conflicts 2026-06-27 16:34:53 +05:30
Mihir Kandoi
e64e9866fb chore: fix conflicts 2026-06-27 16:34:20 +05:30
mergify[bot]
b292be34cb chore(crm_settings): remove unused delete_custom_fields import (backport #56558) (#56583) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-27 16:29:48 +05:30
Mihir Kandoi
0b42241682 fix: party aliases should be no copy 
(cherry picked from commit 057af21cd8)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/selling/doctype/customer/customer.json
 2026-06-27 10:55:31 +00:00
mergify[bot]
df1b4431b6 fix: do not allow closing the accounting period for future dates (backport #56551) (#56577) 
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:11 +05:30
mergify[bot]
112b773193 chore: removing controllers from pre-commit eslint hooks exclude list (backport #56575) (#56579) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-27 01:37:18 +05:30
mergify[bot]
b4d83e542a fix: ignored posting time 00:00:00 in RIV (backport #56571) (#56573) 
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:45 +05:30
mergify[bot]
9bc240c4f0 ci: bump pre-commit actions to v3.0.1 (backport #56562) (#56567) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-26 17:06:08 +05:30
Mihir Kandoi
1b7486f61a Merge pull request #56565 from frappe/mergify/bp/version-16-hotfix/pr-56559 
fix: remove dead bundle helper call from purchase receipt print format (backport #56559)
 2026-06-26 16:54:11 +05:30
Shllokkk
2eaa635ab6 fix: remove dead bundle helper call from purchase receipt print format 
(cherry picked from commit b9f5a77fa7)
 2026-06-26 11:07:51 +00:00
Mihir Kandoi
733a837c18 Merge pull request #56550 from frappe/mergify/bp/version-16-hotfix/pr-56127 
fix: allow rename for Quality Inspection Parameter (backport #56127)
 2026-06-26 15:56:43 +05:30
Shllokkk
a886d0b445 fix: show contextual balance label on party dashboard for net balances 
(cherry picked from commit 3251b40365)
 2026-06-26 15:03:06 +05:30
Mohd Haris
410a772510 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)
 2026-06-26 08:15:17 +00:00
Mihir Kandoi
2404074b9d Merge pull request #56512 from frappe/revert-56500-mergify/bp/version-16-hotfix/pr-56497 
Revert "fix: handle missing serial and batch bundle in print format (backport #56497)"
 2026-06-26 12:56:19 +05:30
Mihir Kandoi
5f02ff5f8c Revert "fix: handle missing serial and batch bundle in print format (backport #56497)" 2026-06-26 10:08:25 +05:30
rohitwaghchaure
6dad1b1ae6 refactor: move Inventory Dimension mandatory check from field-level to server-side (#56451) 
* refactor: move Inventory Dimension mandatory check from field-level to server-side

* refactor: split large function

* fix: greptile issue
 2026-06-25 20:10:09 +05:30
Shllokkk
a00874fa95 Merge pull request #56500 from frappe/mergify/bp/version-16-hotfix/pr-56497 
fix: handle missing serial and batch bundle in print format (backport #56497)
 2026-06-25 19:33:50 +05:30
Shllokkk
c84d4a282d fix: handle missing serial and batch bundle in print format 
(cherry picked from commit 548d90df4f)
 2026-06-25 13:53:11 +00:00
mergify[bot]
30ba950abd fix(crm): using get_list instead of get_all in get_opportunities (backport #56463) (#56466) 
* fix(crm): using `get_list` instead of `get_all` in `get_opportunities` (#56463)

(cherry picked from commit 9b4c8a8d7f)

# Conflicts:
#	erpnext/crm/doctype/prospect/prospect.py

* chore: resolve conflict

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-25 10:23:04 +00:00
mergify[bot]
ef3d444a60 fix: rewrite item rate calculation (backport #56315) 
Co-authored-by: Harsh Patadia <harsh@Harshs-MacBook-Air.local>
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
Co-authored-by: Smit Vora <mailsmitvora@gmail.com>
 2026-06-25 09:50:50 +00:00
Shllokkk
4e94b75b5d Merge pull request #56460 from Shllokkk/psoa-restrict-jinja-context-v16 
fix: remove frappe.utils from jinja context in process statement of accounts
 2026-06-25 15:17:29 +05:30
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
Shllokkk
37ec2d0edd fix: remove frappe.utils from jinja context in process statement of accounts 2026-06-25 14:55:47 +05:30
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