Commit graph

1154 commits

Author SHA1 Message Date
Nabin Hait
b375ee9eef fix: merge conflict 2019-06-18 18:45:21 +05:30
Nabin Hait
df438c1697
Revert "fix: Set default only if the dependent field is set (#7130)" (#7644)
This reverts commit 73c1f531e8.
2019-06-05 20:30:13 +05:30
Rushabh Mehta
6480619307
Merge pull request #7572 from surajshetty3416/bulk-workflow-approval
feat(list view): Bulk workflow approval
2019-06-03 16:58:57 +05:30
Suraj Shetty
67b41deb44 test: Add test case to check get_common_transition_actions 2019-06-02 10:56:20 +05:30
Suraj Shetty
12f06d6af7 fix: Change progress title 2019-05-30 17:29:35 +05:30
Karthikeyan S
acd2f589b6 fix(Barcode): excluding Barcode feild from XSS FIlter (#7605)
(cherry picked from commit e579b8960e1c34e7ad0bf794a10596b40530bc09)
2019-05-30 13:51:14 +05:30
Karthikeyan S
0404390064 fix(Barcode): excluding Barcode feild from XSS FIlter (#7604) 2019-05-30 13:50:05 +05:30
Faris Ansari
778bc4349b
fix: Check if value is string (#7583)
Breaks the check when value is a map. So we reverse the check.
2019-05-29 11:40:53 +05:30
Suraj Shetty
1d99c1cc86 fix: Pass complete doc to avoid data loss 2019-05-28 17:00:45 +05:30
Suraj Shetty
cc7ea9fae6 fix: Handle edge cases
Handle edge cases like
- same action is used twice for transision
- workflow field is not set for the doc
2019-05-28 14:48:57 +05:30
Suraj Shetty
b4dfd88f5f fix: Make it work in harmony ☮️ 2019-05-28 12:06:22 +05:30
Suraj Shetty
a1e19ba0a3 feat(list view): Add bulk workflow approval option 2019-05-28 08:37:11 +05:30
Himanshu
73c6520aef fix: Remove update_timeline_links from document.py (#7563) 2019-05-26 15:37:10 +05:30
Faris Ansari
e9b0c2229d fix: Error message for invalid Workflow Transition (#7553)
When you import a document of a DocType which has a workflow, you
shouldn't be able to set the workflow_state to a state except the first.
This patch shows a better error message.
2019-05-25 11:56:20 +05:30
Faris Ansari
6fdbb6fd79 fix: Error message for invalid Workflow Transition (#7552)
When you import a document of a DocType which has a workflow, you
shouldn't be able to set the workflow_state to a state except the first.
This patch shows a better error message.
2019-05-25 11:55:46 +05:30
Rushabh Mehta
1c893e44c0 fix: frappe.conf.db_type -> frappe.db.db_type 2019-05-24 11:44:28 +05:30
Rushabh Mehta
7135c0d9e8 fix(various): after manual testing 2019-05-24 11:22:09 +05:30
Rushabh Mehta
81fa64d4bc refactor(form.js): remove very old API 2019-05-24 09:08:56 +05:30
Rushabh Mehta
83eb9c3acc refactor(form.js): wip 2019-05-24 09:08:56 +05:30
Himanshu
51042b1359 fix(load): alias creation in get communications (#7538)
* fix: alias creation

* fix: fix update_timeline_doc

* fix: add timeline link irrespective of comm medium
2019-05-23 09:35:53 +05:30
Rushabh Mehta
01dc6bee5b fix(delete_fields): handle commit for DDL separately for MariaDB and Postgres 2019-05-22 13:21:07 +05:30
Himanshu
2b14c95644 fix(Communication): New child doctype for Communication Timeline Links (#7524)
* fix: separate child doctype for communication

* fix: reload doc before running the patches

* fix: update_timeline_doc

* fix: manipulatetimeline fields in Comm Links

* fix: test cases

* fix: reload comm_link before communication

* patch: remove redundant patch
2019-05-21 20:48:55 +05:30
Rushabh Mehta
28ed21b94c
Merge pull request #7419 from josejibin/fix/postgres-compatible
fix(postgres): Make db queries postgres compatible
2019-05-20 18:02:30 +05:30
jibin jose
1a58c13966 fix(postgres): Make db queries postgres compatible 2019-05-20 12:31:30 +05:30
Himanshu Warekar
0050fb58ff fix: remove clear reference links from delete doc 2019-05-18 10:40:55 +05:30
Himanshu Warekar
447019b947 Merge develop into comm_ref 2019-05-17 00:25:24 +05:30
Himanshu Warekar
aa98dd28a6 test: communication tests 2019-05-16 20:04:49 +05:30
Himanshu Warekar
43bc6ca8d1 fix: missing quotes in where clause 2019-05-16 18:36:10 +05:30
Himanshu Warekar
005c1a8de1 fix: use frappe sql for query 2019-05-16 17:40:58 +05:30
Rushabh Mehta
0284b1a965 fix(null-handling): for doctype, doctype, ignore null values 2019-05-16 15:44:46 +05:30
Rushabh Mehta
e2d3b86374 fix(null-handling): for doctype, doctype, ignore null values 2019-05-16 15:20:31 +05:30
Himanshu Warekar
d075c3b748 fix: link error while deleting linked doc 2019-05-16 13:26:35 +05:30
Himanshu Warekar
a4478afcd5 Merge branch 'develop' of https://github.com/frappe/frappe into comm_ref 2019-05-16 13:03:46 +05:30
Himanshu Warekar
b31070d427 fix: delete_doc for timeline references 2019-05-15 18:00:16 +05:30
Himanshu Warekar
77d009747d fix: remove debug parameter 2019-05-15 14:00:25 +05:30
Suraj Shetty
1bcdc0b7cb fix(report): Allow report export only if user has export permission on ref doctype (#7458)
* fix: Allow export only if user has export permission on reference doctype

* fix: Show only custom "no permission" error

* fix: while saving employee user getting user permissions error
2019-05-15 11:59:13 +05:30
Himanshu Warekar
f114e03c8c Merge branch 'develop' into comm_ref 2019-05-14 16:18:32 +05:30
Saurabh
abe1defb25
Merge pull request #7463 from rmehta/remove-feedback-trigger
BREAKING CHANGE: remove Feedback Trigger and Feedback Rating, this was not very configurable and can now be done better with Web Forms
2019-05-14 15:18:44 +05:30
Himanshu Warekar
5d09fb26a9 fix: timeline docs to dynamic links 2019-05-14 12:01:14 +05:30
Anurag Mishra
b9170012b2 feat: added follow on creation and changes done by user will not send to him (#7460)
* feat: added follow on creation

* style: Missing comma and a parameter

* fix: travis

* removed print statement
2019-05-13 14:59:49 +05:30
Rushabh Mehta
3d26d2dd22 BREAKING CHANGE: remove Feedback Trigger and Feedback Rating, this was not very configurable and can now be done better with Web Forms 2019-05-13 14:18:02 +05:30
Suraj Shetty
efd5f52fde fix(report): Allow report export only if user has export permission on ref doctype (#7433)
* fix: Allow export only if user has export permission on reference doctype

* fix: Show only custom "no permission" error
2019-05-10 15:59:59 +05:30
Suraj Shetty
794f3d08b2
Merge pull request #7303 from Mangesh-Khairnar/default-user-permission
feat: Default user permission
2019-04-24 15:51:47 +05:30
Mangesh-Khairnar
c23876198d fix: filter default docs from allowed docs 2019-04-22 13:54:05 +05:30
Mangesh-Khairnar
8d8ef7ad3c fix: return allowed docs along with default doc 2019-04-22 13:53:43 +05:30
Anurag Mishra
b56830e2e5 fix: Cannot delete Issue because it is linked to Comments(v12) (#7270)
* fix: Cannot delete Issue because it is linked to Comments

* fix: commonified code
2019-04-22 11:27:58 +05:30
Rushabh Mehta
0496e5cd28 fix(tests) 2019-04-18 12:07:29 +05:30
Rushabh Mehta
7406ee31f2 fix: API change for version 2019-04-18 08:51:02 +05:30
Rushabh Mehta
7402f495d5 feat: Milestone Tracker. Track document lifecycle with milestones 2019-04-17 18:00:03 +05:30
Mangesh-Khairnar
aa84910946 style: change comment formatting 2019-04-16 23:37:52 +05:30