[MERGE] forward port branch 11.0 up to b8be821058

This commit is contained in:
Christophe Simonis
2019-08-05 17:12:30 +02:00
4 changed files with 9 additions and 2 deletions
@@ -727,6 +727,7 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
*/
_onSelectMoveLine: function (event) {
var $el = $(event.target);
$el.prop('disabled', true);
this._destroyPopover($el);
var moveLineId = $el.closest('.mv_line').data('line-id');
this.trigger_up('add_proposition', {'data': moveLineId});
+1 -1
View File
@@ -316,7 +316,7 @@
<input type="text" name="city" class="form-control" t-att-value="city or partner.city" />
</div>
<div t-attf-class="form-group #{error.get('zip') and 'has-error' or ''} col-lg-6">
<label class="control-label" for="zipcode">Zip / Postal Code</label>
<label class="control-label label-optional" for="zipcode">Zip / Postal Code</label>
<input type="text" name="zipcode" class="form-control" t-att-value="zipcode or partner.zip" />
</div>
<div t-attf-class="form-group #{error.get('country_id') and 'has-error' or ''} col-lg-6">
+2
View File
@@ -165,6 +165,7 @@
<record model="ir.ui.view" id="product_form_view_procurement_button">
<field name="name">product.product.procurement</field>
<field name="model">product.product</field>
<field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<data>
@@ -241,6 +242,7 @@
<record model="ir.ui.view" id="product_template_form_view_procurement_button">
<field name="name">product.template_procurement</field>
<field name="model">product.template</field>
<field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/>
<field name="inherit_id" ref="product.product_template_only_form_view"/>
<field name="arch" type="xml">
<data>
+5 -1
View File
@@ -25,7 +25,11 @@
<rng:optional><rng:attribute name="consolidation"/></rng:optional>
<rng:optional><rng:attribute name="consolidation_max"/></rng:optional>
<rng:optional><rng:attribute name="consolidation_exclude"/></rng:optional>
<rng:empty/>
<rng:optional><rng:attribute name="duration_unit"/></rng:optional>
<rng:optional><rng:attribute name="drag_resize"/></rng:optional>
<rng:optional><rng:attribute name="relative_field"/></rng:optional>
<rng:optional><rng:attribute name="action"/></rng:optional>
<rng:empty/>
</rng:element>
</rng:define>
<rng:start>