From cfca2bb0ffa8a16aeafa3c4114c7f731ee0c87d9 Mon Sep 17 00:00:00 2001 From: "Julien (juc) Castiaux" Date: Mon, 5 Nov 2018 15:29:48 +0000 Subject: [PATCH 001/101] [FIX] event: wrong email footer In a multiple company account, when creating an event without company, the emails sent contain "Send by False" as footer, this PR correct that by disabling the footer in case there is no company opw-1894825 --- addons/event/data/email_template_data.xml | 4 ++++ addons/event/i18n/event.pot | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml index c1ca30a1347..023cb9d44bc 100644 --- a/addons/event/data/email_template_data.xml +++ b/addons/event/data/email_template_data.xml @@ -205,6 +205,7 @@ +% if object.company_id
@@ -216,6 +217,7 @@
+% endif ${object.partner_id.lang} @@ -399,6 +401,7 @@ +% if object.company_id
@@ -410,6 +413,7 @@
+% endif ${object.partner_id.lang} diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index 9af3e6e90ed..36d5324019a 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -316,11 +316,13 @@ msgid "\n" @@ -502,11 +504,13 @@ msgid "
\n" " \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" From de6a8cefd0bb7acf7af3daba1d3c76da4cedfd76 Mon Sep 17 00:00:00 2001 From: "Julien (juc) Castiaux" Date: Mon, 5 Nov 2018 15:33:34 +0000 Subject: [PATCH 002/101] [FIX] mail: no company printed in footer In a multiple company account, when a parter is doesn't have a company, the mails he revieved have "Send by using odoo" as footer. This PR correct that by setting the footer to "Send using odoo" when there is no company. opw-1894825 --- addons/mail/data/mail_data.xml | 5 ++++- addons/mail/i18n/mail.pot | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index dd1b88e21e0..ed26830a36a 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -88,11 +88,14 @@

- Sent by + Sent + + by + using Odoo.

diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot index beb83dc09eb..80b1399e139 100644 --- a/addons/mail/i18n/mail.pot +++ b/addons/mail/i18n/mail.pot @@ -4533,7 +4533,8 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:397 +#: code:addons/mail/static/src/xml/thread.xml:390 +#: model_terms:ir.ui.view,arch_db:mail.message_notification_email #: model_terms:ir.ui.view,arch_db:mail.view_mail_search #: selection:mail.mail,state:0 #: selection:mail.notification,email_status:0 @@ -5566,6 +5567,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/activity.xml:43 +#: model_terms:ir.ui.view,arch_db:mail.message_notification_email #: model_terms:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "by" From 70a55a33c6a25f1d68c3faffb6a9616e78115e21 Mon Sep 17 00:00:00 2001 From: Swapnesh Shah Date: Fri, 26 Oct 2018 20:06:44 +0000 Subject: [PATCH 003/101] [FIX] point_of_sale: Tips product available in pos From 12.0 tips product from pos moduleis not available in PoS by default closes odoo/odoo#28569 --- addons/point_of_sale/data/point_of_sale_data.xml | 1 + 1 file changed, 1 insertion(+) 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 @@ Tips TIPS + From 253676da5482872b8fce30a5e2223af244923bda Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Thu, 8 Nov 2018 14:59:21 +0000 Subject: [PATCH 004/101] [FIX] product: Fields in the pricelist are not fully displayed Steps to reproduce the bug: -Activate the option "Prices computed from formulas (discounts, margins, roundings)" on the pricelist. -On the pricelist, click on Edit and select a product item. -Select "Formula" as Compute price Bug: The fields price_surcharge and price_max_margin were not fully displayed. Introduced by: https://github.com/odoo/odoo/commit/9de1bc0eef6f5bfaa2a8d745431caa361ae91548#diff-e0b4a29125b1abccb0318498970342fcL61 opw:1907217 closes odoo/odoo#28514 --- addons/product/i18n/product.pot | 5 +++++ addons/product/views/product_pricelist_views.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot index b039d460360..0f502a62c36 100644 --- a/addons/product/i18n/product.pot +++ b/addons/product/i18n/product.pot @@ -1220,6 +1220,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 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 = +
\n" " \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" "