[MERGE] forward port branch 10.0 up to b8b33c6363

This commit is contained in:
Christophe Simonis
2018-10-18 14:52:51 +02:00
7 changed files with 29 additions and 2 deletions
@@ -182,4 +182,6 @@ class AccountInvoice(models.Model):
default['reference_type'] = reference_type
if reference_type == 'bba':
default['reference'] = self.generate_bbacomm(self.type, reference_type, self.partner_id.id, '')['value']['reference']
elif self.reference_type == 'bba':
default['reference_type'] = 'none'
return super(AccountInvoice, self).copy(default)
+1 -1
View File
@@ -858,7 +858,7 @@
</t>
<t t-name="FieldMany2One">
<t t-if="widget.get('effective_readonly')">
<a t-if="!widget.options.no_open" class="o_form_uri" href="#"/>
<a t-if="!widget.options.no_open" t-att-tabindex="widget.node.attrs.tabindex" class="o_form_uri" href="#"/>
<span t-if="widget.options.no_open"/>
</t>
<div t-if="!widget.get('effective_readonly')" t-att-class="'o_form_field_many2one' + ((widget.options.no_open)? '' : ' o_with_button')">
+1 -1
View File
@@ -406,7 +406,7 @@
<div class="col-sm-7">
<span itemprop="image" t-attf-content="{{request.httprequest.url_root}}web/image/product.template/{{product.id}}/image" t-field="product.image" t-options="{'widget': 'image', 'class': 'product_detail_img', 'alt-field': 'name', 'zoom': 'image'}" groups="!website_sale.group_website_multi_image"/>
<t groups="website_sale.group_website_multi_image">
<t t-set="variant_img" t-value="product.product_variant_id.image_variant"/>
<t t-set="variant_img" t-value="any(product.mapped('product_variant_ids.image_variant'))"/>
<t t-set="image_ids" t-value="product.product_image_ids"/>
<div id="o-carousel-product" class="carousel slide" data-ride="carousel" data-interval="0">
<div class="carousel-outer">
+11
View File
@@ -0,0 +1,11 @@
Germany, 2017-11-24
I hereby agree to the terms of the Odoo Individual Contributor License
Agreement v1.0.
I declare that I am authorized and able to make this agreement and sign this
declaration.
Signed,
Andreas Raster lazor@affenbande.org https://github.com/rakete
+11
View File
@@ -0,0 +1,11 @@
FRANCE, 2018-09-26
I hereby agree to the terms of the Odoo Individual Contributor License
Agreement v1.0.
I declare that I am authorized and able to make this agreement and sign this
declaration.
Signed,
zoggy 43614933+zoggy444@users.noreply.github.com https://github.com/zoggy444
+1
View File
@@ -178,6 +178,7 @@ CREATE TABLE res_company (
name varchar NOT NULL,
partner_id integer,
currency_id integer,
sequence integer,
primary key(id)
);
+2
View File
@@ -134,6 +134,8 @@ class FSWatcher(object):
try:
source = open(path, 'rb').read() + '\n'
compile(source, path, 'exec')
except FileNotFoundError:
_logger.error('autoreload: python code change detected, FileNotFound for %s', path)
except SyntaxError:
_logger.error('autoreload: python code change detected, SyntaxError in %s', path)
else: