odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

bugfix 

bzr revid: fp@tinyerp.com-20090126182807-c7h6sv0ekcfey1g2
This commit is contained in:
Fabien Pinckaers 2009-01-26 19:28:07 +01:00
parent 31fc6a5973
commit 264fb04db7
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/base_contact/base_contact.py
View File

@ -79,7 +79,7 @@ class res_partner_address(osv.osv):
res.append((r['id'], r['partner_id'][1]))
else:
addr = str('')
addr += "%s %s %s" % ( r.get('street', ''), r.get('zip', ''), r.get('city', '') )
addr += "%s %s %s" % ( r.get('street', '') or '', r.get('zip', '') or '', r.get('city', '') or '' )
res.append((r['id'], addr.strip() or '/'))
return res

16
addons/hr_expense/hr_expense_view.xml
View File

@ -40,16 +40,18 @@
<field name="model">hr.expense.expense</field>
<field name="arch" type="xml">
<form string="Expenses Sheet">
<notebook>
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="employee_id" select="1"/>
<field name="id" select="2"/>
<field name="date" select="1"/>
<field name="amount"/>
<field name="currency_id"/>
</group>
<notebook colspan="4">
<page string="Expense Sheet">
<field name="name" select="1"/>
<field name="id" select="2"/>
<field name="employee_id" select="1"/>
<field name="date" select="1"/>
<field name="ref" select="2"/>
<newline/>
<field name="amount"/>
<field name="currency_id"/>
<field colspan="4" name="line_ids" nolabel="1">
<form string="Expense Lines">
<field name="product_id" on_change="onchange_product_id(product_id, uom_id)" select="2"/>