nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-09 23:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,036 Commits 632 Branches 1,810 Tags
e37ba3f8cf376ed4eb0c4b884954b183c5573be3
Commit Graph

2460 Commits

Author SHA1 Message Date
mergify[bot]
934c7d833c fix(setup): strict permissions for transaction deletion record (backport #58687) (#58722) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-09-04 06:53:44 +00:00
AarDG10
3edd8ee8be refactor: remove bold from formatter 2026-08-28 11:48:07 +05:30
Aarol D'Souza
81cf874fd7 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-58351 2026-08-27 15:42:27 +05:30
mergify[bot]
d62f6e715f fix: mark item tax templates as not applicable (backport #54673) (backport #54677) (#58462) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-08-27 09:46:30 +00:00
AarDG10
de260bd43c fix(company): throw if linked to demo_company field 
Throws an error msg if user is deleting demo company directly.

(cherry picked from commit aaa3100efc)
 2026-08-26 07:24:05 +00:00
mergify[bot]
c6211eb075 fix(email_digest): added permission check for get_msg_html (backport #58197) (#58199) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-08-15 16:47:02 +00:00
Mihir Kandoi
9c9bc8e9bf Merge pull request #58039 from mihir-kandoi/backport-58036-version-15-hotfix 
fix(stock): validate warehouse accounts when used (backport #58036)
 2026-08-11 19:15:29 +05:30
Mihir Kandoi
d620720445 fix(stock): validate warehouse accounts when used 2026-08-11 18:04:30 +05:30
Mihir Kandoi
2a4a9fff3d fix(setup): fetch driver address by supplier link 
(cherry picked from commit 3ffb888d26)
 2026-08-11 09:47:54 +00:00
Deepesh Garg
faa7c466b1 fix: Ignore permission while deleting user permission 
(cherry picked from commit 3b10ff7df7)
 2026-08-03 13:02:49 +00:00
Mihir Kandoi
1602639a80 fix: resolve backport conflicts for version-15 
install() holds the preset list inline on this branch, so the root is
resolved there instead of in get_preset_records. Dropping the preset-record
test with it -- there is no seam to call without running the whole installer.

The patch test is adapted to this branch: TestItem does not roll back between
tests, so it restores the original root name, and it passes parent_item_group
explicitly since ItemGroup.validate skips root-defaulting under
frappe.flags.in_test.
 2026-07-30 19:22:29 +05:30
Mihir Kandoi
848335086c fix: seed standard Item Groups under the existing tree root 
install_fixtures always inserted "All Item Groups" as a parentless group.
On a site where another app had already created the root, ItemGroup.validate
re-parented it, leaving a second group-root that held the standard groups
while the real root held everything else.

This is reproducible with the healthcare app on a non-English site: its
after_install seeds the root as _("All Item Groups"), so a pt-BR site gets
"Todos os Grupos de Itens" as the root before the setup wizard runs. The
split predates #57390 -- the old translated-name lookup resolved to the same
root and produced an identical tree.

Resolve the root once with get_root_of (falling back to the canonical English
name on fresh installs) and use it for the root record's exists-guard and the
standard groups' parent, matching Company.create_default_departments.

Patch merges an already-seeded "All Item Groups" into the root it sits under,
lifting its children and repointing every link.

Closes #57581

(cherry picked from commit e7088d8981)

# Conflicts:
#	erpnext/setup/doctype/item_group/test_item_group.py
#	erpnext/setup/setup_wizard/operations/install_fixtures.py
 2026-07-30 13:41:45 +00:00
mergify[bot]
1d60ab449c fix(tnc): get_terms_and_conditions render_template with safe_exec (backport #56944) (backport #56977) (#57106) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-07-28 21:59:17 +05:30
diptanilsaha
0a5daeed57 feat(crm_settings): auto-update crm sync settings on frappe crm install and uninstall 
(cherry picked from commit c86aa2d6fe)
 2026-07-09 10:01:54 +00:00
mergify[bot]
5666fd1334 fix(company): ignore user permissions for link fields having link to Account and Cost Center (backport #56748) (#56794) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-07-02 13:02:09 +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]
ce8fce78f1 fix: Add likely missing escapes (backport #55574) (#55580) 
* fix: Add likely missing escaps (#55574)

(cherry picked from commit b72cde73ba)

# Conflicts:
#	erpnext/accounts/doctype/budget/budget.py
#	erpnext/controllers/website_list_for_contact.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2026-06-18 11:32:54 +00:00
mergify[bot]
8c7a313a38 fix: Add authorization checks on internal functions (backport #55709) (backport #55726) (#55736) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: Add authorization checks on internal functions (backport #55709) (#55726)
fix: Add authorization checks on internal functions (#55709)
 2026-06-16 21:34:10 +00:00
mergify[bot]
5f5b2a6ae2 fix: updated role based permission for terms and conditions doctype (backport #55674) (#55675) 
* fix: updated role based permission for terms and conditions doctype (#55674)

(cherry picked from commit 0ba2961103)

# Conflicts:
#	erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json

* chore: resolve conflicts

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-16 21:30:22 +00:00
mergify[bot]
8a9461ff45 fix(company): replaced "this company" with company name on delete transactions dialog (backport #56021) (#56022) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(company): replaced "this company" with company name on delete transactions dialog (#56021)
 2026-06-17 02:14:05 +05:30
nareshkannasln
81e05fc1f6 fix: update system manager permissions 
(cherry picked from commit 501c8087cb)
 2026-06-16 20:42:53 +05:30
diptanilsaha
9405b49e93 fix(get_exchange_rate): using get_single_value to fetch disabled value from currency_exchange_settings 
(cherry picked from commit abb579e2db)
 2026-06-15 08:53:17 +00:00
diptanilsaha
64fc3ac309 test: fixed currency exchange test for frankfurter v2 api 
(cherry picked from commit 138f683a68)
 2026-06-15 08:53:16 +00:00
diptanilsaha
d62985d9a7 fix: use frankfurter v2 by default for new install 
(cherry picked from commit 479f9f63c9)
 2026-06-15 08:53:16 +00:00
Raghav Ruia
3356583865 fix: show company name in delete transactions confirmation dialog 
Display the actual company name in bold within the confirmation dialog
label so users immediately know which company they must type to confirm,
reducing the risk of accidental data loss.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 87d26a2d67)
 2026-06-15 04:20:25 +00:00
Rohit Waghchaure
559c95c8a8 fix: pemission for whitelist functions 
(cherry picked from commit dd56e80512)

# Conflicts:
#	erpnext/accounts/doctype/bank_clearance/bank_clearance.py
#	erpnext/manufacturing/doctype/bom_creator/bom_creator.py
#	erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py
 2026-06-13 12:45:31 +00:00
Mihir Kandoi
e40999c879 fix: sync employee user status after save 2026-06-11 20:58:35 +05:30
pandiyan
559585fb7b fix: show user disable audit log 
(cherry picked from commit 73d1852773)
 2026-06-11 15:01:32 +00:00
mergify[bot]
9095c5a3c2 regional(setup): add 0% and 6% VAT rates for Belgium (backport #54719) (#55582) 
Co-authored-by: Antoine Maas <antoine.maas@okte.io>
 2026-06-03 14:11:51 +05:30
mergify[bot]
2a52ea6850 fix(regional): Japanese CT Rate (backport #54998) (#55437) 
Co-authored-by: mh35 <mh35jp@gmail.com>
fix(regional): Japanese CT Rate (#54998)
 2026-05-30 22:00:19 +05:30
diptanilsaha
fff023bf7b Merge pull request #55143 from frappe/mergify/bp/version-15-hotfix/pr-55127 
refactor: migrate get_tax_template to query builder with hierarchical group matching (backport #55127)
 2026-05-22 02:32:22 +05:30
mergify[bot]
429e02e6f9 chore: migrate Address/Contact custom fields from JSON fixtures to install (backport #55084) (#55087) 
fixtures to install (backport #55084)
 2026-05-21 20:41:36 +00:00
diptanilsaha
6517ed72b4 feat: add get_parent_supplier_groups using query builder 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit cb610b79d2)
 2026-05-21 11:35:54 +00:00
diptanilsaha
c125d1489c refactor: migrate get_parent_customer_groups to query builder 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 91a2a7b0a0)
 2026-05-21 11:35:54 +00:00
mergify[bot]
9586bc7635 fix: added permission validation for deactivate_sales_person (backport #54884) (#54885) 
* fix: added permission validation for `deactivate_sales_person` (#54884)

(cherry picked from commit 9134db9cd3)

# Conflicts:
#	erpnext/setup/doctype/employee/employee.py

* chore: resolved conflicts

---------

Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-05-12 16:30:56 +00:00
mergify[bot]
29282a80cf feat: copy terms attachments to transactions (backport #53403) (#54660) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-05-01 13:04:07 +00:00
mergify[bot]
14085de332 fix: resolve user permission error on status change by updating user … (backport #54033) (#54059) 
Co-authored-by: Krishna Shirsath <shirsathkrishna19@gmail.com>
 2026-04-07 10:25:32 +05:30
Navin-S-R
55a0603356 chore: resolve conflict 2026-03-10 17:58:57 +05:30
Poovitha Palanivelu
c5796fed4a fix: update user status depends on employee status 
(cherry picked from commit 194d060f13)

# Conflicts:
#	erpnext/setup/doctype/employee/employee.py
 2026-03-10 07:39:56 +00:00
diptanilsaha
0ba965aae6 fix: restore missing has_permission import 2026-02-23 20:07:27 +05:30
Abdeali Chharchhoda
773e56808a refactor: method to get employee contact without permission check 
(cherry picked from commit 58cdb9503b)
 2026-02-23 13:33:39 +00:00
Abdeali Chharchhoda
cb17dbd616 refactor: use common method to get employee contacts 
(cherry picked from commit ec1eb6d222)
 2026-02-23 13:33:39 +00:00
Abdeali Chharchhoda
943e2c00bc fix: get employee email with priority if preferred is not set 
(cherry picked from commit 7b89c12470)
 2026-02-23 13:33:39 +00:00
Abdeali Chharchhoda
0866c03e20 refactor: add validation for missing employee parameter 
(cherry picked from commit b8e06b9636)
 2026-02-23 13:33:38 +00:00
Abdeali Chharchhoda
4b2ac626c5 feat: retrieve employee basic contact information 
(cherry picked from commit 4ad1474e32)
 2026-02-23 13:33:37 +00:00
Mihir Kandoi
c432506912 fix: setup fails to set abbr to departments 
(cherry picked from commit debe868950)
 2026-02-17 15:57:32 +00:00
Trusted Computer
b034f3d3db fix: remove incorrect validation from email digest throwing spurious error (backport #51827) (#52582) 2026-02-09 23:45:56 +05:30
ruthra kumar
fb525fec80 refactor: scrub http and use https in sales partner 
(cherry picked from commit 8cf31548f2)
 2026-02-04 12:32:22 +00:00
Solede
f5481dc7d5 fix: backport Switzerland VAT rates update to version-15 (#52244) 
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
 2026-02-03 00:58:42 +05:30
mergify[bot]
d89ac99e76 fix: update country_wise_tax.json for Algerian Taxes (backport #51878) (#52037) 
fix: update country_wise_tax.json for Algerian Taxes (#51878)

* Algeria chart of accounts

Algeria chart of accounts

* Update Algeria Chart Of Account

* Algeria chart of account

* Algeria Chart of Account

Algeria Chart of Account

* Modify Algeria tax entries in country_wise_tax.json

Updated tax rates and account names for Algeria.

* Rename account for Algeria tax from VAT to TVA

Rename account for Algeria tax from VAT to TVA

(cherry picked from commit e810cd8440)

Co-authored-by: HALFWARE <contact@half-ware.com>
 2026-01-24 06:48:04 +00:00