Rutul Shah(Open ERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-bug-attachment_usability-rts into lp:~openerp-dev/openobject-server/trunk-bugfixes-Ind.
Requested reviews: OpenERP R&D Team (openerp-dev) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-attachment_usability-rts/+merge/60338 -- https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-attachment_usability-rts/+merge/60338 Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-server/trunk-bug-attachment_usability-rts into lp:~openerp-dev/openobject-server/trunk-bugfixes-Ind.
=== modified file 'openerp/addons/base/i18n/ru.po' --- openerp/addons/base/i18n/ru.po 2011-04-28 16:04:34 +0000 +++ openerp/addons/base/i18n/ru.po 2011-05-09 06:55:51 +0000 @@ -7,14 +7,14 @@ "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: [email protected]\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 <[email protected]>\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 @@ #: 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 @@ #. 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 @@ 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 @@ #. module: base #: view:ir.rule:0 msgid "Record rules" -msgstr "ÐÑавила запиÑи" +msgstr "ÐгÑаниÑение доÑÑÑпа" #. module: base #: view:ir.property:0 @@ -6421,7 +6421,7 @@ #: 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 === modified file 'openerp/addons/base/i18n/vi.po' --- openerp/addons/base/i18n/vi.po 2011-04-28 16:04:34 +0000 +++ openerp/addons/base/i18n/vi.po 2011-05-09 06:55:51 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: [email protected]\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 <[email protected]>\n" +"PO-Revision-Date: 2011-05-04 18:57+0000\n" +"Last-Translator: Phong Nguyen-Thanh <Unknown>\n" "Language-Team: Vietnamese <[email protected]>\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 @@ "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 @@ #: 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 @@ #: 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 @@ #: 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 @@ #: 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 @@ #: 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 @@ #: 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 === modified file 'openerp/addons/base/ir/ir.xml' --- openerp/addons/base/ir/ir.xml 2011-04-26 10:39:53 +0000 +++ openerp/addons/base/ir/ir.xml 2011-05-09 06:55:51 +0000 @@ -984,7 +984,7 @@ <group expand="0" string="Group By..."> <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_extended"/> - <filter string="Company" icon="terp-gtk-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> + <filter string="Company" help="Group by Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <separator orientation="vertical"/> <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/> </group> === modified file 'openerp/addons/base/ir/ir_attachment.py' --- openerp/addons/base/ir/ir_attachment.py 2011-02-21 10:32:35 +0000 +++ openerp/addons/base/ir/ir_attachment.py 2011-05-09 06:55:51 +0000 @@ -121,7 +121,7 @@ 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 @@ 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' === modified file 'openerp/addons/base/res/res_user.py' --- openerp/addons/base/res/res_user.py 2011-04-28 15:39:01 +0000 +++ openerp/addons/base/res/res_user.py 2011-05-09 06:55:51 +0000 @@ -365,7 +365,7 @@ 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 === modified file 'openerp/report/render/rml2pdf/trml2pdf.py' --- openerp/report/render/rml2pdf/trml2pdf.py 2011-02-07 12:57:23 +0000 +++ openerp/report/render/rml2pdf/trml2pdf.py 2011-05-09 06:55:51 +0000 @@ -451,7 +451,7 @@ 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)
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-web Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-web More help : https://help.launchpad.net/ListHelp
