odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Bugfix in csv import 

Better origin computations
Workflow in activities

bzr revid: fp@tinyerp.com-90f4dcf0c6477ec3c0983046d6449d7778eec570
This commit is contained in:
Fabien Pinckaers 2007-10-18 06:45:27 +00:00
parent c51ac0093d
commit 47ccfc54b9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/addons/base/ir/workflow/workflow_view.xml
View File

@ -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"/>

2
bin/tools/convert.py
View File

@ -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)