Commit graph

13216 commits

Author SHA1 Message Date
Makarand Bauskar
eefbf5e61e [v8.7.0] added change log for version 8.7.0 (#3878) 2017-08-08 16:03:37 +05:30
mbauskar
a5d3c90e97 resolved merge conflicts 2017-08-08 12:52:50 +05:30
mbauskar
bd0aac2d98 Merge branch 'hotfix' 2017-08-08 12:51:32 +05:30
mbauskar
7b90a9a9e9 bumped to version 8.6.8 2017-08-08 13:21:32 +06:00
Makarand Bauskar
bb750d5739 [test] test_customize_form.js (#3875) 2017-08-08 12:23:32 +05:30
rohitwaghchaure
57f1d351be [Fix] Workflow is not working even if the user has permission to submit the record (#3871) 2017-08-08 11:32:57 +05:30
mbauskar
e4675498bb Merge branch 'master' into staging 2017-08-04 11:02:07 +05:30
mbauskar
52182a27f3 Merge branch 'hotfix' 2017-08-04 11:02:07 +05:30
mbauskar
edfed87e75 bumped to version 8.6.7 2017-08-04 11:32:07 +06:00
rohitwaghchaure
5925aada69 Added order by in_create for dynamic link query (#3849) 2017-08-04 10:55:38 +05:30
Nabin Hait
b524d892f7 Add where clause only if conditions exists (#3853) 2017-08-03 17:02:47 +05:30
Faris Ansari
76a12ca5b6 Handle error when _user_tags column is added on the fly (#3854) 2017-08-03 17:02:30 +05:30
mbauskar
20b0aa20c6 Merge branch 'develop' into staging 2017-08-03 16:16:41 +05:30
Faris Ansari
05fc130225 Watch build.json for file additions (#3851) 2017-08-03 15:48:05 +05:30
Rushabh Mehta
3af5d51a41 [style] cleanup tags 2017-08-03 15:34:02 +05:30
Rushabh Mehta
44a0cc0940 [test] test_customize_form.js 2017-08-03 12:19:36 +05:30
Rushabh Mehta
5cebfb26b9 [minor] fix patch and module command 2017-08-03 12:02:18 +05:30
Aditya Hase
375dfd601d Replaced urlparse imports with six.moves.urllib.parse (#3847) 2017-08-03 11:43:28 +05:30
Makarand Bauskar
09a3a77ec2 [revert] Print traceback on ImportError in get_app_commands (#3846)
* [revert] Print traceback on ImportError in get_app_commands

* [tests] fixed the customize form test cases
2017-08-03 11:30:06 +05:30
mbauskar
53167626ab resolved merge conflicts 2017-08-02 18:32:30 +05:30
mbauskar
286c92aef0 Merge branch 'staging' 2017-08-02 18:28:21 +05:30
mbauskar
aa8eabaa7e bumped to version 8.6.6 2017-08-02 18:58:20 +06:00
mbauskar
f646af1c33 resolved merge conflicts 2017-08-02 18:12:49 +05:30
mbauskar
80a2beb32c resolved merge conflicts 2017-08-02 18:10:23 +05:30
mbauskar
01b75bf1c1 Merge branch 'hotfix' 2017-08-02 18:08:03 +05:30
mbauskar
3f854301e4 bumped to version 8.6.5 2017-08-02 18:38:03 +06:00
Rushabh Mehta
eb2c725dba [fix] stop action if trigger fails for validate and before_, fixes frappe/erpnext#10200 (#3842)
* [fix] stop action if trigger fails for validate and before_, fixes frappe/erpnext#10200

* [fix] stop action if trigger fails for validate and before_, fixes frappe/erpnext#10200

* [fix] codacy

* [fix] add test to tests.txt
2017-08-02 17:53:28 +05:30
Aditya Hase
62bb03ef6e Replaced Python 2 print syntax with Python 3 syntax (#3838)
* Replaced Python 2 print syntax with Python 3 syntax

* Update utils.py
2017-08-02 17:10:40 +05:30
Aditya Hase
16a9bdfd31 Replaced urllib.unquote imports with six.moves.urllib.parse.unquote (#3836) 2017-08-02 17:09:31 +05:30
Aditya Hase
9d7d384a63 Replaced urllib.quote imports with six.moves.urllib.parse.quote (#3837) 2017-08-02 17:09:16 +05:30
Aditya Hase
729bbf0dad Replaced Python 2 exec syntax usage with Python 3 syntax (#3835) 2017-08-02 17:05:39 +05:30
Aditya Hase
7c9c53840a Replaced types import with six (#3834)
Importing six.text_type instead of types.UnicodeType and
six.binary_type instead of types.StringType
2017-08-02 17:04:56 +05:30
Aditya Hase
b4b889835a Print traceback on ImportError in get_app_commands (#3833) 2017-08-02 17:04:01 +05:30
Aditya Hase
ec9a01e3aa Replaced 'except' clause syntax (#3827) 2017-08-02 16:58:24 +05:30
Aditya Hase
a3070690fd FileAndRedisStream inherits io.FileIO instead of file (#3826)
io.FileIO is available in both Python 2 and 3, file is removed in
python 3.
2017-08-02 16:58:07 +05:30
Aditya Hase
e6bd1e4995 Replaced all instances of 'unicode' with 'six.text_type' (#3825) 2017-08-02 16:57:39 +05:30
bcornwellmott
1f46637cc2 Fix workflow override (#3824) 2017-08-02 16:56:56 +05:30
RogueRonin
4776011cbc check whether the used filters were really parseable and usable and did not just result in an empty string or dict (#3822) 2017-08-02 16:55:46 +05:30
Rushabh Mehta
8bc72a1255 [minor] list is extensible 2017-08-02 14:54:28 +05:30
Makarand Bauskar
fc715efdbb [hotfix] fixes for AttributeError: 'NoneType' object has no attribute 'split' (#3840)
* [hotfix] fixes for AttributeError: 'NoneType' object has no attribute 'split'

* [tests] added test cases for not in and in filters
2017-08-02 12:47:10 +05:30
Makarand Bauskar
465d6b3431 [minor] fixes in frappe.client.get_value method (#3830) 2017-08-01 16:42:28 +05:30
Makarand Bauskar
20145b231e [minor] check if user exists or not (#3831)
* [minor] check if user exists or not

* [minor] remove the User Permission Link from module view
2017-08-01 16:11:05 +05:30
Aditya Hase
774c5fd2c6 Replaced mixed usage of tabs and spaces for indents with tabs only (#3828) 2017-08-01 11:53:58 +05:30
Nabin Hait
89860d7ef3 Update user permissions only if record if present (#3820) 2017-08-01 11:15:14 +05:30
Makarand Bauskar
ecaf4f6cd1 merged hotfix branch into staging (#3821)
* [hotfix] Linked with and List item click (#3803)

* [hotfix] Linked with and List item click

* Run a single test using Test Runner

* Add test for Linked With

* [minor] List view fixes

* bumped to version 8.6.3

* [Fix] Getting an error datetime.datetime is not iterable during importing purchase invoice data (#3818)

* Update quick_entry.js (#3815)

Fix typo

* bumped to version 8.6.4
2017-08-01 11:05:22 +05:30
Rushabh Mehta
ece91d903c [docs] simplified docs home 2017-07-31 17:39:44 +05:30
Rushabh Mehta
e75dc25a72 [minor] show breadcrumbs in mobile view 2017-07-31 16:53:49 +05:30
Rushabh Mehta
590310091b [docs] remove {{docs_base_url}} 2017-07-31 16:41:19 +05:30
Rushabh Mehta
8f2b001bd0 [docs] add headings 2017-07-31 16:21:13 +05:30
mbauskar
b1e70892d3 Merge branch 'master' into develop 2017-07-31 12:20:10 +05:30