diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-07-23 13:41:04 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-07-23 13:41:04 +0200 |
| commit | 6e71cf8a71d0713945947a4e96a9b70978d7f90d (patch) | |
| tree | e93c52ef713881004c684d772a2a198fae774b65 | |
| parent | 402aac89a721443ce3c5b9ba85f0c013d5941f65 (diff) | |
| parent | af2e480e419b5817933fb5250fb84fa99e5c3839 (diff) | |
[MERGE] forward port branch 9.0 up to af2e480e419
| -rw-r--r-- | addons/purchase/views/purchase_views.xml | 8 | ||||
| -rw-r--r-- | doc/reference/security.rst | 2 | ||||
| -rw-r--r-- | odoo/modules/loading.py | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml index c5d25337645..b1a532ff1b9 100644 --- a/addons/purchase/views/purchase_views.xml +++ b/addons/purchase/views/purchase_views.xml @@ -187,8 +187,8 @@ </button> </div> <div class="oe_title"> - <label string="Request for Quotation " attrs="{'invisible': [('state','not in',('draft','sent','bid'))]}"/> - <label string="Purchase Order " attrs="{'invisible': [('state','in',('draft','sent','bid'))]}"/> + <label string="Request for Quotation " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/> + <label string="Purchase Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/> <h1> <field name="name" readonly="1"/> </h1> @@ -405,7 +405,7 @@ <field name="type">ir.actions.act_window</field> <field name="res_model">purchase.order</field> <field name="context">{'search_default_todo':1}</field> - <field name="domain">[('state','in',('draft','sent','bid','cancel', 'confirmed'))]</field> + <field name="domain">[('state','in',('draft','sent','cancel', 'confirmed'))]</field> <field name="view_mode">tree,kanban,form,pivot,graph,calendar</field> <field name="search_view_id" ref="view_purchase_order_filter"/> <field name="help" type="html"> @@ -431,7 +431,7 @@ <field name="res_model">purchase.order</field> <field name="view_mode">tree,kanban,form,pivot,graph,calendar</field> <field name="context">{'search_default_todo':1, 'show_purchase': True}</field> - <field name="domain">[('state','not in',('draft','sent','bid', 'confirmed'))]</field> + <field name="domain">[('state','not in',('draft','sent', 'confirmed'))]</field> <field name="search_view_id" ref="view_purchase_order_filter"/> <field name="help" type="html"> <p class="oe_view_nocontent_create"> diff --git a/doc/reference/security.rst b/doc/reference/security.rst index fbc4cf1124a..a8c25ff0d2b 100644 --- a/doc/reference/security.rst +++ b/doc/reference/security.rst @@ -71,8 +71,6 @@ This means the first *group rule* restricts access, but any further .. warning:: record rules do not apply to the Administrator user :class: aphorism - although access rules do - .. _reference/security/fields: Field Access diff --git a/odoo/modules/loading.py b/odoo/modules/loading.py index 2c4f6a26e28..3f073a30c93 100644 --- a/odoo/modules/loading.py +++ b/odoo/modules/loading.py @@ -388,7 +388,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False): cr.execute("""select model,name from ir_model where id NOT IN (select distinct model_id from ir_model_access)""") for (model, name) in cr.fetchall(): if model in registry and not registry[model]._abstract and not registry[model]._transient: - _logger.warning('The model %s has no access rules, consider adding one. E.g. access_%s,access_%s,model_%s,,1,0,0,0', + _logger.warning('The model %s has no access rules, consider adding one. E.g. access_%s,access_%s,model_%s,base.group_user,1,0,0,0', model, model.replace('.', '_'), model.replace('.', '_'), model.replace('.', '_')) # Temporary warning while we remove access rights on osv_memory objects, as they have |