pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 11.0 up to 4c93e4be0d

Browse Source
This commit is contained in:
Christophe Simonis
2019-01-16 14:26:14 +01:00
parent ff2efcd1a9 4c93e4be0d
commit 83cc046e9a
6 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/static/src/less/account_reconciliation.less
+4
View File
@@ -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%;
addons/event_sale/wizard/event_edit_registration.xml
+1 -1
View File
@@ -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"/>
addons/hr_org_chart/static/src/xml/hr_org_chart.xml
+1
View File
@@ -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>
addons/l10n_be_invoice_bba/data/mail_template_data.xml
+1 -1
View File
@@ -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
addons/sale/views/sale_views.xml
+2
View File
@@ -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">
addons/website/models/website.py
+1 -1
View File
@@ -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')