From 1e966452ff1c29b0e31048159780fc623e21a4b3 Mon Sep 17 00:00:00 2001
From: Nans Lefebvre <len@odoo.com>
Date: Tue, 15 Jan 2019 12:50:08 +0000
Subject: [PATCH 1/6] [FIX] l10n_be_invoice_bba: fix mail template

The field reference_type has been renamed invoice_reference_type in v11.
The selection value 'bba' for that field has been renamed 'structured'.
We update the template to reflect these changes.

Discovered thanks to a forward port of that field up to v12.

closes odoo/odoo#30224
---
 addons/l10n_be_invoice_bba/data/mail_template_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_be_invoice_bba/data/mail_template_data.xml b/addons/l10n_be_invoice_bba/data/mail_template_data.xml
index b7110f157e733..ea2d688cdb9c6 100644
--- a/addons/l10n_be_invoice_bba/data/mail_template_data.xml
+++ b/addons/l10n_be_invoice_bba/data/mail_template_data.xml
@@ -33,7 +33,7 @@ from ${object.company_id.name}.
 % endif
     <br/><br/>
 
-% if object.reference_type=='bba' and object.reference:
+% if object.invoice_reference_type=='structured' and object.reference:
     <p>Please use the following communication for your payment : <b>${object.reference}</b></p>
 % endif
 

From 8e87075724d0e9e4433d5bf5c3dfd3e62b48d67b Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Tue, 15 Jan 2019 14:28:01 +0000
Subject: [PATCH 2/6] [FIX] sale: inline form SO contains price_total

When removing the editable attribute on the list view
of th o2m towards order_line, when adding a line,
the price_total of the line was neither computed nor sent to the onchange
of the sale order

now it is

OPW 1914740

closes odoo/odoo#30234
---
 addons/sale/views/sale_views.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index dd8104d693809..ceaad5477ee10 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -253,6 +253,7 @@
                                             <field name="invoice_status" invisible="1"/>
                                             <field name="qty_to_invoice" invisible="1"/>
                                             <field name="qty_delivered_updateable" invisible="1"/>
+                                            <field name="price_total" invisible="1"/>
                                             <field name="price_subtotal" invisible="1"/>
                                             <label for="product_uom_qty" string="Ordered Quantity"/>
                                             <div>
@@ -339,6 +340,7 @@
                                     <field name="product_uom_qty"/>
                                     <field name="product_uom" groups="product.group_uom"/>
                                     <field name="price_subtotal"/>
+                                    <field name="price_total" invisible="1"/>
                                     <field name="price_unit"/>
                                     <templates>
                                         <t t-name="kanban-box">

From ae6545ccd5a97b336ae0a6a2bcea021f0f1acf7e Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 15 Jan 2019 09:06:15 +0000
Subject: [PATCH 3/6] [FIX] account: numerous reconciliation models

- Create many reconciliation models (more than 100)
- Try to create a manual reconciliation entry

The reconciliation models buttons are displayed on top of all fields,
making it impossible to encode any data.

We limit the size of the `div` to 54 pixels, which corresponds to 3
lines of buttons. All buttons are still accessible thanks to a
scrollbar.

opw-1890781

closes odoo/odoo#30212
---
 addons/account/static/src/less/account_reconciliation.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/account/static/src/less/account_reconciliation.less b/addons/account/static/src/less/account_reconciliation.less
index e4a6a121aea3f..0683ea28d784e 100644
--- a/addons/account/static/src/less/account_reconciliation.less
+++ b/addons/account/static/src/less/account_reconciliation.less
@@ -272,6 +272,10 @@
             overflow: auto;
             border: 1px solid #ddd;
             border-radius: 5px;
