nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 15:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,858 Commits 459 Branches 1,746 Tags
0c9d3af3fd9a29cef241cfde5529c845c098c68f
Commit Graph

2397 Commits

Author SHA1 Message Date
diptanilsaha
020db922b7 chore: resolve conflicts 2025-12-02 20:56:54 +05:30
ravibharathi656
a444325bd1 fix: exclude is_group records 
(cherry picked from commit e08805128b)

# Conflicts:
#	erpnext/setup/doctype/customer_group/customer_group.json
#	erpnext/setup/doctype/item_group/item_group.json
#	erpnext/setup/doctype/supplier_group/supplier_group.json
#	erpnext/setup/doctype/territory/territory.json
 2025-12-02 15:07:39 +00:00
mergify[bot]
821f3f5884 fix(Employee): add/delete user permission (backport #47016) (#50761) 
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2025-12-01 12:49:37 +01:00
mergify[bot]
488d635dc9 chore: switched frankfurter domain from frankfurter.app to frankfurter.dev (backport #50734) (#50740) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2025-11-25 15:49:53 +05:30
mergify[bot]
f8294f1754 feat(Company): allow setting default sales contact, fetch into sales transaction (backport #50159) (#50599) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-11-18 17:05:58 +05:30
Pugazhendhi Velu
32d3fbf1e8 fix: add company filter for default warehouse for sales return 
(cherry picked from commit 0b614007bb)
 2025-11-11 05:17:53 +00:00
rethik
32182d7cc7 fix: ignore Department doctype 
(cherry picked from commit fff6f1fb23)
 2025-11-06 11:14:55 +00:00
Diptanil Saha
1a3652bee1 chore: resolve conflict 2025-10-31 17:34:15 +05:30
diptanilsaha
d9d9230d4a fix: added validation for default accounts on company 
(cherry picked from commit 4af1ae1470)

# Conflicts:
#	erpnext/setup/doctype/company/company.py
 2025-10-31 10:07:42 +00:00
Kerolles Fathy
89d305ac9f Merge pull request #50153 from KerollesFathy/fix-address-error-when-create-transporter 
fix: Address title error when create new transporter on driver
(cherry picked from commit 8efcf6cb38)
 2025-10-22 08:14:25 +00:00
mergify[bot]
afc2d95736 fix: correct monthly sales history (backport #50056) (#50179) 
fix: correct monthly sales history (#50056)

* fix: correct monthly sales history

* fix: correct monthly sales history calculation

* chore: remove unrelated file accidentally committed

---------


(cherry picked from commit f51ed30c23)

Co-authored-by: Ahmed AbuKhatwa <82771130+AhmedAbokhatwa@users.noreply.github.com>
Co-authored-by: AhmedAbukhatwa <Ahmedabukhatwa1@gmail.com>
 2025-10-21 11:06:02 +05:30
mergify[bot]
bd3a132868 feat: set options for IBAN fields (backport #49377) (#49413) 
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2025-10-14 14:42:08 +00:00
diptanilsaha
c93fbf3982 fix: set default roles on role_profile during reinstallation 
(cherry picked from commit 12c1b8a910)
 2025-10-13 06:38:40 +00:00
mergify[bot]
11eab0c852 Merge pull request #49946 from frappe/mergify/bp/version-15-hotfix/pr-49721 
feat: add company links to Email Account and Communication (backport #49721)
 2025-10-07 17:01:37 +05:30
venkat102
089c068ee8 test: add test to validate user permission in qb 
(cherry picked from commit a5b881ea74)

# Conflicts:
#	erpnext/setup/doctype/employee/test_employee.py
 2025-09-18 16:46:39 +05:30
diptanilsaha
6ab287f19c fix: renamed temporary bank account to 'Demo Bank Account' 
(cherry picked from commit efeda90cad)
 2025-09-06 07:44:55 +00:00
diptanilsaha
07241aa54a fix: skip 'Bank Account' creation on setup 
(cherry picked from commit 47d4319f83)
 2025-09-06 07:44:54 +00:00
ravibharathi656
1d28135898 fix(exchange rate revaluation): add check for gain_loss 
(cherry picked from commit e5affb16c7)
 2025-09-02 08:05:38 +00:00
mergify[bot]
655af24183 feat: add make methods for Bank Account (backport #49000) (#49275) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-08-22 19:04:42 +02:00
Rohit Waghchaure
cea4b50bbc fix: company issue in setup wizard 
(cherry picked from commit 1fb0d1460a)
 2025-08-19 10:52:49 +00:00
mergify[bot]
76b0f4fb25 perf: multiple performance fixes in get_item_warehouse (backport #49118) 
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
 2025-08-12 11:43:43 +00:00
Assem Bahnasy
e762007e0e refactor: Move Employee inclusion to SQL level to preserve search semantics 
(cherry picked from commit 8a9bf166c6)
 2025-08-11 11:15:19 +00:00
Assem Bahnasy
c462219dd7 refactor: Use parameterized SQL queries to prevent injection and handle None values 
(cherry picked from commit a08c7f37d3)
 2025-08-11 11:15:19 +00:00
Jeba Jebas
36cb5b6589 feat: added chart of accounts and tax template for australian localisation (#48208) 
* Add Australian Localisation Setup

* feat: added chart of accounts and tax template for australian localisation

* chore: linter fix

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit bb62a01c0d)
 2025-08-07 04:39:17 +00:00
mergify[bot]
0e67487508 fix(Employee): add context to status in List View (backport #48576) (#48577) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(Employee): add context to status in List View (#48576)
 2025-07-14 15:42:30 +02:00
ljain112
f1cdd76fc1 perf: use cached_doc for Account Settings 
(cherry picked from commit 751f3abd95)
 2025-07-11 09:15:52 +00:00
mahsem
c894b18165 fix: employee_exit_translatability 
(cherry picked from commit 80d6779210)
 2025-07-11 06:33:22 +00:00
mergify[bot]
6b41dc2fed fix: make labels in error message translatable (backport #48327) (#48436) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: make labels in error message translatable (#48327)
 2025-07-07 22:36:48 +02:00
mergify[bot]
6511eb4c7c refactor: track completed app setup wizards and re-run the setup wizard upon new app installation. (backport #47691) (#48223) 
* refactor: track completed app setup wizards and re-run the setup wizard upon new app installation. (#47691)

(cherry picked from commit 75b5ba6e67)

# Conflicts:
#	erpnext/hooks.py
#	erpnext/setup/install.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* fix: permission issue

* fix: space

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-06-24 14:51:15 +05:30
Karuppasamy
cb58d05777 Merge pull request #47898 from aerele/pegged-currency 
Pegged currency

(cherry picked from commit cec0ffad06)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/patches.txt
#	erpnext/setup/install.py
 2025-06-17 15:32:36 +05:30
mahsem
d05b49b0f8 fix: better description of tab name (#44697) 
(cherry picked from commit 6119d4384a)
 2025-06-08 20:15:11 +00:00
ruthra kumar
4a37f2a925 fix: broken test suite due to incorrect OR filter 
(cherry picked from commit 37d74e387d)
 2025-05-09 09:13:26 +00:00
mergify[bot]
f4551bb918 feat!: configure which rate is used to auto-update price list (backport #47417) 
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
 2025-05-06 17:00:03 +05:30
mergify[bot]
fc8a8b5433 fix: remove invalid email account creation (backport #47318) (#47323) 
fix: remove invalid email account creation (#47318)

(cherry picked from commit 7423e4187f)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-04-29 12:40:45 +05:30
Lakshit Jain
0caba9f70d fix: do not check for permission if values are not changed in employee doctype (#47238) 2025-04-24 17:03:30 +02:00
ruthra kumar
f2c3150687 Merge pull request #47013 from frappe/mergify/bp/version-15-hotfix/pr-45924 
fix(Employee): remove User Permissions if create_user_permission is unchecked (backport #45924)
 2025-04-21 15:55:03 +05:30
mergify[bot]
ad177e08b8 fix: create default warehouse (backport #47125) (#47131) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: create default warehouse (#47125)
 2025-04-17 13:40:05 +02:00
barredterra
2431141062 fix: remove invalid parameter 2025-04-11 13:07:44 +02:00
Patrick Eissler
b0e8f85a27 refactor: make linter happy 2025-04-11 12:25:58 +02:00
Patrick Eissler
b0f3d62dd0 fix: only update User Permissions if a relevant field has changed 2025-04-11 12:25:26 +02:00
Patrick Eissler
e47d07d98c chore: use existing utility function 2025-04-11 12:24:25 +02:00
Patrick Eissler
7ab81b7e54 fix(Employee): remove User Permissions if create_user_permission is unchecked 2025-04-11 12:24:04 +02:00
ruthra kumar
1500691bca Merge pull request #46844 from frappe/mergify/bp/version-15-hotfix/pr-46823 
chore: update links to Frappe School (backport #46823)
 2025-04-07 11:45:25 +05:30
Sagar Vora
890abf6b90 perf: reduce query when validating any doc 
(cherry picked from commit b863296e53)
 2025-04-05 18:10:06 +00:00
Md Hussain Nagaria
2dfe13e183 chore: update links to Frappe School (#46823) 
(cherry picked from commit ef4f662c31)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json
#	erpnext/buying/workspace/buying/buying.json
#	erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#	erpnext/projects/workspace/projects/projects.json
#	erpnext/selling/workspace/selling/selling.json
#	erpnext/stock/workspace/stock/stock.json
 2025-04-02 06:46:29 +00:00
venkat102
ea68caec7d fix(Transaction Deletion Record): sql syntax error while fetching lead address 
(cherry picked from commit af0d6eeae8)
 2025-03-17 11:09:38 +00:00
Asmita Hase
4dfdb2b0a1 fix: clear cashe on employee hierarchy change to reflect updated permissions 
(cherry picked from commit 6789578b27)
 2025-03-11 05:13:04 +00:00
mergify[bot]
ccc0358db6 fix: use value from currency exchange when exchange api is disabled (backport #46137) (#46309) 
fix: use value from currency exchange when exchange api is disabled (#46137)

(cherry picked from commit 2d26bff870)

Co-authored-by: Venkatesh <47534423+venkat102@users.noreply.github.com>
 2025-03-05 14:07:12 +05:30
mergify[bot]
1b00de1815 chore: erpnext.com -> frappe.io/erpnext (backport #46288) (#46290) 
* chore: erpnext.com -> frappe.io/erpnext (#46288)

(cherry picked from commit 41fe30ea6e)

# Conflicts:
#	README.md

* Update README.md

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2025-03-05 11:35:52 +05:30
ruthra kumar
1d6c50c9a1 chore: resolve conflict 2025-02-10 10:38:18 +05:30