From 1a0d173b9af787a4acc515f153e3d5d78f358487 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Fri, 30 Sep 2016 15:09:38 +0200 Subject: [PATCH 01/16] [FIX] account: analytic account in write-off The analytic account of the write-off move is not copied on the line when doing a reconciliation. opw-688635 --- addons/account/models/account_move.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index 766826e10d8..4833c8cba7d 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -898,6 +898,8 @@ class AccountMoveLine(models.Model): vals['date'] = self._context.get('date_p') or time.strftime('%Y-%m-%d') if 'name' not in vals: vals['name'] = self._context.get('comment') or _('Write-Off') + if 'analytic_account_id' not in vals: + vals['analytic_account_id'] = self.env.context.get('analytic_id', False) #compute the writeoff amount if not given if 'credit' not in vals and 'debit' not in vals: amount = sum([r.amount_residual for r in self]) From 5b692df1b10ff7ced0185b392519b619b91021c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=A1zquez=20Acosta?= Date: Thu, 4 Aug 2016 15:49:11 -0400 Subject: [PATCH 02/16] [FIX] mail: Ignore case for mail aliases. When receiving new mail (not replies) to an alias we should not take case into account. This also homogenize the treatment of local parts. For instance, lines 967 and 980 convert the local part to lower case to avoid case-sensitivity issues. Also `mail_alias` normalizes alias names by lowering case and finding, if necessary to make it unique, a suffix to alias name provided. From RFC 5321, section 2.4: > Exploiting the case sensitivity of mailbox local-parts impedes > interoperability and is discouraged Closes #334 Closes #13037 --- addons/mail/mail_thread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 8dcc39163ec..4456cb6bdd7 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -1056,7 +1056,7 @@ class mail_thread(osv.AbstractModel): decode_header(message, 'Cc'), decode_header(message, 'Resent-To'), decode_header(message, 'Resent-Cc')]) - local_parts = [e.split('@')[0] for e in tools.email_split(rcpt_tos)] + local_parts = [e.split('@')[0].lower() for e in tools.email_split(rcpt_tos)] if local_parts: alias_ids = mail_alias.search(cr, uid, [('alias_name', 'in', local_parts)]) if alias_ids: From 084e84001611975de15e01f428c33a3f64e7b8cc Mon Sep 17 00:00:00 2001 From: "Denis Vermylen (dve)" Date: Fri, 30 Sep 2016 18:50:22 +0200 Subject: [PATCH 03/16] [FIX] hr_attendance: rename setting correctly Company Screen menu was renamed to Kiosk Mode. This commit renames the associated setting. --- addons/hr_attendance/models/res_config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_attendance/models/res_config.py b/addons/hr_attendance/models/res_config.py index 464b643ca02..d2f06ce6cb5 100644 --- a/addons/hr_attendance/models/res_config.py +++ b/addons/hr_attendance/models/res_config.py @@ -7,6 +7,6 @@ from odoo import fields, models class BaseConfigSettings(models.TransientModel): _inherit = 'base.config.settings' - group_attendance_use_pin = fields.Selection([(0, 'Employees do not need to enter their PIN to check in manually in the "Company Screen".'), - (1, 'Employees must enter their PIN to check in manually in the "Company Screen".')], + group_attendance_use_pin = fields.Selection([(0, 'Employees do not need to enter their PIN to check in manually in the "Kiosk Mode".'), + (1, 'Employees must enter their PIN to check in manually in the "Kiosk Mode".')], string='Employee PIN', help='Enable or disable employee PIN identification at check in', implied_group="hr_attendance.group_hr_attendance_use_pin") From 59849eecc8df180fc367a52d4bae93dd5271bb65 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Fri, 30 Sep 2016 16:06:03 +0200 Subject: [PATCH 04/16] [FIX] website_sale: add zoom icon on hover picture --- addons/website_sale/static/src/css/website_sale.css | 4 ++++ addons/website_sale/static/src/css/website_sale.sass | 3 +++ 2 files changed, 7 insertions(+) diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css index f1def903329..a4183b926cd 100644 --- a/addons/website_sale/static/src/css/website_sale.css +++ b/addons/website_sale/static/src/css/website_sale.css @@ -630,4 +630,8 @@ a.no-decoration { opacity: 1; } +.ecom-zoomable img[data-zoom] { + cursor: zoom-in; +} + /*# sourceMappingURL=website_sale.css.map */ diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass index 7cc6cfc0341..10f98cb6423 100644 --- a/addons/website_sale/static/src/css/website_sale.sass +++ b/addons/website_sale/static/src/css/website_sale.sass @@ -539,3 +539,6 @@ a.no-decoration &.active img opacity: 1 + +.ecom-zoomable img[data-zoom] + cursor: zoom-in \ No newline at end of file From 8875442c811a70aacf441fadb2d1b631d9fa467b Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Fri, 30 Sep 2016 17:50:01 +0200 Subject: [PATCH 05/16] [IMP] website_sale: fix layout issue The payment method and pay now button was not in the left part. So if we only have one line in cart, a big margin top was visible. --- addons/website_sale/views/templates.xml | 141 ++++++++++++------------ 1 file changed, 73 insertions(+), 68 deletions(-) diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 04e38d4f751..e0ccf72f222 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -886,8 +886,10 @@ -
- +
+ + +
@@ -1268,7 +1270,7 @@
- -