diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py
index 7b3e1a3a0d5..1c9eb492b06 100644
--- a/addons/auth_oauth/res_users.py
+++ b/addons/auth_oauth/res_users.py
@@ -38,11 +38,11 @@ class res_users(osv.Model):
def _auth_oauth_validate(self, cr, uid, provider, access_token, context=None):
""" return the validation data corresponding to the access token """
p = self.pool.get('auth.oauth.provider').browse(cr, uid, provider, context=context)
- validation = self._auth_oauth_rpc(cr, uid, p.validation_endpoint, access_token)
+ validation = self._auth_oauth_rpc(cr, uid, p.validation_endpoint, access_token, context=context)
if validation.get("error"):
raise Exception(validation['error'])
if p.data_endpoint:
- data = self._auth_oauth_rpc(cr, uid, p.data_endpoint, access_token)
+ data = self._auth_oauth_rpc(cr, uid, p.data_endpoint, access_token, context=context)
validation.update(data)
return validation
@@ -98,7 +98,7 @@ class res_users(osv.Model):
# else:
# continue with the process
access_token = params.get('access_token')
- validation = self._auth_oauth_validate(cr, uid, provider, access_token)
+ validation = self._auth_oauth_validate(cr, uid, provider, access_token, context=context)
# required check
if not validation.get('user_id'):
# Workaround: facebook does not send 'user_id' in Open Graph Api
diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index c46bd5a16e9..35c1db56bab 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -798,6 +798,11 @@ class calendar_event(osv.Model):
meeting_data[field] = meeting.stop_date if meeting.allday else meeting.stop_datetime
return res
+ def _get_recurrent_fields(self, cr, uid, context=None):
+ return ['byday', 'recurrency', 'final_date', 'rrule_type', 'month_by',
+ 'interval', 'count', 'end_type', 'mo', 'tu', 'we', 'th', 'fr', 'sa',
+ 'su', 'day', 'week_list']
+
def _get_rulestring(self, cr, uid, ids, name, arg, context=None):
"""
Gets Recurrence rule string according to value type RECUR of iCalendar from the values given.
@@ -808,10 +813,8 @@ class calendar_event(osv.Model):
ids = [ids]
#read these fields as SUPERUSER because if the record is private a normal search could raise an error
- events = self.read(cr, SUPERUSER_ID, ids,
- ['id', 'byday', 'recurrency', 'final_date', 'rrule_type', 'month_by',
- 'interval', 'count', 'end_type', 'mo', 'tu', 'we', 'th', 'fr', 'sa',
- 'su', 'day', 'week_list'], context=context)
+ recurrent_fields = self._get_recurrent_fields(cr, uid, context=context)
+ events = self.read(cr, SUPERUSER_ID, ids, recurrent_fields, context=context)
for event in events:
if event['recurrency']:
result[event['id']] = self.compute_rule_string(event)
diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/google_calendar.py
index 81d1bb82f5f..33acda6b82d 100644
--- a/addons/google_calendar/google_calendar.py
+++ b/addons/google_calendar/google_calendar.py
@@ -971,9 +971,10 @@ class calendar_event(osv.Model):
_inherit = "calendar.event"
def get_fields_need_update_google(self, cr, uid, context=None):
- return ['name', 'description', 'allday', 'start', 'date_end', 'stop',
- 'attendee_ids', 'alarm_ids', 'location', 'class', 'active',
- 'start_date', 'start_datetime', 'stop_date', 'stop_datetime']
+ recurrent_fields = self._get_recurrent_fields(cr, uid, context=context)
+ return recurrent_fields + ['name', 'description', 'allday', 'start', 'date_end', 'stop',
+ 'attendee_ids', 'alarm_ids', 'location', 'class', 'active',
+ 'start_date', 'start_datetime', 'stop_date', 'stop_datetime']
def write(self, cr, uid, ids, vals, context=None):
if context is None:
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py
index a45a055b236..bb6e8e9aeb4 100644
--- a/addons/mail/wizard/invite.py
+++ b/addons/mail/wizard/invite.py
@@ -19,7 +19,7 @@ class Invite(models.TransientModel):
if 'message' in fields and model and res_id:
model_name = self.env['ir.model'].search([('model', '=', self.pool[model]._name)]).name_get()[0][1]
document_name = self.env[model].browse(res_id).name_get()[0][1]
- message = _('
Hello,
%s invited you to follow %s document: %s.
') % (user_name, model_name, document_name)
+ message = _('Hello,
%s invited you to follow %s document: %s.
') % (user_name, model_name, document_name)
result['message'] = message
elif 'message' in fields:
result['message'] = _('Hello,
%s invited you to follow a new document.
') % user_name
diff --git a/addons/point_of_sale/README.md b/addons/point_of_sale/README.md
index 7bdc1cf7e8f..d45c48a84ff 100644
--- a/addons/point_of_sale/README.md
+++ b/addons/point_of_sale/README.md
@@ -87,15 +87,6 @@ your store's efficiency.
No more hassle of having to integrate softwares: get all your sales and
inventory operations automatically posted in your G/L.
-Self-checkout Interface
------------------------
-
-Reduce costs by limitting the number of required cashiers. The self-checkout
-mode allows customers to scan products and pay by themselves with a dedicated
-and super easy user interface.
-
-Use lights and sounds to control the checkout distantly.
-
Unified Data Amongst All Shops
------------------------------
diff --git a/addons/point_of_sale/static/description/index.html b/addons/point_of_sale/static/description/index.html
index aec1bb1b324..a49b14a876b 100644
--- a/addons/point_of_sale/static/description/index.html
+++ b/addons/point_of_sale/static/description/index.html
@@ -176,26 +176,6 @@
-
-
-
Self-checkout Interface
-
-
- Reduce costs by limitting the number of required cashiers.
- The self-checkout mode allows customers to scan products and pay by
- themselves with a dedicated and super easy user interface.
-
-
- Use lights and sounds to control the checkout distantly.
-
-
-
-

-
-
-
-
-
Unified Data Amongst All Shops
diff --git a/addons/point_of_sale/static/description/pos_checkout.jpg b/addons/point_of_sale/static/description/pos_checkout.jpg
deleted file mode 100644
index d87e5b8499d..00000000000
Binary files a/addons/point_of_sale/static/description/pos_checkout.jpg and /dev/null differ
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 9ca71bdfe74..ab4fe3c04cc 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -90,7 +90,6 @@ class procurement_order(osv.osv):
_description = "Procurement"
_order = 'priority desc, date_planned, id asc'
_inherit = ['mail.thread','ir.needaction_mixin']
- _log_create = False
_columns = {
'name': fields.text('Description', required=True),
diff --git a/addons/stock/product.py b/addons/stock/product.py
index c2461d3e8c0..edf63baa840 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -151,7 +151,9 @@ class product_product(osv.osv):
moves_in = dict(map(lambda x: (x['product_id'][0], x['product_qty']), moves_in))
moves_out = dict(map(lambda x: (x['product_id'][0], x['product_qty']), moves_out))
res = {}
- for product in self.browse(cr, uid, ids, context=context):
+ ctx = context.copy()
+ ctx.update({'prefetch_fields': False})
+ for product in self.browse(cr, uid, ids, context=ctx):
id = product.id
qty_available = float_round(quants.get(id, 0.0), precision_rounding=product.uom_id.rounding)
incoming_qty = float_round(moves_in.get(id, 0.0), precision_rounding=product.uom_id.rounding)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 380b90c4609..270261e7ea7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1764,7 +1764,6 @@ class stock_move(osv.osv):
_name = "stock.move"
_description = "Stock Move"
_order = 'picking_id, sequence, id'
- _log_create = False
def get_price_unit(self, cr, uid, move, context=None):
""" Returns the unit price to store on the quant """
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index dfec85cb3e5..93d9080e4fd 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -468,7 +468,8 @@ class website(osv.osv):
:rtype: bool
"""
endpoint = rule.endpoint
- methods = rule.methods or ['GET']
+ methods = endpoint.routing.get('method') or ['GET']
+
converters = rule._converters.values()
if not ('GET' in methods
and endpoint.routing['type'] == 'http'
diff --git a/openerp/api.py b/openerp/api.py
index d88cf5ba387..a0fb8e40eb4 100644
--- a/openerp/api.py
+++ b/openerp/api.py
@@ -137,6 +137,12 @@ def constrains(*args):
Should raise :class:`~openerp.exceptions.ValidationError` if the
validation failed.
+
+ .. warning::
+
+ ``@constrains`` only supports simple field names, dotted names
+ (fields of relational fields e.g. ``partner_id.customer``) are not
+ supported and will be ignored
"""
return lambda method: decorate(method, '_constrains', args)
@@ -162,6 +168,12 @@ def onchange(*args):
'warning': {'title': "Warning", 'message': "What is this?"},
}
+
+ .. warning::
+
+ ``@onchange`` only supports simple field names, dotted names
+ (fields of relational fields e.g. ``partner_id.tz``) are not
+ supported and will be ignored
"""
return lambda method: decorate(method, '_onchange', args)
diff --git a/openerp/models.py b/openerp/models.py
index 58998067441..ba42955eb42 100644
--- a/openerp/models.py
+++ b/openerp/models.py
@@ -342,7 +342,6 @@ class BaseModel(object):
_inherit_fields = {}
_table = None
- _log_create = False
_sql_constraints = []
# model dependencies, for models backed up by sql views:
@@ -4342,13 +4341,6 @@ class BaseModel(object):
# recompute new-style fields
recs.recompute()
- if self._log_create and recs.env.recompute and context.get('recompute', True):
- message = self._description + \
- " '" + \
- self.name_get(cr, user, [id_new], context=context)[0][1] + \
- "' " + _("created.")
- self.log(cr, user, id_new, message, True, context=context)
-
self.check_access_rule(cr, user, [id_new], 'create', context=context)
self.create_workflow(cr, user, [id_new], context=context)
return id_new