From b12aa8292678596d607d1c62c8a5fa5aad5fa399 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 3 Nov 2015 14:08:15 +0100 Subject: [PATCH 01/29] [FIX] website_mail_group: Localized messages dates The messages dates in the groups pages - /groups// - /groups// - - + -
@@ -262,7 +262,7 @@ }'/> - - + - -

From 2ae37d7c9a48d029f035e996984a559a150623b4 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Fri, 30 Oct 2015 11:46:59 +0100 Subject: [PATCH 02/29] [FIX] hr_contract: access on resource.calendar.attendance for HR officer Add ACL on resource.calendar.attendance for HR Officer according access right on resource.calendar Otherwise, this isn't possible for HR officers to manage Work Details (`resource.calendar.attendance`), while they can manage Resource Calendar (`resource.calendar`) Closes #9330 --- addons/hr_contract/security/ir.model.access.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv index 5e35e147230..820935111f0 100644 --- a/addons/hr_contract/security/ir.model.access.csv +++ b/addons/hr_contract/security/ir.model.access.csv @@ -1,5 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_hr_resource_manager,hr.employee.resource.manager,resource.model_resource_resource,base.group_hr_manager,1,1,1,1 access_hr_resource_calendar_user,hr.employee.resource.calendar.user,resource.model_resource_calendar,base.group_hr_user,1,1,1,1 +access_hr_resource_calendar_attendance_user,hr.employee.resource.calendar.attendance.user,resource.model_resource_calendar_attendance,base.group_hr_user,1,1,1,1 access_hr_contract_type_manager,hr.contract.type.manager,model_hr_contract_type,base.group_hr_manager,1,1,1,1 access_hr_contract_manager,hr.contract.manager,model_hr_contract,base.group_hr_manager,1,1,1,1 From a69205d561f5cab0691fd9835c9b633fc8597812 Mon Sep 17 00:00:00 2001 From: Nicolas Mac Rouillon Date: Thu, 3 Sep 2015 08:34:33 -0300 Subject: [PATCH 03/29] [CLA] Adding one contributor to adhoc cla --- doc/cla/corporate/adhoc.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/cla/corporate/adhoc.md b/doc/cla/corporate/adhoc.md index b43d8ef0e93..627065bafab 100644 --- a/doc/cla/corporate/adhoc.md +++ b/doc/cla/corporate/adhoc.md @@ -12,3 +12,4 @@ List of contributors: Damián Soriano ds@adhoc.com.ar https://github.com/damiansoriano Juan José Scarafía jjs@adhoc.com.ar https://github.com/jjscarafia +Nicolás Mac Rouillon nmr@adhoc.com.ar https://github.com/nicomacr From 43248915291a9cc54bc57875617a564365b5091b Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Tue, 3 Nov 2015 16:42:43 +0100 Subject: [PATCH 04/29] [FIX] website_sale: add to cart with optional products When clicking on button "add_to_cart" for a product with several options, the user must be redirected to the product page. In this way, the user can choose the options, he wants to buy with the product before adding the product in the cart. opw:653356 --- addons/website_sale/views/templates.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 8d258e3f249..54b9fa843d1 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -116,10 +116,10 @@