Commit graph

771 commits

Author SHA1 Message Date
rohitwaghchaure
0aa97b7aaa Made seprate method to parse the naming series (#3293) 2017-05-16 12:46:58 +05:30
Prateeksha Singh
b23aa1446b Multiselect dialog for getting items (#3255)
* First approach by making a control

* Implement multi select for child tables

* Basic UI and items fetch in place

* Multiselect with checkboxes

* Functional modal with filters and new_doc

* Map filter fields to target_doc

* pass json arrays instead of strings

* Get items from quotation (in SO) working

* [minor] fix link route in list

* [minor] cleanup

* Add date, select first by default

* map_docs test, default date field

* [minor][fix] make new button bug

* [minor] move map_docs to erpnext

* [minor] format dates
2017-05-15 11:29:41 +05:30
Rushabh Mehta
0a5df4fb4d [debug] show where permission is failing (#3264)
* [debug] show where permission is failing

* [fix] document.py
2017-05-11 11:46:47 +05:30
tundebabzy
6e29d9e925 xrange to range (#3237)
* introduces build status for local fork

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range

* converts xrange to range using six.moves.range

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* Revert "introduces build status for local fork"

This reverts commit 61f40983d0b3c6725369171ab850a18e5c029cc4.
2017-05-11 10:55:34 +05:30
tundebabzy
6fbe20caaa Except and raise statement python 3 compatible style (#3216)
* changes exception and raise statements to python 3 style

* changes except statement to python 3 style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* adds six.reraise to fix python 3 style raise statements with traceback

* fixes indentation
2017-05-11 10:51:59 +05:30
Rushabh Mehta
1b13539b4f [fix] covert to unicode before sanitizing #8347 2017-05-10 14:24:55 +05:30
Rushabh Mehta
3d4a05490f [minor] rename_doc.py 2017-05-08 16:19:41 +05:30
Rushabh Mehta
262f361021 [minor] ignore permissions option for filters in db_query (#3234) 2017-05-06 12:43:47 +05:30
Nabin Hait
bc4a1fa238 In global search property not allowed for no_value_fields 2017-05-02 14:08:08 +05:30
Makarand Bauskar
8eeda18692 [fixes] minor fix for between operator filter (#3196)
* [fixes] minor fix for between operator filter

* [minor] added a test case for between operator filter
2017-05-01 14:14:04 +05:30
tundebabzy
7b41d7e5eb Python 3 compatible print statements (#3199)
* changes print statements in file to python 3 compatible style using `__future__`

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* changes deprecated md5 module to hashlib

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements
2017-05-01 12:34:29 +05:30
Faris Ansari
95edd73b5b Fix Date between query 2017-04-28 14:43:32 +05:30
rohitwaghchaure
ae8aa76246 Dynamic link validation, sort the sequence of the doctypes based on the field User Cannot Search (#3173)
* Ignore dynamic link validation for the doctypes, which has permission do not search and view by the users

* fix test cases

* Update

* Update dynamic_links.py

* Update dynamic_links.py
2017-04-27 16:48:51 +05:30
Rushabh Mehta
4832c3b50f [fix] missing first column in HTML for auto_email_report 2017-04-26 15:33:59 +05:30
Rushabh Mehta
346bbb008e [fix] ux for auto email report 2017-04-25 12:58:10 +05:30
Nabin Hait
0398e2d397 trim tables for a doctype 2017-04-24 16:13:14 +05:30
Nabin Hait
ae088d2211 Drop unwanted indexes from Communication and fixes for restoring v7 backup on v8 bench (#3112) 2017-04-19 15:49:55 +05:30
Rushabh Mehta
a1e31ed20b [feature] set decimal precision for currency in currency settings and currency formatting will be global 2017-04-13 12:39:01 +05:30
Rushabh Mehta
54df9298f8 [enhance] Signature Control (#3024)
* - Add controller for signature field, including buttons for save and reset
- Add library and style

* Add DB mapping for Signature field -> fix bug not saving
Add empty image, and auto load image when loading form
Add option for Signature field type on Doctype form

* Make field uneditable after submitting

* Remove console log and revert adding empty lines

* Update layout, remove edit mode/button, make save button compact. Refactor and use change event to trigger save.

* [cleanup] Signature Control
2017-04-07 13:52:42 +05:30
Rushabh Mehta
5e55f66db2 [minor] fix rename_doc for old patches 2017-04-02 21:17:29 +05:30
Rushabh Mehta
49517479cc [fix] update global search in the foreground process while migration, fixes frappe/erpnext#8233 2017-03-31 17:32:51 +05:30
Rushabh Mehta
e8af0b15b1 [minor] add a separator for append_number_if_name_exists 2017-03-31 17:21:21 +05:30
Rushabh Mehta
2c8754a96e [fix] save un translated doctype names for desktop icons, fixes frappe/erpnext#8157 2017-03-31 17:18:17 +05:30
Rushabh Mehta
c79055c40f [minor] refactor naming.py 2017-03-21 17:44:22 +01:00
Nabin Hait
d836d1367f Fixed merge conflict 2017-03-15 11:26:55 +05:30
mbauskar
5cd886b8cf [hook] added before_change hook to trigger email_alerts before db_set 2017-03-10 09:51:01 +05:30
Nabin Hait
7fe50c885a Merge branch 'master' into develop 2017-03-09 14:59:02 +05:30
Nabin Hait
54af579e09 Merge pull request #2823 from wshurafa/fix-query-condition-case-sensitivity
Fix query condition case sensitivity
2017-03-08 14:03:06 +05:30
Wael AlShurafa
3033aa4d5b Fix condition operator case sensitivity 2017-03-07 21:52:20 +02:00
Rushabh Mehta
1e7229c45f [enhance] global search in website (#2810)
* [enhance] global search in website

* [fix] create table query

* [website] navbar search in header if set

* [minor] navbar_search in website settings
2017-03-07 16:37:50 +05:30
Rohit Waghchaure
1644e273de minor fix 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
8a2c83918b changed user_roles to roles 2017-03-06 14:42:13 +05:30
Rohit Waghchaure
e57e9f170b [Enhancement] Provision to add roles in the report 2017-03-06 14:38:54 +05:30
Faris Ansari
1a76d64781 ListView refactor (#2715)
* [list_settings] save last_view, kanban_board, gantt_mode

* listview.js cleanup

* image_view refactor

* image_view done

* wip

* [photoswipe] wip

* show view for calendar, kanban even if no results

* [gantt_view] refactor into separate file

* [imageview] 3 column border fix

* [imageview] gallery working

* delete old libs

* indentation to tabs

* [gantt] update lib, custom popup html

* custom fontawesome checkbox

* reset gantt state when not permitted

* checkbox styling fix

* working commit

* image, calendar, gantt view working

* more refactoring, kanban view

* minor

* removed old files

* user settings improved

* filters and sort selector de-coupling

* wip

* [imageview] white pswp background

* kanban filters saving fixed

* fixed reportview

* minor

* removed listing.js

* minor fixes and cleanup

* patch for UserSettings table

* patch fix
2017-03-06 11:32:27 +05:30
Rushabh Mehta
6dff729d88 [enhance] Web View settings in DocType (#2798)
* [enhance] add web view settings doctype

* [enhance] add web view settings doctype

* [fix] default for checks (?)

* [fix] framework json

* [fix] missing return

* [fix] hooks for website_generators
2017-03-05 11:12:32 +05:30
Nabin Hait
b8bf36e45b Merge branch 'master' into develop 2017-03-02 22:43:21 +05:30
Nabin Hait
b5936ffa82 Validate sub-query in order by and group by 2017-03-02 18:50:04 +05:30
Nabin Hait
cc12dc033e Minor fix 2017-03-02 18:02:46 +05:30
Nabin Hait
6bdb453cb4 Update db_query.py 2017-03-02 17:49:30 +05:30
Nabin Hait
0a844d15d5 Fixed merge conflict 2017-03-02 17:02:40 +05:30
Saurabh
b2b2df56aa [fix] consider optional fields too while chekcing sql injection 2017-03-02 16:52:21 +05:30
Nabin Hait
29d9abb7bd Update db_query.py 2017-03-02 13:01:41 +05:30
Nabin Hait
25bce97acd Update db_query.py 2017-03-02 12:57:49 +05:30
Saurabh
acb660322d [fix] trim whitespaces 2017-02-28 19:15:39 +05:30
Saurabh
049d51cdf1 [security][fix] fixed order by and group by clause vulnerability for sql injection 2017-02-28 18:52:07 +05:30
Rushabh Mehta
155cdff99b [fix] socket io limit doc_open and other minor fixes 2017-02-24 14:46:34 +05:30
mbauskar
e5f296b78d [minor] delete feedback and open feedback request if document is deleted 2017-02-22 15:41:33 +05:30
Rushabh Mehta
86ceb21005 [feature] Global Search (again) (#2710)
* [start] global search frappe/erpnext#6674

* [fix] setup before running test

* [start] global search frappe/erpnext#6674

* Display result as rudimentary list, rebuild old doctypes

* Media view, child tables, delete document updates, searchable fields

* More results UI

* Code clean up

* remove msgprint from document.py to resolve merge conflict

* Modularization stage 1, get show more to work with it

* Dedicated modal Search bar works, some clean up needed

* Can't data-dismiss on links, Bootstrap issue, use hashchange

* Accomodate missing field content syndrome

* Search in boolean mode, make GS default in awesome bar, fix double modal bug and cleanup

* Add in Meta

* Add in customize form

* Modularise Global Search

* Search object

* Commonify Search UI: Stage I

* II: save list state, UI, default condensed view, refactor

* Fix SQL bug, Refactor awesome bar, Fix unicode bug, add nav results

* Refactor using separate search objects, some async issues

* Fix async flow

* Fix preceding more list bug

* UI additions

* another async fix, back link

* Help: Stage I

* Help: Stage II

* Background jobs, fix route options bug

* Fix GS syncing on install

* Add GS options in awesome bar: test

* Input now remembers search type state

* More UI updates

* Add description for GS results in awesome bar

* Fix help modal bug

* Fix: not commit during install

* Test cases, some fixes

* Update in_test flag in enqueue

* Disable GS sync when not install_db

* Add flag check

* Disable field in child tables

* Cleanups

* Create table fix

* Fix redis exception, remove commit enqueue, add gs in migrate

* Fix tests

* Single enqueue

* cleanups

* Fix tests

* Fix event test

* Fix duplication, search as first option

* Add show name in global search

* fix event tests and desk.less

* Fix communication.json

* [fixes] wip

* [fix] tests

* [minor] for tests

* [minor] for tests

* [minor] for tests

* [minor] for tests
2017-02-13 14:50:54 +05:30
Rushabh Mehta
e329962756 [minor] remove in_fitler, fixes #7381 (#2649) 2017-01-30 15:30:44 +05:30
paurosello
583100ac51 Set Only Once for Datetime (#2621)
The same problem that Date was facing appears with Datetime, otherwise it fails as it is comparing different types.
2017-01-24 10:58:33 +05:30