Ravi Gohil (Open ERP) has proposed merging lp:~openerp-dev/openobject-server/6.0-bug-771784-rgo into lp:openobject-server.
Requested reviews: Anup(OpenERP) (ach-openerp) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-server/6.0-bug-771784-rgo/+merge/66455 Hello, There was a problem while editing the shortcut name from Shortcut menu, the changes made from menu Shortcut->Edit was not reflected in main GUI Shortcuts. This fixes the issue. Thanks. -- https://code.launchpad.net/~openerp-dev/openobject-server/6.0-bug-771784-rgo/+merge/66455 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/6.0-bug-771784-rgo.
=== modified file 'debian/po/nb.po' --- debian/po/nb.po 2011-06-27 04:46:11 +0000 +++ debian/po/nb.po 2011-06-30 12:49:23 +0000 @@ -8,14 +8,24 @@ "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-08-24 22:41+0300\n" +<<<<<<< TREE "PO-Revision-Date: 2010-03-16 05:12+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" +======= +"PO-Revision-Date: 2011-06-09 11:52+0000\n" +"Last-Translator: Rolv RÃ¥en (adEgo) <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Norwegian Bokmal <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-10 05:38+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. Type: string #. Description === modified file 'openerp/addons/base/i18n/cs.po' --- openerp/addons/base/i18n/cs.po 2011-06-27 04:46:11 +0000 +++ openerp/addons/base/i18n/cs.po 2011-06-30 12:49:23 +0000 @@ -1,20 +1,30 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * base +# * base # msgid "" msgstr "" "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" +<<<<<<< TREE "PO-Revision-Date: 2010-06-06 04:19+0000\n" "Last-Translator: VladimÃr Burian <[email protected]>\n" +======= +"PO-Revision-Date: 2011-06-24 01:18+0000\n" +"Last-Translator: Chronos <Unknown>\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: 2011-06-27 04:35+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-25 06:19+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 @@ -9388,6 +9398,7 @@ #. module: base #: selection:base.language.install,lang:0 msgid "Russian / ÑÑÑÑкий ÑзÑк" +<<<<<<< TREE msgstr "RuÅ¡tina / ÑÑÑÑкий ÑзÑк" #~ msgid "Outgoing transitions" @@ -9760,3 +9771,6 @@ #~ msgid "STOCK_CONNECT" #~ msgstr "STOCK_PÅIPOJENO" +======= +msgstr "RuÅ¡tina / ÑÑÑÑкий ÑзÑк" +>>>>>>> MERGE-SOURCE === modified file 'openerp/addons/base/i18n/da.po' --- openerp/addons/base/i18n/da.po 2011-06-27 04:46:11 +0000 +++ openerp/addons/base/i18n/da.po 2011-06-30 12:49:23 +0000 @@ -8,14 +8,24 @@ "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-02-07 05:09+0000\n" "Last-Translator: Fabien (Open ERP) <[email protected]>\n" +======= +"PO-Revision-Date: 2011-05-29 20:17+0000\n" +"Last-Translator: Henning Dinsen <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Danish <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2011-06-27 04:36+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-05-30 05:40+0000\n" +"X-Generator: Launchpad (build 12959)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/en_GB.po' --- openerp/addons/base/i18n/en_GB.po 2011-06-28 04:39:20 +0000 +++ openerp/addons/base/i18n/en_GB.po 2011-06-30 12:49:23 +0000 @@ -8,14 +8,24 @@ "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2011-06-27 13:53+0000\n" "Last-Translator: John Bradshaw <Unknown>\n" +======= +"PO-Revision-Date: 2011-06-20 11:22+0000\n" +"Last-Translator: John Bradshaw <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: English (United Kingdom) <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2011-06-28 04:39+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-21 06:07+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/fi.po' --- openerp/addons/base/i18n/fi.po 2011-06-27 04:46:11 +0000 +++ openerp/addons/base/i18n/fi.po 2011-06-30 12:49:23 +0000 @@ -7,14 +7,24 @@ "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" +<<<<<<< TREE "PO-Revision-Date: 2011-01-26 13:00+0000\n" "Last-Translator: Ville Lindfors <[email protected]>\n" +======= +"PO-Revision-Date: 2011-06-08 09:33+0000\n" +"Last-Translator: Juha Kotamäki <Unknown>\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: 2011-06-27 04:36+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-09 05:43+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/it.po' --- openerp/addons/base/i18n/it.po 2011-06-27 04:46:11 +0000 +++ openerp/addons/base/i18n/it.po 2011-06-30 12:49:23 +0000 @@ -7,15 +7,25 @@ "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" +<<<<<<< TREE "PO-Revision-Date: 2011-04-28 13:32+0000\n" "Last-Translator: Lorenzo Battistini - Agile BG - Domsense " +======= +"PO-Revision-Date: 2011-06-06 09:35+0000\n" +"Last-Translator: Lorenzo Battistini - Agile BG - Domsense " +>>>>>>> MERGE-SOURCE "<[email protected]>\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: 2011-06-27 04:38+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-07 05:51+0000\n" +"X-Generator: Launchpad (build 12959)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/nb.po' --- openerp/addons/base/i18n/nb.po 2011-06-27 04:46:11 +0000 +++ openerp/addons/base/i18n/nb.po 2011-06-30 12:49:23 +0000 @@ -8,14 +8,24 @@ "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2010-03-11 05:06+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" +======= +"PO-Revision-Date: 2011-06-09 11:51+0000\n" +"Last-Translator: Rolv RÃ¥en (adEgo) <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Norwegian Bokmal <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2011-06-27 04:39+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-10 05:38+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/ru.po' --- openerp/addons/base/i18n/ru.po 2011-06-27 04:46:11 +0000 +++ openerp/addons/base/i18n/ru.po 2011-06-30 12:49:23 +0000 @@ -7,14 +7,24 @@ "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" +<<<<<<< TREE "PO-Revision-Date: 2011-05-26 04:57+0000\n" "Last-Translator: Pomazan Bogdan <Unknown>\n" +======= +"PO-Revision-Date: 2011-06-29 12:46+0000\n" +"Last-Translator: Chertykov Denis <[email protected]>\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: 2011-06-27 04:41+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-30 05:19+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 @@ -3897,7 +3907,7 @@ #: view:ir.ui.view_sc:0 #: field:res.partner.title,shortcut:0 msgid "Shortcut" -msgstr "Ðакладка" +msgstr "СокÑаÑение" #. module: base #: field:ir.model.data,date_init:0 @@ -4902,7 +4912,7 @@ #. module: base #: field:ir.actions.act_window,search_view_id:0 msgid "Search View Ref." -msgstr "ÐоиÑк ÑÑÑлки на обзоÑ" +msgstr "СÑÑлка на поиÑк вида" #. module: base #: field:ir.module.module,installed_version:0 @@ -5811,7 +5821,7 @@ #. module: base #: model:ir.ui.menu,name:base.menu_administration_shortcut msgid "Custom Shortcuts" -msgstr "ÐолÑзоваÑелÑÑкие комбинаÑии клавиÑ" +msgstr "ÐолÑзоваÑелÑÑкие закладки" #. module: base #: selection:base.language.install,lang:0 === modified file 'openerp/addons/base/i18n/tr.po' --- openerp/addons/base/i18n/tr.po 2011-06-27 04:46:11 +0000 +++ openerp/addons/base/i18n/tr.po 2011-06-30 12:49:23 +0000 @@ -7,14 +7,24 @@ "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" +<<<<<<< TREE "PO-Revision-Date: 2011-05-26 05:01+0000\n" "Last-Translator: Ahmet AltınıÅık <Unknown>\n" +======= +"PO-Revision-Date: 2011-06-27 06:13+0000\n" +"Last-Translator: Ahmet AltınıÅık <Unknown>\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: 2011-06-27 04:43+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-28 05:29+0000\n" +"X-Generator: Launchpad (build 13168)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 === modified file 'openerp/addons/base/i18n/vi.po' --- openerp/addons/base/i18n/vi.po 2011-06-27 04:46:11 +0000 +++ openerp/addons/base/i18n/vi.po 2011-06-30 12:49:23 +0000 @@ -8,14 +8,23 @@ "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" +<<<<<<< TREE "PO-Revision-Date: 2011-06-14 10:07+0000\n" +======= +"PO-Revision-Date: 2011-06-04 22:17+0000\n" +>>>>>>> MERGE-SOURCE "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" +<<<<<<< TREE "X-Launchpad-Export-Date: 2011-06-27 04:43+0000\n" "X-Generator: Launchpad (build 13168)\n" +======= +"X-Launchpad-Export-Date: 2011-06-05 06:14+0000\n" +"X-Generator: Launchpad (build 12959)\n" +>>>>>>> MERGE-SOURCE #. module: base #: view:ir.filters:0 @@ -24,7 +33,11 @@ #: field:ir.rule,domain_force:0 #: field:res.partner.title,domain:0 msgid "Domain" +<<<<<<< TREE msgstr "Miá»n giá trá»" +======= +msgstr "Miá»n" +>>>>>>> MERGE-SOURCE #. module: base #: model:res.country,name:base.sh @@ -130,9 +143,15 @@ "specified as a Python expression defining a list of triplets. For example: " "[('color','=','red')]" msgstr "" +<<<<<<< TREE "Miá»n giá trá» tùy chá»n dùng Äá» giá»i hạn các giá trá» có thá» Äá»i vá»i các trÆ°á»ng " "quan há», Äược chá» Äá»nh bá»i má»t biá»u thức Python Äá»nh nghÄ©a má»t danh sách của " "các bá» ba. Và dụ: [('mà u'='Äá»')]" +======= +"Miá»n tùy chá»n dùng Äá» giá»i hạn các giá trá» có thá» Äá»i vá»i các trÆ°á»ng quan " +"há», Äược chá» Äá»nh bá»i má»t biá»u thức Python Äá»nh nghÄ©a má»t danh sách của các " +"bá» ba. Và dụ: [('mà u'='Äá»')]" +>>>>>>> MERGE-SOURCE #. module: base #: field:res.partner,ref:0 === modified file 'openerp/addons/base/ir/ir_ui_view.py' --- openerp/addons/base/ir/ir_ui_view.py 2011-06-24 13:33:35 +0000 +++ openerp/addons/base/ir/ir_ui_view.py 2011-06-30 12:49:23 +0000 @@ -196,13 +196,10 @@ def get_sc(self, cr, uid, user_id, model='ir.ui.menu', context=None): ids = self.search(cr, uid, [('user_id','=',user_id),('resource','=',model)], context=context) - results = self.read(cr, uid, ids, ['res_id'], context=context) - name_map = dict(self.pool.get(model).name_get(cr, uid, [x['res_id'] for x in results], context=context)) + results = self.read(cr, uid, ids, ['res_id','name'], context=context) + available_menus = self.pool.get(model).search(cr, uid, [], context=context) # Make sure to return only shortcuts pointing to exisintg menu items. - filtered_results = filter(lambda result: result['res_id'] in name_map, results) - for result in filtered_results: - result.update(name=name_map[result['res_id']]) - return filtered_results + return filter(lambda result: result['res_id'] in available_menus, results) _order = 'sequence,name' _defaults = { === modified file 'openerp/addons/base/res/res_lang.py' --- openerp/addons/base/res/res_lang.py 2011-06-23 14:10:03 +0000 +++ openerp/addons/base/res/res_lang.py 2011-06-30 12:49:23 +0000 @@ -51,6 +51,7 @@ return False lang_ids = self.search(cr, uid, [('code','=', lang)]) if not lang_ids: +<<<<<<< TREE self.load_lang(cr, uid, lang) ir_values_obj = self.pool.get('ir.values') default_value = ir_values_obj.get(cr, uid, 'default', False, ['res.partner']) @@ -59,6 +60,12 @@ default_value = ir_values_obj.get(cr, uid, 'default', False, ['res.users']) if not default_value: ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], lang) +======= + lang_id = self.load_lang(cr, uid, lang) + default_value = values_obj.get(cr, uid, 'default', False, ['res.partner']) + if not default_value: + values_obj.set(cr, uid, 'default', False, 'lang', ['res.partner'], lang) +>>>>>>> MERGE-SOURCE return True def load_lang(self, cr, uid, lang, lang_name=None): === modified file 'openerp/osv/orm.py' --- openerp/osv/orm.py 2011-06-27 13:26:01 +0000 +++ openerp/osv/orm.py 2011-06-30 12:49:23 +0000 @@ -562,6 +562,7 @@ 'translate': (f.translate and 1) or 0, 'relation_field': (f._type=='one2many' and isinstance(f, fields.one2many)) and f._fields_id or '', } + # When its a custom field,it does not contain f.select if context.get('field_state', 'base') == 'manual': if context.get('field_name', '') == k: === modified file 'openerp/report/printscreen/ps_form.py' --- openerp/report/printscreen/ps_form.py 2011-02-07 12:57:23 +0000 +++ openerp/report/printscreen/ps_form.py 2011-06-30 12:49:23 +0000 @@ -54,15 +54,15 @@ if not context: context={} datas['ids'] = ids + pool = pooler.get_pool(cr.dbname) model = pool.get(datas['model']) - pool = pooler.get_pool(cr.dbname) # title come from description of model which are specified in py file. self.title = model._description result = model.fields_view_get(cr, uid, view_type='form', context=context) fields_order = self._parse_string(result['arch']) rows = model.read(cr, uid, datas['ids'], result['fields'].keys() ) - res = self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, model._description) + self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, model._description) return (self.obj.get(), 'pdf') === modified file 'openerp/report/report_sxw.py' --- openerp/report/report_sxw.py 2011-05-09 08:46:41 +0000 +++ openerp/report/report_sxw.py 2011-06-30 12:49:23 +0000 @@ -231,16 +231,6 @@ self.lang_dict_called = False for obj in self.objects: obj._context['lang'] = lang - for table in obj._cache: - for id in obj._cache[table]: - self._lang_cache.setdefault(obj._context['lang'], {}).setdefault(table, - {}).update(obj._cache[table][id]) - if lang in self._lang_cache \ - and table in self._lang_cache[lang] \ - and id in self._lang_cache[lang][table]: - obj._cache[table][id] = self._lang_cache[lang][table][id] - else: - obj._cache[table][id] = {'id': id} def _get_lang_dict(self): pool_lang = self.pool.get('res.lang') === modified file 'openerp/tools/yaml_import.py'
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
