\n"
+" % if object.company_id\n"
" Sent by ${object.company_id.name}\n"
" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
" \n"
" Discover all our events.\n"
" % endif\n"
+" % endif\n"
"
\n"
"
\n"
"
\n"
@@ -502,11 +504,13 @@ msgid "
\n"
"
\n"
"
\n"
+" % if object.company_id:\n"
" Sent by ${object.company_id.name}\n"
" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
" \n"
" Discover all our events.\n"
" % endif\n"
+" % endif\n"
"
\n"
"
\n"
"
\n"
diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py
index 886472e8aba..f4086bb2006 100644
--- a/addons/hr_holidays/models/hr_leave.py
+++ b/addons/hr_holidays/models/hr_leave.py
@@ -658,7 +658,7 @@ class HolidaysRequest(models.Model):
elif holiday.holiday_type == 'company':
employees = self.env['hr.employee'].search([('company_id', '=', self.mode_company_id.id)])
else:
- holiday.department_id.member_ids
+ employees = holiday.department_id.member_ids
for employee in employees:
values = holiday._prepare_holiday_values(employee)
leaves += self.with_context(
diff --git a/addons/hr_holidays/tests/__init__.py b/addons/hr_holidays/tests/__init__.py
index 68ef4445428..9510f75b34b 100644
--- a/addons/hr_holidays/tests/__init__.py
+++ b/addons/hr_holidays/tests/__init__.py
@@ -6,3 +6,4 @@ from . import test_holidays_flow
from . import test_hr_leave_type
from . import test_accrual_allocations
from . import test_change_department
+from . import test_leave_requests
diff --git a/addons/hr_holidays/tests/test_access_rights.py b/addons/hr_holidays/tests/test_access_rights.py
index cf4e8f76ad8..ca651a69010 100644
--- a/addons/hr_holidays/tests/test_access_rights.py
+++ b/addons/hr_holidays/tests/test_access_rights.py
@@ -6,7 +6,7 @@ from dateutil.relativedelta import relativedelta
from odoo import tests
from odoo.addons.hr_holidays.tests.common import TestHrHolidaysBase
-from odoo.exceptions import AccessError, UserError
+from odoo.exceptions import AccessError, ValidationError, UserError
from odoo.tools import mute_logger
@@ -117,6 +117,24 @@ class TestLeavesRights(TestHrHolidaysBase):
with self.assertRaises(AccessError):
other_leave.sudo(self.user_employee_id).write({'name': 'Crocodile Dundee is my man'})
+ # ----------------------------------------
+ # Creation
+ # ----------------------------------------
+
+ @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
+ def test_leave_creation_for_other_user(self):
+ """ Employee cannot creates a leave request for another employee """
+ HolidaysEmployeeGroup = self.env['hr.leave'].sudo(self.user_employee_id)
+ with self.assertRaises(AccessError):
+ HolidaysEmployeeGroup.create({
+ 'name': 'Hol10',
+ 'employee_id': self.employee_hruser_id,
+ 'holiday_status_id': self.leave_type.id,
+ 'date_from': (datetime.today() - relativedelta(days=1)),
+ 'date_to': datetime.today(),
+ 'number_of_days': 1,
+ })
+
# ----------------------------------------
# Reset
# ----------------------------------------
@@ -137,7 +155,7 @@ class TestLeavesRights(TestHrHolidaysBase):
@mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
def test_leave_reset_by_manager_other(self):
- """ Manager may not reset other leaves """
+ """ Manager may reset other leaves """
self.employee_leave.sudo(self.user_hrmanager).action_draft()
@mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
@@ -187,19 +205,23 @@ class TestLeavesRights(TestHrHolidaysBase):
@mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
def test_leave_validation_hr_by_manager(self):
""" Manager validates hr-only leaves """
+ self.assertEqual(self.employee_leave.state, 'confirm')
self.employee_leave.sudo(self.user_hrmanager_id).action_approve()
+ self.assertEqual(self.employee_leave.state, 'validate')
@mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
def test_leave_validation_hr_by_officer_department(self):
""" Officer validates hr-only leaves for co-workers """
+ self.assertEqual(self.employee_leave.state, 'confirm')
self.employee_leave.sudo(self.user_hruser).action_approve()
+ self.assertEqual(self.employee_leave.state, 'validate')
@mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
def test_leave_validation_hr_by_officer_no_department(self):
""" Officer validates hr-only leaves for workers from no department and with no manager """
self.employee_hruser.write({'department_id': False})
- # TDE FIXME: not sure for this one
- # self.employee_leave.sudo(self.user_hruser).action_approve()
+ with self.assertRaises(AccessError):
+ self.employee_leave.sudo(self.user_hruser).action_approve()
@mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
def test_leave_validation_hr_by_officer_other_department_with_manager(self):
@@ -207,6 +229,7 @@ class TestLeavesRights(TestHrHolidaysBase):
self.employee_hruser.write({'department_id': self.hr_dept.id})
with self.assertRaises(AccessError):
self.employee_leave.sudo(self.user_hruser).action_approve()
+ self.assertEqual(self.employee_leave.state, 'confirm')
@mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
def test_leave_validation_hr_by_officer_other_department_wo_manager(self):
@@ -214,6 +237,7 @@ class TestLeavesRights(TestHrHolidaysBase):
self.employee_hruser.write({'department_id': self.hr_dept.id})
with self.assertRaises(AccessError):
self.employee_leave.sudo(self.user_hruser).action_approve()
+ self.assertEqual(self.employee_leave.state, 'confirm')
@mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
def test_leave_validation_hr_by_officer_other_department_manager(self):
@@ -221,7 +245,9 @@ class TestLeavesRights(TestHrHolidaysBase):
self.employee_hruser.write({'department_id': self.hr_dept.id})
self.employee_leave.sudo().department_id.write({'manager_id': self.employee_hruser.id})
+ self.assertEqual(self.employee_leave.state, 'confirm')
self.employee_leave.sudo(self.user_hruser).action_approve()
+ self.assertEqual(self.employee_leave.state, 'validate')
@mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
def test_leave_validation_hr_by_user(self):
@@ -232,6 +258,36 @@ class TestLeavesRights(TestHrHolidaysBase):
with self.assertRaises(UserError):
self.employee_leave.sudo(self.user_employee_id).write({'state': 'validate'})
+ @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
+ def test_leave_validate_by_manager(self):
+ """ Manager (who has no manager) validate its own leaves """
+ manager_leave = self.env['hr.leave'].sudo(self.user_hrmanager_id).create({
+ 'name': 'Hol manager',
+ 'holiday_status_id': self.leave_type.id,
+ 'employee_id': self.employee_hrmanager_id,
+ 'date_from': (datetime.today() + relativedelta(days=15)),
+ 'date_to': (datetime.today() + relativedelta(days=16)),
+ 'number_of_days': 1,
+ })
+ self.assertEqual(manager_leave.state, 'confirm')
+ manager_leave.action_approve()
+ self.assertEqual(manager_leave.state, 'validate')
+
+ @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
+ def test_leave_validate_by_manager_2(self):
+ """ Manager (who has also a manager) validate its own leaves """
+ manager_leave2 = self.env['hr.leave'].sudo(self.user_hrmanager_2_id).create({
+ 'name': 'Hol manager2',
+ 'holiday_status_id': self.leave_type.id,
+ 'employee_id': self.employee_hrmanager_2_id,
+ 'date_from': (datetime.today() + relativedelta(days=15)),
+ 'date_to': (datetime.today() + relativedelta(days=16)),
+ 'number_of_days': 1,
+ })
+ self.assertEqual(manager_leave2.state, 'confirm')
+ manager_leave2.action_approve()
+ self.assertEqual(manager_leave2.state, 'validate')
+
# ----------------------------------------
# Validation: one validation, manager
# ----------------------------------------
diff --git a/addons/hr_holidays/tests/test_holidays_flow.py b/addons/hr_holidays/tests/test_holidays_flow.py
index 51bcafe049c..08e1be1b20d 100644
--- a/addons/hr_holidays/tests/test_holidays_flow.py
+++ b/addons/hr_holidays/tests/test_holidays_flow.py
@@ -13,8 +13,69 @@ from odoo.addons.hr_holidays.tests.common import TestHrHolidaysBase
class TestHolidaysFlow(TestHrHolidaysBase):
@mute_logger('odoo.addons.base.models.ir_model', 'odoo.models')
- def test_00_leave_request_flow(self):
- """ Testing leave request flow """
+ def test_00_leave_request_flow_unlimited(self):
+ """ Testing leave request flow: unlimited type of leave request """
+ Requests = self.env['hr.leave']
+ HolidaysStatus = self.env['hr.leave.type']
+
+ # HrManager creates some holiday statuses
+ HolidayStatusManagerGroup = HolidaysStatus.sudo(self.user_hrmanager_id)
+ HolidayStatusManagerGroup.create({
+ 'name': 'WithMeetingType',
+ 'allocation_type': 'no',
+ 'categ_id': self.env['calendar.event.type'].sudo(self.user_hrmanager_id).create({'name': 'NotLimitedMeetingType'}).id
+ })
+ self.holidays_status_hr = HolidayStatusManagerGroup.create({
+ 'name': 'NotLimitedHR',
+ 'allocation_type': 'no',
+ 'validation_type': 'hr',
+ })
+ self.holidays_status_manager = HolidayStatusManagerGroup.create({
+ 'name': 'NotLimitedManager',
+ 'allocation_type': 'no',
+ 'validation_type': 'manager',
+ })
+
+ HolidaysEmployeeGroup = Requests.sudo(self.user_employee_id)
+
+ # Employee creates a leave request in a no-limit category hr manager only
+ hol1_employee_group = HolidaysEmployeeGroup.create({
+ 'name': 'Hol11',
+ 'employee_id': self.employee_emp_id,
+ 'holiday_status_id': self.holidays_status_hr.id,
+ 'date_from': (datetime.today() - relativedelta(days=1)),
+ 'date_to': datetime.today(),
+ 'number_of_days': 1,
+ })
+ hol1_user_group = hol1_employee_group.sudo(self.user_hruser_id)
+ hol1_manager_group = hol1_employee_group.sudo(self.user_hrmanager_id)
+ self.assertEqual(hol1_user_group.state, 'confirm', 'hr_holidays: newly created leave request should be in confirm state')
+
+ # HrUser validates the employee leave request -> should work
+ hol1_user_group.action_approve()
+ self.assertEqual(hol1_manager_group.state, 'validate', 'hr_holidays: validated leave request should be in validate state')
+
+ # Employee creates a leave request in a no-limit category department manager only
+ hol12_employee_group = HolidaysEmployeeGroup.create({
+ 'name': 'Hol12',
+ 'employee_id': self.employee_emp_id,
+ 'holiday_status_id': self.holidays_status_manager.id,
+ 'date_from': (datetime.today() + relativedelta(days=12)),
+ 'date_to': (datetime.today() + relativedelta(days=13)),
+ 'number_of_days': 1,
+ })
+ hol12_user_group = hol12_employee_group.sudo(self.user_hruser_id)
+ hol12_manager_group = hol12_employee_group.sudo(self.user_hrmanager_id)
+ self.assertEqual(hol12_user_group.state, 'confirm', 'hr_holidays: newly created leave request should be in confirm state')
+
+ # HrManager validate the employee leave request
+ hol12_manager_group.action_approve()
+ self.assertEqual(hol1_user_group.state, 'validate', 'hr_holidays: validates leave request should be in validate state')
+
+
+ @mute_logger('odoo.addons.base.models.ir_model', 'odoo.models')
+ def test_01_leave_request_flow_limited(self):
+ """ Testing leave request flow: limited type of leave request """
Requests = self.env['hr.leave']
Allocations = self.env['hr.leave.allocation']
HolidaysStatus = self.env['hr.leave.type']
@@ -29,13 +90,6 @@ class TestHolidaysFlow(TestHrHolidaysBase):
self.assertEqual(holiday_status.virtual_remaining_leaves, vrl,
'hr_holidays: wrong type days computation')
- # HrUser creates some holiday statuses -> crash because only HrManagers should do this
- with self.assertRaises(AccessError):
- HolidaysStatus.sudo(self.user_hruser_id).create({
- 'name': 'UserCheats',
- 'allocation_type': 'no',
- })
-
# HrManager creates some holiday statuses
HolidayStatusManagerGroup = HolidaysStatus.sudo(self.user_hrmanager_id)
HolidayStatusManagerGroup.create({
@@ -43,111 +97,19 @@ class TestHolidaysFlow(TestHrHolidaysBase):
'allocation_type': 'no',
'categ_id': self.env['calendar.event.type'].sudo(self.user_hrmanager_id).create({'name': 'NotLimitedMeetingType'}).id
})
- self.holidays_status_1 = HolidayStatusManagerGroup.create({
- 'name': 'NotLimitedHR',
- 'allocation_type': 'no',
- 'validation_type': 'hr',
- })
- self.holidays_status_2 = HolidayStatusManagerGroup.create({
+
+ self.holidays_status_limited = HolidayStatusManagerGroup.create({
'name': 'Limited',
'allocation_type': 'fixed',
'validation_type': 'both',
})
- self.holidays_status_3 = HolidayStatusManagerGroup.create({
- 'name': 'NotLimitedManager',
- 'allocation_type': 'no',
- 'validation_type': 'manager',
- })
- self.holiday_status_4 = HolidayStatusManagerGroup.create({
- 'name': 'TimeNotLimited',
- 'allocation_type': 'no',
- 'validation_type': 'manager',
- 'validity_start': fields.Datetime.from_string('2017-01-01 00:00:00'),
- 'validity_stop': fields.Datetime.from_string('2017-06-01 00:00:00'),
- })
-
- # --------------------------------------------------
- # Case1: unlimited type of leave request
- # --------------------------------------------------
-
- # Employee creates a leave request for another employee -> should crash
HolidaysEmployeeGroup = Requests.sudo(self.user_employee_id)
- Requests.search([('name', '=', 'Hol10')]).unlink()
-
- # Employee creates a leave request in a no-limit category hr manager only
- hol1_employee_group = HolidaysEmployeeGroup.create({
- 'name': 'Hol11',
- 'employee_id': self.employee_emp_id,
- 'holiday_status_id': self.holidays_status_1.id,
- 'date_from': (datetime.today() - relativedelta(days=1)),
- 'date_to': datetime.today(),
- 'number_of_days': 1,
- })
- hol1_user_group = hol1_employee_group.sudo(self.user_hruser_id)
- hol1_manager_group = hol1_employee_group.sudo(self.user_hrmanager_id)
- self.assertEqual(hol1_user_group.state, 'confirm', 'hr_holidays: newly created leave request should be in confirm state')
-
- # Employee validates its leave request -> should not work
- self.assertEqual(hol1_manager_group.state, 'confirm', 'hr_holidays: employee should not be able to validate its own leave request')
-
- # HrUser validates the employee leave request -> should work
- hol1_user_group.action_approve()
- self.assertEqual(hol1_manager_group.state, 'validate', 'hr_holidays: validated leave request should be in validate state')
-
- # Employee creates a leave request in a no-limit category department manager only
- hol12_employee_group = HolidaysEmployeeGroup.create({
- 'name': 'Hol12',
- 'employee_id': self.employee_emp_id,
- 'holiday_status_id': self.holidays_status_3.id,
- 'date_from': (datetime.today() + relativedelta(days=12)),
- 'date_to': (datetime.today() + relativedelta(days=13)),
- 'number_of_days': 1,
- })
- hol12_user_group = hol12_employee_group.sudo(self.user_hruser_id)
- hol12_manager_group = hol12_employee_group.sudo(self.user_hrmanager_id)
- self.assertEqual(hol12_user_group.state, 'confirm', 'hr_holidays: newly created leave request should be in confirm state')
-
- # Employee validates its leave request -> should not work
- self.assertEqual(hol12_user_group.state, 'confirm', 'hr_holidays: employee should not be able to validate its own leave request')
-
- # HrManager validate the employee leave request
- hol12_manager_group.action_approve()
- self.assertEqual(hol1_user_group.state, 'validate', 'hr_holidays: validates leave request should be in validate state')
-
- # --------------------------------------------------
- # Case2: limited type of leave request
- # --------------------------------------------------
-
- # Employee creates a new leave request at the same time -> crash, avoid interlapping
- with self.assertRaises(ValidationError):
- HolidaysEmployeeGroup.create({
- 'name': 'Hol21',
- 'employee_id': self.employee_emp_id,
- 'holiday_status_id': self.holidays_status_1.id,
- 'date_from': (datetime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M'),
- 'date_to': datetime.today(),
- 'number_of_days': 1,
- })
-
- # Employee creates a leave request in a limited category -> crash, not enough days left
- with self.assertRaises(ValidationError):
- HolidaysEmployeeGroup.create({
- 'name': 'Hol22',
- 'employee_id': self.employee_emp_id,
- 'holiday_status_id': self.holidays_status_2.id,
- 'date_from': (datetime.today() + relativedelta(days=1)).strftime('%Y-%m-%d %H:%M'),
- 'date_to': (datetime.today() + relativedelta(days=2)),
- 'number_of_days': 1,
- })
-
- # Clean transaction
- Requests.search([('name', 'in', ['Hol21', 'Hol22'])]).unlink()
# HrUser allocates some leaves to the employee
aloc1_user_group = Allocations.sudo(self.user_hruser_id).create({
'name': 'Days for limited category',
'employee_id': self.employee_emp_id,
- 'holiday_status_id': self.holidays_status_2.id,
+ 'holiday_status_id': self.holidays_status_limited.id,
'number_of_days': 2,
})
# HrUser validates the first step
@@ -156,14 +118,14 @@ class TestHolidaysFlow(TestHrHolidaysBase):
# HrManager validates the second step
aloc1_user_group.sudo(self.user_hrmanager_id).action_validate()
# Checks Employee has effectively some days left
- hol_status_2_employee_group = self.holidays_status_2.sudo(self.user_employee_id)
+ hol_status_2_employee_group = self.holidays_status_limited.sudo(self.user_employee_id)
_check_holidays_status(hol_status_2_employee_group, 2.0, 0.0, 2.0, 2.0)
# Employee creates a leave request in the limited category, now that he has some days left
hol2 = HolidaysEmployeeGroup.create({
'name': 'Hol22',
'employee_id': self.employee_emp_id,
- 'holiday_status_id': self.holidays_status_2.id,
+ 'holiday_status_id': self.holidays_status_limited.id,
'date_from': (datetime.today() + relativedelta(days=2)).strftime('%Y-%m-%d %H:%M'),
'date_to': (datetime.today() + relativedelta(days=3)),
'number_of_days': 1,
@@ -201,15 +163,6 @@ class TestHolidaysFlow(TestHrHolidaysBase):
self.assertEqual(hol2.state, 'draft',
'hr_holidays: resetting should lead to draft state')
- # HrManager changes the date and put too much days -> crash when confirming
- hol2_manager_group.write({
- 'date_from': (datetime.today() + relativedelta(days=4)).strftime('%Y-%m-%d %H:%M'),
- 'date_to': (datetime.today() + relativedelta(days=7)),
- 'number_of_days': 4,
- })
- with self.assertRaises(ValidationError):
- hol2_manager_group.action_confirm()
-
employee_id = self.ref('hr.employee_admin')
# cl can be of maximum 20 days for employee_admin
hol3_status = self.env.ref('hr_holidays.holiday_status_cl').with_context(employee_id=employee_id)
@@ -236,75 +189,6 @@ class TestHolidaysFlow(TestHrHolidaysBase):
# Check left days for casual leave: 19 days left
_check_holidays_status(hol3_status, 20.0, 1.0, 19.0, 19.0)
- Requests.create({
- 'name': 'Sick Leave',
- 'holiday_status_id': self.holiday_status_4.id,
- 'date_from': fields.Datetime.from_string('2017-03-03 06:00:00'),
- 'date_to': fields.Datetime.from_string('2017-03-11 19:00:00'),
- 'employee_id': employee_id,
- 'number_of_days': 1,
- }).unlink()
-
- with self.assertRaises(ValidationError):
- Requests.create({
- 'name': 'Sick Leave',
- 'holiday_status_id': self.holiday_status_4.id,
- 'date_from': fields.Datetime.from_string('2017-07-03 06:00:00'),
- 'date_to': fields.Datetime.from_string('2017-07-11 19:00:00'),
- 'employee_id': employee_id,
- 'number_of_days': 1,
- })
-
- hol41 = HolidaysEmployeeGroup.create({
- 'name': 'Hol41',
- 'employee_id': self.employee_emp_id,
- 'holiday_status_id': self.holidays_status_1.id,
- 'date_from': (datetime.today() + relativedelta(days=9)).strftime('%Y-%m-%d %H:%M'),
- 'date_to': (datetime.today() + relativedelta(days=10)),
- 'number_of_days': 1,
- })
-
- # A simple user should be able to reset it's own leave
- hol41.action_draft()
- hol41.unlink()
-
- hol42 = Requests.sudo(self.user_hrmanager_id).create({
- 'name': 'Hol41',
- 'employee_id': self.employee_hrmanager_id,
- 'holiday_status_id': self.holidays_status_1.id,
- 'date_from': (datetime.today() + relativedelta(days=9)).strftime('%Y-%m-%d %H:%M'),
- 'date_to': (datetime.today() + relativedelta(days=10)),
- 'number_of_days': 1,
- })
-
- # A manager should be able to reset someone else's leave
- hol42.action_draft()
- hol42.unlink()
-
- # Manager should be able to approve it's own leave
- hol51 = HolidaysEmployeeGroup.sudo(self.user_hrmanager_2_id).create({
- 'name': 'Hol51',
- 'employee_id': self.employee_hrmanager_2_id,
- 'holiday_status_id': self.holidays_status_1.id,
- 'date_from': (datetime.today() + relativedelta(days=15)).strftime('%Y-%m-%d %H:%M'),
- 'date_to': (datetime.today() + relativedelta(days=16)),
- 'number_of_days': 1,
- })
-
- hol51.action_approve()
-
- # Unless there is not manager above
- hol52 = HolidaysEmployeeGroup.sudo(self.user_hrmanager_id).create({
- 'name': 'Hol52',
- 'employee_id': self.employee_hrmanager_id,
- 'holiday_status_id': self.holidays_status_1.id,
- 'date_from': (datetime.today() + relativedelta(days=15)).strftime('%Y-%m-%d %H:%M'),
- 'date_to': (datetime.today() + relativedelta(days=16)),
- 'number_of_days': 1,
- })
-
- hol52.action_approve()
-
def test_10_leave_summary_reports(self):
# Print the HR Holidays(Summary Department) Report through the wizard
ctx = {
diff --git a/addons/hr_holidays/tests/test_hr_leave_type.py b/addons/hr_holidays/tests/test_hr_leave_type.py
index 495d1aa2e4b..dfe1b77713d 100644
--- a/addons/hr_holidays/tests/test_hr_leave_type.py
+++ b/addons/hr_holidays/tests/test_hr_leave_type.py
@@ -4,6 +4,8 @@
from datetime import datetime
from dateutil.relativedelta import relativedelta
+from odoo.exceptions import AccessError
+
from odoo.addons.hr_holidays.tests.common import TestHrHolidaysBase
@@ -30,3 +32,11 @@ class TestHrLeaveType(TestHrHolidaysBase):
self.env['resource.calendar.leaves'].search([('holiday_id', '=', leave_1.id)]).time_type,
'leave'
)
+
+ def test_type_creation_right(self):
+ # HrUser creates some holiday statuses -> crash because only HrManagers should do this
+ with self.assertRaises(AccessError):
+ self.env['hr.leave.type'].sudo(self.user_hruser_id).create({
+ 'name': 'UserCheats',
+ 'allocation_type': 'no',
+ })
diff --git a/addons/hr_holidays/tests/test_leave_requests.py b/addons/hr_holidays/tests/test_leave_requests.py
new file mode 100644
index 00000000000..8dad86eae39
--- /dev/null
+++ b/addons/hr_holidays/tests/test_leave_requests.py
@@ -0,0 +1,152 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields
+from odoo.exceptions import ValidationError
+from odoo.tools import mute_logger
+
+from odoo.addons.hr_holidays.tests.common import TestHrHolidaysBase
+
+class TestLeaveRequests(TestHrHolidaysBase):
+
+ def _check_holidays_status(self, holiday_status, ml, lt, rl, vrl):
+ self.assertEqual(holiday_status.max_leaves, ml,
+ 'hr_holidays: wrong type days computation')
+ self.assertEqual(holiday_status.leaves_taken, lt,
+ 'hr_holidays: wrong type days computation')
+ self.assertEqual(holiday_status.remaining_leaves, rl,
+ 'hr_holidays: wrong type days computation')
+ self.assertEqual(holiday_status.virtual_remaining_leaves, vrl,
+ 'hr_holidays: wrong type days computation')
+
+ def setUp(self):
+ super(TestLeaveRequests, self).setUp()
+
+ # Make sure we have the rights to create, validate and delete the leaves, leave types and allocations
+ LeaveType = self.env['hr.leave.type'].sudo(self.user_hrmanager_id).with_context(tracking_disable=True)
+
+ self.holidays_type_1 = LeaveType.create({
+ 'name': 'NotLimitedHR',
+ 'allocation_type': 'no',
+ 'validation_type': 'hr',
+ })
+ self.holidays_type_2 = LeaveType.create({
+ 'name': 'Limited',
+ 'allocation_type': 'fixed',
+ 'validation_type': 'hr',
+ })
+ self.holidays_type_3 = LeaveType.create({
+ 'name': 'TimeNotLimited',
+ 'allocation_type': 'no',
+ 'validation_type': 'manager',
+ 'validity_start': fields.Datetime.from_string('2017-01-01 00:00:00'),
+ 'validity_stop': fields.Datetime.from_string('2017-06-01 00:00:00'),
+ })
+
+ self.set_employee_create_date(self.employee_emp_id, '2010-02-03 00:00:00')
+ self.set_employee_create_date(self.employee_hruser_id, '2010-02-03 00:00:00')
+
+ def set_employee_create_date(self, id, newdate):
+ """ This method is a hack in order to be able to define/redefine the create_date
+ of the employees.
+ This is done in SQL because ORM does not allow to write onto the create_date field.
+ """
+ self.env.cr.execute("""
+ UPDATE
+ hr_employee
+ SET create_date = '%s'
+ WHERE id = %s
+ """ % (newdate, id))
+
+ @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
+ def test_overlapping_requests(self):
+ """ Employee cannot create a new leave request at the same time, avoid interlapping """
+ self.env['hr.leave'].sudo(self.user_employee_id).create({
+ 'name': 'Hol11',
+ 'employee_id': self.employee_emp_id,
+ 'holiday_status_id': self.holidays_type_1.id,
+ 'date_from': (datetime.today() - relativedelta(days=1)),
+ 'date_to': datetime.today(),
+ 'number_of_days': 1,
+ })
+
+ with self.assertRaises(ValidationError):
+ self.env['hr.leave'].sudo(self.user_employee_id).create({
+ 'name': 'Hol21',
+ 'employee_id': self.employee_emp_id,
+ 'holiday_status_id': self.holidays_type_1.id,
+ 'date_from': (datetime.today() - relativedelta(days=1)),
+ 'date_to': datetime.today(),
+ 'number_of_days': 1,
+ })
+
+ @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
+ def test_limited_type_no_days(self):
+ """ Employee creates a leave request in a limited category but has not enough days left """
+
+ with self.assertRaises(ValidationError):
+ self.env['hr.leave'].sudo(self.user_employee_id).create({
+ 'name': 'Hol22',
+ 'employee_id': self.employee_emp_id,
+ 'holiday_status_id': self.holidays_type_2.id,
+ 'date_from': (datetime.today() + relativedelta(days=1)).strftime('%Y-%m-%d %H:%M'),
+ 'date_to': (datetime.today() + relativedelta(days=2)),
+ 'number_of_days': 1,
+ })
+
+ @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
+ def test_limited_type_days_left(self):
+ """ Employee creates a leave request in a limited category and has enough days left """
+ aloc1_user_group = self.env['hr.leave.allocation'].sudo(self.user_hruser_id).create({
+ 'name': 'Days for limited category',
+ 'employee_id': self.employee_emp_id,
+ 'holiday_status_id': self.holidays_type_2.id,
+ 'number_of_days': 2,
+ })
+ aloc1_user_group.action_approve()
+
+ holiday_status = self.holidays_type_2.sudo(self.user_employee_id)
+ self._check_holidays_status(holiday_status, 2.0, 0.0, 2.0, 2.0)
+
+ hol = self.env['hr.leave'].sudo(self.user_employee_id).create({
+ 'name': 'Hol11',
+ 'employee_id': self.employee_emp_id,
+ 'holiday_status_id': self.holidays_type_2.id,
+ 'date_from': (datetime.today() - relativedelta(days=2)),
+ 'date_to': datetime.today(),
+ 'number_of_days': 2,
+ })
+
+ holiday_status.invalidate_cache()
+ self._check_holidays_status(holiday_status, 2.0, 0.0, 2.0, 0.0)
+
+ hol.sudo(self.user_hrmanager_id).action_approve()
+
+ self._check_holidays_status(holiday_status, 2.0, 2.0, 0.0, 0.0)
+
+ @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
+ def test_accrual_validity_time_valid(self):
+ """ Employee ask leave during a valid validity time """
+ self.env['hr.leave'].sudo(self.user_employee_id).create({
+ 'name': 'Valid time period',
+ 'employee_id': self.employee_emp_id,
+ 'holiday_status_id': self.holidays_type_3.id,
+ 'date_from': fields.Datetime.from_string('2017-03-03 06:00:00'),
+ 'date_to': fields.Datetime.from_string('2017-03-11 19:00:00'),
+ 'number_of_days': 1,
+ })
+
+ @mute_logger('odoo.models.unlink', 'odoo.addons.mail.models.mail_mail')
+ def test_accrual_validity_time_not_valid(self):
+ """ Employee ask leav during a not valid validity time """
+ with self.assertRaises(ValidationError):
+ self.env['hr.leave'].sudo(self.user_employee_id).create({
+ 'name': 'Sick Leave',
+ 'employee_id': self.employee_emp_id,
+ 'holiday_status_id': self.holidays_type_3.id,
+ 'date_from': fields.Datetime.from_string('2017-07-03 06:00:00'),
+ 'date_to': fields.Datetime.from_string('2017-07-11 19:00:00'),
+ 'number_of_days': 1,
+ })
diff --git a/addons/l10n_be_invoice_bba/__manifest__.py b/addons/l10n_be_invoice_bba/__manifest__.py
index 274fd996fc6..53c121f9de6 100644
--- a/addons/l10n_be_invoice_bba/__manifest__.py
+++ b/addons/l10n_be_invoice_bba/__manifest__.py
@@ -11,17 +11,18 @@
'description': """
Add Structured Communication to customer invoices.
----------------------------------------------------------------------------------------------------------------------
+--------------------------------------------------
-Using BBA structured communication simplifies the reconciliation between invoices and payments.
+Using BBA structured communication simplifies the reconciliation between invoices and payments.
You can select the structured communication as payment communication in Invoicing/Accounting settings.
Three algorithms are suggested:
+
1) Random : +++RRR/RRRR/RRRDD+++
**R..R =** Random Digits, **DD =** Check Digits
2) Date : +++DOY/YEAR/SSSDD+++
**DOY =** Day of the Year, **SSS =** Sequence Number, **DD =** Check Digits
3) Customer Reference +++RRR/RRRR/SSSDDD+++
- **R..R =** Customer Reference without non-numeric characters, **SSS =** Sequence Number, **DD =** Check Digits
+ **R..R =** Customer Reference without non-numeric characters, **SSS =** Sequence Number, **DD =** Check Digits
""",
'depends': ['account', 'l10n_be'],
'data' : [
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 2c7b833452d..9553cc5b69e 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -88,11 +88,14 @@
",
+ channel_ids: [1],
+ id: 4,
+ model: 'mail.channel',
+ needaction: true,
+ needaction_partner_ids: [44],
+ record_name: 'general',
+ res_id: 1,
+ };
+ this.data['mail.message'].records = [needactionMessage1, needactionMessage2];
+ this.data.initMessaging.channel_slots.channel_channel[0].message_unread_counter = 0;
+ this.data.initMessaging.needaction_inbox_counter = 2;
+
+ var messagingMenu = new MessagingMenu();
+ testUtils.addMockEnvironment(messagingMenu, {
+ services: this.services,
+ data: this.data,
+ session: {
+ partner_id: 44,
+ },
+ });
+ messagingMenu.appendTo($('#qunit-fixture'));
+
+ messagingMenu.$('.dropdown-toggle').click();
+ var $previews = messagingMenu.$('.o_mail_preview');
+
+ assert.strictEqual($previews.length, 2,
+ "should display two previews (one for needaction, one for channel)");
+
+ var $needactionPreview = $previews.eq(0);
+ var $channelPreview = $previews.eq(1);
+
+ assert.strictEqual($needactionPreview.find('.o_preview_counter').text().trim(), "(2)",
+ "should show two needaction messages in the needaction preview");
+ assert.strictEqual($needactionPreview.find('.o_last_message_preview').text().replace(/\s/g, ""),
+ "Other:@Administrator:pong",
+ "should display last needaction message on needaction preview");
+ assert.strictEqual($channelPreview.find('.o_preview_counter').text().trim(), "",
+ "should show no unread messages in the channel preview");
+ assert.strictEqual($channelPreview.find('.o_last_message_preview').text().replace(/\s/g, ""),
+ "Other:@Administrator:pong",
+ "should display last needaction message on channel preview");
+
+ messagingMenu.destroy();
+});
+
});
});
diff --git a/addons/mail/static/tests/thread_window/basic_thread_window_tests.js b/addons/mail/static/tests/thread_window/basic_thread_window_tests.js
index f05fd367697..4b8935e81cf 100644
--- a/addons/mail/static/tests/thread_window/basic_thread_window_tests.js
+++ b/addons/mail/static/tests/thread_window/basic_thread_window_tests.js
@@ -353,6 +353,81 @@ QUnit.test('do not mark as read the newly open thread window from received messa
parent.destroy();
});
+QUnit.test('show document link of message linked to a document', function (assert) {
+ assert.expect(6);
+
+ this.data['mail.channel'] = {
+ fields: {
+ name: {
+ string: "Name",
+ type: "char",
+ required: true,
+ },
+ channel_type: {
+ string: "Channel Type",
+ type: "selection",
+ },
+ channel_message_ids: {
+ string: "Messages",
+ type: "many2many",
+ relation: 'mail.message'
+ },
+ message_unread_counter: {
+ string: "Amount of Unread Messages",
+ type: "integer"
+ },
+ },
+ records: [{
+ id: 2,
+ name: "R&D Tasks",
+ channel_type: "channel",
+ }],
+ };
+ this.data['mail.message'].records.push({
+ author_id: [5, "Someone else"],
+ body: "
Test message
",
+ id: 40,
+ model: 'some.document',
+ record_name: 'Some Document',
+ res_id: 10,
+ channel_ids: [2],
+ });
+
+ this.data.initMessaging.channel_slots.channel_channel.push({
+ id: 2,
+ name: "R&D Tasks",
+ channel_type: "public",
+ });
+
+ var parent = this.createParent({
+ data: this.data,
+ services: this.services,
+ session: { partner_id: 3 },
+ });
+
+ assert.strictEqual($('.o_thread_window').length, 0,
+ "no thread window should be open initially");
+
+ // get channel instance to link to thread window
+ var channel = parent.call('mail_service', 'getChannel', 2);
+ channel.detach();
+
+ var $threadWindow = $('.o_thread_window');
+ assert.strictEqual($threadWindow.length, 1,
+ "a thread window should be open");
+ assert.strictEqual($threadWindow.find('.o_thread_window_title').text().trim(),
+ "#R&D Tasks",
+ "should be thread window of correct channel");
+ assert.strictEqual($threadWindow.find('.o_thread_message').length, 1,
+ "should contain a single message in thread window");
+ assert.ok($threadWindow.find('.o_mail_info').text().replace(/\s/g, "").indexOf('Someoneelse') !== -1,
+ "message should be from 'Someone else' user");
+ assert.ok($threadWindow.find('.o_mail_info').text().replace(/\s/g, "").indexOf('onSomeDocument') !== -1,
+ "message should link to 'Some Document'");
+
+ parent.destroy();
+});
+
});
});
});
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 0e146197260..643c03db195 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -114,14 +114,16 @@ class MassMailingList(models.Model):
from
mail_mass_mailing_contact_list_rel r
left join mail_mass_mailing_contact c on (r.contact_id=c.id)
+ left join mail_blacklist bl on (LOWER(substring(c.email, %s)) = bl.email and bl.active)
where
+ list_id in %s
COALESCE(r.opt_out,FALSE) = FALSE
- AND substring(c.email, '%s') IS NOT NULL
- AND LOWER(substring(c.email, '%s')) NOT IN (select email from mail_blacklist where active = TRUE)
+ AND c.email IS NOT NULL
+ AND bl.id IS NULL
group by
list_id
- ''' % (EMAIL_PATTERN, EMAIL_PATTERN))
- data = dict(self.env.cr.fetchall())
+ ''')
+ data = dict(self.env.cr.fetchall(), [EMAIL_PATTERN, tuple(self.ids)])
for mailing_list in self:
mailing_list.contact_nbr = data.get(mailing_list.id, 0)
@@ -767,7 +769,8 @@ class MassMailing(models.Model):
[('list_id', 'in', self.contact_list_ids.ids)])
opt_out_contacts = target_list_contacts.filtered(lambda rel: rel.opt_out).mapped('contact_id.email')
opt_in_contacts = target_list_contacts.filtered(lambda rel: not rel.opt_out).mapped('contact_id.email')
- opt_out = set(c for c in opt_out_contacts if c not in opt_in_contacts)
+ normalized_email = [tools.email_split(c) for c in opt_out_contacts if c not in opt_in_contacts]
+ opt_out = set(email[0].lower() for email in normalized_email if email)
_logger.info(
"Mass-mailing %s targets %s, blacklist: %s emails",
diff --git a/addons/mass_mailing/static/src/css/mass_mailing_popup.css b/addons/mass_mailing/static/src/css/mass_mailing_popup.css
index 2408f53f218..1ebd8b85beb 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing_popup.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing_popup.css
@@ -152,7 +152,6 @@ fieldset[disabled] #o_newsletter_popup .btn.btn-success.active {
}
#o_newsletter_popup .o_popup_modal_content {
border-radius: 2px;
- margin: 20px;
box-shadow: 0 0 20px rgba(255, 255, 255, 0.11);
-webkit-box-shadow: 0 0 20px rgba(255, 255, 255, 0.11);
border: 1px solid #767676;
diff --git a/addons/mass_mailing_sale/models/mass_mailing.py b/addons/mass_mailing_sale/models/mass_mailing.py
index 8257d14db6f..723bdee7b1a 100644
--- a/addons/mass_mailing_sale/models/mass_mailing.py
+++ b/addons/mass_mailing_sale/models/mass_mailing.py
@@ -14,15 +14,21 @@ class MassMailing(models.Model):
@api.depends('mailing_domain')
def _compute_sale_quotation_count(self):
+ has_so_access = self.env['sale.order'].check_access_rights('read', raise_exception=False)
for mass_mailing in self:
- mass_mailing.sale_quotation_count = self.env['sale.order'].search_count(self._get_sale_utm_domain())
+ mass_mailing.sale_quotation_count = self.env['sale.order'].search_count(self._get_sale_utm_domain()) if has_so_access else 0
@api.depends('mailing_domain')
def _compute_sale_invoiced_amount(self):
+ has_so_access = self.env['sale.order'].check_access_rights('read', raise_exception=False)
+ has_invoice_report_access = self.env['account.invoice.report'].check_access_rights('read', raise_exception=False)
for mass_mailing in self:
- invoices = self.env['sale.order'].search(self._get_sale_utm_domain()).mapped('invoice_ids')
- res = self.env['account.invoice.report'].search_read([('invoice_id', 'in', invoices.ids)], ['user_currency_price_total'])
- mass_mailing.sale_invoiced_amount = sum(r['user_currency_price_total'] for r in res)
+ if has_so_access and has_invoice_report_access:
+ invoices = self.env['sale.order'].search(self._get_sale_utm_domain()).mapped('invoice_ids')
+ res = self.env['account.invoice.report'].search_read([('invoice_id', 'in', invoices.ids)], ['user_currency_price_total'])
+ mass_mailing.sale_invoiced_amount = sum(r['user_currency_price_total'] for r in res)
+ else:
+ mass_mailing.sale_invoiced_amount = 0
@api.multi
def action_redirect_to_quotations(self):
diff --git a/addons/membership/views/partner_views.xml b/addons/membership/views/partner_views.xml
index d7235e3998a..739f0cff968 100644
--- a/addons/membership/views/partner_views.xml
+++ b/addons/membership/views/partner_views.xml
@@ -28,9 +28,9 @@
-
+
-
+
diff --git a/addons/membership/views/product_views.xml b/addons/membership/views/product_views.xml
index 80192e9bad8..1acbfaa183c 100644
--- a/addons/membership/views/product_views.xml
+++ b/addons/membership/views/product_views.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/addons/mrp/models/stock_warehouse.py b/addons/mrp/models/stock_warehouse.py
index a03ab6ddc36..c66d15131c6 100644
--- a/addons/mrp/models/stock_warehouse.py
+++ b/addons/mrp/models/stock_warehouse.py
@@ -108,6 +108,7 @@ class StockWarehouse(models.Model):
'create_values': {
'action': 'manufacture',
'procure_method': 'make_to_order',
+ 'company_id': self.company_id.id,
'picking_type_id': self.manu_type_id.id,
'route_id': self._find_global_route('mrp.route_warehouse0_manufacture', _('Manufacture')).id
},
diff --git a/addons/point_of_sale/data/point_of_sale_data.xml b/addons/point_of_sale/data/point_of_sale_data.xml
index eef8edee6ce..e35a32fc706 100644
--- a/addons/point_of_sale/data/point_of_sale_data.xml
+++ b/addons/point_of_sale/data/point_of_sale_data.xml
@@ -34,6 +34,7 @@
TipsTIPS
+
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index b991609ca89..59ec2f0b801 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -437,6 +437,8 @@ td {
display: flex;
-webkit-flex: 1;
flex: 1;
+ max-width: -moz-available;
+ max-width: -webkit-fill-available;
}
.pos .orders {
display: -webkit-flex;
diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js
index e61f8d1097e..c48ecae1c5d 100644
--- a/addons/pos_restaurant/static/src/js/multiprint.js
+++ b/addons/pos_restaurant/static/src/js/multiprint.js
@@ -139,8 +139,10 @@ models.Orderline = models.Orderline.extend({
}
},
set_dirty: function(dirty) {
- this.mp_dirty = dirty;
- this.trigger('change',this);
+ if (this.mp_dirty !== dirty) {
+ this.mp_dirty = dirty;
+ this.trigger('change', this);
+ }
},
get_line_diff_hash: function(){
if (this.get_note()) {
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index b039d460360..a72f3ca5eae 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -15,15 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: product
-#: code:addons/product/models/product_template.py:469
-#, python-format
-msgid "\n"
-" The number of variants to generate is too high.\n"
-" You should either not generate variants for each combination or generate them on demand from the sales order.\n"
-" To do so, open the form view of attributes and change the mode of *Create Variants*."
-msgstr ""
-
#. module: product
#: selection:product.pricelist.item,applied_on:0
msgid " Product Category"
@@ -1220,6 +1211,11 @@ msgstr ""
msgid "Never"
msgstr ""
+#. module: product
+#: model_terms:ir.ui.view,arch_db:product.product_pricelist_item_form_view
+msgid "New Price ="
+msgstr ""
+
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product__activity_date_deadline
#: model:ir.model.fields,field_description:product.field_product_template__activity_date_deadline
@@ -2012,7 +2008,13 @@ msgid "The number of products under this category (Does not consider the childre
msgstr ""
#. module: product
-#: code:addons/product/models/product_attribute.py:55
+#: code:addons/product/models/product_template.py:475
+#, python-format
+msgid "The number of variants to generate is too high. You should either not generate variants for each combination or generate them on demand from the sales order. To do so, open the form view of attributes and change the mode of *Create Variants*."
+msgstr ""
+
+#. module: product
+#: code:addons/product/models/product_attribute.py:56
#, python-format
msgid "The operation cannot be completed:\n"
"You are trying to delete an attribute value with a reference on a product variant."
diff --git a/addons/product/models/product.py b/addons/product/models/product.py
index 0806370c998..b1b2340f16d 100644
--- a/addons/product/models/product.py
+++ b/addons/product/models/product.py
@@ -604,6 +604,22 @@ class ProductProduct(models.Model):
return name
+ def _has_valid_attributes(self, valid_attributes, valid_values):
+ """ Check if a product has valid attributes. It is considered valid if:
+ - it uses ALL valid attributes
+ - it ONLY uses valid values
+ We must make sure that all attributes are used to take into account the case where
+ attributes would be added to the template.
+
+ :param valid_attributes: a recordset of product.attribute
+ :param valid_values: a recordset of product.attribute.value
+ :return: True if the attibutes and values are correct, False instead
+ """
+ self.ensure_one()
+ values = self.attribute_value_ids.filtered(lambda v: v.attribute_id.create_variant != 'no_variant')
+ attributes = values.mapped('attribute_id')
+ return attributes == valid_attributes and values <= valid_values
+
class ProductPackaging(models.Model):
_name = "product.packaging"
diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index 102ba1ca109..1ccf742bd9a 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -434,7 +434,6 @@ class ProductTemplate(models.Model):
@api.multi
def create_variant_ids(self):
Product = self.env["product.product"]
- AttributeValues = self.env['product.attribute.value']
variants_to_create = []
variants_to_activate = []
@@ -448,34 +447,50 @@ class ProductTemplate(models.Model):
updated_products = tmpl_id.product_variant_ids.filtered(lambda product: value_id.attribute_id not in product.mapped('attribute_value_ids.attribute_id'))
updated_products.write({'attribute_value_ids': [(4, value_id.id)]})
- # iterator of n-uple of product.attribute.value *ids*
- variant_matrix = [
- AttributeValues.browse(value_ids)
- for value_ids in itertools.product(*(line.value_ids.ids for line in tmpl_id.attribute_line_ids if line.value_ids[:1].attribute_id.create_variant != 'no_variant'))
- ]
+ # Determine which product variants need to be created based on the attribute
+ # configuration. If any attribute is set to generate variants dynamically, skip the
+ # process.
+ # Technical note: if there is no attribute, a variant is still created because
+ # 'not any([])' and 'set([]) not in set([])' are True.
+ if not any(attrib.create_variant == 'dynamic' for attrib in tmpl_id.mapped('attribute_line_ids.attribute_id')):
+ # Iterator containing all possible attribute values combination
+ # The iterator is used to avoid MemoryError in case of a huge number of combination.
+ all_variants = itertools.product(*(
+ line.value_ids.ids for line in tmpl_id.attribute_line_ids if line.value_ids[:1].attribute_id.create_variant != 'no_variant'
+ ))
+ # Set containing existing attribute values combination
+ existing_variants = {
+ frozenset(variant.attribute_value_ids.filtered(lambda r: r.attribute_id.create_variant != 'no_variant').ids)
+ for variant in tmpl_id.product_variant_ids
+ }
+ # For each possible variant, create if it doesn't exist yet.
+ for value_ids in all_variants:
+ value_ids = frozenset(value_ids)
+ if value_ids not in existing_variants:
+ variants_to_create.append({
+ 'product_tmpl_id': tmpl_id.id,
+ 'attribute_value_ids': [(6, 0, list(value_ids))],
+ })
+ if len(variants_to_create) > 1000:
+ raise UserError(_(
+ 'The number of variants to generate is too high. '
+ 'You should either not generate variants for each combination or generate them on demand from the sales order. '
+ 'To do so, open the form view of attributes and change the mode of *Create Variants*.'))
- # get the value (id) sets of existing variants
- existing_variants = {frozenset(variant.attribute_value_ids.filtered(lambda r: r.attribute_id.create_variant != 'no_variant').ids) for variant in tmpl_id.product_variant_ids}
- # -> for each value set, create a recordset of values to create a
- # variant for if the value set isn't already a variant
- for value_ids in variant_matrix:
- if set(value_ids.ids) not in existing_variants and not any(value_id.attribute_id.create_variant == 'dynamic' for value_id in value_ids):
- variants_to_create.append({
- 'product_tmpl_id': tmpl_id.id,
- 'attribute_value_ids': [(6, 0, value_ids.ids)]
- })
-
- if len(variants_to_create) > 1000:
- raise UserError(_("""
- The number of variants to generate is too high.
- You should either not generate variants for each combination or generate them on demand from the sales order.
- To do so, open the form view of attributes and change the mode of *Create Variants*."""))
-
- # check product
+ # Check existing variants if any needs to be activated or unlinked.
+ # - if the product is not active and has valid attributes and attribute values, it
+ # should be activated
+ # - if the product does not have valid attributes or attribute values, it should be
+ # deleted
+ valid_value_ids = tmpl_id.mapped('attribute_line_ids.value_ids').filtered(
+ lambda v: v.attribute_id.create_variant != 'no_variant'
+ )
+ valid_attribute_ids = valid_value_ids.mapped('attribute_id')
for product_id in tmpl_id.product_variant_ids:
- if not product_id.active and product_id.attribute_value_ids.filtered(lambda r: r.attribute_id.create_variant != 'no_variant') in variant_matrix:
- variants_to_activate.append(product_id)
- elif product_id.attribute_value_ids.filtered(lambda r: r.attribute_id.create_variant != 'no_variant') not in variant_matrix:
+ if product_id._has_valid_attributes(valid_attribute_ids, valid_value_ids):
+ if not product_id.active:
+ variants_to_activate.append(product_id)
+ else:
variants_to_unlink.append(product_id)
if variants_to_activate:
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 2a94a4b2a29..e6ccde44d8e 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -17,7 +17,7 @@ class report_product_pricelist(models.AbstractModel):
quantities = self._get_quantity(data)
return {
'doc_ids': data.get('ids', data.get('active_ids')),
- 'doc_model': 'hr.contribution.register',
+ 'doc_model': 'product.pricelist',
'docs': products,
'data': dict(
data,
diff --git a/addons/product/tests/common.py b/addons/product/tests/common.py
index 559b8b9dcfa..50831e2a88c 100644
--- a/addons/product/tests/common.py
+++ b/addons/product/tests/common.py
@@ -101,3 +101,19 @@ class TestProductCommon(common.SavepointCase):
'name': 'Stone',
'uom_id': cls.uom_unit.id,
'uom_po_id': cls.uom_unit.id})
+
+
+class TestAttributesCommon(common.SavepointCase):
+
+ @classmethod
+ def setUpClass(cls):
+ super(TestAttributesCommon, cls).setUpClass()
+
+ # create 10 attributes with 10 values each
+ cls.att_names = "ABCDEFGHIJ"
+ cls.attributes = cls.env['product.attribute'].create([{
+ 'name': name,
+ 'create_variant': 'no_variant',
+ 'value_ids': [(0, 0, {'name': n}) for n in range(10)]
+ } for name in cls.att_names
+ ])
diff --git a/addons/product/tests/test_variants.py b/addons/product/tests/test_variants.py
index 8fc890c31f1..9381868b623 100644
--- a/addons/product/tests/test_variants.py
+++ b/addons/product/tests/test_variants.py
@@ -2,6 +2,7 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from . import common
+from odoo.exceptions import UserError
from odoo.tests.common import TransactionCase
class TestVariantsSearch(TransactionCase):
@@ -367,3 +368,96 @@ class TestVariantsNoCreate(common.TestProductCommon):
variant_id.attribute_value_ids += self.size_S
template.attribute_line_ids += template.attribute_line_ids.browse()
self.assertEqual(len(template.product_variant_ids), 1)
+
+
+class TestVariantsManyAttributes(common.TestAttributesCommon):
+
+ def test_01_create_no_variant(self):
+ toto = self.env['product.template'].create({
+ 'name': 'Toto',
+ 'attribute_line_ids': [(0, 0, {
+ 'attribute_id': attribute.id,
+ 'value_ids': [(6, 0, attribute.value_ids.ids)],
+ }) for attribute in self.attributes],
+ })
+ self.assertEqual(len(toto.attribute_line_ids.mapped('attribute_id')), 10)
+ self.assertEqual(len(toto.attribute_line_ids.mapped('value_ids')), 100)
+ self.assertEqual(len(toto.product_variant_ids), 1)
+
+ def test_02_create_dynamic(self):
+ self.attributes.write({'create_variant': 'dynamic'})
+ toto = self.env['product.template'].create({
+ 'name': 'Toto',
+ 'attribute_line_ids': [(0, 0, {
+ 'attribute_id': attribute.id,
+ 'value_ids': [(6, 0, attribute.value_ids.ids)],
+ }) for attribute in self.attributes],
+ })
+ self.assertEqual(len(toto.attribute_line_ids.mapped('attribute_id')), 10)
+ self.assertEqual(len(toto.attribute_line_ids.mapped('value_ids')), 100)
+ self.assertEqual(len(toto.product_variant_ids), 0)
+
+ def test_03_create_always(self):
+ self.attributes.write({'create_variant': 'always'})
+ with self.assertRaises(UserError):
+ self.env['product.template'].create({
+ 'name': 'Toto',
+ 'attribute_line_ids': [(0, 0, {
+ 'attribute_id': attribute.id,
+ 'value_ids': [(6, 0, attribute.value_ids.ids)],
+ }) for attribute in self.attributes],
+ })
+
+ def test_04_create_no_variant_dynamic(self):
+ self.attributes[:5].write({'create_variant': 'dynamic'})
+ toto = self.env['product.template'].create({
+ 'name': 'Toto',
+ 'attribute_line_ids': [(0, 0, {
+ 'attribute_id': attribute.id,
+ 'value_ids': [(6, 0, attribute.value_ids.ids)],
+ }) for attribute in self.attributes],
+ })
+ self.assertEqual(len(toto.attribute_line_ids.mapped('attribute_id')), 10)
+ self.assertEqual(len(toto.attribute_line_ids.mapped('value_ids')), 100)
+ self.assertEqual(len(toto.product_variant_ids), 0)
+
+ def test_05_create_no_variant_always(self):
+ self.attributes[:2].write({'create_variant': 'always'})
+ toto = self.env['product.template'].create({
+ 'name': 'Toto',
+ 'attribute_line_ids': [(0, 0, {
+ 'attribute_id': attribute.id,
+ 'value_ids': [(6, 0, attribute.value_ids.ids)],
+ }) for attribute in self.attributes],
+ })
+ self.assertEqual(len(toto.attribute_line_ids.mapped('attribute_id')), 10)
+ self.assertEqual(len(toto.attribute_line_ids.mapped('value_ids')), 100)
+ self.assertEqual(len(toto.product_variant_ids), 100)
+
+ def test_06_create_dynamic_always(self):
+ self.attributes[:5].write({'create_variant': 'dynamic'})
+ self.attributes[5:].write({'create_variant': 'always'})
+ toto = self.env['product.template'].create({
+ 'name': 'Toto',
+ 'attribute_line_ids': [(0, 0, {
+ 'attribute_id': attribute.id,
+ 'value_ids': [(6, 0, attribute.value_ids.ids)],
+ }) for attribute in self.attributes],
+ })
+ self.assertEqual(len(toto.attribute_line_ids.mapped('attribute_id')), 10)
+ self.assertEqual(len(toto.attribute_line_ids.mapped('value_ids')), 100)
+ self.assertEqual(len(toto.product_variant_ids), 0)
+
+ def test_07_create_no_create_dynamic_always(self):
+ self.attributes[3:6].write({'create_variant': 'dynamic'})
+ self.attributes[6:].write({'create_variant': 'always'})
+ toto = self.env['product.template'].create({
+ 'name': 'Toto',
+ 'attribute_line_ids': [(0, 0, {
+ 'attribute_id': attribute.id,
+ 'value_ids': [(6, 0, attribute.value_ids.ids)],
+ }) for attribute in self.attributes],
+ })
+ self.assertEqual(len(toto.attribute_line_ids.mapped('attribute_id')), 10)
+ self.assertEqual(len(toto.attribute_line_ids.mapped('value_ids')), 100)
+ self.assertEqual(len(toto.product_variant_ids), 0)
diff --git a/addons/product/views/product_pricelist_views.xml b/addons/product/views/product_pricelist_views.xml
index 2e219583d10..9f89adb2cc7 100644
--- a/addons/product/views/product_pricelist_views.xml
+++ b/addons/product/views/product_pricelist_views.xml
@@ -58,7 +58,7 @@
- New Price =
+
Public Price - Cost -
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index cf3127ca22d..0afcfcfa727 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -138,8 +138,8 @@
-
-
+
+
diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py
index 03830451911..72636feea62 100644
--- a/addons/project/controllers/portal.py
+++ b/addons/project/controllers/portal.py
@@ -131,7 +131,7 @@ class CustomerPortal(CustomerPortal):
# extends filterby criteria with project (criteria name is the project id)
# Note: portal users can't view projects they don't follow
- project_groups = request.env['project.task'].read_group([('project_id', 'not in', project.ids)],
+ project_groups = request.env['project.task'].read_group([('project_id', 'not in', projects.ids)],
['project_id'], ['project_id'])
for group in project_groups:
proj_id = group['project_id'][0] if group['project_id'] else False
diff --git a/addons/purchase/models/product.py b/addons/purchase/models/product.py
index 724fdb45069..49897429a4e 100644
--- a/addons/purchase/models/product.py
+++ b/addons/purchase/models/product.py
@@ -43,7 +43,7 @@ class ProductTemplate(models.Model):
@api.multi
def action_view_po(self):
action = self.env.ref('purchase.action_purchase_order_report_all').read()[0]
- action['domain'] = [('state', 'in', ['purchase', 'done']), '&', ('product_tmpl_id', 'in', self.ids)]
+ action['domain'] = ['&', ('state', 'in', ['purchase', 'done']), ('product_tmpl_id', 'in', self.ids)]
action['context'] = {
'search_default_last_year_purchase': 1,
'search_default_status': 1, 'search_default_order_month': 1,
@@ -75,7 +75,7 @@ class ProductProduct(models.Model):
@api.multi
def action_view_po(self):
action = self.env.ref('purchase.action_purchase_order_report_all').read()[0]
- action['domain'] = [('state', 'in', ['purchase', 'done']), '&', ('product_id', 'in', self.ids)]
+ action['domain'] = ['&', ('state', 'in', ['purchase', 'done']), ('product_id', 'in', self.ids)]
action['context'] = {
'search_default_last_year_purchase': 1,
'search_default_status': 1, 'search_default_order_month': 1,
diff --git a/addons/purchase_requisition/models/purchase_requisition.py b/addons/purchase_requisition/models/purchase_requisition.py
index 6778c47ebc3..7e899b2e928 100644
--- a/addons/purchase_requisition/models/purchase_requisition.py
+++ b/addons/purchase_requisition/models/purchase_requisition.py
@@ -492,3 +492,15 @@ class StockMove(models.Model):
return [(requisition_line.requisition_id, requisition_line.requisition_id.user_id, visited) for requisition_line in self.requisition_line_ids if requisition_line.state not in ('done', 'cancel')]
else:
return super(StockMove, self)._get_upstream_documents_and_responsibles(visited)
+
+
+class Orderpoint(models.Model):
+ _inherit = "stock.warehouse.orderpoint"
+
+ def _quantity_in_progress(self):
+ res = super(Orderpoint, self)._quantity_in_progress()
+ for op in self:
+ for pr in self.env['purchase.requisition'].search([('state','=','draft'),('origin','=',op.name)]):
+ for prline in pr.line_ids.filtered(lambda l: l.product_id.id == op.product_id.id):
+ res[op.id] += prline.product_uom_id._compute_quantity(prline.product_qty, op.product_uom, round=False)
+ return res
diff --git a/addons/purchase_stock/models/stock.py b/addons/purchase_stock/models/stock.py
index 75599c59dbc..6fefdbb3335 100644
--- a/addons/purchase_stock/models/stock.py
+++ b/addons/purchase_stock/models/stock.py
@@ -112,6 +112,8 @@ class StockWarehouse(models.Model):
'create_values': {
'action': 'buy',
'picking_type_id': self.in_type_id.id,
+ 'group_propagation_option': 'none',
+ 'company_id': self.company_id.id,
'route_id': self._find_global_route('purchase_stock.route_warehouse0_buy', _('Buy')).id
},
'update_values': {
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index 3102bb3b210..a09fa8711e8 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -549,10 +549,11 @@ class SaleOrder(models.Model):
raise UserError(_('There is no invoiceable line. If a product has a Delivered quantities invoicing policy, please make sure that a quantity has been delivered.'))
for invoice in invoices.values():
+ invoice.compute_taxes()
if not invoice.invoice_line_ids:
raise UserError(_('There is no invoiceable line. If a product has a Delivered quantities invoicing policy, please make sure that a quantity has been delivered.'))
# If invoice is negative, do a refund invoice instead
- if invoice.amount_untaxed < 0:
+ if invoice.amount_total < 0:
invoice.type = 'out_refund'
for line in invoice.invoice_line_ids:
line.quantity = -line.quantity
@@ -563,7 +564,10 @@ class SaleOrder(models.Model):
# by onchanges, which are not triggered when doing a create.
invoice.compute_taxes()
# Idem for partner
+ so_payment_term_id = invoice.payment_term_id.id
invoice._onchange_partner_id()
+ # To keep the payment terms set on the SO
+ invoice.payment_term_id = so_payment_term_id
invoice.message_post_with_view('mail.message_origin_link',
values={'self': invoice, 'origin': references[invoice]},
subtype_id=self.env.ref('mail.mt_note').id)
diff --git a/addons/sale/report/sale_report_views.xml b/addons/sale/report/sale_report_views.xml
index ef419e6eb0a..0b098040bd5 100644
--- a/addons/sale/report/sale_report_views.xml
+++ b/addons/sale/report/sale_report_views.xml
@@ -18,7 +18,7 @@
sale.report
-
+
diff --git a/addons/sale/static/src/js/product_configurator_mixin.js b/addons/sale/static/src/js/product_configurator_mixin.js
index 5908e151155..aa1066a0c24 100644
--- a/addons/sale/static/src/js/product_configurator_mixin.js
+++ b/addons/sale/static/src/js/product_configurator_mixin.js
@@ -418,7 +418,7 @@ var ProductConfiguratorMixin = {
var $optional_price = $parent.find(".oe_optional:first .oe_currency_value");
$price.html(self._priceToStr(combination.price));
$default_price.html(self._priceToStr(combination.list_price));
- if (combination.list_price - combination.price > 0.01) {
+ if (combination.list_price - combination.price >= 0.01) {
$default_price
.closest('.oe_website_sale')
.addClass("discount");
@@ -567,4 +567,4 @@ var ProductConfiguratorMixin = {
return ProductConfiguratorMixin;
-});
\ No newline at end of file
+});
diff --git a/addons/sale_margin/models/sale_order.py b/addons/sale_margin/models/sale_order.py
index cf5902d6b2b..866890ff822 100644
--- a/addons/sale_margin/models/sale_order.py
+++ b/addons/sale_margin/models/sale_order.py
@@ -60,14 +60,6 @@ class SaleOrderLine(models.Model):
for line in self:
currency = line.order_id.pricelist_id.currency_id
price = line.purchase_price
- if not price:
- from_cur = line.env.user.company_id.currency_id
- price = from_cur._convert(
- line.product_id.standard_price,
- currency,
- line.order_id.company_id or self.env.user.company_id,
- line.order_id.date_order or fields.Date.today(), round=False)
-
line.margin = currency.round(line.price_subtotal - (price * line.product_uom_qty))
diff --git a/addons/sale_stock/models/sale_order.py b/addons/sale_stock/models/sale_order.py
index 9d84752dd24..430c3cc52d9 100644
--- a/addons/sale_stock/models/sale_order.py
+++ b/addons/sale_stock/models/sale_order.py
@@ -327,7 +327,10 @@ class SaleOrderLine(models.Model):
self.ensure_one()
qty = 0.0
for move in self.move_ids.filtered(lambda r: r.state != 'cancel'):
- qty += move.product_uom._compute_quantity(move.product_uom_qty, self.product_uom, rounding_method='HALF-UP')
+ if move.picking_code == 'outgoing':
+ qty += move.product_uom._compute_quantity(move.product_uom_qty, self.product_uom, rounding_method='HALF-UP')
+ elif move.picking_code == 'incoming':
+ qty -= move.product_uom._compute_quantity(move.product_uom_qty, self.product_uom, rounding_method='HALF-UP')
return qty
@api.multi
@@ -433,7 +436,8 @@ class SaleOrderLine(models.Model):
return is_available
def _update_line_quantity(self, values):
- if self.mapped('qty_delivered') and values['product_uom_qty'] < max(self.mapped('qty_delivered')):
+ precision = self.env['decimal.precision'].precision_get('Product Unit of Measure')
+ if self.mapped('qty_delivered') and float_compare(values['product_uom_qty'], max(self.mapped('qty_delivered')), precision_digits=precision) == -1:
raise UserError(_('You cannot decrease the ordered quantity below the delivered quantity.\n'
'Create a return first.'))
super(SaleOrderLine, self)._update_line_quantity(values)
diff --git a/addons/sale_timesheet/data/sale_service_demo.xml b/addons/sale_timesheet/data/sale_service_demo.xml
index a38c6212b3a..84ad2f1b1e2 100644
--- a/addons/sale_timesheet/data/sale_service_demo.xml
+++ b/addons/sale_timesheet/data/sale_service_demo.xml
@@ -6,7 +6,7 @@
Advance
-
+ 150.05.0
diff --git a/addons/stock_account/views/stock_account_views.xml b/addons/stock_account/views/stock_account_views.xml
index f92c5af295d..7dde572369a 100644
--- a/addons/stock_account/views/stock_account_views.xml
+++ b/addons/stock_account/views/stock_account_views.xml
@@ -87,6 +87,7 @@
product.productproduct.product
+
diff --git a/addons/test_mail/tests/test_mail_mail.py b/addons/test_mail/tests/test_mail_mail.py
index 207cc80d26f..aebb4734fc3 100644
--- a/addons/test_mail/tests/test_mail_mail.py
+++ b/addons/test_mail/tests/test_mail_mail.py
@@ -48,4 +48,4 @@ class TestMail(common.SavepointCase, mail_common.MockEmails):
'partner_ids': [(4, self.user_employee.partner_id.id)]
})
- self.assertRaises(MailDeliveryException, mail.send)
+ self.assertRaises(MailDeliveryException, lambda: mail.send(raise_exception=True))
diff --git a/addons/web/models/models.py b/addons/web/models/models.py
index 572f07333d2..2e3bd54788d 100644
--- a/addons/web/models/models.py
+++ b/addons/web/models/models.py
@@ -40,11 +40,14 @@ class Base(models.AbstractModel):
records_values = self.search_read(domain or [], [progress_bar['field'], group_by])
data = {}
+ field_type = self._fields[group_by].type
+ if field_type == 'selection':
+ selection_labels = dict(self.fields_get()[group_by]['selection'])
+
for record_values in records_values:
group_by_value = record_values[group_by]
# Again, imitating what _read_group_format_result and _read_group_prepare_data do
- field_type = self._fields[group_by].type
if group_by_value and field_type in ['date', 'datetime']:
locale = self._context.get('lang') or 'en_US'
group_by_value = fields.Datetime.to_datetime(group_by_value)
@@ -61,7 +64,7 @@ class Base(models.AbstractModel):
locale=locale)
if field_type == 'selection':
- group_by_value = dict(self.fields_get()[group_by]['selection'])[group_by_value]
+ group_by_value = selection_labels[group_by_value]
if type(group_by_value) == tuple:
group_by_value = group_by_value[1] # FIXME should use technical value (0)
diff --git a/addons/web/static/src/js/chrome/abstract_action.js b/addons/web/static/src/js/chrome/abstract_action.js
index 5b0f7e3aeca..c4755338bf0 100644
--- a/addons/web/static/src/js/chrome/abstract_action.js
+++ b/addons/web/static/src/js/chrome/abstract_action.js
@@ -32,6 +32,13 @@ var AbstractAction = Widget.extend({
* Called each time the action is detached from the DOM.
*/
on_detach_callback: function () {},
+ /**
+ * Called by the action manager when action is restored (typically, when the
+ * user clicks on the action in the breadcrumb)
+ *
+ * @returns {Deferred|undefined}
+ */
+ willRestore: function () {},
//--------------------------------------------------------------------------
// Public
diff --git a/addons/web/static/src/js/chrome/action_manager_act_window.js b/addons/web/static/src/js/chrome/action_manager_act_window.js
index 7b87cb45dd3..e66ae801bc1 100644
--- a/addons/web/static/src/js/chrome/action_manager_act_window.js
+++ b/addons/web/static/src/js/chrome/action_manager_act_window.js
@@ -646,8 +646,10 @@ ActionManager.include({
});
} else {
viewOptions = _.extend(viewOptions || {}, action.env);
- return controller.widget.reload(viewOptions).then(function () {
- return controller;
+ return $.when(controller.widget.willRestore()).then(function () {
+ return controller.widget.reload(viewOptions).then(function () {
+ return controller;
+ });
});
}
});
diff --git a/addons/web/static/src/js/core/dom.js b/addons/web/static/src/js/core/dom.js
index 725658a351b..2a961596862 100644
--- a/addons/web/static/src/js/core/dom.js
+++ b/addons/web/static/src/js/core/dom.js
@@ -397,9 +397,10 @@ return {
if (options.maxWidth) {
maxWidth = options.maxWidth();
} else {
- var rect = $el[0].getBoundingClientRect();
+ var mLeft = $el.is('.ml-auto, .mx-auto, .m-auto');
+ var mRight = $el.is('.mr-auto, .mx-auto, .m-auto');
+ maxWidth = computeFloatOuterWidthWithMargins($el[0], mLeft, mRight);
var style = window.getComputedStyle($el[0]);
- maxWidth = (rect.right - rect.left);
maxWidth -= (parseFloat(style.paddingLeft) + parseFloat(style.paddingRight) + parseFloat(style.borderLeftWidth) + parseFloat(style.borderRightWidth));
maxWidth -= _.reduce($unfoldableItems, function (sum, el) {
return sum + computeFloatOuterWidthWithMargins(el);
@@ -434,10 +435,17 @@ return {
$extraItemsToggle.find('.nav-link').toggleClass('active', $extraItems.children().hasClass('active'));
}
- function computeFloatOuterWidthWithMargins(el) {
+ function computeFloatOuterWidthWithMargins(el, mLeft, mRight) {
var rect = el.getBoundingClientRect();
var style = window.getComputedStyle(el);
- return rect.right - rect.left + parseFloat(style.marginLeft) + parseFloat(style.marginRight);
+ var outerWidth = rect.right - rect.left;
+ if (mLeft !== false) {
+ outerWidth += parseFloat(style.marginLeft);
+ }
+ if (mRight !== false) {
+ outerWidth += parseFloat(style.marginRight);
+ }
+ return outerWidth;
}
},
/**
diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index 0aff337dcbf..183885b9fb8 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -264,7 +264,9 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
resIDs: record.res_ids,
},
on_success: def.resolve.bind(def),
- on_fail: def.reject.bind(def),
+ on_fail: function () {
+ self.update({}, {reload: false}).always(def.reject.bind(def));
+ },
on_closed: reload,
});
return this.alive(def);
diff --git a/addons/web/static/src/js/views/form/form_controller.js b/addons/web/static/src/js/views/form/form_controller.js
index 7587e52fcd0..9c354be6765 100644
--- a/addons/web/static/src/js/views/form/form_controller.js
+++ b/addons/web/static/src/js/views/form/form_controller.js
@@ -49,6 +49,15 @@ var FormController = BasicController.extend({
this._super.apply(this, arguments);
this.autofocus();
},
+ /**
+ * Force mode back to readonly. Whenever we leave a form view, it is saved,
+ * and should no longer be in edit mode.
+ *
+ * @override
+ */
+ willRestore: function () {
+ this.mode = 'readonly';
+ },
//--------------------------------------------------------------------------
// Public
@@ -241,7 +250,7 @@ var FormController = BasicController.extend({
* @override
*/
update: function (params, options) {
- params = _.extend({viewType: 'form'}, params);
+ params = _.extend({viewType: 'form', mode: this.mode}, params);
return this._super(params, options);
},
diff --git a/addons/web/static/src/js/views/graph/graph_controller.js b/addons/web/static/src/js/views/graph/graph_controller.js
index 09992695506..27bd59e476d 100644
--- a/addons/web/static/src/js/views/graph/graph_controller.js
+++ b/addons/web/static/src/js/views/graph/graph_controller.js
@@ -179,7 +179,6 @@ var GraphController = AbstractController.extend(GroupByMenuInterfaceMixin,{
*/
_onButtonClick: function (ev) {
var $target = $(ev.target);
- var parent;
var field;
if ($target.hasClass('o_graph_button')) {
this._setMode($target.data('mode'));
diff --git a/addons/web/static/src/js/views/graph/graph_model.js b/addons/web/static/src/js/views/graph/graph_model.js
index adefe1e8953..26c1aec6545 100644
--- a/addons/web/static/src/js/views/graph/graph_model.js
+++ b/addons/web/static/src/js/views/graph/graph_model.js
@@ -6,11 +6,8 @@ odoo.define('web.GraphModel', function (require) {
* server. It basically just do a read_group and format/normalize data.
*/
-var core = require('web.core');
var AbstractModel = require('web.AbstractModel');
-var _t = core._t;
-
return AbstractModel.extend({
/**
* @override
diff --git a/addons/web/static/src/js/views/kanban/kanban_model.js b/addons/web/static/src/js/views/kanban/kanban_model.js
index fd21ed4df86..bfb6f5e0cc9 100644
--- a/addons/web/static/src/js/views/kanban/kanban_model.js
+++ b/addons/web/static/src/js/views/kanban/kanban_model.js
@@ -305,7 +305,7 @@ var KanbanModel = BasicModel.extend({
* @override
*/
_load: function (dataPoint, options) {
- if (dataPoint.progressBar) {
+ if (dataPoint.groupedBy.length && dataPoint.progressBar) {
return this._readProgressBarGroup(dataPoint, options);
}
return this._super.apply(this, arguments);
diff --git a/addons/web/static/src/js/views/view_dialogs.js b/addons/web/static/src/js/views/view_dialogs.js
index d6ea10d1243..ee11afbc3bd 100644
--- a/addons/web/static/src/js/views/view_dialogs.js
+++ b/addons/web/static/src/js/views/view_dialogs.js
@@ -186,9 +186,12 @@ var FormViewDialog = ViewDialog.extend({
}
fields_view_def.then(function (viewInfo) {
+ var refinedContext = _.pick(self.context, function (value, key) {
+ return key.indexOf('_view_ref') === -1;
+ });
var formview = new FormView(viewInfo, {
modelName: self.res_model,
- context: self.context,
+ context: refinedContext,
ids: self.res_id ? [self.res_id] : [],
currentId: self.res_id || undefined,
index: 0,
diff --git a/addons/web/static/tests/chrome/action_manager_tests.js b/addons/web/static/tests/chrome/action_manager_tests.js
index 9233229a984..7424d31f365 100644
--- a/addons/web/static/tests/chrome/action_manager_tests.js
+++ b/addons/web/static/tests/chrome/action_manager_tests.js
@@ -2878,6 +2878,31 @@ QUnit.module('ActionManager', {
actionManager.destroy();
});
+ QUnit.test('form views are restored in readonly when coming back in breadcrumbs', function (assert) {
+ assert.expect(2);
+
+ var actionManager = createActionManager({
+ actions: this.actions,
+ archs: this.archs,
+ data: this.data,
+ });
+ actionManager.doAction(3);
+
+ // open a record in form view
+ actionManager.$('.o_list_view .o_data_row:first').click();
+ // switch to edit mode
+ $('.o_control_panel .o_form_button_edit').click();
+
+ assert.ok(actionManager.$('.o_form_view').hasClass('o_form_editable'));
+ // do some other action
+ actionManager.doAction(4);
+ // go back to form view
+ $('.o_control_panel .breadcrumb a').last().click();
+ assert.ok(actionManager.$('.o_form_view').hasClass('o_form_readonly'));
+
+ actionManager.destroy();
+ });
+
QUnit.test('honor group_by specified in actions context', function (assert) {
assert.expect(5);
diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index cb864afdf7e..f1640b06c82 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -1247,10 +1247,7 @@ QUnit.module('basic_fields', {
form.destroy();
});
- QUnit.skip('input field: change password value', function (assert) {
- // password policy needs an RPC call to initialize &
- // presents somewhat differently (custom widget), need way
- // to augment/override tests
+ QUnit.test('input field: change password value', function (assert) {
assert.expect(4);
var form = createView({
@@ -1278,7 +1275,7 @@ QUnit.module('basic_fields', {
form.destroy();
});
- QUnit.skip('input field: empty password', function (assert) {
+ QUnit.test('input field: empty password', function (assert) {
assert.expect(3);
this.data.partner.records[0].foo = false;
diff --git a/addons/web/static/tests/qweb_tests.js b/addons/web/static/tests/qweb_tests.js
index 6e40dd1b1cb..b31c604b4bf 100644
--- a/addons/web/static/tests/qweb_tests.js
+++ b/addons/web/static/tests/qweb_tests.js
@@ -49,9 +49,10 @@ function loadTest(assert, template, context) {
var args = params ? JSON.parse(params.textContent) : (context ? _.clone(context) : {});
var results = doc.querySelector('result#' + template);
+
assert.equal(
trim(qweb.render(template, args)),
- trim(results.textContent),
+ trim(results.textContent.replace(new RegExp(String.fromCharCode(13), 'g'), '')),
template);
} catch (error) {
assert.notOk(error.stack || error, 'Rendering error');
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index fce865ac29f..ada27d09afc 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -5993,10 +5993,7 @@ QUnit.module('Views', {
form.destroy();
});
- QUnit.skip('support password attribute', function (assert) {
- // password policy needs an RPC call to initialize &
- // presents somewhat differently (custom widget), need way
- // to augment/override tests
+ QUnit.test('support password attribute', function (assert) {
assert.expect(3);
var form = createView({
@@ -6989,6 +6986,69 @@ QUnit.module('Views', {
form.destroy();
});
+ QUnit.test('keep editing after call_button fail', function (assert) {
+ assert.expect(4);
+
+ var values;
+ var form = createView({
+ View: FormView,
+ model: 'partner',
+ data: this.data,
+ arch:'',
+ res_id: 1,
+ intercepts: {
+ execute_action: function (ev) {
+ assert.ok(true, 'the action is correctly executed');
+ ev.data.on_fail();
+ },
+ },
+ mockRPC: function (route, args) {
+ if (args.method === 'write') {
+ assert.deepEqual(args.args[1].p[0][2], values);
+ }
+ return this._super.apply(this, arguments);
+ },
+ viewOptions: {
+ mode: 'edit',
+ },
+ });
+
+ // add a row and partially fill it
+ form.$('.o_field_x2many_list_row_add a').click();
+ form.$('input:nth(0)').val('abc').trigger('input');
+
+ // click button which will trigger_up 'execute_action' (this will save)
+ values = {
+ display_name: 'abc',
+ product_id: false,
+ };
+ form.$('button.p').click();
+
+ // edit the new row again and set a many2one value
+ form.$('.o_form_view .o_field_one2many .o_data_row .o_data_cell').click();
+ var $dropdown = form.$('.o_field_many2one input').autocomplete('widget');
+ form.$('.o_field_many2one input').click();
+ $dropdown.find('li:first()').click();
+
+ assert.strictEqual(form.$('.o_field_many2one input').val(), 'xphone',
+ "value of the m2o should have been correctly updated");
+
+ values = {
+ product_id: 37,
+ };
+ form.$buttons.find('.o_form_button_save').click();
+
+ form.destroy();
+ });
+
QUnit.test('asynchronous rendering of a widget tag', function (assert) {
assert.expect(1);
@@ -7286,7 +7346,6 @@ QUnit.module('Views', {
'' +
'',
res_id: 2,
- //debug:1,
});
assert.strictEqual(form.$buttons.find('.o_form_button_edit')[0],document.activeElement,
"in read mode, when there are no primary buttons on the form, the default button with the focus should be edit");
diff --git a/addons/web/static/tests/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js
index 305dda05701..435c13cd3f1 100644
--- a/addons/web/static/tests/views/kanban_tests.js
+++ b/addons/web/static/tests/views/kanban_tests.js
@@ -4364,6 +4364,37 @@ QUnit.module('Views', {
kanban.destroy();
});
+ QUnit.test('column progressbars should not crash in non grouped views', function (assert) {
+ assert.expect(3);
+
+ var kanban = createView({
+ View: KanbanView,
+ model: 'partner',
+ data: this.data,
+ arch:
+ '' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '
' +
+ '' +
+ '
' +
+ '' +
+ '',
+ mockRPC: function (route, args) {
+ assert.step(route)
+ return this._super(route, args);
+ },
+ });
+
+ assert.strictEqual(kanban.$('.o_kanban_record').text(), 'namenamenamename',
+ "should have renderer 4 records");
+
+ assert.verifySteps(['/web/dataset/search_read'], "no read on progress bar data is done");
+ kanban.destroy();
+ });
+
QUnit.test('column progressbars: creating a new column should create a new progressbar', function (assert) {
assert.expect(1);
@@ -4459,8 +4490,7 @@ QUnit.module('Views', {
kanban.destroy();
});
- // XXX test deactivated in saas~11.2 as kanban archiving has been removed (and readded in saas~11.4)
- QUnit.skip('column progressbars on archiving records update counter', function (assert) {
+ QUnit.test('column progressbars on archiving records update counter', function (assert) {
assert.expect(4);
// add active field on partner model and make all records active
@@ -4491,7 +4521,9 @@ QUnit.module('Views', {
"the counter progressbars should be correctly displayed");
// archive all records of the second columns
- kanban.$('.o_kanban_group:eq(1) .o_column_archive').click();
+ kanban.$('.o_kanban_group:eq(1) .o_kanban_config a.o-no-caret').click();
+ kanban.$('.o_column_archive_records:visible').click();
+ $('.modal-footer button:first').click();
assert.strictEqual(kanban.$('.o_kanban_group:eq(1) .o_kanban_counter_side').text(), "0",
"counter should contain the correct value");
@@ -4501,7 +4533,7 @@ QUnit.module('Views', {
kanban.destroy();
});
- QUnit.skip('kanban with progressbars: correctly update env when archiving records', function (assert) {
+ QUnit.test('kanban with progressbars: correctly update env when archiving records', function (assert) {
assert.expect(3);
// add active field on partner model and make all records active
@@ -4526,13 +4558,15 @@ QUnit.module('Views', {
groupBy: ['bar'],
intercepts: {
env_updated: function (ev) {
- assert.step(ev.data.ids);
+ assert.step(ev.data.env.ids);
},
},
});
// archive all records of the first column
- kanban.$('.o_kanban_group:first .o_column_archive').click();
+ kanban.$('.o_kanban_group:first .o_kanban_config a.o-no-caret').click();
+ kanban.$('.o_column_archive_records:visible').click();
+ $('.modal-footer button:first').click();
assert.verifySteps([
[1, 2, 3, 4],
diff --git a/addons/web/static/tests/views/list_tests.js b/addons/web/static/tests/views/list_tests.js
index 4540b34c725..030a676f4eb 100644
--- a/addons/web/static/tests/views/list_tests.js
+++ b/addons/web/static/tests/views/list_tests.js
@@ -2849,72 +2849,6 @@ QUnit.module('Views', {
list.destroy();
});
- QUnit.skip('navigation: moving left/right with keydown', function (assert) {
- assert.expect(8);
-
- this.data.foo.fields.foo.type = 'text';
- var list = createView({
- View: ListView,
- model: 'foo',
- data: this.data,
- arch:
- '' +
- '' +
- '' +
- '' +
- '' +
- '' +
- '',
- });
-
- list.$('td:contains(13)').click();
- var $m2m = list.$('[name="m2m"] input');
- var $foo = list.$('textarea[name="foo"]');
- var $bar = list.$('[name="bar"] input');
- var $m2o = list.$('[name="m2o"] input');
- var $qux = list.$('input[name="qux"]');
-
- assert.strictEqual(document.activeElement, $qux[0],
- "'qux' input should be focused");
-
- $qux[0].selectionEnd = 0; // Simulate browser keyboard left behavior (unselect)
- $qux.trigger({type: 'keydown', which: $.ui.keyCode.LEFT});
- assert.strictEqual(document.activeElement, $m2o[0],
- "'m2o' input should be focused");
-
- // forget unselecting and try leaving
- $m2o.trigger({type: 'keydown', which: $.ui.keyCode.LEFT});
- assert.strictEqual(document.activeElement, $m2o[0],
- "'m2o' input should still be focused");
-
- $m2o[0].selectionEnd = 0; // Simulate browser keyboard left behavior (unselect)
- $m2o.trigger({type: 'keydown', which: $.ui.keyCode.LEFT});
- assert.strictEqual(document.activeElement, $bar[0],
- "'bar' input should be focused");
-
- // no unselect here as it is a checkbox
- $bar.trigger({type: 'keydown', which: $.ui.keyCode.LEFT});
- assert.strictEqual(document.activeElement, $foo[0],
- "'foo' input should be focused");
-
- // forget unselecting and try leaving
- $foo.trigger({type: 'keydown', which: $.ui.keyCode.LEFT});
- assert.strictEqual(document.activeElement, $foo[0],
- "'foo' input should still be focused");
-
- $foo[0].selectionEnd = 0; // Simulate browser keyboard left behavior (unselect)
- $foo.trigger({type: 'keydown', which: $.ui.keyCode.LEFT});
- assert.strictEqual(document.activeElement, $m2m[0],
- "'m2m' input should be focused");
-
- $m2m[0].selectionStart = $m2m[0].value.length; // Simulate browser keyboard right behavior (unselect)
- $m2m.trigger({type: 'keydown', which: $.ui.keyCode.RIGHT});
- assert.strictEqual(document.activeElement, $foo[0],
- "'foo' input should be focused");
-
- list.destroy();
- });
-
QUnit.test('discarding changes in a row properly updates the rendering', function (assert) {
assert.expect(3);
diff --git a/addons/web/static/tests/views/view_dialogs_tests.js b/addons/web/static/tests/views/view_dialogs_tests.js
index b45c27e4d60..372edbc0f24 100644
--- a/addons/web/static/tests/views/view_dialogs_tests.js
+++ b/addons/web/static/tests/views/view_dialogs_tests.js
@@ -364,6 +364,61 @@ QUnit.module('Views', {
form.destroy();
});
+ QUnit.test('Form dialog and subview with _view_ref contexts', function (assert) {
+ assert.expect(2);
+
+ this.data.instrument.records = [{id: 1, name: 'Tromblon', badassery: [1]}];
+ this.data.partner.records[0].instrument = 1;
+
+ var form = createView({
+ View: FormView,
+ model: 'partner',
+ data: this.data,
+ arch: '',
+ res_id: 1,
+ archs: {
+ 'instrument,false,form': '',
+
+ 'badassery,false,list': ''+
+ ''+
+ '',
+ },
+ viewOptions: {
+ mode: 'edit',
+ },
+
+ mockRPC: function(route, args) {
+ if (args.method === 'get_formview_id') {
+ return $.when(false);
+ }
+ return this._super(route, args);
+ },
+
+ interceptsPropagate: {
+ load_views: function (ev) {
+ var evaluatedContext = ev.data.context;
+ if (ev.data.modelName === 'instrument') {
+ assert.deepEqual(evaluatedContext, {tree_view_ref: 'some_tree_view'},
+ 'The correct _view_ref should have been sent to the server, first time');
+ }
+ if (ev.data.modelName === 'badassery') {
+ assert.deepEqual(evaluatedContext, {tree_view_ref: 'some_other_tree_view'},
+ 'The correct _view_ref should have been sent to the server for the subview');
+ }
+ },
+ },
+ });
+
+ form.$('.o_field_widget[name="instrument"] button.o_external_button').click();
+ form.destroy();
+ });
+
QUnit.test('SelectCreateDialog: save current search', function (assert) {
assert.expect(4);
diff --git a/addons/web_editor/static/src/js/editor/summernote.js b/addons/web_editor/static/src/js/editor/summernote.js
index a2f0f6a308f..36f5becce06 100644
--- a/addons/web_editor/static/src/js/editor/summernote.js
+++ b/addons/web_editor/static/src/js/editor/summernote.js
@@ -1936,6 +1936,15 @@ $.summernote.pluginEvents.formatBlock = function (event, editor, layoutInfo, sTa
if (!r) {
return;
}
+ // select content since container (that firefox selects) may be removed
+ if (r.so === 0) {
+ r.sc = dom.firstChild(r.sc);
+ }
+ if (dom.nodeLength(r.ec) >= r.eo) {
+ r.ec = dom.lastChild(r.ec);
+ r.eo = dom.nodeLength(r.ec);
+ }
+ r = range.create(r.sc, r.so, r.ec, r.eo);
r.reRange().select();
if (sTagName === "blockquote" || sTagName === "pre") {
@@ -1949,6 +1958,10 @@ $.summernote.pluginEvents.formatBlock = function (event, editor, layoutInfo, sTa
for (var i=0; i
+
diff --git a/addons/web_tour/__manifest__.py b/addons/web_tour/__manifest__.py
index 6e89cf26673..80f44db9165 100644
--- a/addons/web_tour/__manifest__.py
+++ b/addons/web_tour/__manifest__.py
@@ -13,6 +13,7 @@ Odoo Web tours.
'depends': ['web'],
'data': [
'security/ir.model.access.csv',
+ 'security/ir.rule.csv',
'views/tour_templates.xml',
'views/tour_views.xml'
],
diff --git a/addons/web_tour/security/ir.rule.csv b/addons/web_tour/security/ir.rule.csv
new file mode 100644
index 00000000000..6afd916bf7f
--- /dev/null
+++ b/addons/web_tour/security/ir.rule.csv
@@ -0,0 +1,2 @@
+"id","model_id/id","name","active","perm_create","perm_unlink","perm_read","perm_write","domain_force"
+"own_tours","model_web_tour_tour","own tours","True","True","True","True","True","[('user_id','=', user.id)]"
diff --git a/addons/website/controllers/backend.py b/addons/website/controllers/backend.py
index da8a9118a4a..b558620a0f5 100644
--- a/addons/website/controllers/backend.py
+++ b/addons/website/controllers/backend.py
@@ -61,6 +61,6 @@ class WebsiteBackend(http.Controller):
request.env['res.config.settings'].create({
'google_management_client_id': ga_client_id,
'google_analytics_key': ga_analytics_key,
- 'website_id': current_website,
+ 'website_id': current_website.id,
}).execute()
return True
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 28c0a0f8e85..3a54d5ce29c 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -78,7 +78,7 @@
diff --git a/addons/website/models/ir_actions.py b/addons/website/models/ir_actions.py
index f26d6263004..4add5587d7f 100644
--- a/addons/website/models/ir_actions.py
+++ b/addons/website/models/ir_actions.py
@@ -38,7 +38,7 @@ class ServerAction(models.Model):
def _get_website_url(self):
for action in self:
if action.state == 'code' and action.website_published:
- action.website_url = self._compute_website_url(action.website_path, action.xml_id)
+ action.website_url = action._compute_website_url(action.website_path, action.xml_id)
@api.model
def _get_eval_context(self, action):
diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index 84089d5c0c6..75b1a8d4fe4 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -45,17 +45,20 @@ class View(models.Model):
view.with_context(no_cow=True).key = 'website.key_%s' % str(uuid.uuid4())[:6]
if not view.website_id and current_website_id and not self._context.get('no_cow'):
# If already a specific view for this generic view, write on it
- website_specific_view = self.env['ir.ui.view'].search([
+ website_specific_view = view.search([
('key', '=', view.key),
('website_id', '=', current_website_id)
], limit=1)
if not website_specific_view:
# Set key to avoid copy() to generate an unique key as we want the specific view to have the same key
- website_specific_view = view.copy({'website_id': current_website_id, 'key': view.key})
+ copy_vals = {'website_id': current_website_id, 'key': view.key}
+ if vals.get('inherit_id'):
+ copy_vals['inherit_id'] = vals['inherit_id']
+ website_specific_view = view.copy(copy_vals)
view._create_website_specific_pages_for_view(website_specific_view,
view.env['website'].browse(current_website_id))
- for inherit_child in view.inherit_children_ids:
+ for inherit_child in view.inherit_children_ids.filter_duplicate():
# COW won't be triggered if there is already a website_id on the view, we should copy the view ourself
if inherit_child.website_id.id == current_website_id:
inherit_child.copy({'inherit_id': website_specific_view.id, 'key': inherit_child.key})
diff --git a/addons/website/static/src/js/backend/dashboard.js b/addons/website/static/src/js/backend/dashboard.js
index b4fe22ba84e..1a83e8dc39a 100644
--- a/addons/website/static/src/js/backend/dashboard.js
+++ b/addons/website/static/src/js/backend/dashboard.js
@@ -44,6 +44,9 @@ var Dashboard = AbstractAction.extend(ControlPanelMixin, {
var self = this;
return $.when(ajax.loadLibs(this), this._super()).then(function() {
return self.fetch_data();
+ }).then(function(){
+ var website = _.findWhere(self.websites, {selected: true});
+ self.website_id = website ? website.id : false;
});
},
diff --git a/addons/website/static/src/js/content/menu.js b/addons/website/static/src/js/content/menu.js
index c5371e3c5fb..42a12414557 100644
--- a/addons/website/static/src/js/content/menu.js
+++ b/addons/website/static/src/js/content/menu.js
@@ -98,6 +98,17 @@ sAnimation.registry.autohideMenu = sAnimation.Class.extend({
def.resolve();
});
});
+
+ // The previous code will make sure we wait for images to be fully
+ // loaded before initializing the auto more menu. But in some cases,
+ // it is not enough, we also have to wait for fonts or even extra
+ // scripts. Those will have no impact on the feature in most cases
+ // though, so we will only update the auto more menu at that time,
+ // no wait for it to initialize the feature.
+ var $window = $(window);
+ $window.on('load.autohideMenu', function () {
+ $window.trigger('resize');
+ });
}
return $.when.apply($, defs).then(function () {
if (!self.noAutohide) {
@@ -112,6 +123,7 @@ sAnimation.registry.autohideMenu = sAnimation.Class.extend({
destroy: function () {
this._super.apply(this, arguments);
if (!this.noAutohide) {
+ $(window).off('.autohideMenu');
dom.destroyAutoMoreMenu(this.$el);
}
},
diff --git a/addons/website/static/src/js/menu/customize.js b/addons/website/static/src/js/menu/customize.js
index d8ce436248e..b931e938cc6 100644
--- a/addons/website/static/src/js/menu/customize.js
+++ b/addons/website/static/src/js/menu/customize.js
@@ -18,8 +18,14 @@ var CustomizeMenu = Widget.extend({
/**
* @override
*/
- start: function () {
+ willStart: function () {
this.viewName = $(document.documentElement).data('view-xmlid');
+ return this._super.apply(this, arguments);
+ },
+ /**
+ * @override
+ */
+ start: function () {
if (!this.viewName) {
_.defer(this.destroy.bind(this));
}
@@ -27,6 +33,7 @@ var CustomizeMenu = Widget.extend({
if (this.$el.is('.show')) {
this._loadCustomizeOptions();
}
+ return this._super.apply(this, arguments);
},
//--------------------------------------------------------------------------
diff --git a/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss b/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss
new file mode 100644
index 00000000000..82beeec2cbf
--- /dev/null
+++ b/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss
@@ -0,0 +1,300 @@
+/**
+ * This file's purpose is to *ease* migration from 11.0.
+ */
+
+// Restore gray utilities
+$-compat-gray-map: (
+ 'gray-darker': '900',
+ 'gray-dark': '900',
+ 'gray': '700',
+ 'gray-light': '600',
+ 'gray-lighter': '200',
+);
+@each $old, $new in $-compat-gray-map {
+ @include bg-variant(".bg-#{$old}", gray($new));
+ @include text-emphasis-variant(".text-#{$old}", gray($new));
+}
+
+// Restore media ?
+
+// Restore progress bars
+@each $color, $value in $theme-colors {
+ @include bg-variant(".progress-bar-#{$color}", $value);
+}
+
+// Adapt radio ?
+
+// Adapt labels
+.label {
+ @extend .badge;
+}
+@each $color, $value in $theme-colors {
+ .label-#{$color} {
+ @include badge-variant($value);
+ }
+}
+.label-default {
+ @include badge-variant(theme-color('secondary'));
+}
+
+// Adapt center-block
+.center-block {
+ display: block;
+ margin: auto;
+}
+
+// Adapt pull-* classes
+.pull-left {
+ float: left;
+}
+.pull-right {
+ float: right;
+}
+
+// Adapt pagination
+.pagination > li {
+ @extend .page-item;
+ > a {
+ @extend .page-link;
+ }
+}
+
+// Adapt carousel
+.carousel .item {
+ @extend .carousel-item;
+}
+
+// Adapt checkboxes ?
+
+// Adapt tables
+.table-condensed {
+ @extend .table-sm;
+}
+
+// Adapt forms
+.control-label {
+ @extend .col-form-label;
+}
+.help-block {
+ @extend .form-text;
+}
+.has-error .form-control {
+ @extend .is-invalid;
+}
+.has-success .form-control {
+ @extend .is-valid;
+}
+.form-horizontal .form-group {
+ @extend .row;
+}
+
+// Adapt list-inline
+.list-inline > li {
+ @extend .list-inline-item;
+}
+
+// Adapt list-group
+.panel .list-group {
+ @extend .list-group-flush;
+}
+
+// Adapt image utilies
+.img-rounded {
+ @extend .rounded;
+}
+.img-circle {
+ @extend .rounded-circle;
+}
+
+// Adapt input group
+.input-group {
+ .input-group-btn:first-child {
+ @extend .input-group-prepend;
+ }
+ .form-control ~ .input-group-btn {
+ @extend .input-group-append;
+ }
+ .input-group-addon {
+ @extend .input-group-append;
+ @extend .input-group-text;
+ }
+}
+
+// Adapt panels
+.panel {
+ @extend .card;
+}
+@each $color, $value in $theme-colors {
+ @include bg-variant(".panel-#{$color}", $value);
+}
+@include bg-variant(".panel-default", $white);
+.panel-heading {
+ @extend .card-header;
+}
+.panel-body {
+ @extend .card-body;
+}
+.panel-footer {
+ @extend .card-footer;
+}
+.well {
+ @extend .card;
+ @extend .card-body;
+}
+
+// Adapt grid (push-pull, xs ?)
+@each $breakpoint in map-keys($grid-breakpoints) {
+ $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
+ $infix: if($infix != "", $infix, "-xs");
+
+ @include media-breakpoint-up($breakpoint, $grid-breakpoints) {
+ // `$grid-columns - 1` because offsetting by the width of an entire row isn't possible
+ @for $i from 0 through ($grid-columns - 1) {
+ .col#{$infix}-offset-#{$i} {
+ @include make-col-offset($i, $grid-columns);
+ }
+ }
+ }
+}
+
+// Adapt breadcrumb
+.breadcrumb > li {
+ @extend .breadcrumb-item;
+}
+
+// Adapt nav
+.nav > li {
+ @extend .nav-item;
+ > a {
+ @extend .nav-link;
+ }
+}
+.nav-stacked {
+ flex-direction: column;
+}
+@include bg-variant(".navbar-default", $light);
+
+// Adapt img-responsive
+.img-responsive {
+ @extend .img-fluid;
+}
+
+// Adapt dropdowns
+.dropdown-menu {
+ a {
+ @extend .dropdown-item;
+ }
+ .divider {
+ @extend .dropdown-divider;
+ }
+}
+.dropdown-toggle .caret {
+ display: none;
+}
+
+// Adapt buttons
+.btn-default {
+ @include button-variant(theme-color('secondary'), theme-color('secondary'));
+}
+
+// Adapt display classes
+.hidden, .hide {
+ display: none !important;
+}
+.hidden {
+ &-xs {
+ @include media-breakpoint-down(sm) {
+ display: none;
+ }
+ }
+ &-sm {
+ @include media-breakpoint-only(md) {
+ display: none;
+ }
+ }
+ &-md {
+ @include media-breakpoint-only(lg) {
+ display: none;
+ }
+ }
+ &-lg {
+ @include media-breakpoint-only(xl) {
+ display: none;
+ }
+ }
+ &-print {
+ @media print {
+ display: none;
+ }
+ }
+}
+.show {
+ display: block !important;
+}
+.visible {
+ &-xs {
+ &-block, &-inline-block {
+ display: none;
+ }
+ @include media-breakpoint-down(sm) {
+ &-block {
+ display: block;
+ }
+ &-inline-block {
+ display: inline-block;
+ }
+ }
+ }
+ &-sm {
+ &-block, &-inline-block {
+ display: none;
+ }
+ @include media-breakpoint-only(md) {
+ &-block {
+ display: block;
+ }
+ &-inline-block {
+ display: inline-block;
+ }
+ }
+ }
+ &-md {
+ &-block, &-inline-block {
+ display: none;
+ }
+ @include media-breakpoint-only(lg) {
+ &-block {
+ display: block;
+ }
+ &-inline-block {
+ display: inline-block;
+ }
+ }
+ }
+ &-lg {
+ &-block, &-inline-block {
+ display: none;
+ }
+ @include media-breakpoint-only(xl) {
+ &-block {
+ display: block;
+ }
+ &-inline-block {
+ display: inline-block;
+ }
+ }
+ }
+ &-print {
+ &-block, &-inline-block {
+ display: none;
+ }
+ @media print {
+ &-block {
+ display: block;
+ }
+ &-inline-block {
+ display: inline-block;
+ }
+ }
+ }
+}
diff --git a/addons/website/static/src/scss/website.ui.scss b/addons/website/static/src/scss/website.ui.scss
index 1d1c42203b4..d9554a20a1c 100644
--- a/addons/website/static/src/scss/website.ui.scss
+++ b/addons/website/static/src/scss/website.ui.scss
@@ -298,6 +298,7 @@ body .modal {
}
#o_new_content_menu_choices {
+ @include o-w-preserve-base;
@include o-position-absolute($o-navbar-height, 0, 0, 0);
position: fixed;
display: flex;
diff --git a/addons/website/tests/test_views.py b/addons/website/tests/test_views.py
index b16740ad619..49a76cf78ab 100644
--- a/addons/website/tests/test_views.py
+++ b/addons/website/tests/test_views.py
@@ -421,10 +421,13 @@ class TestCowViewSaving(common.TransactionCase):
'arch': '
content
',
})
- total_views = View.search_count([])
+ total_views = View.with_context(active_test=False).search_count([])
base_view.with_context(website_id=1).write({'name': 'New Name'}) # This will not write on `base_view` but will copy it to a specific view on which the `name` change will be applied
+ specific_view = View.search([['name', '=', 'New Name'], ['website_id', '=', 1]])
base_view.with_context(website_id=1).write({'name': 'Another New Name'})
- self.assertEqual(total_views + 1, View.search_count([]), "Second write should have wrote on the view copied during first write")
+ specific_view.active = False
+ base_view.with_context(website_id=1).write({'name': 'Yet Another New Name'})
+ self.assertEqual(total_views + 1, View.with_context(active_test=False).search_count([]), "Subsequent writes should have written on the view copied during first write")
# 2. Test with calling save() from ir.ui.view
view_arch = '''
@@ -444,12 +447,12 @@ class TestCowViewSaving(common.TransactionCase):
'arch': view_arch,
})
- total_views = View.search_count([])
+ total_views = View.with_context(active_test=False).search_count([])
second_view.with_context(website_id=1).save('
' % second_view.id, "/t[1]/t[1]/div[1]/div[3]")
- self.assertEqual(total_views + 1, View.search_count([]), "Second save should have wrote on the view copied during first save")
+ self.assertEqual(total_views + 1, View.with_context(active_test=False).search_count([]), "Second save should have written on the view copied during first save")
- total_specific_view = View.search_count([('arch_db', 'like', 'First editable_part'), ('arch_db', 'like', 'Second editable_part')])
+ total_specific_view = View.with_context(active_test=False).search_count([('arch_db', 'like', 'First editable_part'), ('arch_db', 'like', 'Second editable_part')])
self.assertEqual(total_specific_view, 1, "both editable_part should have been replaced on a created specific view")
def test_cow_complete_flow(self):
@@ -520,3 +523,43 @@ class TestCowViewSaving(common.TransactionCase):
base_arch_w1 = self.base_view.with_context(website_id=1).read_combined(['arch'])['arch']
self.assertEqual('Hello World' in base_arch, True)
self.assertEqual(base_arch, base_arch_w1, "Reading a top level view with or without a website_id in the context should render that exact view..") # ..even if there is a specific view for that one, as read_combined is supposed to render specific inherited view over generic but not specific top level instead of generic top level
+
+ def test_cow_cross_inherit(self):
+ View = self.env['ir.ui.view']
+ total_views = View.search_count([])
+
+ main_view = View.create({
+ 'name': 'Main View',
+ 'type': 'qweb',
+ 'arch': 'GENERIC
',
+ 'key': 'website.child_view',
+ })
+
+ child_view_2 = View.with_context(load_all_views=True).create({
+ 'name': 'Child View 2',
+ 'mode': 'extension',
+ 'inherit_id': main_view.id,
+ 'arch': 'C',
+ 'key': 'website.child_view_2',
+ })
+
+ # These line doing `write()` are the real tests, it should not be changed and should not crash on xpath.
+ child_view_2.with_context(website_id=1).write({'arch': 'D'})
+ self.assertEqual(total_views + 3 + 1, View.search_count([]), "It should have created the 3 initial generic views and created a child_view_2 specific view")
+ main_view.with_context(website_id=1).write({'arch': 'SPECIFIC
Z
'})
+ self.assertEqual(total_views + 3 + 3, View.search_count([]), "It should have duplicated the Main View tree as a specific tree and then removed the specific view from the generic tree as no more needed")
+
+ generic_view = View.with_context(website_id=None).get_view_id('website.main_view')
+ specific_view = View.with_context(website_id=1).get_view_id('website.main_view')
+ generic_view_arch = View.browse(generic_view).with_context(load_all_views=True).read_combined(['arch'])['arch']
+ specific_view_arch = View.browse(specific_view).with_context(load_all_views=True, website_id=1).read_combined(['arch'])['arch']
+ self.assertEqual(generic_view_arch == 'GENERIC
', True, "Writing on top level view hierarchy with a website in context should write on the view and clone it's inherited views")
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index d2b3cffbf60..c9a76741fad 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -567,7 +567,7 @@
These terms of service ("Terms", "Agreement") are an agreement between the website ("Website operator", "us", "we" or "our") and you ("User", "you" or "your"). This Agreement sets forth the general terms and conditions of your use of this website and any of its products or services (collectively, "Website" or "Services").
Although this Website may be linked to other websites, we are not, directly or indirectly, implying any approval, association, sponsorship, endorsement, or affiliation with any linked website, unless specifically stated herein.
Website may use cookies to personalize and facilitate maximum navigation of the User by this site. The User may configure his / her browser to notify and reject the installation of the cookies sent by us.