Commit graph

12519 commits

Author SHA1 Message Date
Prateeksha Singh
eaacdb097c [multiselect]Add search term, filter by date range, pagination (#3333)
* add search term, filter by date range, pagination

* filters on the same row, ellipsis, translate msg

* Rename page_len to page_length
2017-05-19 11:08:05 +05:30
Makarand Bauskar
6069751b1e [minor] added error log if there is any exception in email alert (#3335) 2017-05-19 10:39:30 +05:30
Nabin Hait
d6654f4fe3 Fixed merge conflict 2017-05-18 14:03:14 +05:30
Nabin Hait
787666f54c Merge branch 'develop' 2017-05-18 13:40:47 +05:30
Nabin Hait
89f07fb8d6 bumped to version 8.0.47 2017-05-18 14:10:47 +06:00
Faris Ansari
f16854559d [minor] Handle string with no html tag in xlsxutils (#3332) 2017-05-18 13:39:07 +05:30
Faris Ansari
0eb16baf82 Fix Ctrl + G not working in other languages (frappe/erpnext#7627) (#3331) 2017-05-18 12:22:45 +05:30
Rushabh Mehta
0fbaf93f89 [fix] set title_prefix if set in website settings, fixes frappe/erpnext#4848 (#3294)
* [fix] set title_prefix if set in website settings, fixes frappe/erpnext#4848

* Update context.py
2017-05-18 12:21:03 +05:30
Prateeksha Singh
743cfc625e [fix] hide popovers on blur frappe/erpnext#8721 (#3330) 2017-05-18 12:19:52 +05:30
Faris Ansari
1f47653ca5 Fix Custom Report freeze (Fixes frappe/erpnext#6806) (#3305) 2017-05-18 12:14:52 +05:30
almeidapaulopt
e7cf2bb588 translation fixes (#3327) 2017-05-18 12:14:31 +05:30
Frappe PR Bot
2f1043cfa0 [translation] translation updates (#3312) 2017-05-18 12:14:01 +05:30
Neil Trini Lasrado
c4e8ac47f6 Changed Introduction feild type to text editor (#3297) 2017-05-18 12:12:28 +05:30
Prateeksha Singh
4fa5a25d77 [fix] Tree breadcrumb fix (#3308)
* [fix] set tree doctype breadcrumb to last_view

* [minor]
2017-05-18 12:09:40 +05:30
Makarand Bauskar
ae52c7a487 [minor] added error message if the encryption_key in the site_config is changed (#3326) 2017-05-18 12:08:06 +05:30
tundebabzy
c8d8baeaff fixes frappe/erpnext#8606 (#3322)
* fixes frappe/erpnext#8606

* fixes frappe/erpnext#8606
2017-05-18 12:06:52 +05:30
Makarand Bauskar
f26fa3816a [minor] fixed UnicodeEncode error for item name (#3321)
* [minor] fixed UnicodeEncode error for item name

* Update router.py
2017-05-18 12:05:22 +05:30
Faris Ansari
d8d8db819a Reset comment input when form is refreshed (frappe/erpnext#8151) (#3300) 2017-05-18 11:58:46 +05:30
Faris Ansari
de00b1db4c Update gantt library (#3299)
- Fixes frappe/erpnext#8531
2017-05-18 11:57:01 +05:30
Faris Ansari
1eb9562a3c Obey slickgrid's inline filter for (#3291)
- Print PDF
- Export to Excel

Fixes frappe/erpnext#3747
2017-05-18 11:54:20 +05:30
Manas Solanki
5315bea77f Data Import Tool in excel file format (#3231)
* Data Import in excel file format

* Include test case and minor fixes

* typos
2017-05-18 11:40:44 +05:30
Nabin Hait
44619bcf38 Insert records into global search table in small batches, added progress bar in patch (#3313) 2017-05-17 19:51:44 +05:30
Faris Ansari
8657751554 Fix duplicate cards in Kanban Board (fixes frappe/erpnext#8850) (#3316) 2017-05-17 19:51:06 +05:30
Nabin Hait
dd4d12e5cc Merge branch 'develop' 2017-05-17 13:53:18 +05:30
Nabin Hait
9cdaed84b3 bumped to version 8.0.46 2017-05-17 14:23:18 +06:00
Nabin Hait
7242128dd9 Show results based on get_query method, process based on dict (#3320) 2017-05-17 13:52:07 +05:30
Nabin Hait
5520a5b6cf Merge branch 'develop' 2017-05-17 11:06:23 +05:30
Nabin Hait
a71d4acb4a bumped to version 8.0.45 2017-05-17 11:36:23 +06:00
Nabin Hait
df9c5c71c4 Show all records in multi-select dialog (#3319) 2017-05-17 11:05:42 +05:30
Nabin Hait
d9c559777e Ignore single doctypes for global search 2017-05-16 16:47:11 +05:30
Nabin Hait
20519ffde9 Merge branch 'develop' 2017-05-16 13:35:38 +05:30
Nabin Hait
3fce6cb78b bumped to version 8.0.44 2017-05-16 14:05:38 +06:00
Rushabh Mehta
9abcaff48a [fix] disable email alert on wrong field. fixes frappe/erpnext#3372 (#3290) 2017-05-16 12:49:47 +05:30
rohitwaghchaure
0aa97b7aaa Made seprate method to parse the naming series (#3293) 2017-05-16 12:46:58 +05:30
Faris Ansari
adfc692668 Update field when editing via SlickGrid (Fixes frappe/erpnext#5064) (#3296) 2017-05-16 12:44:39 +05:30
Ayush Shukla
665602522b Close grid on escape key (#3292)
* [minor] Escape fix

* [minor] Method name changed
2017-05-16 11:42:15 +05:30
Faris Ansari
5c6483df97 Add sort order field from Customize Form (#3284)
* Add sort order field from Customize Form

- fixes support issue WN-SUP25048

* Handle case when meta_sort_field is undefined
2017-05-15 13:57:35 +05:30
Prateeksha Singh
44359d058d [minor] Oldest first order, preselect first, build bug fix (#3288) 2017-05-15 13:57:04 +05:30
Makarand Bauskar
41cc814d89 [minor] ignore user filters if frappe.route_options are passed (#3282) 2017-05-15 11:48:46 +05:30
Prateeksha Singh
b23aa1446b Multiselect dialog for getting items (#3255)
* First approach by making a control

* Implement multi select for child tables

* Basic UI and items fetch in place

* Multiselect with checkboxes

* Functional modal with filters and new_doc

* Map filter fields to target_doc

* pass json arrays instead of strings

* Get items from quotation (in SO) working

* [minor] fix link route in list

* [minor] cleanup

* Add date, select first by default

* map_docs test, default date field

* [minor][fix] make new button bug

* [minor] move map_docs to erpnext

* [minor] format dates
2017-05-15 11:29:41 +05:30
ckosiegbu
2b8a12df3a Update contact.js (#3286)
Change incorrect call to erpnext.utilities.doctype.contact.contact.invite_user to frappe.email.doctype.contact.contact.invite_user
2017-05-15 11:26:04 +05:30
Saurabh
eb9551fca7 [fix] check all custom perms before adding permissions from standard docperm (#3280) 2017-05-12 15:41:26 +05:30
Nabin Hait
6cb0d6da77 Re-run global search patch (#3271) 2017-05-12 15:25:31 +05:30
Faris Ansari
355a494641 Kanban fixes (#3278)
- redirect back to list when board is not found
- fix no default columns when custom field is used
2017-05-12 15:25:02 +05:30
Charles-Henri Decultot
8f684444d0 Correction of doctype translations in modal dialog (#3277) 2017-05-12 15:23:51 +05:30
Manas Solanki
bfb181333c handle the escape sequence in the html2text library (#3272) 2017-05-12 15:23:11 +05:30
Saurabh
77ef3e8a27 [fix] list stripe payment gateway under integrations (#3270)
* [fix] list stripe payment gateway under integrations

* Update integrations.py
2017-05-12 15:22:01 +05:30
Makarand Bauskar
931ef1f244 [minor] new line after install & reinstallation of new-site (#3262) 2017-05-12 15:20:47 +05:30
Sagar Vora
1a63f988c7 [minor] Fail travis build immediately, if python tests fail. (#3269) 2017-05-12 15:20:22 +05:30
Nabin Hait
33e1b346bc Updated modified date in system settings 2017-05-12 13:29:11 +05:30