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

[jftempo]

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

4669. By Olivier DOSSMANN <olivier@tempo-laptop> on 2012-09-18

UF-1257 [ADD] Do not display Real Stock and Virtual Stock for export

4670. By Olivier DOSSMANN <olivier@tempo-laptop> on 2012-10-03

UF-1257 [ADD] Only use Code, Description and UoM for product's export (CSV/Excel)

4671. By Olivier DOSSMANN <olivier@tempo-laptop> on 2012-10-03

UF-1257 [MERGE] Last unifield-web trunk lp:unifield-web

=== modified file 'addons/openerp/controllers/impex.py'
--- addons/openerp/controllers/impex.py	2012-03-09 09:29:10 +0000
+++ addons/openerp/controllers/impex.py	2012-10-03 12:37:22 +0000
@@ -388,6 +388,14 @@
             fields = fields.replace('/.id','.id')
             flds = [fields]
 
+        # UF-1257 Only use Code, Description and UoM for export due to timeout error from products with some fields:
+        # - qty_available
+        # - virtual_available
+        # - fmc
+        # - amc
+        if params.model == 'product.product':
+            flds = ['default_code', 'name', 'uom_id']
+            params.fields2 = ['Code', 'Description', 'UoM']
 
         ctx = dict((params.context or {}), **rpc.session.context)
         ctx['import_comp'] = bool(int(import_compat))
@@ -396,7 +404,10 @@
 
         if not params.ids or all_records:
             domain = params.search_domain or []
-            ids = proxy.search(domain, 0, 2000, 0, ctx)
+            if params.model == 'product.product':
+                ids = proxy.search(domain, 0, None, 0, ctx)
+            else:
+                ids = proxy.search(domain, 0, 2000, 0, ctx)
         else:
             ids = params.ids or []
         result = datas_read(ids, params.model, flds, context=ctx)

=== modified file 'addons/openerp/controllers/templates/exp.mako'
--- addons/openerp/controllers/templates/exp.mako	2012-03-09 10:08:59 +0000
+++ addons/openerp/controllers/templates/exp.mako	2012-10-03 12:37:22 +0000
@@ -203,7 +203,11 @@
                             </select>
                         </td>
                         <td class="label">
+                            %if model == 'product.product':
+                            <label for="all_records">Export all query results (<span style="color: #ff0000;">WARNING: could break down machines</span>):</label>
+                            %else:
                             <label for="all_records">Export all query results (limited to 2000 records):</label>
+                            %endif
                         </td>
                         <td>
                             <input type="checkbox" id="all_records" name="all_records" value="1"