Commit graph

1092 commits

Author SHA1 Message Date
Nabin Hait
ef536e055b Merge branch 'master' into develop 2018-04-07 19:57:04 +05:30
Ameya Shenoy
a8f9a652e1 dropbox backup not ablt to find filepath (#5406) 2018-04-07 19:55:01 +05:30
Nabin Hait
944b45b62d fixed merge conflict 2018-04-06 15:05:15 +05:30
Saurabh
4e98f1689e [fix] breakdown backup process into two parts #5365 (#5390) 2018-04-05 18:24:19 +05:30
Suraj Shetty
ba91496378 Permission fixes (#5368)
* ui-fixes
- change help text
- remove if owner description and change label to Only If Creator
- adjust icon size (restricted list)
- add tags.less in build json

* remove block module for user check

* label change for module access
Rename module access section to desktop in user doctype to avoid confusion
2018-04-04 12:54:18 +05:30
Nabin Hait
82f1058ad4 Merge branch 'master' into develop 2018-04-04 11:23:21 +05:30
Suraj Shetty
0be4342649 User permissions redux (#5314)
* [start] removing simpler user permission structure

* permission changes
removed "apply user permission" from has_permission

* test fixes and other supporting fixes

* Removed Apply user permission code

* additional check to see if user has some user permissions related to a doctype

* test fixes

* removed a test

* Permission changes
- Code to restrict access if module is blocked for user.
- [Fix] ignore user perm if applicable

* List view restrictions ui changes

* removed unwanted apply user perm code

* permission (block module fix)

* permission fix

* change user permission
user permission will not be applied if user doesn't have role permission

* removed left "apply_user_permissions" property

* add user permission help template

* perm js refactor

* ui / ux changes
restrict list view before entering view if user is not permitterd
add description for if owner check in role permission manager

* codacy fixes

* permission code fix
add controller permission check
add blocked module check in build_permission

* optimized get blocked module method
2018-04-03 10:42:04 +05:30
Zarrar
edd089d4a1 append now_time to the filename incase of duplicate (#5313) 2018-04-02 18:22:12 +05:30
Achilles Rasquinha
d2bf875b8e
Merge pull request #5341 from achillesrasquinha/python3
fix fmt_money
2018-04-01 01:34:11 +05:30
Achilles Rasquinha
cd13493952 fix fmt_moeny 2018-04-01 01:21:49 +05:30
Achilles Rasquinha
6c7ea22329 fix fmt_moeny 2018-04-01 01:06:20 +05:30
Achilles Rasquinha
1ac98702dd fix fmt_moeny 2018-04-01 00:46:57 +05:30
Achilles Rasquinha
701d59b5ae fix decimal split 2018-04-01 00:44:31 +05:30
Achilles Rasquinha
2396b105fc fix fmt_moeny 2018-04-01 00:31:37 +05:30
Achilles Rasquinha
159a20e5f8 fix fmt_moeny 2018-03-31 23:59:10 +05:30
Achilles Rasquinha
0fc518ace4 python 3 fixes 2018-03-31 18:15:43 +05:30
Achilles Rasquinha
3a5c090bde fix test case 2018-03-31 18:01:11 +05:30
Achilles Rasquinha
0563788cb2 fix data import test case 2018-03-31 17:47:16 +05:30
Achilles Rasquinha
796348cd60 fix indentation 2018-03-29 15:39:49 +05:30
Achilles Rasquinha
6fcd9ad18e
Merge pull request #5309 from achillesrasquinha/cast-singles
cast singles fieldtype
2018-03-29 13:22:22 +05:30
Austin Bischoff
bf7ad3f3f1 pdf.py does not handle output properly if ContentNotFoundError is thrown (#5296)
If wkhtmltopdf throws a ContentNotFoundError exception (even though there is content) or other catchable exceptions the output keyword is not updated properly as it is in the try: section if no exception is thrown.   This causes the PDF being returned to be empty, empty PdfFileWriter() created in print_format.py line 26. This causes issues like https://github.com/frappe/erpnext/issues/13124 to occur where the viewer.js throws an error due to a bad pdf file.  The ContentNotFoundError exception is happening due to no header image in the letterhead or its a bad link being used when multi printing. 

The whole get_pdf() function should be rebuilt to test for ContentNotFoundError and other errors from wkhtmltopdf and then use a secondary try/catch to check for any other IOErrors related to being able to read the PDF back in from the file.  Right now this is not DRY since I basically copy and pasted lines 18 - 22 under line 31 so that if there is an error but the file exists the output will still be appended properly.
2018-03-29 12:00:05 +05:30
Achilles Rasquinha
062c7fa283 fixed codacy 2018-03-29 11:06:48 +05:30
Achilles Rasquinha
eef3491677 fix json loading str to bytes 2018-03-29 10:47:21 +05:30
Achilles Rasquinha
05ad109bcb cast singles fieldtype 2018-03-29 09:56:44 +05:30
Nabin Hait
ea0ce9b409 Merge branch 'master' into develop 2018-03-28 11:53:21 +05:30
Achilles Rasquinha
6a79028f6e avoid multi-redis connections 2018-03-28 11:49:27 +05:30
Zlash65
fae68f7d35 encode unicode objects 2018-03-26 14:59:41 +05:30
Achilles Rasquinha
6d8658decd fix content hash 2018-03-26 10:14:45 +05:30
Achilles Rasquinha
faf9f6c233 fix classType 2018-03-25 23:11:23 +05:30
Nabin Hait
3f3d9e52c8 Fixed merge conflict 2018-03-23 15:16:18 +05:30
Zarrar
577ce03fd8 [Hotfix] File upload fix (#5254)
* append hash if same filename found while uploading through socketio

* pass file size

* upload after filename change
2018-03-23 15:13:58 +05:30
Suraj Shetty
436d7a0d4e Data export tool (#5213)
* Data export tool
New doctype to export data
Child table export option
Ability to add filter

* Filter view refactor
Separated filter css

* Moved exporter script from data import doctype to data export doctype

* some input validation

* removed unwanted file and some style fixes

* removed console log

* hide sidebar

* renamed export method

* added data export link in setup module page

* minor fix

* refactor exporter.py

* data export ui tweaks

* codacy and bug fix

* silly code fixes

* [minor] indentation fix
2018-03-22 11:30:48 +05:30
Achilles Rasquinha
611a74445e fixed bytesio object generation for python 2 and 3 for excel, wtf email 2018-03-20 01:07:17 +05:30
Achilles Rasquinha
0bf3411391 removed dill, revert to cPickle 2018-03-19 19:23:14 +05:30
Rushabh Mehta
a3910cde9b
[debug] dont silently fail if requirements are missing (#5201) 2018-03-19 18:25:32 +05:30
Achilles Rasquinha
f06b15bccb Fixed csv utils 2018-03-18 14:14:48 +05:30
Achilles Rasquinha
962f727283 save_file for bytes 2018-03-12 14:37:20 +05:30
Achilles Rasquinha
67132f775c bytes to string 2018-03-12 14:31:04 +05:30
Prateeksha Singh
096c8b735c [charts] update API 2018-03-12 09:53:46 +05:30
Achilles Rasquinha
c148748b82 Fixed byte response headers 2018-03-09 14:51:27 +05:30
Achilles Rasquinha
3a18f5d47f content bytes 2018-03-09 13:51:27 +05:30
Achilles Rasquinha
b435559c8b fixed upload content of images 2018-03-09 12:51:56 +05:30
Achilles Rasquinha
4b5e7d80dd response headers to string 2018-03-08 20:38:18 +05:30
Achilles Rasquinha
106944abc0
Merge pull request #5115 from achillesrasquinha/py3
Create New Apps.
2018-03-05 14:55:53 +05:30
Achilles Rasquinha
1f2d5c774b create new apps 2018-03-05 14:32:54 +05:30
Suraj Shetty
1202ff1fdb List view bulk edit option (#5107)
* added actions button for bulk operations

also included bulk edit option

* page html refactor and added show/hide action option

* copy field object to avoid mutation

* commonify update method and other refactor

* fixed bug with progress bar level and minor fix with 'value' field display

* fixed frappe/erpnext#13063

* commonify field control method and removed unwanted code

* separate method for submit and cancel

* [minor] msgprint change

* refresh list on complete

* requested changes and refactor

* codacy fix

* code formatting, changed var name

* conflict fix

* description option for progress dialog

* extracted bulk operations to a separate file

* Refactor

commonified redundant method
get_json -> parse_json

* rename change_df -> replace_field
2018-03-05 11:02:50 +05:30
Faris Ansari
2fc96e1419 Remember columns state for each user (#5102)
* Remember columns state for each user

* Chart

* python 3 fix

* Toggle message refactor, Tree structure DataTable update
2018-03-05 11:02:23 +05:30
Faris Ansari
cd54b6f6a1 Query Report (#5097)
* [listview] Show freeze message

* Call refresh on same page

* Simplify query_report lifecycle, Print partially working

* PDF Print, frappe.render_pdf

* Show freeze message

* Export
2018-02-28 17:10:09 +05:30
Achilles Rasquinha
cacc0b8cb2 Use range instead of xrange, and sorted fix (#5094)
* Use range instead of xrange

* sort using cmp_to_key

* [min] import functools
2018-02-28 17:07:59 +05:30
Achilles Rasquinha
3d5a983c0c Use range instead of xrange 2018-02-28 12:26:22 +05:30