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

Proposed by jftempo
Status: Merged
Merged at revision: 4704
Proposed branch: lp:~unifield-team/unifield-web/UF_1719
Merge into: lp:unifield-web
Diff against target: 43 lines (+17/-15)
1 file modified
addons/openerp/widgets/templates/viewform.mako (+17/-15)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/UF_1719
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+152937@code.launchpad.net
To post a comment you must log in.
4700. By jftempo

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

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

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

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
38 % endif38 % endif
39 </td>39 </td>
40 <td align="right">40 <td align="right">
41 <select name="filter_list" id="filter_list"41 % if search.model not in ['account.move.line', 'account.move']:
42 onchange="change_filter(); return false;">42 <select name="filter_list" id="filter_list"
43 <option value="blk">-- ${_("Filters")} --</option>43 onchange="change_filter(); return false;">
44 % if len(search.filters_list):44 <option value="blk">-- ${_("Filters")} --</option>
45 <optgroup id="filter_list_options_group" label="${_('Saved Filters')}">45 % if len(search.filters_list):
46 % for f in search.filters_list:46 <optgroup id="filter_list_options_group" label="${_('Saved Filters')}">
47 <option id="${f[3]}" value="${f[0]}" group_by="${f[2]}">${f[1]}</option>47 % for f in search.filters_list:
48 % endfor48 <option id="${f[3]}" value="${f[0]}" group_by="${f[2]}">${f[1]}</option>
49 % endfor
50 </optgroup>
51 % endif
52 <optgroup label="${_('Actions')}">
53 <option value="nf">${_("New Filter")}</option>
54 <option value="sf">${_("Save Filter")}</option>
55 <option value="mf">${_("Manage Filters")}</option>
49 </optgroup>56 </optgroup>
50 % endif57 </select>
51 <optgroup label="${_('Actions')}">58 % endif
52 <option value="nf">${_("New Filter")}</option>
53 <option value="sf">${_("Save Filter")}</option>
54 <option value="mf">${_("Manage Filters")}</option>
55 </optgroup>
56 </select>
57 </td>59 </td>
58 </tr>60 </tr>
59 </table>61 </table>

Subscribers

People subscribed via source and target branches

to all changes: