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

[MERGE] merged latest fixes from 6.0, up to revision 3420 

Rev 3420 = odo@openerp.com-20110506093704-1vwxsqyz63lq40a1

bzr revid: odo@openerp.com-20110506093920-j1uobqryzx5vv6vv
This commit is contained in:
Olivier Dony 2011-05-06 11:39:20 +02:00
parent c79040b08e 423fe4258e
commit ab212d05eb
5 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openerp/addons/base/i18n/ru.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-04-27 12:17+0000\n"
"PO-Revision-Date: 2011-05-04 17:31+0000\n"
"Last-Translator: Chertykov Denis <chertykov@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: 2011-04-28 05:48+0000\n"
"X-Generator: Launchpad (build 12758)\n"
"X-Launchpad-Export-Date: 2011-05-05 06:00+0000\n"
"X-Generator: Launchpad (build 12959)\n"
#. module: base
#: view:ir.filters:0
@ -23,7 +23,7 @@ msgstr ""
#: field:ir.rule,domain_force:0
#: field:res.partner.title,domain:0
msgid "Domain"
msgstr "Домен"
msgstr "Ограничение"
#. module: base
#: model:res.country,name:base.sh
@ -256,7 +256,7 @@ msgstr "Макс. размер"
#. module: base
#: field:res.partner.address,name:0
msgid "Contact Name"
msgstr "Название договора"
msgstr "Имя контакта"
#. module: base
#: code:addons/base/module/wizard/base_export_language.py:56
@ -685,7 +685,7 @@ msgstr "Импорт / Экспорт"
msgid ""
"Optional domain filtering of the destination data, as a Python expression"
msgstr ""
"Дополнительная фильтрация данных назначения, в виде выражения на Python"
"Дополнительная фильтрация выходных данных, в виде выражения на Python"
#. module: base
#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
@ -2572,7 +2572,7 @@ msgstr "RML (устаревший - используйте Отчет)"
#. module: base
#: view:ir.rule:0
msgid "Record rules"
msgstr "Правила записи"
msgstr "Ограничение доступа"
#. module: base
#: view:ir.property:0
@ -6421,7 +6421,7 @@ msgstr ""
#: model:ir.actions.act_window,name:base.action_rule
#: model:ir.ui.menu,name:base.menu_action_rule
msgid "Record Rules"
msgstr "Правила записи"
msgstr "Ограничение доступа"
#. module: base
#: field:res.config.users,name:0

22
openerp/addons/base/i18n/vi.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-04-19 02:34+0000\n"
"Last-Translator: Nguyễn Thịnh <thinhnverp@gmail.com>\n"
"PO-Revision-Date: 2011-05-04 18:57+0000\n"
"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
"Language-Team: Vietnamese <vi@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: 2011-04-20 05:56+0000\n"
"X-Generator: Launchpad (build 12758)\n"
"X-Launchpad-Export-Date: 2011-05-05 06:00+0000\n"
"X-Generator: Launchpad (build 12959)\n"
#. module: base
#: view:ir.filters:0
@ -118,6 +118,8 @@ msgid ""
"You can not write in this document (%s) ! Be sure your user belongs to one "
"of these groups: %s."
msgstr ""
"Bạn không thể viết trong tài liệu này (% s) ! Hãy chắc chắn người dùng của "
"bạn thuộc một trong các nhóm: %s."
#. module: base
#: help:ir.model.fields,domain:0
@ -692,7 +694,7 @@ msgstr ""
#: field:res.partner,mobile:0
#: field:res.partner.address,mobile:0
msgid "Mobile"
msgstr "Di động"
msgstr "Số di động"
#. module: base
#: model:res.country,name:base.om
@ -4447,7 +4449,7 @@ msgstr ""
#: view:res.partner:0
#: field:res.partner,user_id:0
msgid "Salesman"
msgstr "NV bán hàng"
msgstr "Nhân viên bán hàng"
#. module: base
#: field:res.partner,address:0
@ -6810,7 +6812,7 @@ msgstr "Các mô-đun sau chưa được cài đặt hoặc không biết: %s"
#: view:res.users:0
#: field:res.widget.user,user_id:0
msgid "User"
msgstr "Người dùng"
msgstr "Người sử dụng"
#. module: base
#: model:res.country,name:base.pr
@ -7021,7 +7023,7 @@ msgstr "Tháng: %(month)s"
#: field:res.widget.user,sequence:0
#: field:wizard.ir.model.menu.create.line,sequence:0
msgid "Sequence"
msgstr "Sequence"
msgstr "Trình tự"
#. module: base
#: model:res.country,name:base.tn
@ -8766,7 +8768,7 @@ msgstr ""
#: view:res.users:0
#: field:res.users,company_id:0
msgid "Company"
msgstr "Company"
msgstr "Công ty"
#. module: base
#: view:res.users:0
@ -9016,7 +9018,7 @@ msgstr "ir.actions.server"
#: field:res.config.users,progress:0
#: field:res.config.view,progress:0
msgid "Configuration Progress"
msgstr "Configuration Progress"
msgstr "Tiến trình cấu hình"
#. module: base
#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form

11
openerp/addons/base/ir/ir_attachment.py
View File

@ -121,7 +121,7 @@ class ir_attachment(osv.osv):
return self.pool.get('ir.actions.act_window').for_xml_id(
cr, uid, 'base', 'action_attachment', context=context)
def _name_get_resname(self, cr, uid, ids, object,method, context):
def _name_get_resname(self, cr, uid, ids, object, method, context):
data = {}
for attachment in self.browse(cr, uid, ids, context=context):
model_object = attachment.res_model
@ -129,9 +129,14 @@ class ir_attachment(osv.osv):
if model_object and res_id:
model_pool = self.pool.get(model_object)
res = model_pool.name_get(cr,uid,[res_id],context)
data[attachment.id] = (res and res[0][1]) or False
res_name = res and res[0][1] or False
if res_name:
field = self._columns.get('res_name',False)
if field and len(res_name) > field.size:
res_name = res_name[:field.size-3] + '...'
data[attachment.id] = res_name
else:
data[attachment.id] = False
data[attachment.id] = False
return data
_name = 'ir.attachment'

2
openerp/addons/base/res/res_user.py
View File

@ -365,7 +365,7 @@ class users(osv.osv):
break
else:
if 'company_id' in values:
if not (values['company_id'] in self.read(cr, uid, uid, ['company_ids'], context=context)['company_ids']):
if not (values['company_id'] in self.read(cr, 1, uid, ['company_ids'], context=context)['company_ids']):
del values['company_id']
uid = 1 # safe fields only, so we write as super-user to bypass access rights

2
openerp/report/render/rml2pdf/trml2pdf.py
View File

@ -451,7 +451,7 @@ class _rml_canvas(object):
res = utils._regex.findall(node.text)
for key in res:
newtext = eval(key, {}, self.localcontext)
node.text = newtext
node.text = newtext or ''
image_data = None
if node.text:
image_data = base64.decodestring(node.text)