projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MERGE] All modification from all import_project
[odoo/odoo.git]
/
addons
/
import_base
/
mapper.py
diff --git
a/addons/import_base/mapper.py
b/addons/import_base/mapper.py
index
582a45e
..
4f34712
100644
(file)
--- a/
addons/import_base/mapper.py
+++ b/
addons/import_base/mapper.py
@@
-57,7
+57,7
@@
class concat(mapper):
self.delimiter = delimiter and delimiter.get('delimiter', ' ') or ' '
def __call__(self, external_values):
self.delimiter = delimiter and delimiter.get('delimiter', ' ') or ' '
def __call__(self, external_values):
- return self.delimiter.join(map(lambda x : external_values.get(x,''), self.arg))
+ return self.delimiter.join(map(lambda x : str(external_values.get(x,'')), self.arg))
class ppconcat(mapper):
"""
class ppconcat(mapper):
"""
@@
-71,7
+71,7
@@
class ppconcat(mapper):
self.delimiter = delimiter and delimiter.get('delimiter', ' ') or '\n\n'
def __call__(self, external_values):
self.delimiter = delimiter and delimiter.get('delimiter', ' ') or '\n\n'
def __call__(self, external_values):
- return self.delimiter.join(map(lambda x : x + ": " + external_values.get(x,''), self.arg))
+ return self.delimiter.join(map(lambda x : x + ": " + str(external_values.get(x,'')), self.arg))
class const(mapper):
"""
class const(mapper):
"""
@@
-94,12
+94,16
@@
class value(mapper):
and don't care about the name of the field
call(self.method, value('field1'))
"""
and don't care about the name of the field
call(self.method, value('field1'))
"""
- def __init__(self, val, default=''):
+ def __init__(self, val, default='', fallback=False):
self.val = val
self.default = default
self.val = val
self.default = default
+ self.fallback = fallback
def __call__(self, external_values):
def __call__(self, external_values):
- return external_values.get(self.val, self.default)
+ val = external_values.get(self.val, self.default)
+ if self.fallback and (not val or val == self.default):
+ val = external_values.get(self.fallback, self.default)
+ return val
class map_val(mapper):
"""
class map_val(mapper):
"""
@@
-163,5
+167,3
@@
class call(mapper):
else:
args.append(arg)
return self.fun(external_values, *args)
else:
args.append(arg)
return self.fun(external_values, *args)
-
-
\ No newline at end of file