Merge lp:~unifield-team/unifield-web/uf-1696 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/impex.py'
--- addons/openerp/controllers/impex.py	2012-10-03 12:32:26 +0000
+++ addons/openerp/controllers/impex.py	2013-01-15 08:39:34 +0000
@@ -391,11 +391,21 @@
         # 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
+        # - product_amc
+        # - reviewed_consumption
+        # - monthly_consumption
         if params.model == 'product.product':
-            flds = ['default_code', 'name', 'uom_id']
-            params.fields2 = ['Code', 'Description', 'UoM']
+            tmp_flds = flds
+            flds = []
+            flds_to_remove = ['qty_available', 'virtual_available', 'product_amc', 'reviewed_consumption', 'monthly_consumption']
+            fields_to_remove = ['Real Stock', 'Virtual Stock', 'Real Consumption', 'Monthly consumption', 'Forecasted Monthly Consumption']
+            for f in tmp_flds:
+                if f not in flds_to_remove:
+                    flds.append(f)
+
+            for f_r in fields_to_remove:
+                if f_r in params.fields2:
+                    params.fields2.remove(f_r)
 
         ctx = dict((params.context or {}), **rpc.session.context)
         ctx['import_comp'] = bool(int(import_compat))