nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 18:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,440 Commits 463 Branches 1,750 Tags
4089af5a7b24de2f4d7da98922e378b01bc44bb6
Commit Graph

1525 Commits

Author SHA1 Message Date
ruthra kumar
240118ee8b chore: resolve conflict 2024-07-24 18:48:32 +05:30
ruthra kumar
8e340bb7fd refactor: provision for monthly re-evaluation 
(cherry picked from commit ce2b9e0f1a)

# Conflicts:
#	erpnext/setup/doctype/company/company.json
#	erpnext/setup/doctype/company/company.py
 2024-07-24 13:15:15 +00:00
mergify[bot]
fcf6500144 fix(Holiday List): sort holidays on save to avoid disorienting the user (backport #42236) (#42251) 
* fix(Holiday List): sort holidays on save to avoid disorienting the user (#42236)

fix: sort holidays on save to avoid disorienting the user
(cherry picked from commit ad137250fc)

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

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-07-09 18:44:08 +05:30
mergify[bot]
e33416a4a7 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-41659 2024-06-12 12:13:11 +00:00
mergify[bot]
245c6d8672 fix: allow Employee role to select Department (backport #41877) (#41880) 
* fix: allow Employee role to select Department (#41877)

(cherry picked from commit 56082f5a29)

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

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-06-12 17:19:16 +05:30
mergify[bot]
5ab5bd138f fix: Ignore disabling default currency field while creating new company (backport #41699) (#41760) 
fix: Ignore disabling default currency field while creating new company (#41699)

(cherry picked from commit 80f6228d45)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-06-04 11:55:42 +05:30
barredterra
a53a80f01d chore: resolve conflicts 2024-05-27 18:54:17 +02:00
barredterra
18b6d50a31 fix: allow Auditor to select a company 
(cherry picked from commit 06401cc84f)

# Conflicts:
#	erpnext/setup/doctype/company/company.json
 2024-05-27 16:50:26 +00:00
HarryPaulo
1078a98cce fix: "Based on" field always has the value "Not applicable" 
(cherry picked from commit fae640c56f)
 2024-05-10 11:13:03 +00:00
mergify[bot]
5d05bf8d4e fix: don't attempt to set gender from salutation (backport #40997) (#41072) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: don't attempt to set gender from salutation (#40997)
 2024-04-17 17:54:03 +02:00
Akhil Narang
b087fb3d54 fix(treewide): manual ruff fixes 
(cherry picked from commit f63396ef47)
(cherry picked from commit 7828eee014)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
Akhil Narang
4d34b1ead7 refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
ruthra kumar
4d6fad26f3 refactor: use sql to clear comments 
(cherry picked from commit 1f46c1530e)
 2024-03-28 12:12:12 +00:00
ruthra kumar
5791c50fdf refactor: config changes in Transaction Deletion Record 
(cherry picked from commit 4ba67fb3ec)
 2024-03-21 05:17:16 +00:00
ruthra kumar
1515bb7f0b refactor: replace get_job with create_job_id utility method 2024-03-21 09:53:55 +05:30
ruthra kumar
87fdb4e720 chore: resolve conflicts 2024-03-20 19:58:18 +05:30
ruthra kumar
e5722a772a chore: fix linting issue in JS 
(cherry picked from commit 02c522b7cd)
 2024-03-20 14:13:21 +00:00
ruthra kumar
35fcd032ad refactor(test): test cases modified to handle new approach 
(cherry picked from commit 81309576b0)

# Conflicts:
#	erpnext/setup/demo.py
#	erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py
 2024-03-20 14:13:21 +00:00
ruthra kumar
1fe14334f3 refactor: ability to process in single transaction 
(cherry picked from commit a158b825d7)
 2024-03-20 14:13:20 +00:00
ruthra kumar
b429f75d65 refactor: link running doc validation to company master 
(cherry picked from commit 5a3afea8c7)

# Conflicts:
#	erpnext/setup/doctype/company/company.js
#	erpnext/setup/doctype/company/company.py
 2024-03-20 14:13:20 +00:00
ruthra kumar
fab5c1170d chore: rename entry point 
(cherry picked from commit 5fe0b20be1)
 2024-03-20 14:13:19 +00:00
ruthra kumar
d496a1e58e chore: move status and error log to their own section 
(cherry picked from commit 3cec62d4f8)
 2024-03-20 14:13:19 +00:00
ruthra kumar
6ae9eb250f refactor: minor UI tweaks 
(cherry picked from commit 0455d0c46c)
 2024-03-20 14:13:19 +00:00
ruthra kumar
5e590389f3 refactor: exception propogation 
(cherry picked from commit 4a55240e63)
 2024-03-20 14:13:18 +00:00
ruthra kumar
1110dd93ff chore: code cleanup 
(cherry picked from commit eea260b9f9)
 2024-03-20 14:13:17 +00:00
ruthra kumar
0ea9ce7a5a refactor: better method naming 
(cherry picked from commit 30463657bf)
 2024-03-20 14:13:17 +00:00
ruthra kumar
cf6cb80d18 refactor: barebones hook on all doctypes with 'company' field 
(cherry picked from commit ec194ef076)
 2024-03-20 14:13:16 +00:00
ruthra kumar
e908003358 refactor: make sure only one task is running for doc 
(cherry picked from commit 78c9cc63b1)
 2024-03-20 14:13:16 +00:00
ruthra kumar
962105bc87 refactor: validations to prevent duplicate jobs 
(cherry picked from commit 31a2da552b)
 2024-03-20 14:13:15 +00:00
ruthra kumar
e600109872 refactor: no copy on summary table and more validations 
(cherry picked from commit 55e93b3fe1)
 2024-03-20 14:13:15 +00:00
ruthra kumar
97ed905627 refactor: reset all flags and remove unwanted code 
(cherry picked from commit 2dbe68a09d)
 2024-03-20 14:13:14 +00:00
ruthra kumar
c38cfd14f3 chore: show correct status in list view 
(cherry picked from commit 1014940953)
 2024-03-20 14:13:14 +00:00
ruthra kumar
341e467056 refactor: validate status before running events 
(cherry picked from commit 86b5e2e277)
 2024-03-20 14:13:14 +00:00
ruthra kumar
833df2c76b refactor: make Excluded doctype table read only 
(cherry picked from commit 7c4cff2649)
 2024-03-20 14:13:13 +00:00
ruthra kumar
a303788c71 chore: remove unwanted UI code 
(cherry picked from commit b98a5e4edc)
 2024-03-20 14:13:13 +00:00
ruthra kumar
0d791f594f refactor: use separate child table for summary 
(cherry picked from commit 49d3bcbc8d)
 2024-03-20 14:13:13 +00:00
ruthra kumar
b1367e839c refactor: chained callback 
(cherry picked from commit b12ca65fcc)
 2024-03-20 14:13:12 +00:00
ruthra kumar
e56138ddb0 refactor: reorder flags in Tasks section 
(cherry picked from commit cccb2d5141)
 2024-03-20 14:13:12 +00:00
ruthra kumar
c9d77044b0 refactor: use flags to decide on current stage 
(cherry picked from commit 6a77d86a53)

# Conflicts:
#	erpnext/setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.py
 2024-03-20 14:13:12 +00:00
ruthra kumar
5542985e25 refactor: UI trigger 
(cherry picked from commit 8944ab8b6a)
 2024-03-20 14:13:11 +00:00
ruthra kumar
52d22d8b55 refactor: tasks section and UI niceties 
(cherry picked from commit d0dc2c6e77)
 2024-03-20 14:13:11 +00:00
ruthra kumar
7280a76f73 refactor: set status and trigger job on submit 
(cherry picked from commit 6fbb67b1d2)
 2024-03-20 14:13:10 +00:00
ruthra kumar
07c98146c5 refactor: more options for 'status' and move it to top 
(cherry picked from commit 0d65d878de)

# Conflicts:
#	erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
 2024-03-20 14:13:10 +00:00
Ankush Menat
4c629d31c6 style: format js files 2024-03-11 11:03:58 +05:30
Nihantra C. Patel
411157c258 fix: load ignored doctype and include Mode of Payment Account (#40334) 
(cherry picked from commit 68baa3612a)
 2024-03-07 12:14:10 +00:00
Rohit Waghchaure
d6fad08d20 fix: Webpages not working without login 2024-02-22 16:24:30 +05:30
barredterra
f3d8d273f4 test: improve test for local holidays 
(cherry picked from commit 60329ade9e)
 2024-01-11 13:28:41 +00:00
barredterra
3180266150 fix: consider all years in holiday list 
(cherry picked from commit 300aaa39fe)
 2024-01-11 13:28:40 +00:00
Raffael Meyer
080a742725 fix(Employee): treeview (#39126) 
(cherry picked from commit e912e9597d)
 2024-01-04 12:34:48 +00:00
Raffael Meyer
1773e31499 feat: new Report "Lost Quotations" (#38309) 
(cherry picked from commit 477d9fa87e)
 2023-11-24 21:27:50 +00:00