63 Commits

Author SHA1 Message Date
mergify[bot]
24da29a817 fix: link between parent and child procedure (backport #37903) (#37943)
* fix: link between parent and child procedure

(cherry picked from commit 05f24ede96)

* chore: add missing filters for `Parent Procedure`

(cherry picked from commit 8fbd4cea5b)

* test: add test case for Quality Procedure`

(cherry picked from commit 30c6b83a10)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-06 19:28:19 +05:30
RitvikSardana
451cc7bc12 fix: added ignore_user_permissions to parent field of tree doctypes
(cherry picked from commit de433d8626)
2023-09-04 07:17:07 +00:00
mergify[bot]
33a947726d fix: Defined "Open" Status as default (backport #36421) (#36424)
fix: Defined "Open" Status as default (#36421)

Defined "Open" Status as default of the child doctype (Quality Review Objective), because without it the main doctype (Quality Review) has "Passed" status.
This happens because in the "set_status" function, the status is updated according to the status of the child records.

(cherry picked from commit 652398fad2)

Co-authored-by: xdlumertz <alexandrelumertz@gmail.com>
2023-07-31 18:32:29 +05:30
mergify[bot]
289dc36696 fix: process_owner is not link User (backport #36420) (#36422)
fix: process_owner is not link User (#36420)

-Changed "fetch from" since field is not a binding field
-Change field "full_name" from Hidden to Read Only

(cherry picked from commit 05b07e098a)

Co-authored-by: xdlumertz <alexandrelumertz@gmail.com>
2023-07-31 17:38:02 +05:30
mergify[bot]
6d051f5732 fix: removed "fetch_from" (backport #36365) (#36386)
fix: removed "fetch_from"

* fix: removed ("fetch_from": "goal.objective")
The field ended up being disabled because of this.

(cherry picked from commit 1c687a4afd)

Co-authored-by: xdlumertz <alexandrelumertz@gmail.com>
2023-07-28 18:15:06 +05:30
mergify[bot]
841d2e4b2c refactor: Workspace cleanup (backport #35409) (#35505)
* refactor: Workspace cleanup

(cherry picked from commit 243c49c550)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json
#	erpnext/assets/workspace/assets/assets.json

* fix: Delete Retail and Utilities worspaces amd hide default Settings and Integration workspaces

(cherry picked from commit 0b28f641ad)

* fix: Added pos links in Selling workspace

(cherry picked from commit 86f88817a9)

* fix: removed duplicate links of manufacturing workspace

(cherry picked from commit 5cf4c8c8b7)

* fix: Rearranged accounting module links

(cherry picked from commit e78a7de1e5)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json

* chore: typo

(cherry picked from commit bb67cc03df)

* chore: conflicts

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-05-31 16:51:54 +05:30
Ankush Menat
1db83247ce chore: hardcode doctype 2022-11-17 12:01:11 +05:30
Suraj Shetty
6e837bcdfc style: Fix linter warning 2022-04-14 10:02:15 +05:30
Ankush Menat
79fbc2c504 test: flaky PR close test (#30709) 2022-04-13 20:42:25 +05:30
Suraj Shetty
cef28df8db test: Do not overwrite frappe.form_dict to retain proxy reference
Set frappe.local.form_dict instead
2022-04-13 19:10:19 +05:30
Suraj Shetty
01909d2e8c test: Fix used frappe._dict to avoid AttributeError down the line
ref: https://github.com/frappe/erpnext/runs/5816574721?check_suite_focus=true#step:12:880
2022-04-04 20:21:36 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Shariq Ansari
bc187c121a fix: updated standard workspace json files 2022-01-13 19:24:11 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Shariq Ansari
790c1cda6f fix: Removing unused fields from workspace JSON files #27612
fix: Removing unused fields from workspace JSON files
2021-10-13 16:18:20 +05:30
Chillar Anand
915b34391c chore: Clean up imports (#27302)
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Ankush Menat
4551d7d602 chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Shariq Ansari
b32c2fa561 fix: updated erpnext wspace json files (#26380)
* fix: updated erpnext wspace json files

* fix: updated wspace json files

* fix: updated wspace json files

* fix: removed padding code from  wspace json files

* fix: Updated restrict_to_domain in wspace json

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-08-13 12:19:16 +05:30
Walstan Baptista
d6360755b9 chore: frappe.whitelist for doc methods (#25068)
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-31 12:30:32 +05:30
Marica
5471265f92 Merge branch 'develop' into patch-6 2021-03-09 13:32:23 +05:30
Daniel Chalmers
2efdfa26b4 fix: Change FieldType from Text to Text Editor in Non-Conformance DocType (#24760)
* Enable Text Editors

Enable rich Text Editors for Corrective Action and Preventive Action fields. Closes #24759

* Update non_conformance.json
2021-03-01 15:44:16 +05:30
Daniel Chalmers
28da945ecd Update quality_meeting.json 2021-02-26 21:14:12 -06:00
Daniel Chalmers
56f6dbb666 Remove obsolete section titles 2021-02-26 21:11:56 -06:00
Shivam Mishra
2fa3cac814 feat: update workspace folders 2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86 feat: rename desk page to workspace 2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb feat: update desk page json 2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c chore: update all desk pages 2020-12-01 12:51:38 +05:30
Shivam Mishra
27e7c264f2 fix: link type 2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b feat: update desk pages 2020-11-30 14:58:00 +05:30
Shivam Mishra
bed717b442 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-12 11:32:59 +05:30
Rushabh Mehta
12a2e51e20 fix(minor): translation string encoding in quality_procedure.py 2020-10-27 18:38:44 +05:30
Rushabh Mehta
cf1428904a fix(refactor): refactor tests, client side code 2020-10-27 17:36:30 +05:30
Rushabh Mehta
ea49e30bfd fix(cleanup): cleaned up forms 2020-10-26 15:30:52 +05:30
Shivam Mishra
9d468a8daf Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-21 11:38:31 +05:30
Anupam
528a75ae9b fix: review changes 2020-10-13 11:46:52 +05:30
Anupam
c39b65a5f5 fix: quality procedure parent 2020-09-22 14:23:54 +05:30
Shivam Mishra
1358efe896 feat: update icons 2020-07-23 17:02:32 +05:30
marination
8e62035991 fix: Quality Feedback and Template (minor) 2020-07-03 16:19:55 +05:30
marination
24ee482d8f fix: Codacy 2020-06-18 11:49:15 +05:30
marination
b9c38a13d1 chore: Remove unnecessary get_doc 2020-06-17 18:36:12 +05:30
marination
8b19d01d57 fix: Quality Procedure Fixes
- Dont prompt error message if parent is the same in child
- filter child procedure field
- Disable New button in tree view
- Editable grid for Quality Procedure Proces table.
2020-06-17 18:35:27 +05:30
Anurag Mishra
ec54653852 fix: Child is shown in Parent process if added from tree view 2020-06-12 17:02:31 +05:30
Himanshu
19ecde2197 fix: add naming series (#21769) 2020-05-19 14:30:42 +05:30
Shivam Mishra
ebcc46d837 feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
Deepesh Garg
fa6454b9c5 fix: Update is_tree field in Tree doctypes (#20981) 2020-03-19 11:01:23 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
Shivam Mishra
c14f49c079 fix: filters for quality_procedure tree 2020-02-17 11:12:28 +05:30
Himanshu
10b3b79c0f fix(Report): query report for Quality Action (#20424)
* fix: query report for QA

* fix: add QM permission

* fix: add QM permission
2020-02-03 16:16:49 +05:30