diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po index 5570b263bec..b7a82684881 100644 --- a/bin/addons/base/i18n/bg.po +++ b/bin/addons/base/i18n/bg.po @@ -7,13 +7,21 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-03-30 04:19+0000\n" +======= +"PO-Revision-Date: 2010-03-31 08:05+0000\n" +>>>>>>> MERGE-SOURCE "Last-Translator: Boris \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n" +======= +"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +>>>>>>> MERGE-SOURCE "X-Generator: Launchpad (build Unknown)\n" #. module: base @@ -1411,7 +1419,7 @@ msgid "" "This wizard will detect new terms in the application so that you can update " "them manually." msgstr "" -"Помощника установи нови условия в приложението които можете да обновите " +"Помощника установи нови преводи в приложението които можете да обновите " "ръчно." #. module: base @@ -3185,7 +3193,7 @@ msgstr "Монсерат" #. module: base #: model:ir.ui.menu,name:base.menu_translation_app msgid "Application Terms" -msgstr "Условия за използване на програмата" +msgstr "Изрази в програмата" #. module: base #: selection:ir.report.custom.fields,operation:0 @@ -5798,7 +5806,7 @@ msgstr "Ел. поща" #: model:ir.actions.act_window,name:base.action_wizard_update_translations #: model:ir.ui.menu,name:base.menu_wizard_update_translations msgid "Resynchronise Terms" -msgstr "Повторно синхронизиране на условията" +msgstr "Ресинхронизиране на изразите" #. module: base #: model:res.country,name:base.tg @@ -5886,8 +5894,8 @@ msgid "" "translations for your own module, you can also publish all your translation " "at once." msgstr "" -"За да се подобрите превода на термини от официалния превод на OpenERP, Вие " -"трябва да промените термините в launchpad. Ако сте превели голяма част от " +"За да се подобрите превода на изрази от официалния превод на OpenERP, Вие " +"трябва да промените изразите в \"launchpad\". Ако сте превели голяма част от " "ваш модул, може да публикувате вашите преводи наведнъж." #. module: base @@ -6321,7 +6329,7 @@ msgstr "terp-administration" #: model:ir.actions.act_window,name:base.action_translation #: model:ir.ui.menu,name:base.menu_action_translation msgid "All terms" -msgstr "Всички условия" +msgstr "Всички изрази" #. module: base #: model:res.country,name:base.no @@ -7028,7 +7036,7 @@ msgstr "Джибути" #. module: base #: field:ir.translation,value:0 msgid "Translation Value" -msgstr "Преведено значение" +msgstr "Превод" #. module: base #: model:res.country,name:base.ag @@ -7107,7 +7115,7 @@ msgstr "турски / Türkçe" #: model:ir.actions.act_window,name:base.action_translation_untrans #: model:ir.ui.menu,name:base.menu_action_translation_untrans msgid "Untranslated terms" -msgstr "Непреведен термин" +msgstr "Непреведени изрази" #. module: base #: wizard_view:module.lang.import,init:0 @@ -7251,7 +7259,7 @@ msgstr "Канали" #. module: base #: view:ir.module.module:0 msgid "Schedule for Installation" -msgstr "График на инсталация" +msgstr "Инсталирай" #. module: base #: selection:ir.model.fields,select_level:0 @@ -7272,7 +7280,7 @@ msgstr "Изпрати" #. module: base #: field:ir.translation,src:0 msgid "Source" -msgstr "Източник" +msgstr "Оригинал" #. module: base #: help:res.partner.address,partner_id:0 diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po index f3739c66bf3..2c80be2d6ca 100644 --- a/bin/addons/base/i18n/hr.po +++ b/bin/addons/base/i18n/hr.po @@ -7,13 +7,21 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-03-30 04:36+0000\n" +======= +"PO-Revision-Date: 2010-03-31 06:01+0000\n" +>>>>>>> MERGE-SOURCE "Last-Translator: goranc \n" "Language-Team: openerp-translators\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n" +======= +"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +>>>>>>> MERGE-SOURCE "X-Generator: Launchpad (build Unknown)\n" "Language: hr\n" diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po index 3d99b3829d9..8a9a054c1dd 100644 --- a/bin/addons/base/i18n/it.po +++ b/bin/addons/base/i18n/it.po @@ -7,13 +7,22 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-03-30 09:53+0000\n" "Last-Translator: Carlo Vettore \n" +======= +"PO-Revision-Date: 2010-03-31 05:14+0000\n" +"Last-Translator: OpenERP Administrators \n" +>>>>>>> MERGE-SOURCE "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n" +======= +"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +>>>>>>> MERGE-SOURCE "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po index 9430360cb87..06b80ff4be6 100644 --- a/bin/addons/base/i18n/ja.po +++ b/bin/addons/base/i18n/ja.po @@ -8,13 +8,21 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-03-30 04:24+0000\n" +======= +"PO-Revision-Date: 2010-03-31 05:47+0000\n" +>>>>>>> MERGE-SOURCE "Last-Translator: Harry (Open ERP) \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n" +======= +"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +>>>>>>> MERGE-SOURCE "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po index 92102068d0d..05d25ee5451 100644 --- a/bin/addons/base/i18n/sv.po +++ b/bin/addons/base/i18n/sv.po @@ -7,13 +7,21 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-03-30 04:18+0000\n" +======= +"PO-Revision-Date: 2010-03-31 04:49+0000\n" +>>>>>>> MERGE-SOURCE "Last-Translator: Anders Wallenquist \n" "Language-Team: <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n" +======= +"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +>>>>>>> MERGE-SOURCE "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po index be9ac9ddeb1..e6fe890f75a 100644 --- a/bin/addons/base/i18n/uk.po +++ b/bin/addons/base/i18n/uk.po @@ -7,13 +7,21 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-03-30 04:37+0000\n" +======= +"PO-Revision-Date: 2010-03-31 05:27+0000\n" +>>>>>>> MERGE-SOURCE "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n" +======= +"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +>>>>>>> MERGE-SOURCE "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po index 795f0a2c33f..750afdb8015 100644 --- a/bin/addons/base/i18n/zh_CN.po +++ b/bin/addons/base/i18n/zh_CN.po @@ -7,13 +7,21 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-03-30 04:19+0000\n" +======= +"PO-Revision-Date: 2010-03-31 05:03+0000\n" +>>>>>>> MERGE-SOURCE "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n" +======= +"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +>>>>>>> MERGE-SOURCE "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/osv/fields.py b/bin/osv/fields.py index bbe21b9a321..edf78156dcc 100644 --- a/bin/osv/fields.py +++ b/bin/osv/fields.py @@ -756,11 +756,14 @@ class related(function): if self._type != "many2one": t_id = t_data.id t_data = t_data[self.arg[i]][0] + else: + t_data = False + break else: t_id = t_data['id'] t_data = t_data[self.arg[i]] - if t_id: + if t_id and t_data: obj.pool.get(field_detail['object']).write(cr,uid,[t_id],{args[-1]:values}, context=context) def _fnct_read(self, obj, cr, uid, ids, field_name, args, context=None): diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 32efe32558b..430745deaa0 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -3098,7 +3098,8 @@ class orm(orm_template): upd1 = upd1 + ',' + self._columns[field]._symbol_set[0] upd2.append(self._columns[field]._symbol_set[1](vals[field])) else: - upd_todo.append(field) + if not isinstance(self._columns[field], fields.related): + upd_todo.append(field) if field in self._columns \ and hasattr(self._columns[field], 'selection') \ and vals[field]: @@ -3268,8 +3269,9 @@ class orm(orm_template): upd0.append('"'+v+'"='+self._columns[v]._symbol_set[0]) upd1.append(self._columns[v]._symbol_set[1](value[v])) upd1.append(id) - cr.execute('update "' + self._table + '" set ' + \ - string.join(upd0, ',') + ' where id = %s', upd1) + if upd0 and upd1: + cr.execute('update "' + self._table + '" set ' + \ + string.join(upd0, ',') + ' where id = %s', upd1) else: for f in val: