Commit graph

4389 commits

Author SHA1 Message Date
Pratik Vyas
142afdeb26 Merge branch 'develop' 2014-01-14 18:49:10 +05:30
Pratik Vyas
2722caba59 bumped to version 3.7.1 2014-01-14 19:19:10 +06:00
Nabin Hait
05d774c5f9 Merge pull request #399 from akhileshdarjee/hotfix
set default condition only if not conditions in filters
2014-01-14 02:30:39 -08:00
Nabin Hait
ea682cc15a Merge pull request #400 from nabinhait/hotfix
Delete notification count for messages, after read or post
2014-01-14 02:30:18 -08:00
Nabin Hait
529b52cc96 Delete notification count for messages, after read or post 2014-01-14 15:53:16 +05:30
Akhilesh Darjee
bd2b891f92 set default condition only if not conditions in filters 2014-01-14 13:09:37 +05:30
Pratik Vyas
065c592735 Merge branch 'develop' 2014-01-13 18:37:03 +05:30
Pratik Vyas
2e06deff89 bumped to version 3.7.0 2014-01-13 19:07:03 +06:00
Nabin Hait
63ac6376fc Merge pull request #398 from nabinhait/hotfix
Added missing field in Custom Field compared to DocField
2014-01-13 04:32:59 -08:00
Nabin Hait
396a39ad8b Custom Field: Label is mandatory only if fieldname not exists 2014-01-13 18:00:22 +05:30
Nabin Hait
747d3e3cba Custom Field: Label is mandatory only if fieldname not exists 2014-01-13 17:52:47 +05:30
Nabin Hait
a55c447eb1 Fixed conflict 2014-01-10 16:35:54 +05:30
Nabin Hait
f3104016c4 Merge pull request #397 from akhileshdarjee/hotfix
custom field list view to show doctype, field type and field name
2014-01-10 03:04:41 -08:00
Nabin Hait
da546cb031 Added missing field in Custom Field compared to DocField 2014-01-10 16:32:54 +05:30
Akhilesh Darjee
4d633889ec custom field list view to show doctype, field type and field name 2014-01-10 15:07:21 +05:30
Pratik Vyas
a65d907e0e Merge branch 'develop' 2014-01-09 15:51:59 +05:30
Pratik Vyas
cec9060373 bumped to version 3.5.0 2014-01-09 16:21:59 +06:00
Nabin Hait
89f47bd1d7 Merge pull request #395 from anandpdoshi/hotfix-check-readonly
Fix: Render Checkbox in Forms when read-only
2014-01-08 22:12:13 -08:00
Anand Doshi
e6a45b9d27 Fix: Render Checkbox in Forms when read-only 2014-01-09 11:38:21 +05:30
Pratik Vyas
3c1e69c798 Merge branch 'develop' 2014-01-07 13:47:39 +05:30
Pratik Vyas
da0b73da66 bumped to version 3.4.4 2014-01-07 14:17:39 +06:00
Anand Doshi
54a6a01be8 Merge pull request #393 from pdvyas/hotfix-mysql
pin mysql-python to 1.2.4
2014-01-06 22:36:15 -08:00
Pratik Vyas
87fa6bee40 pin mysql-python to 1.2.4 2014-01-07 12:00:30 +05:30
Nabin Hait
1027351269 Merge pull request #391 from nabinhait/hotfix
Fixes in reportview filter conditions
2014-01-06 03:04:31 -08:00
Nabin Hait
fc6d904c9a Fixes in reportview filter conditions 2014-01-06 16:29:01 +05:30
Pratik Vyas
ee15674874 Merge branch 'develop' 2014-01-02 17:11:55 +05:30
Pratik Vyas
2a004e8755 bumped to version 3.4.3 2014-01-02 17:41:55 +06:00
Nabin Hait
d4d05f3e07 Merge pull request #388 from nabinhait/hotfix
Load extra doctypes while building filter conditions
2014-01-02 03:03:36 -08:00
Nabin Hait
8e1a96e6de Load extra doctypes while building filter conditions 2014-01-02 16:08:43 +05:30
Nabin Hait
46dced5f3d Merge pull request #387 from anandpdoshi/hotfix-autosuggest
Autosuggest should be rendered above all, just like Date Picker
2014-01-02 00:34:41 -08:00
Anand Doshi
a388f10065 Autosuggest should be rendered above all, just like Date Picker 2014-01-02 13:54:24 +05:30
Pratik Vyas
60093c845b Merge branch 'develop' 2013-12-30 19:34:33 +05:30
Pratik Vyas
26f47936c3 bumped to version 3.4.2 2013-12-30 20:04:33 +06:00
Pratik Vyas
8d8d8191ab Merge pull request #382 from anandpdoshi/hotfix-reportview-filters
[hotfix] Reportview Filters
2013-12-30 06:03:32 -08:00
Anand Doshi
82298a2f26 [hotfix] Reportview Filters 2013-12-30 19:30:43 +05:30
Pratik Vyas
614b623d3a Merge branch 'develop' 2013-12-30 18:57:58 +05:30
Pratik Vyas
83b47d9fb4 bumped to version 3.4.1 2013-12-30 19:27:58 +06:00
Pratik Vyas
c99feef3cf Merge pull request #381 from anandpdoshi/hotfix-reportview-filters
Reportview Filters null value fix
2013-12-30 05:26:47 -08:00
Anand Doshi
2b0c2595c7 Reportview Filters null value fix 2013-12-30 18:55:51 +05:30
Pratik Vyas
bd38aafa37 Merge branch 'develop' 2013-12-30 17:47:57 +05:30
Pratik Vyas
27efedc601 bumped to version 3.4.0 2013-12-30 18:17:57 +06:00
Nabin Hait
0079e085a2 Merge pull request #371 from nabinhait/hotfix
Fixes in Filter conditions in reportview to handle null values
2013-12-30 03:44:34 -08:00
Nabin Hait
a701dd9472 Fixes in filter_conditions, null issue 2013-12-27 18:06:33 +05:30
Nabin Hait
b83cd0291e Small fixes in query report 2013-12-27 17:38:46 +05:30
Nabin Hait
19d375a20b Call validate form update_after_submit 2013-12-27 17:38:16 +05:30
Nabin Hait
3feaa9fd43 Fixes in Filter conditions in reportview to handle null values 2013-12-25 14:49:24 +05:30
Nabin Hait
df62a9fc1a Fixes in Filter conditions in reportview to handle null values 2013-12-25 14:49:24 +05:30
Nabin Hait
55003f860c Merge pull request #370 from akhileshdarjee/hotfix
[fix] [minor] improved month_start and month_end
2013-12-24 03:47:51 -08:00
Akhilesh Darjee
86bacfe901 [fix] [minor] improved month_start and month_end 2013-12-24 14:34:44 +05:30
Pratik Vyas
ac4d34d635 Merge branch 'develop' 2013-12-23 17:31:19 +05:30