mbauskar
2c95983e4d
Merge branch 'develop' into staging
2017-08-23 13:18:55 +05:30
mbauskar
7efd470c0d
Merge branch 'master' into develop
2017-08-23 13:05:20 +05:30
mbauskar
12aaad9ed0
Merge branch 'hotfix'
2017-08-23 13:05:19 +05:30
mbauskar
091cf22e92
bumped to version 8.8.2
2017-08-23 13:35:19 +06:00
Nabin Hait
ebaee98ecb
Don't show single and child table doctype in User Permission's allowed doctypes ( #3973 )
2017-08-23 11:22:33 +05:30
Rushabh Mehta
7697efcdd5
Merge pull request #3968 from adityahase/fix-list-keys
...
Explicitly convert dict.keys() to list
2017-08-23 10:25:17 +05:30
Rushabh Mehta
36eb4b5335
Merge pull request #3971 from omaraltayyan/patch-1
...
allow hidden columns in reports
2017-08-23 10:24:15 +05:30
Rushabh Mehta
0652262632
Update query_report.js
2017-08-23 10:24:04 +05:30
Rushabh Mehta
60e9412dbb
Merge pull request #3967 from ci2014/patch-11
...
Update __init__.py
2017-08-23 10:21:32 +05:30
Rushabh Mehta
ca5ce399f0
Merge pull request #3965 from mbauskar/get-filter-condition
...
[hotfix] check if the operator is passed in filters for get-filter-conditions
2017-08-23 10:20:45 +05:30
mbauskar
c931d99b39
Merge branch 'hotfix'
2017-08-23 08:45:06 +05:30
mbauskar
b78491516b
Merge branch 'master' into develop
2017-08-23 08:45:06 +05:30
mbauskar
483917e8e2
bumped to version 8.8.1
2017-08-23 09:15:05 +06:00
Makarand Bauskar
6200932fce
[hotfix] added filter_count var to base_list.js ( #3972 )
2017-08-23 08:44:21 +05:30
Omar Altayyan
1df8562697
allow hidden columns in reports
...
this code allowes the script report to hide certain columns by simply placing their width to -1 or less
this can be praticularly useful in complex reports where we (for example) use dynamic links and we want to hide the field used to indicate the dynamic link
2017-08-23 01:20:25 +03:00
mbauskar
5e72a1049a
resolved merge conflicts
2017-08-22 20:14:06 +05:30
mbauskar
27c58f6aea
Merge branch 'staging'
2017-08-22 20:06:55 +05:30
mbauskar
3dc6a37f5f
bumped to version 8.8.0
2017-08-22 20:36:55 +06:00
Makarand Bauskar
1c7e01e25c
[minor] added the change log for version 8.8.0 ( #3970 )
2017-08-22 20:06:09 +05:30
mbauskar
f832ae52a6
resolved merge conflicts
2017-08-22 19:43:17 +05:30
mbauskar
e872d4b0e8
Merge branch 'master' into develop
2017-08-22 19:40:13 +05:30
mbauskar
a825342f75
Merge branch 'hotfix'
2017-08-22 19:40:13 +05:30
mbauskar
f5cf11a1dd
bumped to version 8.7.11
2017-08-22 20:10:13 +06:00
Aditya Hase
06d9bd0a1f
Explicitly convert dict.keys() to list
2017-08-22 18:18:50 +05:30
ci2014
ffbfe44a17
Update __init__.py
...
Fix typos
2017-08-22 14:32:46 +02:00
Rushabh Mehta
8dba5d06a3
Merge pull request #3966 from adityahase/fix-python3
...
Fix some Python 3 incompatibilities issues
2017-08-22 17:34:47 +05:30
mbauskar
1481f03905
[hotfix] check if the operator is passed in filters for get-filter-conditions
2017-08-22 17:32:39 +05:30
Aditya Hase
7da257bfaa
Use raise instead of six.reraise
2017-08-22 17:20:39 +05:30
Aditya Hase
00c655b2f4
Decode string before passsing to regex.match
2017-08-22 17:20:35 +05:30
Rushabh Mehta
3d78cabfe9
[merge] hotfix
2017-08-22 15:48:19 +05:30
Rushabh Mehta
40f4803799
Merge pull request #3960 from rmehta/search-icon-fix-1
...
[fix] search icon for reportview
2017-08-22 13:23:20 +05:30
Rushabh Mehta
a3bc668da1
Merge pull request #3961 from netchampfaris/email-tags
...
Remove meta and style tags from email communication
2017-08-22 13:23:07 +05:30
Rushabh Mehta
fb1aec1de7
Merge pull request #3963 from netchampfaris/no-reload-prompt-in-dev-mode
...
Dont ask for reload prompt in dev mode
2017-08-22 13:22:51 +05:30
Rushabh Mehta
224a06eef7
[fix] throttle running multiple times ( #3962 )
...
* [fix] throttle running multiple times
* [fix] lint
2017-08-22 12:51:14 +05:30
Faris Ansari
51d0cba35a
Dont ask for reload prompt in dev mode
2017-08-22 12:50:43 +05:30
Rushabh Mehta
8c49f0b7a7
[fix] lint
2017-08-22 12:41:06 +05:30
Faris Ansari
ae272c88c2
Remove meta and style tags from email communication
2017-08-22 12:26:18 +05:30
Rushabh Mehta
a23a8ddc2e
[fix] search icon for reportview
2017-08-22 12:18:28 +05:30
Rushabh Mehta
3ba0baaff4
Merge pull request #3947 from rmehta/print-style
...
[added] print style
2017-08-22 11:03:51 +05:30
Saurabh
b6fc88de36
Merge branch 'master' into staging
2017-08-21 15:48:55 +05:30
Saurabh
0f63f8a889
Merge branch 'hotfix'
2017-08-21 15:48:55 +05:30
Saurabh
54b6c2244d
Merge branch 'master' into develop
2017-08-21 15:48:55 +05:30
Saurabh
69085c75e3
bumped to version 8.7.10
2017-08-21 16:18:54 +06:00
Saurabh
6a7aa57ef2
Merge pull request #3958 from saurabh6790/clear-limit-fix
...
[hot][fix] add daily_emails key in clear-limits check
2017-08-21 15:44:17 +05:30
Saurabh
087dd23e3b
[hot][fix] add daily_emails key in clear-limits check
2017-08-21 15:32:02 +05:30
Rushabh Mehta
0bc687f592
Merge pull request #3952 from netchampfaris/datebetween-filter
...
[fix] DateRange filter when language is not en frappe/erpnext#10307
2017-08-21 15:08:34 +05:30
Rushabh Mehta
11899dbb81
Merge pull request #3953 from ci2014/patch-10
...
Update file.py
2017-08-21 15:07:46 +05:30
Rushabh Mehta
013e2da67c
Merge pull request #3955 from rohitwaghchaure/minor_template_validation_issue
...
[minor] Skip template validation for js print format
2017-08-21 15:07:31 +05:30
mbauskar
3913bc542f
Merge branch 'master' into staging
2017-08-21 08:54:38 +05:30
mbauskar
f8fd415eec
Merge branch 'master' into develop
2017-08-21 08:54:38 +05:30
