nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-18 00:48:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,202 Commits 607 Branches 1,799 Tags
08f3cf98f9e0738a01ca8a5809fdbfb1b7bb6104
Commit Graph

753 Commits

Author SHA1 Message Date
mergify[bot]
338feb31e1 fix(issue): check permission before issue status modification (backport #55458) (#55459) 
* fix(issue): check permission before issue status modification (#55458)

(cherry picked from commit 876f403500)

# Conflicts:
#	erpnext/support/doctype/issue/issue.py

* chore: resolve conflicts

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-05-31 19:06:01 +00:00
mergify[bot]
30fe711c44 fix(support-settings): disable the auto-close tickets feature if close_issue_after_days is set to 0 (backport #53499) (#53504) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(support-settings): disable the auto-close tickets feature if `close_issue_after_days` is set to 0 (#53499)
 2026-03-16 12:12:04 +00:00
Ankush Menat
dab8ac7b1d fix: Short circuit guest perm checks 2025-12-14 12:11:55 +05:30
Diptanil Saha
a3a6d39436 fix: added exception handling on service level agreement apply hook (#50096) 
* fix: added exception handling on service level agreement apply hook

* Revert "fix: added exception handling on service level agreement apply hook"

This reverts commit dae93aa96f.

* fix: Ignore missing SLA table during install/uninstall

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 182c9fd966)
 2025-10-15 14:04:17 +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
diptanilsaha
0d5613ca4c fix: set first_response_time on status change of issue 
(cherry picked from commit ba459204b0)
 2025-09-21 18:36:29 +00:00
Sagar Vora
890abf6b90 perf: reduce query when validating any doc 
(cherry picked from commit b863296e53)
 2025-04-05 18:10:06 +00:00
Ben Kebdani
506dd3c6b9 fix: Close and Reopen buttons dissapear after saving changes (#46048) 
* fix: Close and Reopen buttons dissapear after saving changes

* style: linter issue

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2025-03-05 15:34:55 +05:30
Mihir Kandoi
446a8fe096 chore: resolve conflicts 2025-03-05 13:08:47 +05:30
Mihir Kandoi
af49f5a8af fix: patch path 
(cherry picked from commit dcec446e55)

# Conflicts:
#	erpnext/patches.txt
 2025-03-05 07:16:48 +00:00
Mihir Kandoi
46b0734d6f fix: tests 
(cherry picked from commit 019303dd12)

# Conflicts:
#	erpnext/support/doctype/issue/issue.json
 2025-03-05 07:16:47 +00:00
Mihir Kandoi
d41303961c fix: tests 
(cherry picked from commit 1b831e9abd)
 2025-03-05 07:16:47 +00:00
Mihir Kandoi
c5717b983d fix: rename some sla fields 
(cherry picked from commit baa0dd1235)

# Conflicts:
#	erpnext/patches.txt
 2025-03-05 07:16:46 +00:00
mahsem
9ecafdc680 fix: Hold_to_On_Hold 
(cherry picked from commit 92b1f314ef)
 2025-01-06 03:15:30 +00:00
barredterra
4914481105 fix: translatability of boldened text 
(cherry picked from commit af0ae930ca)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-08-17 00:21:05 +00:00
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
Rohit Waghchaure
b089eda8bf fix: enable list view for the issues on the portal 
(cherry picked from commit bddc1e3974)
 2024-03-28 05:38:12 +00:00
mergify[bot]
7d3d2eb928 ci: add prettier to pre-commit (backport #40206) (#40362) 
* ci: add prettier to pre-commit

(cherry picked from commit 2c16036ef3)

* style: format js files

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-03-11 10:47:18 +05:30
barredterra
f5d7fbdaf8 fix(Issue): create communication 
Ignore permisions and mandatory. Required, for example, when Issue is created by Customer via portal.

(cherry picked from commit 3f1d008741)
 2024-02-16 19:15:39 +00:00
mergify[bot]
2045306283 fix: Reset SLA on issue doesn't work (backport #38789) (#38791) 
fix: Reset SLA on issue doesn't work (#38789)

This was broken since last refactor where it was spun off to work with
all types of doctypes but client side code was never adapted.

(cherry picked from commit fa1c7b663c)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-15 22:02:33 +05:30
mergify[bot]
5e6a4d257e feat: enable automatic type annotations (backport #38452) (#38454) 
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-11-30 14:43:16 +05:30
mergify[bot]
80afeca229 fix: OperationalError while selecting Serial No in Warranty Claim (backport #38394) (#38414) 
* refactor: use arrow function

(cherry picked from commit 1763824e5f)

* refactor: use DocType `Fetch From` instead of `frm.add_fetch`

(cherry picked from commit 01044ca8e9)

* refactor: use `frm.set_query` to add filters

(cherry picked from commit 640dfab827)

* refactor: don't use `cur_frm`

(cherry picked from commit 9fadf5f426)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-29 10:40:41 +05:30
mergify[bot]
18e40dd032 refactor: remove extraneous disabled filters (backport #37732) (#37749) 
refactor: remove extraneous disabled filters

(cherry picked from commit f276fbba4f)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
 2023-10-30 09:57:32 +05:30
Ankush Menat
0d22fe02be refactor!: Lower all perm to Desk User 2023-08-28 22:42:14 +05:30
Deepesh Garg
3f81e15672 Merge pull request #36147 from deepeshgarg007/eslint 
refactor(ci): add eslint and update linting confs
 2023-07-24 20:55:07 +05:30
Ankush Menat
bd9ef74ef7 perf: send SLA doctypes in boot 
This request is fired on every load, data rarely if ever changes though.
 2023-07-16 11:38:54 +05:30
Deepesh Garg
924cdef6d9 ci: add eslint and update linting confs 2023-07-14 18:53:02 +05:30
Ankush Menat
a3ea985348 refactor: Use db.set_single_value (#35668) 
I just applied semgrep autofix. Untested completed, review before merging.

```yaml
- id: frappe-set-value-semantics
  patterns:
    - pattern-either:
      - pattern: frappe.db.set_value($DOCTYPE, None, $...AFTER)
      - pattern: frappe.db.set_value($DOCTYPE, $DOCTYPE, $...AFTER)
  fix: frappe.db.set_single_value($DOCTYPE, $...AFTER)
  message: |
    If $DOCTYPE is a single doctype then using `frappe.db.set_value` is discouraged for setting values in DB. Use db.set_single_value for single doctype instead.
  languages: [python]
  severity: ERROR
```
 2023-06-13 17:30:38 +05:30
David Arnold
c1b42b858d fix: set Phone and Email option in doctypes (#35549) 2023-06-11 19:34:41 +05:30
Nabin Hait
243c49c550 refactor: Workspace cleanup 2023-05-30 13:17:59 +05:30
Ankush Menat
ac871797b2 fix: SLA permissions (#34981) 2023-04-21 18:05:29 +05:30
barredterra
502a37a864 refactor: use renamed timezone utils 
https://github.com/frappe/frappe/pull/20253
 2023-03-04 19:31:40 +01:00
Ankush Menat
915e0347b0 chore!: remove activity log feeds (#33294) 
- This contains little to no information and practically no one uses this.
- Also causes a lot of problem by adding way too many feeds in activity
  log to the point where activity page doesn't even load.
 2022-12-12 15:14:30 +05:30
Ankush Menat
7e1742956c refactor: Remove usage of deprecated methods (#32914) 
Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```

Required after: https://github.com/frappe/frappe/pull/18815
 2022-11-09 20:09:06 +05:30
ruthra kumar
ced8d2a537 test: lead creation and deletion restricted to dummy company 2022-10-17 16:26:07 +05:30
Shadrak Gurupnor
f2b7c9ee66 fix: validate for active sla (#32132) 2022-09-13 13:42:45 +05:30
Ankush Menat
755a060ba7 refactor: dont force issue list options (#31613) 
Setting route option forces the filters, only default filters should be
set and not forced for each visit.
 2022-07-18 11:12:07 +05:30
Conor
b8f728a40a refactor: use CURRENT_DATE instead of CURDATE() (#31356) 
* refactor: use CURRENT_DATE instead of CURDATE()

* style: reformat to black spec

* refactor: use QB for auto_close queries

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:07:33 +05:30
Ankush Menat
a896895a9e fix: bulk fix (~330) missing translations 2022-04-04 13:59:51 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Rushabh Mehta
fcf12c4054 fix(minor): allow SLA update without permission check 2022-01-18 18:07:11 +05:30
Ankush Menat
3db8d908dc Merge pull request #29278 from shariquerik/update-workspace-json 
fix: Updating public workspace json based on new design
 2022-01-17 13:25:16 +05:30
Saqib Ansari
cc88b31f1f test: remove sla if no active sla found 2022-01-14 18:17:40 +05:30
Saqib Ansari
b31679b6ef fix: customer filter while fetching active sla 2022-01-14 16:31:48 +05:30
Saqib Ansari
0bfbfa3719 fix: reset sla if no active sla found 2022-01-14 16:13:17 +05:30
Saqib Ansari
a68fc546e7 refactor: do not allow submittable doctypes for SLA 2022-01-14 15:35:40 +05:30
Saqib Ansari
a9ab157198 fix: remove dashboard showing only issue count 2022-01-14 11:42:34 +05:30
Shariq Ansari
bc187c121a fix: updated standard workspace json files 2022-01-13 19:24:11 +05:30
Rucha Mahabal
2b33e63d2c fix: use get_all instead of get_list while fetching SLA doctypes (#29216) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-11 14:40:08 +05:30
Saqib Ansari
fcc5fa14c8 fix: failing tests of first response time (#29153) 2022-01-05 20:44:06 +05:30