Commit graph

1049 commits

Author SHA1 Message Date
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
Achilles Rasquinha
1388870aeb six moved to moves 2018-02-24 00:17:21 +05:30
Achilles Rasquinha
e405d1cabd [PY3] Added input compat with six 2018-02-23 17:04:15 +05:30
Nabin Hait
764c5e2167 Fixed merge conflict 2018-02-23 16:58:01 +05:30
Rushabh Mehta
f20da41bf6 [fix] rename custom fields before sync if name conflicts (#5062)
* [fix] rename custom fields before sync if name conflicts

* [minor] re-add text_type

* Update doctype.py
2018-02-23 11:10:21 +05:30
Raghavendra Kamath
08a6727fb8 Add date format configurability to date format function (#5037) 2018-02-20 17:25:33 +05:30
tundebabzy
c33b3b25d4 skip file if file name isn't as expected (#5029) 2018-02-19 11:17:22 +05:30
Faris Ansari
e581be9fa8 Add translation support for DocFields (#5002)
* Initial changes for Translation

* Merged translate app into frappe core

* Minor typo fix

* Fixes while syncing translations

* Set defaults

* Fixes on setup

* Improve Code Quality

* Could Code Quality be Improved?

* Small code tweaks

* Minor typo fix

* Addition of Translatable Property

* Small fixes for Codacy Comments

* Simplify code

* Show translations in grid

* Remove enabled from Language

* Revert render_template logic

* typo

* Cleanup unused methods

* move patch to erpnext

* fix codacy

* Update patches.txt

* Update patches.txt
2018-02-16 15:12:12 +05:30
Achilles Rasquinha
14924620dc replaced raw_input to input 2018-02-15 15:38:06 +05:30
Achilles Rasquinha
c023695e71 encode utf-8 for help database 2018-02-13 18:28:48 +05:30
Britlog
ec52cb4744 Price rounding Half Up (#4904) 2018-02-13 11:03:03 +05:30
Achilles Rasquinha
255e88d297 Ensure worker is quiet during development 2018-02-08 23:58:55 +05:30
Achilles Rasquinha
30726f6706 Fix importlib error 2018-02-08 11:40:12 +05:30
Ameya Shenoy
de6fc02509 indentation fix 43941d4 (#4944) 2018-01-31 13:10:11 +05:30
Ritesh Shrivastav
43941d40d7 Provision to print a complex object for all 'bench execute' commands (#4908) 2018-01-31 11:25:01 +05:30
Achilles Rasquinha
473d3eb6be Fixes for Python 3 (#4940)
* Fixed dict_keys and lists

* [FIX] config.get keys must be list

* [FIX] pickle all objects

* [FIX] get versions in unicode

* [FIX] get log versions

* debugging

* Fixed commit ID reference

* Fixed branch reference

* Fixed doc keys to list

* [LOG] test log

* [LOG] test log

* Convert iterators to list

* removed logs

* [FIX] Trial to load templates

* Fixed codacy
2018-01-31 10:51:13 +05:30
Saurabh
2e994bd300 Merge branch 'master' into develop 2018-01-24 11:17:24 +05:30
Rushabh Mehta
61bf34f3ef
[fix] help images (#4897) 2018-01-23 15:30:37 +05:30
Rushabh Mehta
7965deaae3
[feature] add bench auto-deploy command (#4894) 2018-01-23 15:18:51 +05:30
Revant Nandgaonkar
5f22459013 Salesforce social login (#4819)
* Added Salesforce Social Login

* [Docs] Generate client_id client_secret for login providers

* [Fix] salesforce userid

Saleforce sub from openid is https://login.salesforce.com/id/ABC/XYZ
Extracting ABC/XYZ
2018-01-19 12:23:37 +05:30
Saurabh
3f43899839 resolved merge conflicts 2018-01-15 18:34:11 +05:30
Manas Solanki
edbbf4b464 add the field attach_to_field in the file (#4823) 2018-01-15 18:10:53 +05:30
Nabin Hait
f3e8446a82 Don't set window size in selenium tests 2018-01-11 12:05:40 +05:30
Saurabh
11be75723b Merge branch 'master' into develop 2018-01-09 12:15:49 +05:30
Shridhar Patil
56fa6e1cc8 Logout from all sessions on password change (#4542)
* Logout from all sessions on password change

Add checkbox to logout from all sessions
If checked logout from all sessions

https://github.com/frappe/frappe/issues/4383

* Changed spaces to tabs

* Send logout_all_sessions as 0 or 1

Convert it to in on server side and pass to update_password

* changed logout_all_sessions from bolean to int

* Move checkbox inside form
2018-01-09 10:57:42 +05:30
Zlash65
634e3f3dbb bypass root node validation if no parent found 2018-01-08 11:53:29 +05:30
Revant Nandgaonkar
bb0a2abdd5 [Fix] patch social login key refactor (#4749)
* [Fix] patch social login key refactor

* [Fix] import frappe in html_utils.py
2018-01-03 18:50:32 +05:30
Faris Ansari
6f4e2b046c
[fix] get_icon_html (#4748) 2018-01-03 18:07:38 +05:30
Revant Nandgaonkar
02aa7b6f41 Social login refactor (#4519)
* Added DocType Social Login Key

WIP for https://github.com/frappe/frappe/issues/4496
added basic fields
after_insert add provider_username and provider_userid fields on User dt
on_trash deletes added fields on User dt

* Added field to store fontawesome icon for provider

* [Patch] Social Login Keys to Social Login Key

* [Patch] Social Login Keys to Social Login Key

* Social Login Key generates boilerplate

* patch fixed for social_login_refactor

* removed patch-not working

* use social login keys to initiate flow

* Login page shows Social Login Key

* show login via if base_url present

* removed boilerplate generator

* Multiple Changes

fix zxcvbn import in password_strength.py
use of child table instead of additional fields on user dt to store username and userid

* Fetched Template on Client JS

* Frappe social login template working

* Added Social Login Key Templates

* Codacy fixes and validate social login key urls

* [Patch] Social Login Keys (untested)

* [Fix] Patch refactor social login keys

* [Fix] Patch refactor_social_login_keys manually tested

* Refactor OAuth 2.0 related changes for Social Login Key

* [Fix] Patch refactor social login keys

* Test - Adding Frappe Social Login Key

* Social Login Key Tests

check added child table entry on user for provider frappe
it also checks if userid is created

* [WIP] Office 365 Social Login Key Template

* [Fix] Social Login - Redirect URL

* [Test] Single sign-on icons for added provider

* [Fix] Codacy Errors

* [Fix] Social Login Key Form JS

* Docs Added for Social Login Key

* [Fix] Patch Refactor Social Login Keys

* Handle different icon types

Handle different icon types (image, icon, emoji) with just icon field

* Move the login methods to a new py file

frappe.integrations.oauth2_logins added
copied whitelisted guest oauth2 redirect endpoints from login.py
removing the functions from login.py will break backward compatibility

* Social Login Key Form Changes

Moved Enable field to top
Fields which are not editable are collapsed

* [Fix] Codacy Errors

* Corrected Docs, sync.py

* [Docs] Adding a social login provider

* [Fix] set frappe userid from User Social Login

* [Fix] frappe userid in oauth.py

* removed icon_type

* Use frappe.utils.is_image
2018-01-03 14:57:16 +05:30
tundebabzy
27df2485d9 UnboundLocalError When Trying To Upload File #4692 (#4693)
* allow to attach empty files

* PEP8 compliance
2017-12-28 12:56:34 +05:30
Nabin Hait
8a09f915e9 Merge branch 'master' into develop 2017-12-25 13:30:48 +05:30
Prateeksha Singh
ae0234e7e6 [export-fields] export comma separated lines for long values (#4667)
* [export-fields] export comma separated lines for long values, fixes frappe/erpnext#12085

* Update xlsxutils.py
2017-12-22 11:11:13 +05:30
Rohit Waghchaure
0a367e837e [Fix] Decimal issue 2017-12-21 15:53:22 +05:30
Nabin Hait
2e46b1d70c Merge branch 'master' into develop 2017-12-15 12:52:55 +05:30
Manas Solanki
520bfc2ae4 New data import (#4601)
* created/moved the files

* added the model for the downloading the data

* add the file with the error data

* changes added other changes and fix codacy

* changes in the config and utils files

* fixed the test cases

* minor changes in the data keys dict

* changed the test file location

* fixed the tests

* set the route in the list view and show only erors

* minor fixes in the childtable import and log tables rendering

* Refactor Download dialog to use MultiCheck
2017-12-15 12:17:24 +05:30
tundebabzy
d5dcc0b98f Issue 4616 (#4617)
* fail silently when key not found

* PEP 8: spacing, docstrings

* codacy
2017-12-14 14:57:05 +05:30
Nabin Hait
7506c49dc4 Fixed Merge conflict 2017-12-12 19:08:53 +05:30
Faris Ansari
49b63d7680 Add is_image util (#4605) 2017-12-12 19:04:38 +05:30
Brown-Harry Boma
b9201dbdd0 Make improve page link generic in help documentation (#4586) 2017-12-12 12:53:59 +05:30
Achilles Rasquinha
79a8be3633 [HOTFIX] Currency Format on Print (#4584)
* [HOTFIX] fix currency issue on print

* [HOTFIX] fix currency issue on print

* added value check for format

* added value check for format

* fix codacy
2017-12-11 15:10:32 +05:30
Prateeksha Singh
d1aa5c60b4 [Multicheck control] (#4529)
* multicheck control

* [checkboxes] replace in domain settings

* [checkboxes] use in setup_wizard domains

* [multicheck] minor

* [multicheck] set and get value as an array

* [multicheck] make controls.less

* basic view control with value as array object

* load active domains

* selenium helper: multicheck

* [multicheck] make field if not present

* [multicheck] append control in an HTML field
2017-12-06 13:25:33 +05:30
Sushant Nadkar
0ca98a0c74 Added additional_offset parameter to scroll_to and login functions (#4545) 2017-11-30 14:27:53 +05:30
Zarrar
9927eecc9c fix issue with node delete for tree based doctypes (#4554) 2017-11-30 11:51:43 +05:30
rohitwaghchaure
ef7c6c3389 [fix] Item group test cases (#4555) 2017-11-30 11:48:59 +05:30