[MERGE] forward port branch 11.0 up to e18ed24c07
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
<xpath expr="//field[@name='vat']" position="replace">
|
||||
</xpath>
|
||||
<xpath expr="//label[@for='street']" position="before">
|
||||
<field name="vat" string="VAT" placeholder="e.g. BE0477472701"/>
|
||||
<field name="vat" string="VAT" placeholder="e.g. BE0477472701" attrs="{'readonly': [('parent_id','!=',False)]}"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
@@ -21,7 +21,7 @@
|
||||
<xpath expr="//field[@name='vat']" position="replace">
|
||||
</xpath>
|
||||
<xpath expr="//label[@for='street']" position="before">
|
||||
<field name="vat" string="VAT" placeholder="e.g. BE0477472701"/>
|
||||
<field name="vat" string="VAT" placeholder="e.g. BE0477472701" attrs="{'readonly': [('parent_id','!=',False)]}"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -117,7 +117,7 @@ class MrpUnbuild(models.Model):
|
||||
if produce_move.has_tracking != 'none':
|
||||
original_move = self.mo_id.move_raw_ids.filtered(lambda move: move.product_id == produce_move.product_id)
|
||||
needed_quantity = produce_move.product_qty
|
||||
for move_lines in original_move.mapped('move_line_ids'):
|
||||
for move_lines in original_move.mapped('move_line_ids').filtered(lambda ml: ml.lot_produced_id == self.lot_id):
|
||||
# Iterate over all move_lines until we unbuilded the correct quantity.
|
||||
taken_quantity = min(needed_quantity, move_lines.qty_done)
|
||||
if taken_quantity:
|
||||
|
||||
@@ -2025,7 +2025,7 @@ var BasicModel = AbstractModel.extend({
|
||||
* @param {Object} [options]
|
||||
* @param {string[]} [options.fieldNames] the list of fields to fetch. If
|
||||
* not given, fetch all the fields in record.fieldNames (+ display_name)
|
||||
* @param {string} [optinos.viewType] the type of view for which the record
|
||||
* @param {string} [options.viewType] the type of view for which the record
|
||||
* is fetched (usefull to load the adequate fields), by defaults, uses
|
||||
* record.viewType
|
||||
* @returns {Deferred<Object>} resolves to the record or is rejected in
|
||||
|
||||
@@ -775,7 +775,7 @@ registry.colorpicker = SnippetOption.extend({
|
||||
*/
|
||||
_onColorResetButtonClick: function () {
|
||||
this.$target.removeClass(this.classes);
|
||||
self.$target.trigger('content_changed');
|
||||
this.$target.trigger('content_changed');
|
||||
this.$el.find('.colorpicker button.selected').removeClass('selected');
|
||||
},
|
||||
});
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
The Netherlands, 2018-10-24
|
||||
|
||||
Brahoo B.V. agrees to the terms of the Odoo Corporate Contributor License
|
||||
Agreement v1.0.
|
||||
|
||||
I declare that I am authorized and able to make this agreement and sign this
|
||||
declaration.
|
||||
|
||||
Signed,
|
||||
|
||||
Cas Vissers c.vissers@brahoo.nl https://github.com/CasVissers
|
||||
|
||||
List of contributors:
|
||||
|
||||
Cas Vissers c.vissers@brahoo.nl https://github.com/CasVissers
|
||||
Reference in New Issue
Block a user