[MERGE] lp:openobject-server
bzr revid: jam@tinyerp.com-20120713044316-g8bvxbdul9cdhuxg
This commit is contained in:
Jigar Amin - OpenERP
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -113,28 +113,21 @@
|
||||
<h1>
|
||||
<field name="name"/>
|
||||
</h1>
|
||||
<div attrs="{'invisible': [('is_company','=', True)]}">
|
||||
<label for="parent_id" class="oe_edit_only"/>
|
||||
</div>
|
||||
<h2 attrs="{'invisible': [('is_company','=', True)]}">
|
||||
<field name="parent_id"
|
||||
domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
|
||||
class="oe_inline"
|
||||
on_change="onchange_address(use_parent_address, parent_id)"/>,
|
||||
<field name="function" class="oe_inline" placeholder="Job Position"/>
|
||||
</h2>
|
||||
<field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
|
||||
</div>
|
||||
|
||||
<group>
|
||||
<group>
|
||||
<field name="parent_id"
|
||||
domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
|
||||
attrs="{'invisible': [('is_company','=', True)]}"
|
||||
on_change="onchange_address(use_parent_address, parent_id)"/>,
|
||||
<label for="type" attrs="{'invisible': [('parent_id','=', False)]}"/>
|
||||
<div attrs="{'invisible': [('parent_id','=', False)]}">
|
||||
<field class="oe_inline"
|
||||
name="type"/>
|
||||
<label for="use_parent_address"/>
|
||||
<field name="use_parent_address"
|
||||
class="oe_inline"
|
||||
<label for="use_parent_address" class="oe_edit_only"/>
|
||||
<field name="use_parent_address" class="oe_edit_only oe_inline"
|
||||
on_change="onchange_address(use_parent_address, parent_id)"/>
|
||||
</div>
|
||||
|
||||
@@ -143,20 +136,23 @@
|
||||
<field name="street" placeholder="Street..."/>
|
||||
<field name="street2"/>
|
||||
<div>
|
||||
<field name="zip" class="oe_inline" placeholder="ZIP"/>
|
||||
<field name="city" class="oe_inline" placeholder="City"/>
|
||||
<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%%"/>
|
||||
</div>
|
||||
<field name="state_id" placeholder="State"/>
|
||||
<field name="country_id" placeholder="Country"/>
|
||||
<field name="country_id" placeholder="Country" class="oe_no_button"/>
|
||||
</div>
|
||||
<field name="website" widget="url" placeholder="www.openerp.com"/>
|
||||
<field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="phone" placeholder="+32.81.81.37.00"/>
|
||||
<field name="function" placeholder="e.g. Sales Director"
|
||||
attrs="{'invisible': [('is_company','=', True)]}"/>
|
||||
<field name="phone" placeholder="e.g. +32.81.81.37.00"/>
|
||||
<field name="mobile"/>
|
||||
<field name="fax"/>
|
||||
<field name="email" widget="email"/>
|
||||
<field name="title" domain="[('domain', '=', 'contact')]" attrs="{'invisible': [('is_company','=', True)]}"/>
|
||||
<field name="title" domain="[('domain', '=', 'contact')]"
|
||||
class="oe_no_button" attrs="{'invisible': [('is_company','=', True)]}"/>
|
||||
</group>
|
||||
</group>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user