Commit graph

47 commits

Author SHA1 Message Date
rohitwaghchaure
de9778047d [Fix] Not able to delete the document which has workflow (#6119) 2018-09-24 12:34:21 +05:30
Suraj Shetty
9a7dc7b4e5 Workflow action ui ux fixes (#5926)
* Allow cancel for doctype with workflow

* Fix child row deletion in workflows

-https://github.com/frappe/erpnext/issues/14731

* Add get_pdf_link method

* Refactor workflow action response

- Confirm before applying action

* Fix bug with confirmation page for workflow action

* Fix codacy

* Add cancel button and pdf link

* Fix Codacy

Remove trailing whitespace
2018-08-07 14:43:20 +05:30
Suraj Shetty
ecde50a699 Add logic to check if the document was modified (#5746)
- Check if the document was modified after the workflow
action mail was sent.
If yes, then show an alert with the latest document preview.
2018-07-02 19:10:48 +05:30
Suraj Shetty
26c6e2928c Move allow self approval check to transisition for more control (#5691)
* Move allow self approval check to transisition for more control

* Disable email alert from workflow test

* Add allow_self_approval to each transition of test workflow

* Remove print statement

* Remove extra blank lines
2018-06-21 09:08:27 +05:30
Suraj Shetty
9e402ec3b5 Clear cache on workflow update (#5677) 2018-06-12 21:50:36 +05:30
Suraj Shetty
6b77c10cc9 [Workflow] Added a check to enable/disable workflow action emails and test fix (#5668)
* Fix build and make py3 compatible

* Remove unused test since state edit check was removed

* Add toggle to enable or disable workflow action emails
2018-06-11 15:09:42 +05:30
Suraj Shetty
90325ceccf [Improvement] Allow user to apply Workflow Action without login (#5637)
* Enqueue send email job

* Allow user to apply action without login

* Reorganize method

* Show username instead of email

* Refactor send email job

* Fix python 3 test

* Fix python 3 tests

- send user data list instead of dict-view
https://stackoverflow.com/a/16228268
2018-06-04 11:43:24 +05:30
Suraj Shetty
c71c132ba2 Workflow actions (#5598)
* Init workflow actions

- WIP code
- Add hooks to create and update
workflow action on document status changes.
- Tweak listview to show host document on list view item click
- Add new doctype "Pending Workflow Action"
- Add allow_self_approval check in Workflow master

* Rename doctypes

- Rename "Workflow Action" to "Workflow Action Master"
- Rename "Pending Workflow Action" to "Workflow Action"
- Remove irrelevant files

* Clear old workflow action on docstatus change

- Add check for user permission before creating a workflow action record
- Make doctype changes to support the Workflow Action  System

* Show host document only if workflow action status is open

* Send workflow action mail notifications

* Add patch to rename `tabWorkflow Action` to `tab Workflow Master`

- Rename table to retain data in `tabWorkflow Action` as it
will be overwritten with new structure on migration

* Enqueue email

* Remove unused files

* Add hook for custom has_permission

* Optimize send_workflow_action_email method

* Add permission_query_condition hook

* Show notification based on status

* Override get_form_link in list view

* Refactor workflow action

- Add action link
- update workflow action hooks

* Avoid repeated creation of Worklow Actions

- Update hooks entry to avoid unwanted method call

* Fix error with frappe.db.count usage

* Fix ui/ux for Workflow Action

- Fix action url and improve response on action button click
- Fix workflow action template style

* Fix Codacy

* Add self approval check

* Fix codacy

* Fix test

* Fix python version confilct and a permission error

* Fix incorrect 'this' reference

* Update with requested changes

* Add next action email template option

* Fix string formatting

* Refactor workflow Action

- Make process_workflow_action smaller

* Fix bugs and errors due to refactor

* Fix workflow field caching

* Add a workflow action test

* Fix bugs with email template
2018-05-30 11:24:49 +05:30
Rushabh Mehta
b4650f42a1 [minor] remove in_dialog old property 2018-05-16 12:51:01 +05:30
Nabin Hait
6737f1912c Fixed merge conflict 2018-05-08 15:27:37 +05:30
Saurabh
2147bca5d4 [fix] set no_copy property for workflow state field (#5531)
* [fix] set no_copy property for workflow state field

* [fix] check if custom field exists before loading doc
2018-05-08 15:16:08 +05:30
Rushabh Mehta
c4e1b9e0c1
[enhance] Add condition in transitions and move workflow to server-side (#5399)
* [workflow] move to server side

* [workflow] tests

* [workflow] tests

* [minor] remove print

* [fixes] tests and lint

* [tests] fix typo

* [fix] tests
2018-04-11 00:38:13 -08:00
Zarrar
d29e280d14 [Fix] Workflow ui test dependency (#4421)
* timer increased, role selection removed

* used return promise instead of timeout
2017-11-03 13:37:48 +05:30
Rushabh Mehta
a0436456f8 [tests] fix 2017-08-29 15:31:04 +05:30
Zlash65
b7b77609ce added workflow mechanism to add user 2017-08-29 11:08:40 +05:30
Nabin Hait
2e02267e88 Added fields in global search 2017-02-20 13:39:21 +05:30
Rushabh Mehta
d989a95472 [feature] document versioning #2469 (#2523)
* [feature] document versioning #2469

* [minor] remove on_update from WebsiteGenerator

* [fix] delete shares when deleting user

* [test] don't run delete in background if test

* [fix] test_db

* [added] Deleted Document

* [fix] added track_changes in all documents

* [fix] add to deleted only if exists

* [fix] in_install flag in deleted documents

* [minor] name will always be reset
2016-12-29 18:01:42 +05:30
Rushabh Mehta
7bc7e3bc63 Upgrade Font Awesome (#2410)
* Font-Awesome V3.x to V4.x

Font-Awesome V3.x to V4.x

* Font Tidy

Font Tidy

* FA4 Upgrade - Html Js & Json

FA4 Upgrade - Html Js & Json

* Minor

Minor
2016-12-05 13:07:03 +05:30
Rushabh Mehta
95fdfe44d3 [minor] added default standard filters (#2270)
* [minor] added default standard filters

* [fix] frappe.sendmail

* [fix] frappe.sendmail
2016-11-07 17:18:49 +05:30
RobertSchouten
5a4d093cfe [feature] opt out of workflow status override in list view (#2040)
* [feature] opt out of workflow status override in list view

* [feature] opt out of workflow status override in list view
2016-09-19 13:13:55 +05:30
Rushabh Mehta
c10d7ec8cb [minor] add quick_entry and added icelandic language 2016-07-25 15:03:26 +05:30
Rushabh Mehta
093f293f42 [fix] grids editable by default 2016-07-11 16:06:20 +05:30
Anand Doshi
106e281608 [fix] don't allow import for child tables 2016-01-06 12:22:03 +05:30
Rushabh Mehta
52b63f9858 [translation] for frappe/erpnext#4461 2015-12-10 10:34:13 +05:30
Anand Doshi
5621ba30c0 [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:09:44 +05:30
Rushabh Mehta
15c686f572 [fix] make all VARCHAR default lengths as 140 2015-10-14 17:28:10 +05:30
Anand Doshi
3c4f31a23c Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error 2015-10-14 16:00:14 +05:30
Anand Doshi
ffb8ef29ca [fix] Use User Permission value as default only if the document type is Setup 2015-09-14 13:00:24 +05:30
Anand Doshi
ad9c500863 Exported all doctypes 2015-08-27 16:45:45 +05:30
Rushabh Mehta
2f7f4542e8 [minor] workflow in non-single, non-table & get_query fix 2015-08-24 13:51:13 +05:30
Rushabh Mehta
3a117b5656 [merge] develop 2015-07-30 16:06:06 +05:30
Rushabh Mehta
6985d4127e [fixes] document_type, added set-config in commands, prompt in form.js 2015-07-28 17:37:01 +05:30
Anand Doshi
30993bd04a [minor] changed modified for json files to affect #1215 2015-07-27 16:32:55 +05:30
Tsutomu Mimori
c9a651fe13 Removed HTML from messages 2015-07-27 16:32:54 +05:30
Anand Doshi
ec7763eb94 [minor] changed modified for json files to affect #1215 2015-07-27 12:15:05 +05:30
Tsutomu Mimori
a72b6d89de Removed HTML from messages 2015-07-23 21:12:56 +09:00
Pratik Vyas
0f7b9cf135 Merge pull request #1124 from rmehta/help
[help] helpers for youtube videos added in list, form sidebar, modules
2015-05-27 14:49:59 +05:30
Rushabh Mehta
09af425b1b [workflow] hide icon selector, not use right now, fixes frappe/erpnext#3326 2015-05-27 12:21:46 +05:30
Rushabh Mehta
b2ee616bb4 [help] helpers for youtube videos added in list, form sidebar, modules 2015-05-25 18:29:52 +05:30
Anand Doshi
2995f02f3b Web Notes to Frappe, better alerts, css fixes, fixed splash 2015-03-03 15:09:34 +05:30
Anand Doshi
f6cdd4a655 Merge remote-tracking branch 'frappe/develop' into v5.0
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.py
	frappe/core/page/desktop/desktop.js
	frappe/hooks.py
	frappe/translations/ar.csv
	frappe/translations/es.csv
	frappe/translations/fr.csv
	frappe/translations/hr.csv
	frappe/translations/id.csv
	frappe/translations/ja.csv
	frappe/translations/nl.csv
	frappe/translations/pl.csv
	frappe/translations/pt-BR.csv
	frappe/translations/ru.csv
	frappe/translations/tr.csv
	frappe/translations/zh-cn.csv
	frappe/translations/zh-tw.csv
	frappe/utils/email_lib/html2text.py
	setup.py
2015-02-24 18:06:16 +05:30
Rushabh Mehta
9a649a4a3d [share] added share permission and patch #992 2015-02-05 15:51:31 +05:30
Rushabh Mehta
dc009ae6f9 [ui] added list head 2015-01-15 15:29:59 +05:30
Rushabh Mehta
090e9ac48c [ui] workflow and listview 2015-01-08 14:28:24 +05:30
Rushabh Mehta
4735486a26 [minor] [fixes] data import routing & removed workflow test records 2015-01-02 14:40:16 +05:30
Nabin Hait
a4d45cce6f Renamed table fieldnames 2014-12-26 13:17:18 +05:30
Rushabh Mehta
2f30edd65c [refactor] moved workflow to separate module 2014-09-29 12:21:11 +05:30