Commit graph

12856 commits

Author SHA1 Message Date
mbauskar
a6fa154287 [minor] enabled allow error traceback ins system settings 2017-06-29 15:00:41 +05:30
mbauskar
73e4bb5662 Merge branch 'master' into develop 2017-06-29 12:08:53 +05:30
mbauskar
9f20e1cd16 Merge branch 'hotfix' 2017-06-29 12:08:53 +05:30
mbauskar
18ac7d444b bumped to version 8.1.4 2017-06-29 12:38:53 +06:00
Makarand Bauskar
4b8b99030e Merge pull request #3581 from saurabh6790/date_legacy_function
[fix] add date into legacy support for js globals
2017-06-29 12:06:04 +05:30
Saurabh
1dee1a9369 [fix] add date into legacy support for js globals 2017-06-29 12:02:18 +05:30
Manas Solanki
24ad910211 In pemission manager make doctype and role list sorted (#3576) 2017-06-28 14:41:14 +05:30
Vishal Dhayagude
0dc4ba2c9e [fix]Filter using 'Not Equals' condition (#3571) 2017-06-28 14:40:27 +05:30
rohitwaghchaure
1767922b8d [Fix] In words for polish lanaguage (#3577) 2017-06-28 14:38:55 +05:30
tundebabzy
c98b97a21c Using " causes issues #7776 (#3563)
* refactors `get_route_str`.
The result is the addition of two new functions - `get_raw_route_str` and `_decode_str`

* delays decoding of route parts
2017-06-28 14:38:15 +05:30
Rushabh Mehta
e232abdafd [enhannce] new filter design (#3553)
* [enhannce] new filter design

* [minor]
2017-06-28 14:25:27 +05:30
mbauskar
26638a9a83 Merge branch 'develop' 2017-06-28 10:38:39 +05:30
mbauskar
c569ab32d5 bumped to version 8.1.3 2017-06-28 11:08:39 +06:00
Makarand Bauskar
93eb8b229c Merge pull request #3560 from samicoder/master
[fix] non frappe commands execution after last bench_helper update
2017-06-27 19:32:39 +05:30
Makarand Bauskar
de2ce50d7a Merge pull request #3534 from rohitwaghchaure/field_type_change_issue
[Fix] Don't allow user to change the select fieldtype to data from the customize form
2017-06-27 19:29:54 +05:30
Makarand Bauskar
2f8ee4f6f7 Merge pull request #3574 from rohitwaghchaure/date_field_issue
[Fix] Date fields not changing when viewing another records
2017-06-27 19:18:49 +05:30
Makarand Bauskar
55e266c865 Merge pull request #3575 from tundebabzy/fix_docstring
[minor] corrects docstring for `set_new_name`
2017-06-27 19:13:15 +05:30
Makarand Bauskar
309093551e Merge pull request #3572 from rmehta/add-reginal-js
[regional] ability to load country-wise js for forms
2017-06-27 19:08:54 +05:30
Rohit Waghchaure
15241d3f37 [Fix] Date fields not changing when viewing another records 2017-06-27 18:33:38 +05:30
tunde
8c9249b629 [minor] corrects docstring for set_new_name 2017-06-27 14:00:23 +01:00
Makarand Bauskar
a4b6cd9db6 Merge pull request #3573 from pratu16x7/search-fixes
[fix] skipped awesome bar options
2017-06-27 18:00:32 +05:30
pratu16x7
7595ea6891 [fix] skipped awesome bar options 2017-06-27 17:53:10 +05:30
Rushabh Mehta
1ba6e32508 [fix] system_country can be none 2017-06-27 17:45:09 +05:30
Rushabh Mehta
f5b975305d [regional] ability to load country-wise js for forms 2017-06-27 17:30:50 +05:30
Makarand Bauskar
3c58a54a8d Merge pull request #3570 from pratu16x7/add-child-clone-fix
[fix] Allow for cloning other children
2017-06-27 16:02:32 +05:30
pratu16x7
86ceaaf0a3 [minor] 2017-06-27 14:23:11 +05:30
pratu16x7
e112c71b86 allow for cloning other children 2017-06-27 14:05:41 +05:30
Makarand Bauskar
f04502632c Merge pull request #3568 from frappe-pr-bot/translations-2017-06-27
[translation] translation update
2017-06-27 13:31:56 +05:30
rohitwaghchaure
c4e08a8e87 Merge pull request #3569 from rmehta/filter-ignore-validate
[minor] ignore link validation for reports
2017-06-27 13:23:00 +05:30
Rushabh Mehta
90d905c809 [minor] ignore link validation for reports 2017-06-27 13:06:54 +05:30
frappe-pr-bot
a6f053389e [translation] translation updates 2017-06-27 08:34:50 +02:00
Makarand Bauskar
760ab551bb Merge pull request #3547 from rmehta/fixes-for-gst
Permissions and other minor fixes for GST
2017-06-27 11:19:08 +05:30
Suyash Phadtare
17a43a4748 [Feature] Enable overriding Quick Entry in custom app (#3519)
* [Feature] Override Quick Entry Class in custom app

* [minor] remove var from if block

* [minor] Rename QuickEntryController to QuickEntryForm

* [fixes] indentation & syntax fixes

* [fix] indentation fix
2017-06-26 12:10:04 +05:30
Saurabh
1410bb4452 Merge branch 'develop' 2017-06-26 10:58:37 +05:30
Saurabh
f32f199586 bumped to version 8.1.2 2017-06-26 11:28:37 +06:00
Rushabh Mehta
ba2f800a8d [fix] query report filters 2017-06-26 10:50:29 +05:30
Vishal Dhayagude
42100a15bc [fix]syntax error on file list (#3559)
* [fix]syntax error on file list

* [fix]Linked with file bug
2017-06-25 10:58:27 +05:30
samicoder
173523ce8b fix other apps command execution 2017-06-24 18:21:40 +03:00
samicoder
a57473c3cd Merge pull request #1 from frappe/master
Master
2017-06-24 18:17:53 +03:00
Rohit Waghchaure
2c5e6c7d0f [Fix] Don't allow user to change the select fieldtype to data from the customize form 2017-06-24 18:18:46 +05:30
Sophat Vathana
7074d0cfe1 Update requirements.txt (#3522) 2017-06-23 18:01:25 +05:30
Prateeksha Singh
283f67d752 commonify parse_validate_and_set_in_modal, onchange in df (#3540) 2017-06-23 18:00:57 +05:30
Manas Solanki
64262dc635 error in the reports while downloading in the mobile app (#3551) 2017-06-23 17:53:42 +05:30
almeidapaulopt
615f135311 file list error + codacy (#3552) 2017-06-23 17:44:59 +05:30
Charles-Henri Decultot
ef3b892a5e New avatar-xl css class (#3543) 2017-06-23 17:43:54 +05:30
Rushabh Mehta
834ee797ca [wip] add inline images in frappe.sendmail (#3528) 2017-06-23 17:23:29 +05:30
Faris Ansari
fd082ea9f0 Fallback calendar color to blue (#3542) 2017-06-22 22:50:41 +05:30
Charles-Henri Decultot
fb85e91ed6 Bug in contact.js (#3546) 2017-06-22 22:50:16 +05:30
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