Commit graph

16095 commits

Author SHA1 Message Date
shriharishastry
0d21f8daa9 header clean up 2018-06-28 18:11:31 +05:30
shriharishastry
d4399b29ea merge conflicts 2018-06-28 18:03:54 +05:30
shriharishastry
b5e363c6c6 changes on cleaning colmn headers 2018-06-28 17:30:48 +05:30
Prateeksha Singh
1a322f1019 [merge] conflicts 2018-06-28 17:21:46 +05:30
Prateeksha Singh
692ac54d00 [prepared-report] add download report 2018-06-28 17:19:20 +05:30
shriharishastry
47c93b4eb1 merge issues resolved 2018-06-28 16:55:31 +05:30
shriharishastry
41f1e05a6f added check not trigger run if prepared 2018-06-28 16:47:42 +05:30
Prateeksha Singh
c2714903fe [init] add show report in prepared report 2018-06-28 15:25:48 +05:30
shriharishastry
0cf28e70f5 updated with dev of frappe 2018-06-27 10:31:17 +05:30
shriharishastry
a6374a20ab removed unused imports 2018-06-27 08:42:18 +05:30
shriharishastry
93a2cf7a3c report changes 2018-06-26 23:25:59 +05:30
shriharishastry
eb6c5194fa frappe csv utils usage and save file 2018-06-26 23:14:40 +05:30
shriharishastry
7c1f1d4a52 frappe csv utils usage 2018-06-26 23:13:19 +05:30
shriharishastry
fc222b7173 frappe csv utils usage 2018-06-26 23:10:06 +05:30
shriharishastry
bc7d4a73e6 removed check 2018-06-26 20:04:23 +05:30
shriharishastry
7939d1bec4 removed background report results 2018-06-26 19:49:05 +05:30
shriharishastry
a289d1f349 removed background report results 2018-06-26 17:49:08 +05:30
shriharishastry
0c25bb5088 merge issues 2018-06-26 14:56:33 +05:30
shriharishastry
9b5971691e test cases 2018-06-26 13:45:43 +05:30
shriharishastry
f27447a926 test cases 2018-06-26 13:21:43 +05:30
shriharishastry
d7483657ee test cases 2018-06-26 13:20:05 +05:30
shriharishastry
02084988ba test cases 2018-06-26 13:01:50 +05:30
shriharishastry
fe863b6fc4 prepared report 2018-06-26 12:51:58 +05:30
shriharishastry
0e6748ac85 prepared report 2018-06-26 12:34:02 +05:30
Prateeksha Singh
4bf683606a
Merge pull request #5708 from pratu16x7/css-fixes
[style] max-width class to fulfill ellipsis usage requirement
2018-06-21 22:47:30 +05:30
Prateeksha Singh
f6472ba0b7 [style] max-width class to fulfill ellipsis usage requirement 2018-06-21 22:45:12 +05:30
Prateeksha Singh
4de1414c21
Merge pull request #5706 from pratu16x7/grid-fixes
[fix][grid] static area value update
2018-06-21 16:26:42 +05:30
Prateeksha Singh
2455745d91 [fix][grid] static area value update 2018-06-21 16:24:56 +05:30
Saurabh
8957600e53
Merge pull request #5703 from rohitwaghchaure/error_in_dropbox_settings
[Fix] Dropbox backup not working
2018-06-21 11:42:50 +05:30
Rohit Waghchaure
b7db543316 [Fix] Dropbox backup not working 2018-06-21 11:35:25 +05:30
Frappe PR Bot
0363a64c21 [Translation] Updated Translations (#5699) 2018-06-21 09:10:10 +05:30
Charles-Henri Decultot
27b4b86b27 Stripe corrections (#5700) 2018-06-21 09:09:05 +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
Prateeksha Singh
bb675ae622 [probot-stale] add config (#5701) 2018-06-21 09:08:05 +05:30
Shreya Shah
29831c833f
Merge pull request #5697 from shreyashah115/fix-fetch
Fetch from for dates
2018-06-20 15:34:09 +05:30
Shreya
ae8b203808 Fetch from for dates 2018-06-20 14:24:30 +05:30
Suraj Shetty
3dd5520784 Select status field by default if available during bulk edit (#5696)
* Select status field by default if available during bulk edit

* Call done before modal hide
2018-06-20 14:16:30 +05:30
KanchanChauhan
3990e770d4 [Bug Fix]Last line missing in report export fix (#5690) 2018-06-20 12:44:33 +05:30
Ameya Shenoy
c1bcc4c29f
Merge pull request #5695 from codingCoffee/session
incorrect import fix
2018-06-20 12:42:16 +05:30
Nabin Hait
1128f63bad Fixed import issue 2018-06-20 12:40:51 +05:30
Ameya Shenoy
83a8b33aab incorrect import fix 2018-06-20 12:35:39 +05:30
Shrihari Shastry
26d87b8b2f io of byte 2018-06-20 12:32:55 +05:30
Suraj Shetty
071196a8d5 Add self doctype to the linked doctype multicheck (#5694)
- This will add the ability to skip user permission for the
selected doctype list and the user permission
will only be applicable to the link fields
- Enable ignore_user_permission for
dynamic field `for_value` in User permission
2018-06-20 12:22:20 +05:30
Rushabh Mehta
90188a99c5
[feature] add website_redirects hook (#5692) 2018-06-20 12:10:07 +05:30
Shrihari Shastry
97aea317a4 unit test 2018-06-20 12:07:18 +05:30
Shrihari Shastry
74892c1a82 tab to spaces 2018-06-20 11:51:46 +05:30
Shrihari Shastry
83181eab65 tab to spaces 2018-06-20 11:49:50 +05:30
Shrihari Shastry
5101054fff tab to spaces 2018-06-20 11:45:58 +05:30
Shrihari Shastry
7d1621bdb9 Merge branch 'background_report' of https://github.com/zerodhatech/frappe into background-reports 2018-06-20 11:37:32 +05:30
shhriharishastry
07dc50e658 unit tests changes 2018-06-20 11:11:33 +05:30