Merge branch 'master' of openobject-server into mdv-gpl3-py26

Conflicts:

	bin/tools/translate.py

bzr revid: p_christ@hol.gr-20090128135050-bb1ueo5ovziijg00

diff --cc bin/addons/__init__.py
Simple merge

diff --cc bin/addons/base/ir/ir_actions.py
Simple merge

diff --cc bin/addons/base/ir/ir_cron.py
Simple merge

diff --cc bin/addons/base/module/wizard/wizard_export_lang.py
Simple merge

diff --cc bin/osv/orm.py
index feb6d49,97a4228..fdf81ec
--- 1/bin/osv/orm.py
--- 2/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@@ -178,12 -178,10 +178,13 @@@ class browse_record(object)
                      if f._type in self._fields_process:
                          for d in datas:
                              d[n] = self._fields_process[f._type](d[n])
-                             d[n].set_value(d[n], self, f)
+                             if d[n]:
+                                 d[n].set_value(self._cr, self._uid, d[n], self, f)
  
  
 +          if not datas:
 +                  # Where did those ids come from? Perhaps old entries in ir_model_data?
 +                  raise except_orm('NoDataError', 'Field %s in %s%s'%(name,self._table_name,str(ids)))
              # create browse records for 'remote' objects
              for data in datas:
                  for n, f in ffields:

diff --cc bin/tools/translate.py
index d840560,0dbc018..4345a86
--- 1/bin/tools/translate.py
--- 2/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@@ -604,8 -567,10 +604,11 @@@ def trans_load_data(db_name, fileobj, f
                                            'decimal_point' : str(locale.nl_langinfo(locale.RADIXCHAR)),
                                            'thousands_sep' : str(locale.nl_langinfo(locale.THOUSEP))
                                              })
 +      # Here we try to reset the locale regardless.
-         locale.setlocale(locale.LC_ALL, str(lc + '.' + encoding))
+         try:
 -            locale.resetlocale(locale.LC_ALL)
++            locale.setlocale(locale.LC_ALL, str(lc + '.' + encoding))
+         except:
+             pass
          lang_ids = lang_obj.search(cr, uid, [])
          langs = lang_obj.read(cr, uid, lang_ids)
          ls = map(lambda x: (x['code'],x['name']), langs)

diff --cc setup.py
Simple merge