diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-09-26 19:37:29 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-09-26 19:37:29 +0200 |
| commit | 5f08d82bcd7fa0eaed7c0b0f35c7221c5e0b657a (patch) | |
| tree | 1d1be253f568f18ffd0f7b2bd67577b77afaa3bd /odoo | |
| parent | 7b13888c8e258a05a8044b7566b949071a911eab (diff) | |
| parent | fd122aec52166a2d19fe80579dbf9c98c6ab41fa (diff) | |
[MERGE] forward port branch 11.0 up to fd122aec521
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/addons/base/data/res_country_data.xml | 3 | ||||
| -rw-r--r-- | odoo/addons/base/models/ir_actions.py | 3 | ||||
| -rw-r--r-- | odoo/tools/config.py | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/odoo/addons/base/data/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml index 2eaa0d0abf3..3e0db583e3e 100644 --- a/odoo/addons/base/data/res_country_data.xml +++ b/odoo/addons/base/data/res_country_data.xml @@ -653,6 +653,7 @@ <field file="base/static/img/country_flags/gt.png" name="image" type="base64" /> <field name="currency_id" ref="GTQ" /> <field eval="502" name="phone_code" /> + <field name="vat_label">NIT</field> </record> <record id="gu" model="res.country"> <field name="name">Guam</field> @@ -1127,6 +1128,7 @@ <field name="currency_id" ref="MXN" /> <field eval="52" name="phone_code" /> <field name="vat_label">RFC</field> + <field eval="'%(street)s %(street2)s\n%(zip)s %(city)s, %(state_code)s\n%(country_name)s'" name="address_format" /> </record> <record id="my" model="res.country"> <field name="name">Malaysia</field> @@ -1732,6 +1734,7 @@ <field file="base/static/img/country_flags/vn.png" name="image" type="base64" /> <field name="currency_id" ref="VND" /> <field eval="84" name="phone_code" /> + <field eval="'%(street)s\n%(street2)s\n%(city)s\n%(name)s %(zip)s %(country_name)s'" name="address_format" /> </record> <record id="vu" model="res.country"> <field name="name">Vanuatu</field> diff --git a/odoo/addons/base/models/ir_actions.py b/odoo/addons/base/models/ir_actions.py index 8ad6aaaa23a..dd1fbfaf7f6 100644 --- a/odoo/addons/base/models/ir_actions.py +++ b/odoo/addons/base/models/ir_actions.py @@ -562,6 +562,9 @@ class IrActionsServer(models.Model): active_id = self._context.get('active_id') if not active_id and self._context.get('onchange_self'): active_id = self._context['onchange_self']._origin.id + if not active_id: # onchange on new record + func = getattr(self, 'run_action_%s' % action.state) + res = func(action, eval_context=eval_context) active_ids = self._context.get('active_ids', [active_id] if active_id else []) for active_id in active_ids: # run context dedicated to a particular active_id diff --git a/odoo/tools/config.py b/odoo/tools/config.py index ddda566b68b..5256da34968 100644 --- a/odoo/tools/config.py +++ b/odoo/tools/config.py @@ -285,10 +285,12 @@ class configmanager(object): help="Specify the number of workers, 0 disable prefork mode.", type="int") group.add_option("--limit-memory-soft", dest="limit_memory_soft", my_default=2048 * 1024 * 1024, - help="Maximum allowed virtual memory per worker, when reached the worker be reset after the current request (default 671088640 aka 640MB).", + help="Maximum allowed virtual memory per worker, when reached the worker be " + "reset after the current request (default 2048MiB).", type="int") group.add_option("--limit-memory-hard", dest="limit_memory_hard", my_default=2560 * 1024 * 1024, - help="Maximum allowed virtual memory per worker, when reached, any memory allocation will fail (default 805306368 aka 768MB).", + help="Maximum allowed virtual memory per worker, when reached, any memory " + "allocation will fail (default 2560MiB).", type="int") group.add_option("--limit-time-cpu", dest="limit_time_cpu", my_default=60, help="Maximum allowed CPU time per request (default 60).", |