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

[jftempo]

=== modified file 'addons/openerp/controllers/impex.py'
--- addons/openerp/controllers/impex.py	2012-03-06 17:27:34 +0000
+++ addons/openerp/controllers/impex.py	2012-03-09 09:14:18 +0000
@@ -117,7 +117,15 @@
             for i, view in enumerate(params.view_mode):
                 views[view] = params.view_ids[i]
 
-
+<<<<<<< TREE
+
+=======
+        export_format = data.get('export_format', 'excel')
+        all_records = data.get('all_records', '0')
+
+        if not params.ids:
+            all_records = '1'
+>>>>>>> MERGE-SOURCE
         exports = rpc.RPCProxy('ir.exports')
 
         headers = [{'string' : 'Name', 'name' : 'name', 'type' : 'char'}]
@@ -138,7 +146,11 @@
 
         return dict(existing_exports=existing_exports, model=params.model, ids=params.ids, ctx=ctx,
                     search_domain=params.search_domain, source=params.source,
+<<<<<<< TREE
                     tree=tree, import_compat=import_compat)
+=======
+                    tree=tree, import_compat=import_compat, default=default, export_format=export_format, all_records=all_records)
+>>>>>>> MERGE-SOURCE
 
     @expose()
     def save_exp(self, **kw):
@@ -353,7 +365,11 @@
         return rec(fields)
 
     @expose(content_type="application/octet-stream")
+<<<<<<< TREE
     def export_data(self, fname, fields, import_compat=False, **kw):
+=======
+    def export_data(self, fname, fields, import_compat=False, export_format='csv', all_records=False, **kw):
+>>>>>>> MERGE-SOURCE
 
         params, data_index = TinyDict.split(kw)
         proxy = rpc.RPCProxy(params.model)
@@ -371,9 +387,17 @@
         ctx = dict((params.context or {}), **rpc.session.context)
         ctx['import_comp'] = bool(int(import_compat))
 
+<<<<<<< TREE
         domain = params.seach_domain or []
+=======
+        view_name = ctx.get('_terp_view_name', '')
+>>>>>>> MERGE-SOURCE
 
-        ids = params.ids or proxy.search(domain, 0, 0, 0, ctx)
+        if not params.ids or all_records:
+            domain = params.search_domain or []
+            ids = proxy.search(domain, 0, 2000, 0, ctx)
+        else:
+            ids = params.ids or []
         result = datas_read(ids, params.model, flds, context=ctx)
 
         if result.get('warning'):
 
=== modified file 'addons/openerp/controllers/templates/exp.mako'
--- addons/openerp/controllers/templates/exp.mako	2012-03-06 17:27:34 +0000
+++ addons/openerp/controllers/templates/exp.mako	2012-03-09 09:14:18 +0000
@@ -172,6 +172,25 @@
                                     >${_("Export all Data")}</option>
                             </select>
                         </td>
+<<<<<<< TREE
+=======
+                        <td class="label"><label for="export_format">${_("Format:")}</label></td>
+                        <td>
+                            <select id="export_format" name="export_format">
+                                <option value="excel" style="padding-right: 15px;">${_("Excel")}</option>
+                                <option value="csv" ${'selected=selected' if export_format == "csv" else ''}>${_("CSV")}</option>
+                            </select>
+                        </td>
+                        <td class="label">
+                            <label for="all_records">Export all query results (limited to 2000 records):</label>
+                        </td>
+                        <td>
+                            <input type="checkbox" id="all_records" name="all_records" value="1" 
+                                ${'checked=checked' if all_records=='1' else ''}
+                                ${'disabled=disabled' if not ids else ''}
+                            />
+                        </td>
+>>>>>>> MERGE-SOURCE
                     </tr>
                 </table>
             </td>
 
=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2012-03-06 17:27:34 +0000
+++ addons/openerp/static/javascript/listgrid.js	2012-03-09 09:14:18 +0000
@@ -231,6 +231,23 @@
         }
     },
 
+<<<<<<< TREE
+=======
+
+    expand_all_group: function(pid) {
+        if (!pid) {
+            elem = jQuery('#'+this.name+'_grid')
+        } else {
+            elem = jQuery('tr[parent="' + pid + '"]');
+        }
+        this.expand_all = 1;
+        elem.find('td.group-expand').each(function() {
+            jQuery(this).click();
+        });
+        this.expand_all = 0;
+        $('#expand_all').hide();
+    },
+>>>>>>> MERGE-SOURCE
     group_by: function(id, record, no_leaf, group) {
         var $group_record = jQuery('[records="' + record + '"]');
         var group_by_context = $group_record.attr('grp_context');