+            > div.quick_add > .o_reconcile_models {
+                max-height: 54px;
+                overflow: auto;
+            }
         }
         table {
             width: 49%;

From b876cb397dbd8fe81a9a0ec0f6efbdc73178b9e7 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 16 Jan 2019 07:45:45 +0000
Subject: [PATCH 4/6] [FIX] website: null type redirection

Commit 68e9d5504cb293643 makes the redirection type mandatory, which is
logical. Since we can't add such a constraint in stable, we make the
field required in the view and assign a default value (in case the
module is not upgraded, which is very likely to be the case).

opw-1924983

closes odoo/odoo#30252
---
 addons/website/models/website.py       | 2 +-
 addons/website/views/website_views.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 7072dd954f19a..95565febaee4b 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -910,7 +910,7 @@ class WebsiteRedirect(models.Model):
     _order = "sequence, id"
     _rec_name = 'url_from'
 
-    type = fields.Selection([('301', 'Moved permanently'), ('302', 'Moved temporarily')], string='Redirection Type')
+    type = fields.Selection([('301', 'Moved permanently'), ('302', 'Moved temporarily')], string='Redirection Type', default='301')
     url_from = fields.Char('Redirect From')
     url_to = fields.Char('Redirect To')
     website_id = fields.Many2one('website', 'Website')
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 97fe532e74552..5e14ce2378cf4 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -70,9 +70,9 @@
                     <sheet>
                         <group>
                             <group>
-                                <field name="type"/>
-                                <field name="url_from"/>
-                                <field name="url_to"/>
+                                <field name="type" required="1"/>
+                                <field name="url_from" required="1"/>
+                                <field name="url_to" required="1"/>
                             </group>
                             <group>
                                 <field name="website_id"/>

From 6c47c68eb7859d7bf462fa55f05ae9b2d131792a Mon Sep 17 00:00:00 2001
From: Jorge Pinna Puissant <jpp@odoo.com>
Date: Tue, 15 Jan 2019 14:03:13 +0000
Subject: [PATCH 5/6] [FIX] hr_org_chart: undefined manager name in breadcrumbs

Before this commit, in the organization chart, when a manager that have too many
subordinates, and we want to view all the subordinates clicking the '...' button. There was
an error in the breadcrumbs, the text 'Undefined' was shown in the place of the manager's
name.

Now, the breadcrumbs shows the name of the manager.

OPW-1923990

closes odoo/odoo#30231
---
 addons/hr_org_chart/static/src/xml/hr_org_chart.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_org_chart/static/src/xml/hr_org_chart.xml b/addons/hr_org_chart/static/src/xml/hr_org_chart.xml
index f4e7c53b12593..ff5f2aa7a5139 100644
--- a/addons/hr_org_chart/static/src/xml/hr_org_chart.xml
+++ b/addons/hr_org_chart/static/src/xml/hr_org_chart.xml
@@ -105,6 +105,7 @@
                 <div class="media-left">
                     <a href="#"
                         t-att-data-employee-id="self.id"
+                        t-att-data-employee-name="self.name"
                         class="well o_org_chart_show_more media-object text-center o_employee_sub_redirect">&#8230;</a>
                 </div>
             </div>

From 4c93e4be0dad1f6a4deaaf2cc678e77becfdd916 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 16 Jan 2019 10:43:31 +0000
Subject: [PATCH 6/6] [FIX] event_sale: ticket

- Create a SO with an ticket for an event, confirm
- On the attendees wizard, click on 'Apply'

The event ticket is remove from the registration.

This is because the event ticket wasn't saved when creating the
registration line.

Complement of commits 7492c97bf41 and 0717bb6c0de499

opw-1920464

closes odoo/odoo#30262
---
 addons/event_sale/wizard/event_edit_registration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event_sale/wizard/event_edit_registration.xml b/addons/event_sale/wizard/event_edit_registration.xml
index 5adc5d50baeb9..38042bfd53143 100644
--- a/addons/event_sale/wizard/event_edit_registration.xml
+++ b/addons/event_sale/wizard/event_edit_registration.xml
@@ -12,7 +12,7 @@
                         <tree string="Registration" editable="top" create="false" delete="false">
                             <field name="event_id" readonly='1' force_save="1"/>
                             <field name="registration_id" readonly='1' force_save="1"/>
-                            <field name="event_ticket_id" domain="[('event_id', '=', event_id)]" readonly='1'/>
+                            <field name="event_ticket_id" domain="[('event_id', '=', event_id)]" readonly='1' force_save="1"/>
                             <field name="name"/>
                             <field name="email"/>
                             <field name="phone"/>