[MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf

bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02
bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b
This commit is contained in:
Christophe Simonis
2013-06-13 19:39:00 +02:00
254 changed files with 948 additions and 667 deletions
+5 -1
View File
@@ -422,6 +422,7 @@
<span class="oe_topbar_name"/>
<ul class="oe_dropdown_menu">
<li><a href="#" data-menu="settings">Preferences</a></li>
<li><a href="#" data-menu="account">My OpenERP.com account</a></li>
<li><a href="#" data-menu="about">About OpenERP</a></li>
<li><a href="#" data-menu="help">Help</a></li>
<li><a href="#" data-menu="logout">Log out</a></li>
@@ -739,7 +740,7 @@
<td t-foreach="aggregate_columns" t-as="column" class="oe_list_footer oe_number"
t-att-data-field="column.id" t-att-title="column.label">
</td>
<td t-if="options.deletable"/>
<td t-if="options.deletable" class="oe_list_record_delete"/>
</tr>
</tfoot>
</table>
@@ -1743,6 +1744,9 @@
<label for="export_format">Export Formats</label>
<select id="export_format" name="export_format"></select>
<label for="export_selection_only">Only export selection:</label>
<input type="checkbox" id="export_selection_only"/>
</td>
</tr>