Commit graph

16459 commits

Author SHA1 Message Date
Ameya Shenoy
6cc5547eca
Merge pull request #5975 from codingCoffee/csvutils
[fix] error while importing csv file
2018-08-16 18:11:24 +05:30
Ameya Shenoy
5cee74e8db
python 2/3 fixes 2018-08-16 12:28:59 +00:00
rohitwaghchaure
297c14a123
Merge pull request #5978 from rohitwaghchaure/minor_prepared_report_issue
[minor] Visible show report button when prepared report status is completed
2018-08-16 16:58:17 +05:30
Rohit Waghchaure
fa0657ed6e [minor] Visible show report button when prepared report status is completed 2018-08-16 16:53:22 +05:30
Rushabh Mehta
445e2bd9b8 fix(image): chat room image hidden, finally had to do it in spite of reminding @achillesrasquinha 14 times to do it! 2018-08-16 14:46:46 +05:30
Ameya Shenoy
453ace7931
Merge pull request #5977 from codingCoffee/stack
web form allow others
2018-08-16 13:47:45 +05:30
Ameya Shenoy
e0853af409 web form allow others 2018-08-16 13:45:05 +05:30
Rushabh Mehta
67688c0583 layout(website theme): make a cleaner layout 2018-08-16 10:42:57 +05:30
Rushabh Mehta
98e1e16fb7 fixes(various): macro in web.html, show saving message in quick entry 2018-08-16 09:20:24 +05:30
Prateeksha Singh
f39f435a9b
Merge pull request #5971 from codingCoffee/webformlink
Enable link fields in webform by turning them into Autocomplete fields
2018-08-15 16:49:23 +05:30
Prateeksha Singh
37b4bd7b74 [prepared-report] intuitive first time UI (#5973) 2018-08-15 11:27:21 +05:30
Prateeksha Singh
d0a1565aa8 [csv-utils] don't decode when you've encoded special chars (#5970)
* [csv-utils] don't decode when you've encoded special chars

* Update csvutils.py
2018-08-15 11:25:56 +05:30
Ameya Shenoy
8d0212464e
Enable link fields in webform 2018-08-14 12:15:54 +00:00
Prateeksha Singh
36e39203fa
Merge pull request #5963 from Alsum/develop
showing-table-header-in-webform
2018-08-14 16:26:54 +05:30
Rushabh Mehta
98ac8b007a fix(dialog): no submit in msgprint 2018-08-14 15:58:52 +05:30
Shreya Shah
3134060d80 Uncheck select all if no documents are selected (#5966) 2018-08-14 15:31:02 +05:30
Prateeksha Singh
512924a28e [web_form_class] style cleanup 2018-08-14 14:34:49 +05:30
Faris Ansari
9025a0d765 Update frappe-datatable to 1.2.0 (#5965) 2018-08-14 14:34:13 +05:30
Prateeksha Singh
2c0abc3656 add notation for server-side get_in_list_view_fields() 2018-08-14 12:55:07 +05:30
sivankar
a48b76b940 refactored code to add support in filters to get descendant or ancest… (#5847)
* refactored code to add support in filters to get descendant or ancestor for tree type documents

* added semicolon and comments to imporve code quality

* refactored code to add not ancestor and not descendants of filters

* added test cases for ancestors of and descendants of

* Translate labels
2018-08-14 12:19:18 +05:30
Prateeksha Singh
213279ec87
Merge pull request #5783 from szuyxy/global_search_support_and
[Enhance] Global search multi key words to pin point search result
2018-08-14 12:09:29 +05:30
Zarrar
d3eb8c7abd closing chat popper in mobile view (#5964) 2018-08-14 11:31:51 +05:30
alsum
c967767b7a showing-table-header-in-webform 2018-08-13 17:20:46 +02:00
alsum
bb7a6ed82e Merge branch 'develop' of https://github.com/frappe/frappe into develop 2018-08-13 17:14:53 +02:00
Mohamed_Alsum
364b09e3d6 adding time to total_row in reports (#5961)
* allow null when time field is not required

* Update base_document.py

* adding time to total_row
2018-08-13 10:31:38 +05:30
alsum
9ba9468c50 adding time to total_row 2018-08-12 11:30:05 +02:00
alsum
cb4e4505ad Merge branch 'develop' of https://github.com/frappe/frappe into develop 2018-08-12 11:22:16 +02:00
Faris Ansari
bf6e589e44
Merge pull request #5958 from chdecultot/print_format_builder
Print format builder translations
2018-08-11 12:18:02 +05:30
Charles-Henri Decultot
1e5edc9a11 Print format builder translations 2018-08-10 16:49:57 +00:00
Nabin Hait
2f49806cec
fix(init): get_cached_value (#5956) 2018-08-10 19:01:35 +05:30
Zarrar
146c795496 minor dialog button fix (#5955) 2018-08-10 18:17:43 +05:30
Zarrar
a819863f78 typo fix (#5954) 2018-08-10 14:37:01 +05:30
Ameya Shenoy
4b89e0d5b5 Email Read notification (#5911)
* Email Read notification

* changed email status from Opened to Read
2018-08-10 12:00:51 +05:30
Faris Ansari
2b6c3f7188 Query report fixes (#5946)
* chore: dateutil -> frappe.datetime

* style(report): update datatable styles

* chore: Remove beta tag
2018-08-09 16:19:09 +05:30
Prateeksha Singh
b30bc0dc3b [frappe-client] raise an exception for error codes (#5947) 2018-08-09 16:18:55 +05:30
Ameya Shenoy
5013405f45
Merge pull request #5748 from mhbu50/print_server
Print with Print server (CUPS)
2018-08-09 16:06:18 +05:30
alsum
eb778adb2d Merge branch 'develop' of https://github.com/frappe/frappe into develop 2018-08-09 12:23:16 +02:00
Nabin Hait
39e9e306f2 Cached some queries (#5951) 2018-08-09 11:25:07 +05:30
Rushabh Mehta
b1857a5132
optimize(meta): meta is now cached in redis (#5948)
* optimize(meta): meta is now cached in redis

* fix(meta): test fixes

* fix(meta): codacy

* fix(meta): allow nulls to be serialized

* fix(form_meta): fix form meta caches

* fix(form_meta): fix form meta caches

* fix(form_meta): don't cache for developer_mode'
2018-08-09 11:24:42 +05:30
Rushabh Mehta
bd5c27a30f
fix(webform): allow link fields in web form (#5950)
* fix(webform): allow link fields in web form

* fix(webform): don't allow advanced search in links'
2018-08-09 09:27:37 +05:30
Prateeksha Singh
ef6f160961 [handler] Raise exceptions in request in dev_mode (#5949) 2018-08-08 22:52:39 +05:30
Nabin Hait
8d32749971 [optimize] db exists 2018-08-08 18:34:33 +05:30
Rushabh Mehta
cbbca735b9 fix(database): fetch description only if results 2018-08-08 16:52:40 +05:30
Rushabh Mehta
e7c8b0c138 optimize(various): optimize with frappe.get_cached_value 2018-08-08 16:33:40 +05:30
Nabin Hait
b8f91f36fc fix(document): frappe.get_cached_doc 2018-08-08 13:16:04 +05:30
Nabin Hait
cdc8e2895e feat(document): frappe.get_cached_doc 2018-08-08 13:06:06 +05:30
Nabin Hait
7f2a14bdf1 feat(document): frappe.get_cached_doc 2018-08-08 13:04:23 +05:30
Faris Ansari
2535eb3131 [Website Slideshow] Button to fetch attached images from a doc (#5938) 2018-08-07 18:31:11 +05:30
Faris Ansari
12ea6c03e9
fix(webform): fallback values for sysdefaults (#5940) 2018-08-07 17:10:29 +05:30
Rushabh Mehta
0f95b2c964 fix(webform): ignore mandatory on insert only if files 2018-08-07 14:59:28 +05:30