nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,291 Commits 464 Branches 1,752 Tags
7e26449b9fca6adfcae1a2620e3e5a57f5ae68fc
Commit Graph

53 Commits

Author SHA1 Message Date
mergify[bot]
c574494ddd fix: removed "fetch_from" (backport #36365) (#36387) 
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:24 +05:30
Ankush Menat
9d5c4ffadf chore: hardcode doctype 2022-11-17 12:03:02 +05:30
Suraj Shetty
4df197a282 test: Do not overwrite frappe.form_dict to retain proxy reference 
Set frappe.local.form_dict instead
 2022-08-20 14:14:16 +05:30
Suraj Shetty
5f4760985c 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-08-20 14:14:03 +05:30
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 18:57:43 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +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
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Himanshu Warekar
45e4b73e08 fix: rename fields 2019-12-11 13:07:41 +05:30
Himanshu
6298da4458 fix: treeview fixes (#18803) 2019-09-05 16:12:33 +05:30
Himanshu Warekar
b9f2a6048b test: fix test cases 2019-08-07 18:21:38 +05:30
Himanshu Warekar
e8f95a2adf fix: TreeView fixes 2019-08-05 14:21:09 +05:30
Himanshu Warekar
dc02f4d07d fix: miscellaneous fixes 2019-07-13 20:00:25 +05:30
Himanshu Warekar
b114d9f621 test: fix test case 2019-06-06 12:14:19 +05:30
Himanshu Warekar
9f458e3413 fix: codacy 2019-06-02 20:47:23 +05:30
Himanshu Warekar
4a7a380f0c fix: codacy 2019-06-02 19:46:44 +05:30
Himanshu Warekar
38ed090bf8 test: fix test case 2019-05-29 00:16:04 +05:30