diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-04-16 11:18:08 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-04-16 11:18:08 +0200 |
| commit | 412501a5dc8f8826f10eac0c19adfa82527ad4bb (patch) | |
| tree | 76b7408ff58ac78c16a585b8ed7c41d97770e999 /odoo | |
| parent | 4162360ae2114bc6eee25e2ffca0e0d48e1ef644 (diff) | |
| parent | 71476226653ba0326cfc0331e1463364cfb89f4e (diff) | |
[MERGE] forward port branch 10.0 up to 71476226653
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/addons/base/module/module.py | 2 | ||||
| -rw-r--r-- | odoo/addons/base/res/res_country_data.xml | 2 | ||||
| -rw-r--r-- | odoo/addons/base/res/res_currency_data.xml | 8 | ||||
| -rw-r--r-- | odoo/addons/base/res/res_currency_demo.xml | 6 |
4 files changed, 16 insertions, 2 deletions
diff --git a/odoo/addons/base/module/module.py b/odoo/addons/base/module/module.py index 3e2eb4749cb..e499eb6550b 100644 --- a/odoo/addons/base/module/module.py +++ b/odoo/addons/base/module/module.py @@ -599,7 +599,7 @@ class Module(models.Model): res = [0, 0] # [update, add] default_version = modules.adapt_version('1.0') - known_mods = self.search([]) + known_mods = self.with_context(lang=None).search([]) known_mods_names = {mod.name: mod for mod in known_mods} # iterate through detected modules and update/create them in db diff --git a/odoo/addons/base/res/res_country_data.xml b/odoo/addons/base/res/res_country_data.xml index 8ff0caa1ef0..800e349bf56 100644 --- a/odoo/addons/base/res/res_country_data.xml +++ b/odoo/addons/base/res/res_country_data.xml @@ -1385,7 +1385,7 @@ <field name="name">Sudan</field> <field name="code">sd</field> <field file="base/static/img/country_flags/sd.png" name="image" type="base64" /> - <field name="currency_id" ref="SDD" /> + <field name="currency_id" ref="SDG" /> <field eval="249" name="phone_code" /> </record> <record id="se" model="res.country"> diff --git a/odoo/addons/base/res/res_currency_data.xml b/odoo/addons/base/res/res_currency_data.xml index f986c0a08b8..dc864e1dc9a 100644 --- a/odoo/addons/base/res/res_currency_data.xml +++ b/odoo/addons/base/res/res_currency_data.xml @@ -1016,6 +1016,7 @@ <field name="active" eval="False"/> </record> + <!-- no longer in use since 2007 --> <record id="SDD" model="res.currency"> <field name="name">SDD</field> <field name="symbol">£Sd</field> @@ -1023,6 +1024,13 @@ <field name="active" eval="False"/> </record> + <record id="SDG" model="res.currency"> + <field name="name">SDG</field> + <field name="symbol">ج.س.</field> + <field name="rounding">0.01</field> + <field name="active" eval="False"/> + </record> + <record id="LKR" model="res.currency"> <field name="name">LKR</field> <field name="symbol">Rs</field> diff --git a/odoo/addons/base/res/res_currency_demo.xml b/odoo/addons/base/res/res_currency_demo.xml index ba316d0a7db..e74fb16fda8 100644 --- a/odoo/addons/base/res/res_currency_demo.xml +++ b/odoo/addons/base/res/res_currency_demo.xml @@ -877,6 +877,12 @@ <field name="rate">544.44</field> </record> + <record forcecreate="0" id="rateSDG" model="res.currency.rate"> + <field name="currency_id" ref="SDG" /> + <field name="name">2010-01-01</field> + <field name="rate">3.1999</field> + </record> + <record forcecreate="0" id="rateLKR" model="res.currency.rate"> <field name="currency_id" ref="LKR" /> <field name="name">2010-01-01</field> |