Commit graph

431 commits

Author SHA1 Message Date
Saurabh
8c0a67cde8 [fix] make tree params which includs custom mandatory params (#2571) 2017-01-12 11:26:14 +05:30
Nabin Hait
f2bc961e1b Fixed merge conflict 2016-12-23 17:35:38 +05:30
Rushabh Mehta
6b637203f9 [minor] remove document_flow.py, use _sidebar.json and fix frappe/erpnext#7300 2016-12-23 09:42:15 +05:30
Rushabh Mehta
68e14d40c2 [security] fixed 2016-12-21 11:17:24 +05:30
Rushabh Mehta
241b35ab0a [fix] dots on setup wizard 2016-12-20 11:14:38 +05:30
Rushabh Mehta
225e4a172a [minor] removed linked_with caching - what a terrible idea!, fixes #4936 2016-12-16 14:51:40 +05:30
Rushabh Mehta
f4aed17ce6 [minor] close in checkbox and other fixes 2016-12-16 12:55:48 +05:30
Rushabh Mehta
1aba76f4bb [minor] dont show paging footer if no results in list 2016-12-15 16:19:13 +05:30
OluyomiKay
eb97b2a739 Create link to task from assigned owner (#2449) 2016-12-15 15:12:26 +05:30
Nabin Hait
fa00e8e3b2 Added standard filters 2016-12-15 14:58:16 +05:30
Faris Ansari
c455c40797 [fix] mobile sidebar close button (#2462) 2016-12-15 09:47:10 +05:30
Rushabh Mehta
e0d582bfd4 [minor] expand all in tree frappe/erpnext#6915 (#2431) 2016-12-09 16:00:48 +05:30
Nabin Hait
958d8ea6c0 Merge branch 'master' into develop 2016-12-08 12:32:20 +05:30
Nabin Hait
a0f174621a Merge pull request #2419 from rmehta/update-fetch-on-doctype-save
[enhance] update fetch values on doctype save #2414
2016-12-08 12:20:06 +05:30
robert schouten
acfb0996cf hide disabled reports (#2427)
* hide disabled reports

* Update moduleview.py
2016-12-07 14:40:39 +05:30
Rushabh Mehta
14586e7450 [minor] fontawesome icons 2016-12-07 11:09:23 +05:30
Nabin Hait
c52dc83256 Fixed merge conflict 2016-12-06 16:12:32 +05:30
Rohit Waghchaure
82ac63e5ac [Fix] Total row not working in the report for the report builder type 2016-12-06 16:05:26 +05:30
Rushabh Mehta
9e7b174c76 [enhance] update fetch values on doctype save #2414 2016-12-06 15:20:50 +05:30
Nabin Hait
8c7bd2f76f Merge pull request #2341 from rmehta/fetch-server-side
[fix] fetch values server side for link fields
2016-12-05 16:41:07 +05:30
Rushabh Mehta
7bc7e3bc63 Upgrade Font Awesome (#2410)
* Font-Awesome V3.x to V4.x

Font-Awesome V3.x to V4.x

* Font Tidy

Font Tidy

* FA4 Upgrade - Html Js & Json

FA4 Upgrade - Html Js & Json

* Minor

Minor
2016-12-05 13:07:03 +05:30
Nabin Hait
610ea6b47b Merge branch 'master' into develop 2016-11-23 14:48:48 +05:30
robert schouten
25a9df4364 [fix] charts dont get carried across reports 2016-11-23 15:28:47 +08:00
robert schouten
6917dea00e remove filter dash limit as no performance increase (#2318) 2016-11-22 10:55:59 +05:30
Rushabh Mehta
a099690e8f Revert "[optimize] remove count(*) from queries" (#2353) 2016-11-22 10:55:13 +05:30
Rushabh Mehta
0ff140fa2b [optimize] remove count(*) from queries 2016-11-21 14:58:18 +05:30
Rushabh Mehta
349e803bd1 [fix] fetch values server side for link fields 2016-11-18 14:49:27 +05:30
Nabin Hait
db7837414d Merge pull request #2333 from rmehta/email-reply-fix
Use Message-ID in emails for threading
2016-11-18 13:59:14 +05:30
Rushabh Mehta
43c6c47513 [email] threading based on message_id in Email Queue and test case 2016-11-17 16:47:04 +05:30
Nabin Hait
85c8bbab8d Merge branch 'master' into develop 2016-11-17 16:42:45 +05:30
Nabin Hait
efbe173440 Merge pull request #2331 from shreyasp/downloadable-backups
[Minor] Show only sql.gz in Downloadable Backups Page
2016-11-17 16:01:00 +05:30
shreyas
743e157e03 [Fix] Setup wizard exception fix for unique_module_name_standard 2016-11-17 15:39:31 +05:30
shreyas
4ebbaac586 [Minor] Show only 'sql.gz' in Downloadable backups page 2016-11-16 16:58:17 +05:30
Rushabh Mehta
819983a7b6 Merge branch 'master' into develop 2016-11-16 11:20:42 +05:30
Rushabh Mehta
bd36f63a7b [minor] supress duplicate icon error in setup wizard (#2327) 2016-11-16 11:19:36 +05:30
Nabin Hait
c62fff0c41 Merge branch 'master' into develop 2016-11-14 12:39:04 +05:30
robert schouten
5cfe9c70c1 [fix] show timeline_emails on timeline_docname (#2238) 2016-11-14 12:09:46 +05:30
Nabin Hait
a73e5df9ba Merge pull request #2285 from rmehta/setup-wizard-fix
[minor] do not throw an exception if user tries to complete setup again
2016-11-14 11:49:25 +05:30
Rushabh Mehta
6c91d78348 [fix] for setup wizard in de, fr 2016-11-14 11:16:35 +05:30
Rushabh Mehta
9610e32d08 [minor] do not throw an exception if user tries to complete setup again 2016-11-10 12:56:17 +05:30
Rushabh Mehta
95fdfe44d3 [minor] added default standard filters (#2270)
* [minor] added default standard filters

* [fix] frappe.sendmail

* [fix] frappe.sendmail
2016-11-07 17:18:49 +05:30
Rushabh Mehta
98a7d8e2d0 [feature] Add totals row in report (#2249)
* Fixes issues with old branch

* [fixes] remember totals row option and calculate in the browser if possible
2016-11-04 13:33:08 +05:30
Faris Ansari
3ed6bef17e [setupwizard] mouseless operation (#2244) 2016-11-03 13:10:10 +05:30
Nabin Hait
9ecfebd38c Merge branch 'master' into develop 2016-10-31 15:05:37 +05:30
shreyas
7fc4c4a82a [Minor] Added validation to bulk update in case user does not specify value field 2016-10-28 17:37:27 +05:30
Rushabh Mehta
aece05a792 [fix] default for checks in db_insert and show top 20 filter values 2016-10-26 19:33:04 +05:30
Rushabh Mehta
424f99e6f3 [cleanup] dashboard filters 2016-10-26 19:33:04 +05:30
robert schouten
01a4845ce7 assorted cleanup and v7.1 fixes 2016-10-26 19:33:04 +05:30
robert schouten
5c07b355fe filter_dashboard 2016-10-26 19:33:04 +05:30
robert schouten
074f0fcc0b tag catagories 2016-10-26 19:33:04 +05:30