merge

bzr revid: fp@openerp.com-20120713203613-5o143hbyyzbp20ab

openerp/addons/base/i18n/tlh.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2009-11-30 07:48+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-07-10 17:36+0000\n"
+"Last-Translator: Felix Malmenbeck <felixm@kth.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: 2012-07-05 04:46+0000\n"
-"X-Generator: Launchpad (build 15544)\n"
+"X-Launchpad-Export-Date: 2012-07-11 05:14+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -24,7 +24,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "latlh Qur"
 
 #. module: base
 #: selection:ir.property,type:0

openerp/addons/base/module/module_view.xml

@@ -128,9 +128,7 @@
                         <field name="icon_image" widget="image"/>
                     </div>
                     <div class="oe_title">
-                        <label for="shortdesc" class="oe_edit_only"/>
                         <h1><field name="shortdesc"/></h1>
-                        <label for="category_id" class="oe_edit_only"/>
                         <h2><field name="category_id" class="oe_inline"/></h2>
                     </div>
                     <group>

openerp/addons/base/res/res_bank.py

@@ -172,6 +172,17 @@ class res_partner_bank(osv.osv):
                             ('required', field.required)]
         return res
 
+    def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
+        """
+        Format the name of a res.partner.bank.
+        This function is designed to be inherited to add replacement fields.
+        :param browse_record bank_type_obj: res.partner.bank.type object
+        :param browse_record bank_obj: res.partner.bank object
+        :rtype: str
+        :return: formatted name of a res.partner.bank record
+        """
+        return bank_type_obj.format_layout % bank_obj._data[bank_obj.id]
+
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
@@ -187,7 +198,7 @@ class res_partner_bank(osv.osv):
                         # avoid the default format_layout to result in "False: ..."
                         if not val._data[val.id]['bank_name']:
                             val._data[val.id]['bank_name'] = _('BANK')
-                        result = t.format_layout % val._data[val.id]
+                        result = self._prepare_name_get(cr, uid, t, val, context=context)
                     except:
                         result += ' [Formatting Error]'
                         raise

openerp/addons/base/res/res_partner_view.xml

@@ -135,7 +135,7 @@
                             <div>
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
-                                <div>
+                                <div class="address_format">
                                     <field name="city" placeholder="City" style="width: 40%%"/>
                                     <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
                                     <field name="zip" placeholder="ZIP" style="width: 34%%"/>

openerp/addons/base/res/res_users_view.xml

@@ -209,7 +209,7 @@
                                 groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                         </h2>
                     </div>
-                    <group col="4" string="Preferences">
+                    <group col="4" name="preferences" string="Preferences">
                         <field name="context_lang" readonly="0"/>
                         <field name="context_tz" readonly="0"/>
                     </group>