No content
diff --git a/addons/l10n_in_hr_payroll/views/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/views/l10n_in_hr_payroll_view.xml
index 56ba9b00694..175b8e2fe9a 100644
--- a/addons/l10n_in_hr_payroll/views/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/views/l10n_in_hr_payroll_view.xml
@@ -3,10 +3,10 @@
hr.contract.form.in.inherit
hr.contract
-
-
+
+
+
diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index 8a31a68fc8b..34672cb459f 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -333,6 +333,9 @@ class ProductTemplate(models.Model):
related_vals['volume'] = vals['volume']
if vals.get('weight'):
related_vals['weight'] = vals['weight']
+ # Please do forward port
+ if vals.get('packaging_ids'):
+ related_vals['packaging_ids'] = vals['packaging_ids']
if related_vals:
template.write(related_vals)
return template
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index 465c84dddcc..3b7fbd53543 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -112,7 +112,7 @@
colspan="4"
attrs="{'invisible':['|', ('type', 'not in', ['product', 'consu']), ('product_variant_count', '>', 1)]}"
groups="product.group_stock_packaging">
-
+
@@ -507,6 +507,18 @@
+
+
+ product.packaging.form.view2
+ product.packaging
+ primary
+
+
+
+
Product Packagings
product.packaging
diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml
index e240f64d150..9b5cdd5873e 100644
--- a/addons/project/views/project_portal_templates.xml
+++ b/addons/project/views/project_portal_templates.xml
@@ -112,16 +112,6 @@
-
-
Message and communication history
-
-
-
-
-
+
+ stock.picking.move.tree
+ stock.move
+
+
+
+
+
+
stock.move.kanban
stock.move
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 211d2afba95..1028aaadc69 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -233,6 +233,19 @@
class="oe_stat_button" icon="fa-cubes"
attrs="{'invisible': [('has_packages', '=', False)]}"/>
+
+ Operations
+
+
'+
+ ' ',
+ archs: archs,
+ viewOptions: {
+ initialDate: initialDate,
+ },
+ mockRPC: function (route, args) {
+ if (args.method === "create") {
+ assert.strictEqual(args.args[0].start_date, "2016-12-20 00:00:00");
+ }
+ if (args.method === "write") {
+ assert.step(args.args[1].start_date);
+ }
+ return this._super(route, args);
+ },
+ session: {
+ getTZOffset: function () {
+ return 120; // 2 hours timezone
+ },
+ },
+ });
+
+ // Create event (on 20 december)
+ var $cell = calendar.$('.fc-day-grid .fc-row:eq(3) .fc-day:eq(2)');
+ testUtils.triggerMouseEvent($cell, "mousedown");
+ testUtils.triggerMouseEvent($cell, "mouseup");
+ var $input = $('.modal-body input:first');
+ $input.val("An event").trigger('input');
+ $('.modal button.btn:contains(Create)').trigger('click');
+
+ assert.strictEqual(calendar.$('.o_field_start_date').text().trim(), "12/20/2016")
+
+ // Move event to another day (on 27 november)
+ testUtils.dragAndDrop(
+ calendar.$('.fc-event').first(),
+ calendar.$('.fc-day-top').first()
+ );
+ assert.verifySteps(["2016-11-27 00:00:00"]);
+ assert.strictEqual(calendar.$('.o_field_start_date').text().trim(), "11/27/2016")
+
+ // Move event to last day (on 7 january)
+ testUtils.dragAndDrop(
+ calendar.$('.fc-event').first(),
+ calendar.$('.fc-day-top').last()
+ );
+ assert.verifySteps(["2016-11-27 00:00:00", "2017-01-07 00:00:00"]);
+ assert.strictEqual(calendar.$('.o_field_start_date').text().trim(), "01/07/2017")
+
+ calendar.destroy();
+ });
+
QUnit.test('form_view_id attribute works (for creating events)', function (assert) {
assert.expect(1);
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 4e493e5017e..cb01ebfd6ee 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -22,12 +22,8 @@ class WebsiteForum(http.Controller):
_user_per_page = 30
def _get_notifications(self):
- badge_subtype = request.env.ref('gamification.mt_badge_granted')
- if badge_subtype:
- msg = request.env['mail.message'].search([('subtype_id', '=', badge_subtype.id), ('needaction', '=', True)])
- else:
- msg = list()
- return msg
+ """Deprecated"""
+ return list()
def _prepare_forum_values(self, forum=None, **kwargs):
values = {
diff --git a/addons/website_hr_recruitment/models/hr_recruitment.py b/addons/website_hr_recruitment/models/hr_recruitment.py
index 7d6e88c31c8..ed5c0b422cc 100644
--- a/addons/website_hr_recruitment/models/hr_recruitment.py
+++ b/addons/website_hr_recruitment/models/hr_recruitment.py
@@ -45,7 +45,7 @@ class Job(models.Model):
default_description = self.env["ir.model.data"].xmlid_to_object("website_hr_recruitment.default_website_description")
return (default_description.render() if default_description else "")
- website_description = fields.Html('Website description', translate=html_translate, sanitize_attributes=False, default=_get_default_website_description)
+ website_description = fields.Html('Website description', translate=html_translate, sanitize_attributes=False, default=_get_default_website_description, prefetch=False)
@api.multi
def _compute_website_url(self):
diff --git a/odoo/addons/base/models/ir_qweb_fields.py b/odoo/addons/base/models/ir_qweb_fields.py
index b461c9fa8f5..2c1bb732f8e 100644
--- a/odoo/addons/base/models/ir_qweb_fields.py
+++ b/odoo/addons/base/models/ir_qweb_fields.py
@@ -370,6 +370,10 @@ class FloatTimeConverter(models.AbstractModel):
def value_to_html(self, value, options):
sign = math.copysign(1.0, value)
hours, minutes = divmod(abs(value) * 60, 60)
+ minutes = round(minutes)
+ if minutes == 60:
+ minutes = 0
+ hours += 1
return '%02d:%02d' % (sign * hours, minutes)
diff --git a/odoo/addons/test_new_api/tests/test_one2many.py b/odoo/addons/test_new_api/tests/test_one2many.py
index 8531396fe48..03abaec4f2d 100644
--- a/odoo/addons/test_new_api/tests/test_one2many.py
+++ b/odoo/addons/test_new_api/tests/test_one2many.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from openerp.tests.common import TransactionCase
+from odoo.tests.common import TransactionCase
class One2manyCase(TransactionCase):
@@ -51,6 +51,8 @@ class One2manyCase(TransactionCase):
self.multi.lines = self.multi.lines[:-1]
self.assertEqual(len(self.multi.lines), 9)
self.assertIn("hello", self.multi.lines.mapped('name'))
+ if not self.multi.id:
+ return
# Invalidate the cache and check again; this crashes if the value
# of self.multi.lines in cache contains new records
self.multi.invalidate_cache()
@@ -89,11 +91,26 @@ class One2manyCase(TransactionCase):
self.multi.lines = [(0, 0, {"name": str(name)})]
self.operations()
+ def test_rpcstyle_one_by_one_on_new(self):
+ self.multi = self.env["test_new_api.multi"].new({
+ "name": "What is up?"
+ })
+ for name in range(10):
+ self.multi.lines = [(0, 0, {"name": str(name)})]
+ self.operations()
+
def test_rpcstyle_single(self):
"""Check lines created with RPC style and added in one step"""
self.multi.lines = [(0, 0, {'name': str(name)}) for name in range(10)]
self.operations()
+ def test_rpcstyle_single_on_new(self):
+ self.multi = self.env["test_new_api.multi"].new({
+ "name": "What is up?"
+ })
+ self.multi.lines = [(0, 0, {'name': str(name)}) for name in range(10)]
+ self.operations()
+
def test_many2one_integer(self):
"""Test several models one2many with same inverse Integer field"""
# utility function to convert records to tuples with id,name
diff --git a/odoo/fields.py b/odoo/fields.py
index 0acacc0a6d3..f74f9e53a8e 100644
--- a/odoo/fields.py
+++ b/odoo/fields.py
@@ -2115,8 +2115,8 @@ class _RelationalMulti(_Relational):
elif isinstance(value, (list, tuple)):
# value is a list/tuple of commands, dicts or record ids
comodel = record.env[self.comodel_name]
- # determine the value ids; by convention empty on new records
- ids = OrderedSet(record[self.name].ids if record.id else ())
+ # determine the value ids
+ ids = OrderedSet(record[self.name]._ids)
# modify ids with the commands
for command in value:
if isinstance(command, (tuple, list)):