mirror of
https://github.com/guohuadeng/app-odoo.git
synced 2025-02-23 04:11:36 +02:00
fix superbar
fix auto ref fix chinese
This commit is contained in:
@@ -14,13 +14,19 @@ class ResPartner(models.Model):
|
||||
@api.multi
|
||||
def name_get(self):
|
||||
result = []
|
||||
name = ''
|
||||
for partner in self:
|
||||
if partner.short_name:
|
||||
name = partner.short_name
|
||||
else:
|
||||
name = partner.name
|
||||
if partner.ref:
|
||||
name = '[' + partner.ref + ']' + name
|
||||
try:
|
||||
name = '[' + partner.ref + ']'
|
||||
except:
|
||||
name = ''
|
||||
if partner.short_name:
|
||||
name = name + partner.short_name
|
||||
elif partner.name:
|
||||
name = name + partner.name
|
||||
else:
|
||||
name = name
|
||||
result.append((partner.id, name))
|
||||
return result
|
||||
|
||||
@@ -30,5 +36,3 @@ class PartnerCategory(models.Model):
|
||||
_order = 'sequence, name'
|
||||
|
||||
sequence = fields.Integer('Sequence', help="Used to order partner category")
|
||||
|
||||
|
||||
|
||||
@@ -54,8 +54,12 @@
|
||||
<xpath expr="//notebook/page[1]" position="attributes">
|
||||
<attribute name="attrs">{'invisible': [('is_company','!=', True)]}</attribute>
|
||||
</xpath>
|
||||
<!-- 所有类型联系人都要填姓名 -->
|
||||
<xpath expr="//page//field[@name='child_ids']//form[1]//field[@name='name']" position="attributes">
|
||||
<attribute name="required">1</attribute>
|
||||
</xpath>
|
||||
<!-- 联系人也显示地址,中国格式 -->
|
||||
<xpath expr="//page//form[1]//group//group" position="replace">
|
||||
<xpath expr="//page//field[@name='child_ids']//form[1]//group//group" position="replace">
|
||||
<group attrs="">
|
||||
<label for="street" string="Address"/>
|
||||
<div>
|
||||
@@ -74,7 +78,7 @@
|
||||
</xpath>
|
||||
<!-- res.partner联系人 kanban -->
|
||||
<!-- 显示类型和地址等 -->
|
||||
<xpath expr="//page//kanban[1]//templates//div[@class='oe_kanban_details']" position="replace">
|
||||
<xpath expr="//page//field[@name='child_ids']//kanban[1]//templates//div[@class='oe_kanban_details']" position="replace">
|
||||
<div class="oe_kanban_details">
|
||||
<div>
|
||||
[<field name="ref"/>]
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
<superbar view_mode="kanban,tree">
|
||||
<field name="category_id"/>
|
||||
<field name="country_id"/>
|
||||
<field name="parent_id"
|
||||
<field name="commercial_partner_id"
|
||||
widget="ztree_search"
|
||||
model="res.partner"
|
||||
domain="[[('is_company', '=', 1)]]"
|
||||
domain="[('is_company', '=', 1)]"
|
||||
level="0"/>
|
||||
</superbar>
|
||||
</xpath>
|
||||
|
||||
Reference in New Issue
Block a user