Commit graph

13024 commits

Author SHA1 Message Date
Doridel Cahanap
e92a8c3239 Show Company Address in Sidebar Menu of logged in user if user is a company contact (#3678) 2017-07-17 11:00:32 +05:30
mbauskar
8d6606f70c Merge branch 'master' into develop 2017-07-14 17:45:51 +05:30
mbauskar
5aceb1683c Merge branch 'hotfix' 2017-07-14 17:45:51 +05:30
mbauskar
b85f4d45f3 bumped to version 8.4.1 2017-07-14 18:15:51 +06:00
Utkarsh Yadav
f4c955d5b6 [UI Test] list view (#3684)
* [UI Test] List view

* some fixes in test_list_menu

* codacy fixes

* minor fixes

* removed menu test
2017-07-14 17:36:28 +05:30
Ashwini Save
918e426169 Mobile Screen Title and Timeline Title #9807 (#3672)
* Mobile Screen Title and Timeline Title #9807

* Left align Indicator and corrected “Add to Knowledge Base” button misalignment.

* Pushing title changes only, reverted timeline changes.
2017-07-14 17:35:09 +05:30
Ameya Shenoy
0a32ad83bf [tests] restructured tests to work with the new testing framework (#3683)
* minor changes and added global_test_search

* stashing the changes

* named assertions, modified test_lib to fit ES6 standard, added global search test

* modified to work with the new testing framework

* renamed files

* increased timeouts

* only calendar and desktop test

* modified travis.yml
2017-07-14 17:34:25 +05:30
Rushabh Mehta
dcd77e16b3 [fix] save button remaining disabled (#3685) 2017-07-14 17:23:05 +05:30
Revant Nandgaonkar
6a46a5ae1f [Fix] User frappe_userid set to read only (#3670) 2017-07-14 10:43:11 +05:30
Faris Ansari
f6d265b2ef Email inline_images enhancement, header (#3682)
* minor refactor

* update user.py to use new sendmail api

* On-demand attachments in email

* Replace inline_images by just specifying path

* Add header flag in frappe.sendmail

* Inline images can now be attached from assets/, files/ and private/files/

* Update tests

* Fix email_account test
2017-07-13 18:37:28 +05:30
Rushabh Mehta
ad7911fb96 [minor] better message for beta docs 2017-07-13 17:45:20 +05:30
Rushabh Mehta
7b4957d1f3 [tests] more timeouts 2017-07-13 15:26:11 +05:30
Rushabh Mehta
25ad8ef16c Test Runner - Refactored (#3679)
* [tests] test_runner to run one JS test at a time

* [tests] test_runner to run one JS test at a time

* [test] ignore failing tests

* [test] comment test_calendar_view

* [test] add timeout

* [test] add timeout
2017-07-13 15:17:12 +05:30
mbauskar
65f0cfce23 Merge branch 'develop' 2017-07-13 14:04:55 +05:30
mbauskar
d48377e8e2 bumped to version 8.4.0 2017-07-13 14:34:55 +06:00
Manas Solanki
96297e1ff4 restrict user for changing the option property except few fieldtype (#3666)
* restrict user for changing the option property

* test case modification
2017-07-13 13:59:56 +05:30
Saurabh
28fb74b412 [fix] exclude docfields from callable method generator (#3676) 2017-07-13 13:28:21 +05:30
Prateeksha Singh
bb861f4a50 [fix][awesomebar] remove saved new doc entries (#3673) 2017-07-13 11:50:45 +05:30
Makarand Bauskar
406155750d [minor] fixed the delete method call in frappeclient (#3671) 2017-07-13 11:47:27 +05:30
Makarand Bauskar
9540443438 [minor] don't parse the address if email field is empty (#3675) 2017-07-13 11:33:14 +05:30
Nabin Hait
e87f9f3618 Get default company address (#3674) 2017-07-13 10:37:53 +05:30
rohitwaghchaure
6ce5cc7bff [Fix] Auto increment of series not working if series has multiple dot(.) (#3661)
* [Fix] Auto increment of series not working if series has multiple dot(.)

* Test case for naming series
2017-07-12 17:06:37 +05:30
Makarand Bauskar
e86e69b4e7 [minor] return '' if template is none & ignore if _custom_html field has no options (#3664) 2017-07-12 15:51:08 +05:30
Faris Ansari
087e88fab5 Change datepicker position based on viewport (#3662) 2017-07-12 14:27:41 +05:30
Faris Ansari
044ac18cb5 Email (#3625)
* inline images working, ability to use template name for emails

* Extract header into separate file

* Remove erp-logo

* minor refactor

* [minor] codacy

* fix for test

* Add test case for email body

* remove unused imports

* Add more tests for email body
2017-07-12 14:02:55 +05:30
Faris Ansari
13a7b60f14 Color picker (#3649)
* Added new Color picker pallet for calendar

* Review changes for Color Picker.

* Refactor code as per reviews.

* Refactor code for blur event.

* Add Color to db_schema

* set_value on click, minor cleanup

* Remove test field from Event

* styling

* revert event.json
2017-07-12 14:02:18 +05:30
Saurabh
91415a6508 Download attachments backup (#3663)
* [enhance] provision to download attachments backup

* [fix] enqueue files backup job if job not in queue
2017-07-12 12:59:03 +05:30
Rushabh Mehta
d4fbbf6903 [test] dont run test_insert_many in travis 2017-07-12 12:57:35 +05:30
Rushabh Mehta
e66d664ba6 [fix] text editor refresh for firefox if empty 2017-07-12 10:46:29 +05:30
Frappe PR Bot
4f5f43c279 [translation] translation updates (#3659) 2017-07-11 15:23:45 +05:30
Ameya Shenoy
9d9933491d Desktop, Calendar View and Gantt View tests (#3652)
* verify desktop icon and links

* added comments and fixed indentation

* refactored test_desktop, added test_calendarView, added custom functions to test_lib

* .

* added a generic func to click dropdown items

* codacy fixes

* added comments, changed test_list to delete the todo created

* Update test_lib.js
2017-07-11 14:22:56 +05:30
Makarand Bauskar
4e8bab55d5 [minor] return formatted time on format_value instead of timedelta object (#3657) 2017-07-11 14:05:36 +05:30
mbauskar
dd5121d988 Merge branch 'develop' 2017-07-11 13:01:23 +05:30
mbauskar
2f29868850 bumped to version 8.3.10 2017-07-11 13:31:23 +06:00
Rushabh Mehta
b14a625153 [fix] dont call setup twice 2017-07-11 12:39:24 +05:30
Prateeksha Singh
a309b5696a [wiz][minor] style fixes, static label, first entry mandatory (#3647) 2017-07-11 12:36:10 +05:30
Rushabh Mehta
79e89bb90e [fix] query report set filters, fixes frappe/erpnext#9775 2017-07-11 11:45:55 +05:30
Rushabh Mehta
4d9d66d916 [fix] patch 2017-07-11 11:04:45 +05:30
Rushabh Mehta
06f1eeff35 [fix] patch 2017-07-11 11:01:05 +05:30
Rushabh Mehta
9e5df7aeff [fix] patch 2017-07-11 11:00:10 +05:30
Rushabh Mehta
b6ac024576 [style] make payment pages standard (#3655) 2017-07-11 10:56:01 +05:30
Nabin Hait
8f3eb00541 Delete custom docperm while deleting doctypes (#3654)
* Delete custom docperm while deleting doctypes

* Update delete_custom_docperm_if_doctype_not_exists.py
2017-07-11 10:32:40 +05:30
Rushabh Mehta
2355dafc25 [minor] no scheduler for tests 2017-07-11 10:28:07 +05:30
Rushabh Mehta
b38aff0b89 [minor] remove commented lines in travis.yml 2017-07-11 10:28:07 +05:30
ci2014
b3bf9f35e3 Add success and error callback (#3651)
Allows developers to use callbacks like following:

	new frappe.views.CommunicationComposer({
		doc: frm.doc,
		frm: frm,
		subject: __(frm.meta.name) + ': ' + frm.docname,
		recipients: frm.doc.email || frm.doc.email_id || frm.doc.contact_email,
		attach_document_print: true,
		message: message,
		real_name: frm.doc.real_name || frm.doc.contact_display || frm.doc.contact_name,
		success: function(r) { console.log(r); alert("Mail sent!"); },
		error: function(r) { console.log(r); alert("Mail not sent!"); }
	});
2017-07-11 10:24:36 +05:30
Charles-Henri Decultot
2da4bafa1e Clear outbox modification (#3628)
* Clear Outbox modification

* Correction of SQL query
2017-07-11 10:23:06 +05:30
Manas Solanki
91ebe48c48 add only visible data for downloading report (#3620) 2017-07-11 10:22:25 +05:30
Britlog
6d1c652cfe Blog breadcrumbs (#3646)
* Blog breadcrumbs

* Update blog_post.py

* Update blog_post.py
2017-07-10 12:59:04 +05:30
mbauskar
fc52f2070b Merge branch 'develop' 2017-07-10 12:56:46 +05:30
mbauskar
fcee43d37a bumped to version 8.3.9 2017-07-10 13:26:45 +06:00