Commit graph

1014 commits

Author SHA1 Message Date
Rushabh Mehta
5472f2c327 [fix] pypdf > pydf2 2017-08-11 16:22:55 +05:30
Rushabh Mehta
9c03e3aef7 [fix] pypdf > pydf2 2017-08-11 14:22:15 +05:30
Rushabh Mehta
d2f314e021 Merge pull request #3911 from adityahase/fix-urlencode
Import six.moves.urllib.parse.urlencode instead of urllib.urlencode
2017-08-11 13:02:43 +05:30
Rushabh Mehta
1d6ba9d685 Merge pull request #3913 from adityahase/fix-pypdf
Use PyPDF2 instead of pyPdf
2017-08-11 13:01:55 +05:30
Rushabh Mehta
e71fb55702 Merge branch 'develop' into fix-urlencode 2017-08-11 13:01:24 +05:30
Faris Ansari
7397b68290 Scrub urls fix (#3918)
* Don't expand mailto urls

* Add test case
2017-08-11 13:00:10 +05:30
Rushabh Mehta
ce48aaa2c9 Merge branch 'develop' into fix-long 2017-08-11 12:59:02 +05:30
Rushabh Mehta
4d7a7faa5b Merge pull request #3906 from adityahase/fix-basestring
Replaced all instances of basestring with six.string_types
2017-08-11 12:57:07 +05:30
Rushabh Mehta
14d6f770a4 Merge pull request #3902 from adityahase/fix-string-letters
Use string.ascii_letters instead of string.letters
2017-08-11 12:55:24 +05:30
Rushabh Mehta
8ca5ee3926 Merge pull request #3901 from adityahase/fix-relative-background-jobs-import
Use absolute import to import frappe.utils.background_jobs
2017-08-11 12:55:03 +05:30
Aditya Hase
000d9a41b6 Use PyPDF2 instead of pyPdf 2017-08-11 00:39:24 +05:30
Aditya Hase
e324406c8a Import six.moves.urllib.parse.urlencode instead of urllib.urlencode 2017-08-11 00:38:26 +05:30
Aditya Hase
69c255661d Replaced long with six.integer_types 2017-08-11 00:32:26 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
Aditya Hase
5313c2b2fe Use string.ascii_letters instead of string.letters 2017-08-10 23:59:34 +05:30
Aditya Hase
73a34c2234 Use absolute import to import frappe.utils.background_jobs 2017-08-10 22:51:33 +05:30
Aditya Hase
b51ad328af Convert dict.keys() to list 2017-08-10 22:06:09 +05:30
Rushabh Mehta
9785e925b7 [fix] for ci 2017-08-10 14:55:04 +05:30
Rushabh Mehta
7954ea453c [tests] less verbose logs 2017-08-10 11:50:22 +05:30
Aditya Hase
aac8822d05 Replaced cPickle import with six.moves.cPickle (#3858) 2017-08-04 10:53:21 +05:30
Rushabh Mehta
5cebfb26b9 [minor] fix patch and module command 2017-08-03 12:02:18 +05:30
Makarand Bauskar
09a3a77ec2 [revert] Print traceback on ImportError in get_app_commands (#3846)
* [revert] Print traceback on ImportError in get_app_commands

* [tests] fixed the customize form test cases
2017-08-03 11:30:06 +05:30
Aditya Hase
16a9bdfd31 Replaced urllib.unquote imports with six.moves.urllib.parse.unquote (#3836) 2017-08-02 17:09:31 +05:30
Aditya Hase
9d7d384a63 Replaced urllib.quote imports with six.moves.urllib.parse.quote (#3837) 2017-08-02 17:09:16 +05:30
Aditya Hase
b4b889835a Print traceback on ImportError in get_app_commands (#3833) 2017-08-02 17:04:01 +05:30
Aditya Hase
ec9a01e3aa Replaced 'except' clause syntax (#3827) 2017-08-02 16:58:24 +05:30
Aditya Hase
e6bd1e4995 Replaced all instances of 'unicode' with 'six.text_type' (#3825) 2017-08-02 16:57:39 +05:30
Rushabh Mehta
ece91d903c [docs] simplified docs home 2017-07-31 17:39:44 +05:30
Aditya Hase
928ebb66a6 Replaced HTMLParser imports with six.moves.html_parser (#3812) 2017-07-31 10:58:22 +05:30
Aditya Hase
839874b357 Redefine lambdas to accept multiple args instead of a packed tuple (#3811)
Unlike Python 2, Python 3 does not automatically unpack arguments
to lambdas passed as a tuple into named arguments.
Redefinining lamdas to accept separate arguments instead of a
tuple allows them to work in both Python 2 and 3.
2017-07-31 10:55:00 +05:30
Aditya Hase
d3395dfd28 Replaced StringIO and cStringIO imports with six.StringIO (#3810)
StringIO and cStringIO modules are replaced with io.StringIO in
Python 3. six.StringIO is an alias for StringIO.StringIO in
Python 2 and io.StringIO in Python 3
2017-07-31 10:54:17 +05:30
Aditya Hase
bab692ff59 Replaced mixed usage of tabs and spaces for indents with tabs only (#3813)
Python 3 (PEP 8) strictly disallows mixed use of tabs and spaces
for indentation
frappe innstalltion only throws error on frappe/utils/jinja.py as
of now but the rest are almost equally likely to fail, so changed
all of them in one commit
2017-07-31 10:50:26 +05:30
Rushabh Mehta
c519122929 [docs] Build docs in an app (#3796)
* [docs] to be rendered in website

* [docs] generating-docs.md

* [fix] codacy

* [docs] minor updates

* [fix] routing
2017-07-28 11:43:16 +05:30
Prateeksha Singh
7fa8148d33 Graph additions (#3776)
* remove hardcoded height and width

* [graph] relative measures, offsets, generalise all base jobs

* Multiple datasets! (individually colored)

* [graph] Tooltips

* [graph] animate and change values

* [graph] percentage graph

* [graph] custom height, window resize refresh

* [graph] style changes

* [graph] update docs

* [graphs] make graphs.less

* [graphs] prefix classes with 'graph-', nest inside parent class
2017-07-28 11:14:33 +05:30
Faris Ansari
3f93565553 Email designs (#3786)
* New message email

* Mentioned in a comment

* File backup email

* Feedback email

* Administrator logged in email

* Upcoming events email

* minor

* Add header title and indicator color
2017-07-27 17:51:20 +05:30
Makarand Bauskar
a66845036b [minor] revert enable all roles (#3790) 2017-07-27 09:01:48 +05:30
Makarand Bauskar
3ae5baad2e [minor] added empty line after country fixture installation (#3740) 2017-07-19 15:52:39 +05:30
Makarand Bauskar
9daa7b3751 [domainify] hide restrict to domain modules from modules page (#3677)
* [domainify] hide restrict to domain modules from modules page

* [minor] cleared the domainification cache and other minor fixes

* Update test_domainification.py
2017-07-18 12:29:57 +05:30
Makarand Bauskar
7aa013011e [minor][https://github.com/frappe/erpnext/issues/9892] enabled all roles and domain before running tests (#3719) 2017-07-18 11:17:36 +05:30
Prateeksha Singh
b602a07c7a Graphs, and target notifications (#3641)
* [sales goal] in company; graph, notifs

* cleanup notifications.js, summary and specific val in graph

* Add line graph, add goal data methods in goal.py

* [tests] targets in notification config

* [minor] type of graph as argument in parent

* Update graph docs

* remove company dependent test for notification

* [fix] test

* look for monthly history in cache

* check for cached graph data in field
2017-07-17 14:51:30 +05:30
Makarand Bauskar
3779aa8379 [hotfix] get app version from app.__version__ instead of hooks (#3702) 2017-07-17 12:40:32 +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
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
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
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
Makarand Bauskar
4e8bab55d5 [minor] return formatted time on format_value instead of timedelta object (#3657) 2017-07-11 14:05:36 +05:30
Rushabh Mehta
8eedcda8e9 [fix] for tests 2017-07-06 10:49:21 +05:30
Revant Nandgaonkar
36a54e29e8 Add js to doctype calendar view (#3599) 2017-07-05 11:08:09 +05:30
mbauskar
389344489d [minor] return None is records are not available 2017-07-03 15:54:39 +05:30
Manas Solanki
b7e1060ea7 removed the xlwt and use the openpyxl for sending the auto email report in xlsx format (#3590) 2017-07-03 12:27:34 +05:30