Commit graph

6168 commits

Author SHA1 Message Date
Anand Doshi
9e54ccc4a8 Merge pull request #836 from anandpdoshi/anand-september-10
[permissions] Query Report: don't use a doctype for filtering User Permissions, if the column representing this doctype is empty
2014-09-10 17:27:18 +05:30
Anand Doshi
65ff08e7e9 [permissions] Query Report: don't use a doctype for filtering User Permissions, if the column representing this doctype is empty 2014-09-10 16:56:23 +05:30
Rushabh Mehta
fcbdc01e5f Merge pull request #834 from anandpdoshi/anand-september-10
[fix] File Manager
2014-09-10 16:14:16 +05:30
Anand Doshi
e09fc93001 [fix] File Manager 2014-09-10 15:36:02 +05:30
Anand Doshi
eb846fb38d Merge pull request #831 from anandpdoshi/anand-september-9
Don't allow to set 'Allow on Submit' for standard fields. Fixes frappe/erpnext#956
2014-09-10 15:24:40 +05:30
Nabin Hait
6bff7141da Merge pull request #833 from 81552433qqcom/d1
query report js "Load Report" translation.
2014-09-10 10:11:04 +05:30
81552433qqcom
924d5efd52 query report js "Load Report" translation. 2014-09-10 11:40:05 +08:00
Rushabh Mehta
9da983b029 Merge pull request #832 from 81552433qqcom/d1
Script report name doesn't get translated.
2014-09-09 16:52:47 +05:30
81552433qqcom
f032e0fd98 Script report name doesn't get translated. 2014-09-09 19:12:28 +08:00
Anand Doshi
11801cfbd2 Don't allow to set 'Allow on Submit' for standard fields. Fixes frappe/erpnext#956 2014-09-09 15:25:32 +05:30
Pratik Vyas
20e36ff3f5 Merge branch 'develop' 2014-09-09 15:09:17 +05:30
Pratik Vyas
36b5720ac5 bumped to version 4.3.0 2014-09-09 15:39:17 +06:00
Pratik Vyas
85187ab644 change version in hooks.py 2014-09-09 15:08:41 +05:30
Anand Doshi
66ea988230 Merge pull request #830 from anandpdoshi/anand-september-9
[fix] setting a default value using create_new
2014-09-09 13:01:52 +05:30
Anand Doshi
f8d9271094 [fix] setting a default value using create_new 2014-09-09 12:49:16 +05:30
Rushabh Mehta
87af84073f Merge pull request #828 from anandpdoshi/anand-september-8
Minor: Delete permission for User DocType, validate search fields, use in_list_view to render Grid Row static display
2014-09-09 09:16:37 +05:30
Anand Doshi
fac8578b8b [minor] User in_list_view for rendering Grid Row static display 2014-09-08 17:42:06 +05:30
Anand Doshi
85e6a68c0e Validate search fields 2014-09-08 15:48:24 +05:30
Anand Doshi
bcbc63d277 [minor] System Manager has Delete permission for User 2014-09-08 15:37:39 +05:30
Anand Doshi
00fdee7ec9 Merge pull request #827 from rmehta/translated-08-sep-2014
[translations]
2014-09-08 15:29:06 +05:30
RM
8862ffa277 [translations] 2014-09-08 09:17:23 +00:00
Anand Doshi
c0e957da57 Merge pull request #822 from 81552433qqcom/d1
missed __() for translations.
2014-09-08 14:26:19 +05:30
Rushabh Mehta
aa7af23a37 Merge pull request #824 from anandpdoshi/anand-september-5
Ability to set precision per field. Format 1.0000 as 1, if fieldtype is Float.
2014-09-08 14:23:44 +05:30
Anand Doshi
398207a566 Merge pull request #825 from nabinhait/hotfix
[fix] pass frm.doc to $.trigger, fix in syncing of child docs
2014-09-08 14:20:37 +05:30
Rushabh Mehta
b015cd0f07 Merge pull request #826 from anandpdoshi/anand-september-8
Fixes for _assign and firefox NS Unexpted Error
2014-09-08 13:42:54 +05:30
Anand Doshi
610fad4657 [minor] fixed firefox NS Unexpected Error 2014-09-08 13:08:52 +05:30
Anand Doshi
0fa85213bb [fix] remove _assign from filters if _assign column does not exist 2014-09-08 13:01:59 +05:30
Nabin Hait
f032ccc102 [fix] pass frm.doc to $.trigger, fix in syncing of child docs 2014-09-08 12:57:28 +05:30
Rushabh Mehta
b5e5ef6dfc [fix] [minor] translate.py 2014-09-08 12:42:19 +05:30
Anand Doshi
32e9241409 Ability to set precision per field. Format 1.0000 as 1, if fieldtype is Float. 2014-09-05 17:13:52 +05:30
Anand Doshi
09c2468318 Merge pull request #823 from anandpdoshi/anand-september-5
[fixes] Permission
2014-09-05 15:21:41 +05:30
Anand Doshi
1fb36f9ad1 Assigned To avatar, 17px in size 2014-09-05 15:20:07 +05:30
Anand Doshi
b9c2878cc9 Desk: max-width: 970px 2014-09-05 15:14:47 +05:30
Anand Doshi
ea8b7c9934 [fixes] Permission 2014-09-05 15:14:07 +05:30
81552433qqcom
b9c2442cef missed __() for translations. 2014-09-05 16:40:10 +08:00
Anand Doshi
442a09d3d5 Merge pull request #821 from anandpdoshi/anand-hotfix
[hotfix] reload website form, check illegal default for a docfield
2014-09-05 00:07:08 +05:30
Anand Doshi
425a221947 [hotfix] reload website form, check illegal default for a docfield 2014-09-04 23:59:55 +05:30
Anand Doshi
69f40f8080 [hotfix] assign patch 2014-09-04 15:55:24 +05:30
Anand Doshi
76d5075bbc Merge pull request #818 from rmehta/web-forms
Web forms
2014-09-04 14:59:25 +05:30
Rushabh Mehta
7b9f794bf8 [fixes] [web-form] 2014-09-04 14:41:29 +05:30
Anand Doshi
96f4bb5861 Merge pull request #820 from anandpdoshi/assign-in-list
Show Assigned To in list view
2014-09-04 14:05:58 +05:30
Anand Doshi
06ea54d0d3 Added 'Assigned To Me' icon in listing 2014-09-04 13:17:48 +05:30
Anand Doshi
023b5cbcdf Show Assigned To in list view
Paired between Anand and Rushabh
2014-09-04 12:57:07 +05:30
Rushabh Mehta
41aada3b5a Merge pull request #819 from anandpdoshi/anand-september-3
[translations] German translations from a user
2014-09-03 22:36:24 +05:30
Anand Doshi
b6d4b0f462 [translations] German translations from a user 2014-09-03 21:40:08 +05:30
Rushabh Mehta
4c2c34ee04 Merge pull request #817 from anandpdoshi/anand-september-3
[fix] Include grid templates, list templates, list.js, calendar.js in translate.get_messages_from_doctype
2014-09-03 18:26:58 +05:30
Rushabh Mehta
4d21ee9afc [fixes] tests 2014-09-03 17:56:11 +05:30
Rushabh Mehta
358c65b715 added test cases #807 2014-09-03 17:39:27 +05:30
Rushabh Mehta
9eed57b828 updates 2014-09-03 17:39:27 +05:30
Rushabh Mehta
0a7da0795b start #807 2014-09-03 17:39:25 +05:30