diff options
| author | atp (Open ERP) <atp@tinyerp.co.in> | 2010-06-22 10:45:44 +0530 |
|---|---|---|
| committer | atp (Open ERP) <atp@tinyerp.co.in> | 2010-06-22 10:45:44 +0530 |
| commit | b0efd26edd9f4e2aa75424b787ea46d2be15cd04 (patch) | |
| tree | e78cdb693e62a5c9a17f77a395eec51fb34becbf /addons/document_ics | |
| parent | 46bb1ea51be702758d68a5f69db32c82dbccf9bd (diff) | |
| parent | 2319190c5a20cb8095f85cacca89a33164ba93d7 (diff) | |
[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: atp@tinyerp.co.in-20100622051544-c7hig73zk2at66cy
Diffstat (limited to 'addons/document_ics')
| -rw-r--r-- | addons/document_ics/document_ics.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/document_ics/document_ics.py b/addons/document_ics/document_ics.py index 56998a9408a..a9c5c90fefb 100644 --- a/addons/document_ics/document_ics.py +++ b/addons/document_ics/document_ics.py @@ -85,9 +85,9 @@ class document_directory_content(osv.osv): _columns = { 'object_id': fields.many2one('ir.model', 'Object', oldname= 'ics_object_id'), - 'obj_iterate': fields.boolean('Iterate object',help="If set, a separate \ + 'obj_iterate': fields.boolean('Iterate object', help="If set, a separate \ instance will be created for each record of Object"), - 'fname_field': fields.char("Filename field",size=16,help="The field of the \ + 'fname_field': fields.char("Filename field", size=16, help="The field of the \ object used in the filename. Has to be a unique identifier."), 'ics_domain': fields.char('Domain', size=64), 'ics_field_ids': fields.one2many('document.directory.ics.fields', 'content_id', 'Fields Mapping') @@ -138,7 +138,7 @@ class document_directory_content(osv.osv): dctx2 = { 'active_id': ro['id'] } if fname_fld: dctx2['active_'+fname_fld] = ro[fname_fld] - n = node_content(tname, node, node.context,content,dctx=dctx2, act_id = ro['id']) + n = node_content(tname, node, node.context, content, dctx=dctx2, act_id = ro['id']) n.fill_fields(cr, dctx2) res2.append(n) return res2 |