diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-01-22 17:47:32 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-01-22 17:47:32 +0100 |
| commit | fa1f2132e79f2ac2314a8b417d5d35d6571bd41b (patch) | |
| tree | 3789a8335dd5089998de3c5c6a391b2d95a85187 /odoo | |
| parent | db27489fe756b24647e993a22340705625839698 (diff) | |
| parent | 950d9b2369046f2e3199d144df8edbd0e63f8a2f (diff) | |
[MERGE] forward port branch 11.0 up to 950d9b23690
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/addons/base/data/res_country_data.xml | 2 | ||||
| -rw-r--r-- | odoo/addons/base/models/ir_actions_report.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/odoo/addons/base/data/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml index 031af455c5b..819082fb27d 100644 --- a/odoo/addons/base/data/res_country_data.xml +++ b/odoo/addons/base/data/res_country_data.xml @@ -1597,7 +1597,7 @@ <field name="code">tl</field> <field file="base/static/img/country_flags/tl.png" name="image" type="base64" /> <field name="currency_id" ref="USD" /> - <field eval="0" name="phone_code" /> + <field eval="670" name="phone_code" /> </record> <record id="tr" model="res.country"> <field name="name">Turkey</field> diff --git a/odoo/addons/base/models/ir_actions_report.py b/odoo/addons/base/models/ir_actions_report.py index f4e3648b578..3d66287289a 100644 --- a/odoo/addons/base/models/ir_actions_report.py +++ b/odoo/addons/base/models/ir_actions_report.py @@ -678,7 +678,7 @@ class IrActionsReport(models.Model): """ discard_logo_check = self.env.context.get('discard_logo_check') if (self.env.uid == SUPERUSER_ID) and ((not self.env.user.company_id.external_report_layout) or (not discard_logo_check and not self.env.user.company_id.logo)) and config: - template = self.env.ref('base.view_company_report_form_with_print') + template = self.env.ref('base.view_company_report_form_with_print') if self.env.context.get('from_transient_model', False) else self.env.ref('base.view_company_report_form') return { 'name': _('Choose Your Document Layout'), 'type': 'ir.actions.act_window', |