From 47ccfc54b9d283e04d1bd8ba65e536a4b9fa7fc5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 18 Oct 2007 06:45:27 +0000
Subject: [PATCH] Bugfix in csv import Better origin computations Workflow in
 activities

bzr revid: fp@tinyerp.com-90f4dcf0c6477ec3c0983046d6449d7778eec570
---
 bin/addons/base/ir/workflow/workflow_view.xml | 2 ++
 bin/tools/convert.py                          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 20e3bf68ea1..601b6a06865 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -59,6 +59,7 @@
 		<field name="arch" type="xml">
 			<form string="Activity">
 				<field name="name" colspan="4" select="1"/>
+				<field name="wkf_id" select="1"/>
 				<field name="kind" select="1"/>
 				<field name="action" colspan="4" select="1"/>
 				<field name="subflow_id"/>
@@ -99,6 +100,7 @@
 		<field name="arch" type="xml">
 			<tree string="Activity">
 				<field name="name"/>
+				<field name="wkf_id"/>
 				<field name="kind"/>
 				<field name="action"/>
 				<field name="flow_start"/>
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 44f013fbe71..17d75ba9670 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -648,7 +648,7 @@ def convert_csv_import(cr, module, fname, csvcontent, idref=None, mode='init',
 	uid = 1
 	datas = []
 	for line in reader:
-		if not line.strip():
+		if (not line) or not reduce(lambda x,y: x or y, line) :
 			continue
 		datas.append( map(lambda x:x.decode('utf8').encode('utf8'), line))
 	pool.get(model).import_data(cr, uid, fields, datas,mode, module,noupdate)