Commit graph

819 commits

Author SHA1 Message Date
Nabin Hait
7266e673ac Merge branch 'master' into develop 2017-09-12 16:09:19 +05:30
Nabin Hait
e9eb5c4021 Changed order to avoid deadlock 2017-09-11 19:22:58 +05:30
Rushabh Mehta
4bd7f409de Merge pull request #3975 from pratu16x7/document-get-doc-before-save
[minor] `_doc_before_save` wrapper
2017-09-06 18:20:26 +05:30
pratu16x7
6843b10fcd [minor] use cached before update doc value after save 2017-09-01 19:10:51 +05:30
Makarand Bauskar
6fa9967a04 [hotfix] throw DoesNotExistError if doctype is not available on Delete api (#4013)
* [hotfix] throw DoesNotExistError if doctype is not available on Delete api

* [fixes] aded tests cases and codecy, travis fixes
2017-09-01 09:16:32 +05:30
pratu16x7
71ad9afc87 check if before_save exists 2017-08-30 16:43:46 +05:30
Aditya Hase
7da257bfaa Use raise instead of six.reraise 2017-08-22 17:20:39 +05:30
Rushabh Mehta
3ba0baaff4 Merge pull request #3947 from rmehta/print-style
[added] print style
2017-08-22 11:03:51 +05:30
Rushabh Mehta
7dedc69461 [print-style] sync, fix tests and remove selection 2017-08-18 14:53:38 +05:30
mbauskar
bc603de8be resolved conflicts 2017-08-16 18:24:21 +05:30
Robert Kirschner
67668684ab [minor] fix of translatable terms 2017-08-14 13:12:30 +02:00
Rushabh Mehta
05c88fa3f0 [minor] make email alert configurable, so we can use it list default print formats 2017-08-14 12:58:32 +05:30
Rushabh Mehta
5a31e583a2 Merge pull request #3912 from adityahase/fix-raise
Replace Py2 raise syntax with Py 3
2017-08-11 13:01:40 +05:30
Rushabh Mehta
1b9dd05481 Merge pull request #3910 from adityahase/fix-maxlength-comparison
Make sure that max_length[0][0] is comparable with new_length
2017-08-11 12:59:57 +05:30
Rushabh Mehta
6726f7e1b0 Merge pull request #3908 from adityahase/fix-method-string
Convert method name to string instead of encoding
2017-08-11 12:58:04 +05:30
Rushabh Mehta
751a35fe57 Merge pull request #3907 from adityahase/fix-sql-dict-values
Explicitly convert dict.values() to list
2017-08-11 12:57:22 +05:30
Aditya Hase
2da880fc42 Replace Py2 raise syntax with Py 3 2017-08-11 00:38:58 +05:30
Aditya Hase
5cc6903cd5 Make sure that max_length[0][0] is comparable with new_length 2017-08-11 00:38:01 +05:30
Aditya Hase
39af5d1f1c Convert method name to string instead of encoding 2017-08-11 00:20:11 +05:30
Aditya Hase
dfedd584ca Explicitly convert dict.values() to list 2017-08-11 00:12:00 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
rohitwaghchaure
8e362dfe56 [Fix] User not able to delete if it's linked with the communication (#3884) 2017-08-09 15:33:15 +05:30
mbauskar
e4675498bb Merge branch 'master' into staging 2017-08-04 11:02:07 +05:30
rohitwaghchaure
5925aada69 Added order by in_create for dynamic link query (#3849) 2017-08-04 10:55:38 +05:30
mbauskar
53167626ab resolved merge conflicts 2017-08-02 18:32:30 +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
Makarand Bauskar
fc715efdbb [hotfix] fixes for AttributeError: 'NoneType' object has no attribute 'split' (#3840)
* [hotfix] fixes for AttributeError: 'NoneType' object has no attribute 'split'

* [tests] added test cases for not in and in filters
2017-08-02 12:47:10 +05:30
Aditya Hase
774c5fd2c6 Replaced mixed usage of tabs and spaces for indents with tabs only (#3828) 2017-08-01 11:53:58 +05:30
Rushabh Mehta
f609a478ae [refactor] user permissions (#3713)
* [refactor] user permissions

* [fix] tests

* [ux] user-permissions

* [minor] cleanup system settings

* [minor] end progress
2017-07-28 14:33:31 +05:30
tundebabzy
993692ba32 Issue changing 'Unique' field option in v8 (#3760)
* fix wrong query

* test unique constraint removal
2017-07-24 11:27:59 +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
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
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
Manas Solanki
d0857f8013 Apply User Permissions is being ignored for blank field values (#3496)
* issue where Apply User Permissions is being ignored for blank field values

* configurable settings and added test case

* Update system_settings.json

* save and use locally stored value for strict user permission
2017-07-06 10:48:12 +05:30
Saurabh
19ee84a58e Validate column length (#3556)
* [fix] validate column length while creating doctype or custom field

* [fix] not allow user to add custom fields in [Custom Field, Customize Form Field, Customize Form, Custom Script, Property Setter]

* [fix] check if fieldname is conflicting with method names

* [fix] don't allow Custom Script and Property Setter to be updated via customize form
2017-07-05 15:03:01 +05:30
Rushabh Mehta
1b3fab9daf [text-editor] dont keep refreshing value and better message for mandatory missing 2017-07-05 14:38:05 +05:30
rohitwaghchaure
5b2d7cb12c [Fix] Not able to rename the company if it's linked with the single doctype which has mandatory fields (#3614) 2017-07-05 13:47:17 +05:30
tunde
8c9249b629 [minor] corrects docstring for set_new_name 2017-06-27 14:00:23 +01:00
Rushabh Mehta
0c19319788 [minor] correct flag setting 2017-06-22 18:21:48 +05:30
Rushabh Mehta
6a725d6c95 [cleanups] 2017-06-22 18:21:48 +05:30
Rushabh Mehta
45cbb7facc [minor] cleanups and optimization fixes 2017-06-20 12:46:43 +05:30
Rushabh Mehta
19736308b6 [minor] fix meta.py 2017-06-19 12:24:27 +05:30
tundebabzy
bbde2ec4cf rewrite use of dict.iteritems (#3498)
* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility
2017-06-19 09:10:21 +05:30
tundebabzy
702e52e665 Change raise syntax to python 3 compatible style (#3497)
* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement
2017-06-19 09:07:19 +05:30
Rushabh Mehta
d499ab619c [optimize] make things faster, lots of low hanging fruits fixed (#3495)
* [optimize] make things faster, lots of low hanging fruits fixed

* [fix] dont set gravatar for administrator and guest

* [fix] autocommit

* [fix] clear doctype cache
2017-06-19 09:04:25 +05:30
Prateeksha Singh
d8fb2c2c0d [fix] Enqueue syncing global search (#3455)
* [fix] Enqueue syncing global search

* make passing flags optional

* Create global_search.py
2017-06-16 11:02:22 +05:30
rohitwaghchaure
59acca249a [fix] Email alert for value change not working for the allow on submit field (#3433) 2017-06-06 18:06:05 +05:30
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