[MERGE] forward port branch 11.0 up to 4c93e4b

odoo · Jan 16, 2019 · 83cc046 · 83cc046
2 parents ff2efcd + 4c93e4b
commit 83cc046
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/addons/account/static/src/less/account_reconciliation.less b/addons/account/static/src/less/account_reconciliation.less
@@ -281,6 +281,10 @@
             overflow: auto;
             border: 1px solid #ddd;
             border-radius: 5px;
+            > div.quick_add > .o_reconcile_models {
+                max-height: 54px;
+                overflow: auto;
+            }
         }
         table {
             width: 49%;

diff --git 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"/>

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
@@ -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>

diff --git 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
 

diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
@@ -254,6 +254,7 @@
                                             <field name="qty_to_invoice" invisible="1"/>
                                             <field name="qty_delivered_manual" invisible="1"/>
                                             <field name="qty_delivered_method" invisible="1"/>
+                                            <field name="price_total" invisible="1"/>
                                             <field name="price_subtotal" invisible="1"/>
                                             <label for="product_uom_qty" string="Ordered Quantity"/>
                                             <div>
@@ -342,6 +343,7 @@
                                     <field name="product_uom_qty"/>
                                     <field name="product_uom" groups="uom.group_uom"/>
                                     <field name="price_subtotal"/>
+                                    <field name="price_total" invisible="1"/>
                                     <field name="price_unit"/>
                                     <templates>
                                         <t t-name="kanban-box">

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
@@ -905,7 +905,7 @@ class WebsiteRedirect(models.Model):
     _order = "sequence, id"
     _rec_name = 'url_from'
 
-    type = fields.Selection([('301', 'Moved permanently (301)'), ('302', 'Moved temporarily (302)')], string='Redirection Type', required=True)
+    type = fields.Selection([('301', 'Moved permanently (301)'), ('302', 'Moved temporarily (302)')], string='Redirection Type', required=True, default='301')
     url_from = fields.Char('Redirect From', required=True)
     url_to = fields.Char('Redirect To', required=True)
     website_id = fields.Many2one('website', 'Website')