diff options
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/addons/base/ir/ir_qweb/fields.py | 2 | ||||
| -rw-r--r-- | odoo/addons/base/res/res_country_data.xml | 1 | ||||
| -rw-r--r-- | odoo/addons/base/res/res_currency_data.xml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/odoo/addons/base/ir/ir_qweb/fields.py b/odoo/addons/base/ir/ir_qweb/fields.py index 677763359c7..c7dadb1ce8f 100644 --- a/odoo/addons/base/ir/ir_qweb/fields.py +++ b/odoo/addons/base/ir/ir_qweb/fields.py @@ -97,6 +97,8 @@ class FieldConverter(models.AbstractModel): Converts the specified field of the browse_record ``record`` to HTML :rtype: unicode """ + if not record: + return False value = record[field_name] return False if value is False else record.env[self._name].value_to_html(value, options=options) diff --git a/odoo/addons/base/res/res_country_data.xml b/odoo/addons/base/res/res_country_data.xml index bd642c7c5c4..39282bef53d 100644 --- a/odoo/addons/base/res/res_country_data.xml +++ b/odoo/addons/base/res/res_country_data.xml @@ -354,6 +354,7 @@ <field file="base/static/img/country_flags/co.png" name="image" type="base64" /> <field name="currency_id" ref="COP" /> <field eval="57" name="phone_code" /> + <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_name)s %(zip)s\n%(country_name)s'" /> </record> <record id="cr" model="res.country"> <field name="name">Costa Rica</field> diff --git a/odoo/addons/base/res/res_currency_data.xml b/odoo/addons/base/res/res_currency_data.xml index b67ab0fc41d..c89552c5783 100644 --- a/odoo/addons/base/res/res_currency_data.xml +++ b/odoo/addons/base/res/res_currency_data.xml @@ -50,6 +50,7 @@ <field name="symbol">$</field> <field name="rounding">0.01</field> <field name="active" eval="False"/> + <field name="position">before</field> </record> <record id="CZK" model="res.currency"> |