diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index 6471e090f85..f3c46796e10 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -530,6 +530,8 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({
var tr = self.get_object_by_id(this.one_object.clicked_tr_id, this.one_object['main_object'], [])[0].att_list[0];
var parent_tr = ($(side).prevAll("tr[level=" + String(this.one_object.clicked_tr_level - 1) + "]"))[0];
var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
+ if(_.isUndefined(parent_tr))
+ return;
parent_tr = self.get_object_by_id(parseInt($(parent_tr).attr('id').replace(/[^0-9]+/g, '')), this.one_object['main_object'], [])[0].att_list[0];
_.each([tr, parent_tr],function(element) {
var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false;
@@ -994,7 +996,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({
type_widget.set_value(node.value);
self.add_widget.push(type_widget);
});
- table_selector.find("td[id^=]").attr("width","100px");
+ table_selector.find("td[id^='']").attr("width","100px");
self.add_node_dialog.$el.find('#new_field').click(function() {
model_data = new instance.web.DataSetSearch(self,'ir.model', null, null);
model_data.read_slice([], {domain: [['model','=', self.model]]}).done(function(result) {
diff --git a/addons/website_sale/security/ir.model.access.csv b/addons/website_sale/security/ir.model.access.csv
index 4f96b77911d..65e8c12c270 100644
--- a/addons/website_sale/security/ir.model.access.csv
+++ b/addons/website_sale/security/ir.model.access.csv
@@ -16,3 +16,5 @@ access_product_attribute_price_public,product.attribute price public,product.mod
access_product_attribute_line_public,product.attribute line public,product.model_product_attribute_line,,1,0,0,0
access_fiscal_position_public,fiscal position public,account.model_account_fiscal_position,base.group_portal,1,0,0,0
access_payment_term,payment term public,account.model_account_payment_term,base.group_portal,1,0,0,0
+access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_public,1,0,0,0
+access_pricelist_partnerinfo_user,pricelist.partnerinfo.user,product.model_pricelist_partnerinfo,base.group_public,1,0,0,0
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index e3a7d833e2f..15965a2d8da 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -229,6 +229,11 @@ $('.oe_website_sale').each(function () {
$parent.find(".js_check_product").attr("disabled", "disabled");
}
});
+
+ $('div.js_product', oe_website_sale).each(function () {
+ $('input.js_product_change', this).first().trigger('change');
+ });
+
$('ul.js_add_cart_variants', oe_website_sale).each(function () {
$('input.js_variant_change, select.js_variant_change', this).first().trigger('change');
});
diff --git a/doc/howtos/themes.rst b/doc/howtos/themes.rst
index 9aa83478ba9..cd59db73d5d 100644
--- a/doc/howtos/themes.rst
+++ b/doc/howtos/themes.rst
@@ -9,7 +9,7 @@ Theme Tutorial
Odoo celebrates freedom. Freedom for the designer to go further and
freedom for the user to customize everything according to their needs.
-Ready to create your own theme? Great. Here some things you should know before you begin. This tutorial is a guide to creating an Odoo theme.
+Ready to create your own theme? Great. Here are some things you should know before you begin. This tutorial is a guide to creating an Odoo theme.
.. image:: theme_tutorial_assets/img/Intro.jpg
@@ -219,8 +219,8 @@ Odoo’s themes are packaged like modules. Even if you are designing a very simp
Create another empty file and name it ``__init__.py``. It's a
mandatory system file. Create and leave it blank.
-``view`` and ``static`` folders
- Create them in the main folder. In ``view`` you'll place your xml
+``views`` and ``static`` folders
+ Create them in the main folder. In ``views`` you'll place your xml
files that define your snippets, your pages and your
options. ``static`` folder is the right place for your style ,
images and custom js code.
@@ -276,7 +276,6 @@ The ``data`` property will contain the xml files list. Right now it’s empty, b
Installing your theme
---------------------
-To install your theme you just place your theme folder inside "addons"
To install your theme, you just place your theme folder inside addons in your Odoo installation.
After that, navigate to the Settings page, look for your theme and click on the install button.
@@ -310,7 +309,7 @@ Extend the default Header
By default, Odoo header contains a responsive navigation menu and the company’s logo. You can easily add new elements or style the existing one.
-To do so, create a **layout.xml** file in your **views** folder folder and add the default Odoo xml markup.
+To do so, create a **layout.xml** file in your **views** folder and add the default Odoo xml markup.
.. code-block:: xml
@@ -429,7 +428,7 @@ default page layout with our code.
As you can see, we wrapped our code into two ````, one with ID ``wrap`` and the other one with class ``container``. This is to provide a minimal layout.
The next step is to add an empty area that the user
-can fill with snippets. To archive this, just create a ``div`` with
+can fill with snippets. To achieve this, just create a ``div`` with
``oe_structure`` class just before closing the ``div#wrap`` element.
.. code-block:: xml
@@ -463,7 +462,7 @@ can fill with snippets. To archive this, just create a ``div`` with
You can create as many snippet areas as you like and place them anywhere in your pages.
-Our page is almost ready. Now all we have to do is add **pages.xml** in our **__opererp_.py** file
+Our page is almost ready. Now all we have to do is add **pages.xml** in our **__openerp__.py** file
.. code-block:: python
@@ -555,8 +554,8 @@ order to operate.
In this case, we are referring to ``assets_frontend`` template,
located in the ``website`` module. ``assets_frontend`` specifies the
-list of assets loaded by the the website builder and our goal is to
-add our less file to this list.
+list of assets loaded by the website builder and our goal is to add
+our less file to this list.
This can be achieved using xpath with the attributes
``expr="link[last()]"`` and ``position="after"``, which means "*take my
@@ -615,12 +614,12 @@ The template contains the HTML markup that will be displayed by the snippet.
As you can see, we used Bootstrap default classes for our three columns. It’s not just about layout, these classes **will be triggered by the Website Builder to make them resizable by the user**.
-The previous code will create the snippet’s content, but we still need to place it into the editor bar, so the user will be able to drag&drop it into the page. Copy/paste this template in your **snippet.xml** file.
+The previous code will create the snippet’s content, but we still need to place it into the editor bar, so the user will be able to drag&drop it into the page. Copy/paste this template in your **snippets.xml** file.
.. code-block:: xml
-
+
@@ -666,7 +665,7 @@ Options group properties
Options are wrapped in groups. Groups can have properties that define how the included options will interact with the user interface.
``data-selector=" css selector(s) "``
- Bind the all the options included into the group to a particular element.
+ Bind all the options included into the group to a particular element.
``data-js=" custom method name "``
Is used to bind custom Javascript methods.
``data-drop-in=" css selector(s) "``
@@ -709,7 +708,7 @@ We start by adding a new file in our views folder - name it **options.xml** and
.. note::
- The previous template will inherit the default **snippet_option template** adding our options after the **background** options (xpath expr attribute).
+ The previous template will inherit the default **snippet_options template** adding our options after the **background** options (xpath expr attribute).
To place your options in a particular order, inspect the **snippet_options template** from the **website module** and add your options before/after the desired position.
As you can see, we wrapped all our options inside a DIV tag that will
@@ -724,6 +723,7 @@ Since ``select_class`` method avoids multiple selections, the last "empty"
option will reset the snippet to default.
Add **options.xml** to ``__openerp__.py`` and update your theme.
+
.. image:: theme_tutorial_assets/img/restart.png
Dropping our snippet onto the page, you will notice that our new options are automatically added to the customize menu. Inspecting the page, you will also notice that the class will be applied to the element when selecting an option.
diff --git a/openerp/addons/test_new_api/models.py b/openerp/addons/test_new_api/models.py
index 55611f6029d..4399cb0ed49 100644
--- a/openerp/addons/test_new_api/models.py
+++ b/openerp/addons/test_new_api/models.py
@@ -19,6 +19,7 @@
#
##############################################################################
+from openerp.exceptions import AccessError
from openerp.osv import osv, fields
class res_partner(osv.Model):
@@ -49,6 +50,8 @@ class Category(models.Model):
name = fields.Char(required=True)
parent = fields.Many2one('test_new_api.category')
display_name = fields.Char(compute='_compute_display_name', inverse='_inverse_display_name')
+ discussions = fields.Many2many('test_new_api.discussion', 'test_new_api_discussion_category',
+ 'category', 'discussion')
@api.one
@api.depends('name', 'parent.display_name') # this definition is recursive
@@ -74,6 +77,10 @@ class Category(models.Model):
# assign name of last category, and reassign display_name (to normalize it)
self.name = names[-1].strip()
+ def read(self, fields=None, load='_classic_read'):
+ if self.search_count([('id', 'in', self._ids), ('name', '=', 'NOACCESS')]):
+ raise AccessError('Sorry')
+ return super(Category, self).read(fields, load)
class Discussion(models.Model):
_name = 'test_new_api.discussion'
diff --git a/openerp/addons/test_new_api/tests/test_new_fields.py b/openerp/addons/test_new_api/tests/test_new_fields.py
index af42443fbc0..3aba853c4f8 100644
--- a/openerp/addons/test_new_api/tests/test_new_fields.py
+++ b/openerp/addons/test_new_api/tests/test_new_fields.py
@@ -3,6 +3,7 @@
#
from datetime import date, datetime
+from openerp.exceptions import AccessError
from openerp.tests import common
@@ -337,6 +338,24 @@ class TestNewFields(common.TransactionCase):
self.assertEqual(data['display_name'], display_name)
self.assertEqual(data['size'], size)
+ def test_31_prefetch(self):
+ """ test prefetch of records handle AccessError """
+ Category = self.env['test_new_api.category']
+ cat_1 = Category.create({'name': 'NOACCESS'}).id
+ cat_2 = Category.create({'name': 'ACCESS', 'parent': cat_1}).id
+
+ self.env.clear()
+
+ cat = Category.browse(cat_2)
+ self.assertEqual(cat.name, 'ACCESS')
+ # both categories should be in prefetch ids
+ self.assertSetEqual(self.env.prefetch[Category._name], set([cat_1, cat_2]))
+ # but due to our (lame) overwrite of `read`, it should not forbid us to read records we have access to
+ self.assertFalse(len(cat.discussions))
+ self.assertEqual(cat.parent.id, cat_1)
+ with self.assertRaises(AccessError):
+ Category.browse(cat_1).name
+
def test_40_new(self):
""" test new records. """
discussion = self.env.ref('test_new_api.discussion_0')
diff --git a/openerp/models.py b/openerp/models.py
index 01cfa58de76..d410e95a738 100644
--- a/openerp/models.py
+++ b/openerp/models.py
@@ -3240,7 +3240,8 @@ class BaseModel(object):
try:
result = records.read(list(fnames), load='_classic_write')
except AccessError:
- pass
+ # not all records may be accessible, try with only current record
+ result = self.read(list(fnames), load='_classic_write')
# check the cache, and update it if necessary
if not self._cache.contains(field):