Merge lp:~unifield-team/unifield-web/UF_1719 into lp:unifield-web

[jftempo]

[lp:~unifield-team/unifield-web/UF_1719]

4700. By jftempo on 2013-03-13

UTP-309 [FIX] HQ Entries /Changing line limits functionality doesn't work
lp:~unifield-team/unifield-web/OEB_169
lp:~openerp-dev/openobject-client-web/6.0-opw-584956-xal

4701. By jftempo on 2013-04-02

UF-1309 [FIX] No error message on country restriction deletion
OEB-154 [FIX] No error message displayed on o2m fields in non-save wizard
lp:~unifield-team/unifield-web/uf-1309

4702. By jftempo on 2013-04-02

UTP-553 [FIX] In the journal items when grouping all entries are marked as possible to correct
lp:~unifield-team/unifield-web/UTP-553_grouped_view

4703. By jftempo on 2013-04-03

UF-1392 [FIX] Navigation between form and list views, filter not saved anymore
OEB-173 [FIX] Lost results of the filters on search view
lp:~unifield-team/unifield-web/uf-1392
lp:~openerp-dev/openobject-client-web/6.0-opw-587800-cpa

4704. By jftempo on 2013-04-03

UF-1719 [IMP] Journal items and Journal entries - Enhancements
lp:~unifield-team/unifield-web/UF_1719

=== modified file 'addons/openerp/widgets/templates/viewform.mako'
--- addons/openerp/widgets/templates/viewform.mako	2011-01-17 14:11:42 +0000
+++ addons/openerp/widgets/templates/viewform.mako	2013-03-12 15:23:33 +0000
@@ -38,22 +38,24 @@
                              % endif
                         </td>
                         <td align="right">
-                            <select name="filter_list" id="filter_list"
-                                onchange="change_filter(); return false;">
-                                <option value="blk">-- ${_("Filters")} --</option>
-                                % if len(search.filters_list):
-                                    <optgroup id="filter_list_options_group" label="${_('Saved Filters')}">
-                                    % for f in search.filters_list:
-                                        <option id="${f[3]}" value="${f[0]}" group_by="${f[2]}">${f[1]}</option>
-                                    % endfor
+                            % if search.model not in ['account.move.line', 'account.move']:
+                                <select name="filter_list" id="filter_list"
+                                    onchange="change_filter(); return false;">
+                                    <option value="blk">-- ${_("Filters")} --</option>
+                                    % if len(search.filters_list):
+                                        <optgroup id="filter_list_options_group" label="${_('Saved Filters')}">
+                                        % for f in search.filters_list:
+                                            <option id="${f[3]}" value="${f[0]}" group_by="${f[2]}">${f[1]}</option>
+                                        % endfor
+                                        </optgroup>
+                                    % endif
+                                    <optgroup label="${_('Actions')}">
+                                        <option value="nf">${_("New Filter")}</option>
+                                        <option value="sf">${_("Save Filter")}</option>
+                                        <option value="mf">${_("Manage Filters")}</option>
                                     </optgroup>
-                                % endif
-                                <optgroup label="${_('Actions')}">
-                                    <option value="nf">${_("New Filter")}</option>
-                                    <option value="sf">${_("Save Filter")}</option>
-                                    <option value="mf">${_("Manage Filters")}</option>
-                                </optgroup>
-                            </select>
+                                </select>
+                            % endif
                         </td>
                     </tr>
                 </table>