Nabin Hait
4112407391
Reload in_standard_filter property
2017-01-06 12:56:04 +05:30
Nabin Hait
f2bc961e1b
Fixed merge conflict
2016-12-23 17:35:38 +05:30
Rushabh Mehta
afa8bf1e96
[fix] sortfield validation for multiple fields and frappe.model.set_value (js) takes in a dict
2016-12-21 17:29:16 +05:30
Rushabh Mehta
c8a80786e3
[fix] validate sort_field in doctype.py
2016-12-21 13:01:21 +05:30
Rushabh Mehta
17d78e2bbb
[fix] email validation
2016-12-21 12:41:51 +05:30
Saurabh
b627342a9b
[fix] testcase fix for deactivating additional users after limit set
2016-12-21 12:34:28 +05:30
Saurabh
68cbbaacc7
[fix] test case to deactivate additional user
2016-12-21 12:34:28 +05:30
Rushabh Mehta
8301a17209
[minor] allow any type of user for user_query
2016-12-19 12:16:37 +05:30
Rushabh Mehta
1aba76f4bb
[minor] dont show paging footer if no results in list
2016-12-15 16:19:13 +05:30
Rushabh Mehta
1caf245673
[fix] use POST for data import tool, fixes #2317 , frappe/erpnext#7230
2016-12-15 15:53:45 +05:30
Rushabh Mehta
bbf88108f7
[fix] data import for same doctype appearing multiple ptimes, #2228 ( #2450 )
2016-12-15 15:11:51 +05:30
Nabin Hait
fa00e8e3b2
Added standard filters
2016-12-15 14:58:16 +05:30
robert schouten
c044c476a8
move message_id threading to communication to work with inbox ( #2458 )
...
* move message_id threading to communication to work with inbox
* move message_id threading fix
* rebase fix
* reset threading to email queue but keep in communications
2016-12-15 14:50:52 +05:30
robert schouten
efa86c6e31
Email cc in headers if expose recipients ( #2441 )
...
* move email cc to header
* [test fixes] move email cc to header
* email cc additional tests
* email cc cleanup and unsubsribe link test
* email cc permit footer based cc with expose_recipient and tests + ui
2016-12-15 09:49:54 +05:30
Rushabh Mehta
7128289ad6
[minor] fix image view, frappe/erpnext#7062
2016-12-12 15:45:05 +05:30
Rushabh Mehta
ca97204bdb
[fix] tests + add google analytics id in docs
2016-12-09 16:39:38 +05:30
Rushabh Mehta
889079504c
Blog fixes ( #2437 )
...
* [minor] update fetch field only if null
* [fix] blog filtering, titles etc
2016-12-09 15:59:05 +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
Nabin Hait
5c3213ffa8
Update report.py
2016-12-08 12:18:04 +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
9cd262c0c5
[minor] dont check developer mode in test
2016-12-06 15:39:39 +05:30
Rushabh Mehta
281d8a6481
[fix] for new doctype
2016-12-06 15:31:23 +05:30
Rushabh Mehta
9e7b174c76
[enhance] update fetch values on doctype save #2414
2016-12-06 15:20:50 +05:30
KanchanChauhan
054d0f663f
Invalid language error on creation of Language ( #2390 )
2016-12-05 18:20:36 +05:30
Rushabh Mehta
72569d1313
[fix] file .zip upload;
2016-12-05 17:39:52 +05:30
sbkolate
764cbfe217
added Bulk Upload from zip file feature #2055 ( #2062 )
...
* added Bulk Upload from zip file feature #2055
* Added upload zip in file list
* Fix File URL
* Update file_list.js
2016-12-05 15:09:17 +05:30
Rushabh Mehta
c67d3bfe01
Add attachment from email and copy attachments to Communication Record ( #2412 )
...
* Carry over file attachments in email communications
* [fix] style
2016-12-05 14:59:00 +05:30
robert schouten
4996c94e75
[fix] error log dont update modified on seen ( #2411 )
2016-12-05 14:54:02 +05:30
rohitwaghchaure
2850830fc0
Language field missing in the translation doctype ( #2406 )
2016-12-05 14:52:31 +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
4cf123bd8f
Fixed merge conflict
2016-11-28 14:25:11 +05:30
Rushabh Mehta
4bd2285159
File Based Locking at Document Level ( #2374 )
...
* [redesign] improved locking in documents and redesigned recent documents
* [minor] patch to update doctype in existing documents
2016-11-25 16:14:00 +05:30
robert schouten
ad4ebb1001
allow permission for communication based on timeline not just reference ( #2366 )
2016-11-25 16:02:31 +05:30
Saurabh
6b3bf22462
[enhance] set last active time to user
2016-11-22 12:12:34 +05:30
Rushabh Mehta
90bc926730
[minor] added flush feature in error log and apply filters from list only for link and select, fixes frappe/erpnext#6968 ( #2350 )
2016-11-22 10:55:43 +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
9ef8f18fcf
[fix] for tests, and db_set now accepts dict
2016-11-17 09:45:44 +05:30
Rushabh Mehta
c97d372655
[fix] set message-id and sync threads
2016-11-17 09:45:44 +05:30
Rushabh Mehta
2fe0e2acad
[fix] set Message-Id in email based on reference and tag replies to the same object
2016-11-17 09:45:44 +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
KanchanChauhan
ca22d756e3
Send unsubscribe message in email option added to Email Account ( #2298 )
2016-11-14 12:06:59 +05:30
Nabin Hait
eaf06c4271
Merge pull request #2289 from saurabh6790/set_last_active
...
Set last active
2016-11-11 15:29:40 +05:30
Nabin Hait
2ffa35b38a
Fixed merge conflict
2016-11-11 15:10:35 +05:30
Rohit Waghchaure
fc454e014d
[Fix] break fieldtype issue in the auto email report, object split issue for the columns which has list and dictionary
2016-11-10 19:16:15 +05:30
Saurabh
68c7b14674
[enhance] set last active time to user
2016-11-10 14:40:12 +05:30
Nabin Hait
d3c75b6260
Merge pull request #2275 from rmehta/document-type-fix
...
[fix] label for document type, fixes #2165
2016-11-09 11:31:21 +05:30
