From 27e7d24256c0674a576d55d1cc0aa914503321d9 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 15 Jun 2018 11:48:43 +0200 Subject: [PATCH 1/2] [FIX] packaging: stop removing Odoo lib dir When removing Odoo Debian package, the directory /var/lib/odoo is also removed. This directory could contain important data like filestore or custom modules. With this commit, this directory is preserved on removal and deleted when the purge command is issued with a Debian package manager. Fixes #22138 --- debian/postrm | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/postrm b/debian/postrm index 22f7211203f..274a488c1bf 100644 --- a/debian/postrm +++ b/debian/postrm @@ -10,9 +10,6 @@ case "${1}" in remove) deluser --quiet --system $ODOO_USER || true delgroup --quiet --system --only-if-empty $ODOO_GROUP || true - if [ -d "$ODOO_LIB_DIR" ]; then - rm -rf $ODOO_LIB_DIR - fi ;; purge) From 9cb37398f2c5a36ebd666c434c4478c3b45d6f92 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Mon, 18 Jun 2018 14:23:35 +0200 Subject: [PATCH 2/2] [FIX] calendar: Calendar recurring start date is wrong Steps to reproduce the bug: - Create a recurring meeting, with a start date with time (not all day) (for example 09:00), a duration (for example 5 hours) , each week for example on fridays, for 3 occurences. -Save Bug: - The start_datetime ("Starting at") was increased with the duration of the meeting. PS: The displayed start and stop in calendar view were computed in function "calendar_id2real_id" with the virtual id. opw:1858154 --- addons/calendar/calendar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index b1644c64edd..7333368b2d8 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -1242,7 +1242,7 @@ class calendar_event(osv.Model): if [True for item in new_pile if not item]: continue - result_data.append(self.get_search_fields(ev, order_fields, r_date=r_date)) + result_data.append(self.get_search_fields(ev, order_fields, r_date=r_start_date)) if order_fields: uniq = lambda it: collections.OrderedDict((id(x), x) for x in it).values()