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

Merged 

bzr revid: hda@tinyerp.com-20100323061154-mzl5ud65kktg141v
This commit is contained in:
HDA (OpenERP) 2010-03-23 11:41:54 +05:30
parent 5420c142e2 b6f5ae027d
commit 756cb752c0
9 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/addons/base/i18n/et.po
View File

@ -7,13 +7,13 @@ 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"
"PO-Revision-Date: 2010-03-16 05:12+0000\n"
"PO-Revision-Date: 2010-03-19 08:39+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-17 04:39+0000\n"
"X-Launchpad-Export-Date: 2010-03-20 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@ -174,7 +174,7 @@ msgstr "ir.report.custom.fields"
#. module: base
#: view:res.partner:0
msgid "Search Partner"
msgstr ""
msgstr "Otsi partnerit"
#. module: base
#: code:addons/base/module/wizard/wizard_export_lang.py:0
@ -574,7 +574,7 @@ msgstr "Papua Uus Guinea"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_4
msgid "Basic Partner"
msgstr "Elementaarne partner"
msgstr "Elementaarne klient"
#. module: base
#: rml:ir.module.reference:0
@ -584,7 +584,7 @@ msgstr ","
#. module: base
#: view:res.partner:0
msgid "My Partners"
msgstr ""
msgstr "Minu partnerid"
#. module: base
#: model:res.country,name:base.es
@ -1319,6 +1319,7 @@ msgstr "Kommertsperspektiiv"
msgid ""
"Couldn't generate the next id because some partners have an alphabetic id !"
msgstr ""
"Ei saanud genereerida järgmist id-d sest osadel partneritel on täheline id!"
#. module: base
#: view:ir.attachment:0
@ -3096,7 +3097,7 @@ msgstr "Sisemine kasutaja, kes vastutab selle partneriga suhtlemise eest."
#. module: base
#: field:res.partner,parent_id:0
msgid "Parent Partner"
msgstr ""
msgstr "Ülem partner"
#. module: base
#: view:ir.module.module:0
@ -6203,7 +6204,7 @@ msgstr "Algusaeg"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_5
msgid "Gold Partner"
msgstr "Kuldpartnerid"
msgstr "Kuldpartner"
#. module: base
#: model:ir.model,name:base.model_res_partner
@ -6402,7 +6403,7 @@ msgstr ""
#. module: base
#: model:ir.actions.act_window,name:base.action_partner_other_form
msgid "Other Partners"
msgstr ""
msgstr "Teised partnerid"
#. module: base
#: view:ir.model:0

4
bin/addons/base/i18n/hr.po
View File

@ -7,13 +7,13 @@ 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"
"PO-Revision-Date: 2010-03-17 05:13+0000\n"
"PO-Revision-Date: 2010-03-21 05:21+0000\n"
"Last-Translator: goranc <goranc@gmail.com>\n"
"Language-Team: openerp-translators\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"

4
bin/addons/base/i18n/ja.po
View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-03-17 05:14+0000\n"
"PO-Revision-Date: 2010-03-21 05:26+0000\n"
"Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-18 04:33+0000\n"
"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

14
bin/addons/base/i18n/pl.po
View File

@ -7,13 +7,13 @@ 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"
"PO-Revision-Date: 2010-02-21 06:01+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2010-03-21 13:51+0000\n"
"Last-Translator: Bartosz Kaszubowski <gosimek@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@ -1592,7 +1592,7 @@ msgstr "Akcja serwera"
#. module: base
#: model:res.country,name:base.tt
msgid "Trinidad and Tobago"
msgstr "Trinidad i Tobago"
msgstr "Trynidad i Tobago"
#. module: base
#: model:res.country,name:base.lv
@ -2687,7 +2687,7 @@ msgstr "Boliwia"
#. module: base
#: model:res.country,name:base.gh
msgid "Ghana"
msgstr "Gana"
msgstr "Ghana"
#. module: base
#: field:res.lang,direction:0
@ -6817,7 +6817,7 @@ msgstr "Puste hasło !"
#. module: base
#: model:res.country,name:base.eh
msgid "Western Sahara"
msgstr "Zachodnia Sahara"
msgstr "Sahara Zachodnia"
#. module: base
#: model:ir.model,name:base.model_workflow
@ -7218,7 +7218,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.cx
msgid "Christmas Island"
msgstr "Wyspy Bożego Narodzenia"
msgstr "Wyspa Bożego Narodzenia"
#. module: base
#: view:ir.actions.server:0

4
bin/addons/base/i18n/sv.po
View File

@ -7,13 +7,13 @@ 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"
"PO-Revision-Date: 2010-03-17 05:09+0000\n"
"PO-Revision-Date: 2010-03-21 05:18+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
"Language-Team: <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

4
bin/addons/base/i18n/uk.po
View File

@ -7,13 +7,13 @@ 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"
"PO-Revision-Date: 2010-03-17 05:13+0000\n"
"PO-Revision-Date: 2010-03-21 05:24+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

4
bin/addons/base/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ 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"
"PO-Revision-Date: 2010-03-17 05:11+0000\n"
"PO-Revision-Date: 2010-03-21 05:21+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

2
bin/osv/fields.py
View File

@ -921,7 +921,7 @@ class property(function):
res[id] = default_val
for prop in property.browse(cr, uid, nids):
if prop.value.find(',') >= 0:
res[int(prop.res_id.split(',')[1])] = (prop.value and \
res[int(prop.res_id.id)] = (prop.value and \
int(prop.value.split(',')[1])) or False
else:
res[int(prop.res_id.split(',')[1])] = prop.value or ''

13
bin/osv/orm.py
View File

@ -249,11 +249,14 @@ class browse_record(object):
new_data[n] = self._list_class([browse_record(self._cr, self._uid, id, self._table.pool.get(f._obj), self._cache, context=self._context, list_class=self._list_class, fields_process=self._fields_process) for id in data[n]], self._context)
elif f._type in ('reference'):
if data[n]:
ref_obj, ref_id = data[n].split(',')
ref_id = long(ref_id)
obj = self._table.pool.get(ref_obj)
compids = False
new_data[n] = browse_record(self._cr, self._uid, ref_id, obj, self._cache, context=self._context, list_class=self._list_class, fields_process=self._fields_process)
if isinstance(data[n], browse_record):
new_data[n] = data[n]
else:
ref_obj, ref_id = data[n].split(',')
ref_id = long(ref_id)
obj = self._table.pool.get(ref_obj)
compids = False
new_data[n] = browse_record(self._cr, self._uid, ref_id, obj, self._cache, context=self._context, list_class=self._list_class, fields_process=self._fields_process)
else:
new_data[n] = browse_null()
else: