[MERGE] forward port branch saas-16 up to 810b6aa760
This commit is contained in:
Christophe Simonis
@@ -43,6 +43,12 @@ def migrate_tags_on_taxes(cr, registry):
|
||||
if len(tax_id.ids) == 1:
|
||||
tax_id.sudo().write({'tag_ids': [(6, 0, tax_template.tag_ids.ids)]})
|
||||
|
||||
def preserve_existing_tags_on_taxes(cr, registry, module):
|
||||
''' This is a utility function used to preserve existing previous tags during upgrade of the module.'''
|
||||
env = api.Environment(cr, SUPERUSER_ID, {})
|
||||
xml_records = env['ir.model.data'].search([('model', '=', 'account.account.tag'), ('module', 'like', module)])
|
||||
if xml_records:
|
||||
cr.execute("update ir_model_data set noupdate = 't' where id in %s", [tuple(xml_records.ids)])
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# Account Templates: Account, Tax, Tax Code and chart. + Wizard
|
||||
|
||||
@@ -478,6 +478,8 @@ class AccountAssetDepreciationLine(models.Model):
|
||||
created_moves = self.env['account.move']
|
||||
prec = self.env['decimal.precision'].precision_get('Account')
|
||||
for line in self:
|
||||
if line.move_id:
|
||||
raise UserError(_('This depreciation is already linked to a journal entry! Please post or delete it.'))
|
||||
category_id = line.asset_id.category_id
|
||||
depreciation_date = self.env.context.get('depreciation_date') or line.depreciation_date or fields.Date.context_today(self)
|
||||
company_currency = line.asset_id.company_id.currency_id
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
You can remove contacts from this list to avoid merging them.
|
||||
</p>
|
||||
<group col="2">
|
||||
<field name="dst_partner_id" domain="[('id', 'in', partner_ids and partner_ids[0] and partner_ids[0][2] or False)]" attrs="{'required': [('state', '=', 'selection')]}"/>
|
||||
<field name="dst_partner_id" domain="[('id', 'in', partner_ids or False)]" attrs="{'required': [('state', '=', 'selection')]}"/>
|
||||
</group>
|
||||
<field name="partner_ids" nolabel="1">
|
||||
<tree string="Partners">
|
||||
|
||||
@@ -4,3 +4,8 @@
|
||||
# Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
|
||||
|
||||
from . import models
|
||||
|
||||
|
||||
def _preserve_tag_on_taxes(cr, registry):
|
||||
from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
|
||||
preserve_existing_tags_on_taxes(cr, registry, 'l10n_fr')
|
||||
|
||||
@@ -45,4 +45,5 @@ configuration of their taxes and fiscal positions manually.
|
||||
'data/account_reconcile_model_template.xml',
|
||||
'data/account_chart_template_data.yml',
|
||||
],
|
||||
'post_init_hook': '_preserve_tag_on_taxes',
|
||||
}
|
||||
|
||||
@@ -1,2 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
|
||||
def _preserve_tag_on_taxes(cr, registry):
|
||||
from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
|
||||
preserve_existing_tags_on_taxes(cr, registry, 'l10n_lu')
|
||||
|
||||
@@ -44,4 +44,5 @@ Notes:
|
||||
'data/account.chart.template.csv',
|
||||
'data/account_chart_template_data.yml',
|
||||
],
|
||||
'post_init_hook': '_preserve_tag_on_taxes',
|
||||
}
|
||||
|
||||
@@ -1,2 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
|
||||
def _preserve_tag_on_taxes(cr, registry):
|
||||
from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
|
||||
preserve_existing_tags_on_taxes(cr, registry, 'l10n_no')
|
||||
|
||||
@@ -20,4 +20,5 @@ Updated for Odoo 9 by Bringsvor Consulting AS <www.bringsvor.com>
|
||||
'data/account_tax_data.xml',
|
||||
'data/account_chart_template_data.yml'],
|
||||
"active": False,
|
||||
'post_init_hook': '_preserve_tag_on_taxes',
|
||||
}
|
||||
|
||||
@@ -1,2 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
|
||||
def _preserve_tag_on_taxes(cr, registry):
|
||||
from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
|
||||
preserve_existing_tags_on_taxes(cr, registry, 'l10n_pl')
|
||||
|
||||
@@ -33,4 +33,5 @@ Wewnętrzny numer wersji OpenGLOBE 1.02
|
||||
'data/res_country_state_data.xml',
|
||||
'data/account_chart_template_data.yml'
|
||||
],
|
||||
'post_init_hook': '_preserve_tag_on_taxes',
|
||||
}
|
||||
|
||||
@@ -2,3 +2,8 @@
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
# Copyright (C) 2014 Tech Receptives (<http://techreceptives.com>).
|
||||
|
||||
|
||||
def _preserve_tag_on_taxes(cr, registry):
|
||||
from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
|
||||
preserve_existing_tags_on_taxes(cr, registry, 'l10n_sg')
|
||||
|
||||
@@ -33,4 +33,5 @@ After installing this module, the Configuration wizard for accounting is launche
|
||||
'data/account_tax_data.xml',
|
||||
'data/account_chart_template_data.yml',
|
||||
],
|
||||
'post_init_hook': '_preserve_tag_on_taxes',
|
||||
}
|
||||
|
||||
@@ -1,2 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
|
||||
def _preserve_tag_on_taxes(cr, registry):
|
||||
from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
|
||||
preserve_existing_tags_on_taxes(cr, registry, 'l10n_th')
|
||||
|
||||
@@ -19,4 +19,5 @@ Thai accounting chart and localization.
|
||||
'data/l10n_th_chart_data.xml',
|
||||
'data/account_chart_template_data.yml',
|
||||
],
|
||||
'post_init_hook': '_preserve_tag_on_taxes',
|
||||
}
|
||||
|
||||
@@ -2,3 +2,8 @@
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
# This module is Copyright (c) 2009-2013 General Solutions (http://gscom.vn) All Rights Reserved.
|
||||
|
||||
|
||||
def _preserve_tag_on_taxes(cr, registry):
|
||||
from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
|
||||
preserve_existing_tags_on_taxes(cr, registry, 'l10n_vn')
|
||||
|
||||
@@ -28,5 +28,6 @@ with Chart of account under Circular No. 200/2014/TT-BTC
|
||||
'data/account_data.xml',
|
||||
'data/account_tax_data.xml',
|
||||
'data/account_chart_template_data.yml',
|
||||
]
|
||||
],
|
||||
'post_init_hook': '_preserve_tag_on_taxes',
|
||||
}
|
||||
|
||||
@@ -18,8 +18,7 @@
|
||||
</div>
|
||||
<div class="col-xs-3">
|
||||
<strong>Product:</strong><br/>
|
||||
<span t-field="o.product_id.code"/>
|
||||
<span t-field="o.product_id.name"/>
|
||||
<span t-field="o.product_id"/>
|
||||
</div>
|
||||
<div class="col-xs-3">
|
||||
<strong>Quantity:</strong><br/>
|
||||
|
||||
@@ -8,6 +8,7 @@ var models = require('point_of_sale.models');
|
||||
var core = require('web.core');
|
||||
var ajax = require('web.ajax');
|
||||
var CrashManager = require('web.CrashManager');
|
||||
var BarcodeEvents = require('barcodes.BarcodeEvents').BarcodeEvents;
|
||||
|
||||
|
||||
var _t = core._t;
|
||||
@@ -606,10 +607,9 @@ var Chrome = PosBaseWidget.extend({
|
||||
$(window).off();
|
||||
$('html').off();
|
||||
$('body').off();
|
||||
$(this.$el).parent().off();
|
||||
$('document').off();
|
||||
$('.oe_web_client').off();
|
||||
$('.openerp_webclient_container').off();
|
||||
this.$el.parent().off();
|
||||
// The above lines removed the bindings, but we really need them for the barcode
|
||||
BarcodeEvents.start();
|
||||
},
|
||||
|
||||
build_chrome: function() {
|
||||
|
||||
@@ -235,10 +235,12 @@ var PosDB = core.Class.extend({
|
||||
for(var i = 0, len = partners.length; i < len; i++){
|
||||
partner = partners[i];
|
||||
|
||||
if ( this.partner_write_date &&
|
||||
var local_partner_date = (this.partner_write_date || '').replace(/^(\d{4}-\d{2}-\d{2}) ((\d{2}:?){3})$/, '$1T$2Z');
|
||||
var dist_partner_date = (partner.write_date || '').replace(/^(\d{4}-\d{2}-\d{2}) ((\d{2}:?){3})$/, '$1T$2Z');
|
||||
if ( this.partner_write_date &&
|
||||
this.partner_by_id[partner.id] &&
|
||||
new Date(this.partner_write_date).getTime() + 1000 >=
|
||||
new Date(partner.write_date).getTime() ) {
|
||||
new Date(local_partner_date).getTime() + 1000 >=
|
||||
new Date(dist_partner_date).getTime() ) {
|
||||
// FIXME: The write_date is stored with milisec precision in the database
|
||||
// but the dates we get back are only precise to the second. This means when
|
||||
// you read partners modified strictly after time X, you get back partners that were
|
||||
|
||||
@@ -542,7 +542,7 @@ class ProductProduct(models.Model):
|
||||
history = self.env['product.price.history'].search([
|
||||
('company_id', '=', company_id),
|
||||
('product_id', 'in', self.ids),
|
||||
('datetime', '<=', date or fields.Datetime.now())], limit=1)
|
||||
('datetime', '<=', date or fields.Datetime.now())], order='datetime desc,id desc', limit=1)
|
||||
return history.cost or 0.0
|
||||
|
||||
class ProductPackaging(models.Model):
|
||||
|
||||
@@ -803,7 +803,7 @@ class SaleOrderLine(models.Model):
|
||||
def create(self, values):
|
||||
values.update(self._prepare_add_missing_fields(values))
|
||||
line = super(SaleOrderLine, self).create(values)
|
||||
if line.state == 'sale':
|
||||
if line.order_id.state == 'sale':
|
||||
msg = _("Extra line with %s ") % (line.product_id.display_name,)
|
||||
line.order_id.message_post(body=msg)
|
||||
# create an analytic account if at least an expense product
|
||||
|
||||
@@ -534,14 +534,17 @@ var FieldMany2One = AbstractField.extend({
|
||||
* start/end of the input element. Stops any navigation move event if the
|
||||
* user is selecting text.
|
||||
*
|
||||
* TODO this is a duplicate of InputField._onNavigationMove, maybe this
|
||||
* should be done in a mixin or, better, the m2o field should be an
|
||||
* InputField (but this requires some refactoring).
|
||||
*
|
||||
* @private
|
||||
* @param {OdooEvent} ev
|
||||
*/
|
||||
_onNavigationMove: basicFields.InputField.prototype._onNavigationMove,
|
||||
_onNavigationMove: function (ev) {
|
||||
// TODO Maybe this should be done in a mixin or, better, the m2o field
|
||||
// should be an InputField (but this requires some refactoring).
|
||||
basicFields.InputField.prototype._onNavigationMove.apply(this, arguments);
|
||||
if (this.mode === 'edit' && $(this.$input.autocomplete('widget')).is(':visible')) {
|
||||
ev.stopPropagation();
|
||||
}
|
||||
},
|
||||
/**
|
||||
* @private
|
||||
* @param {OdooEvent} event
|
||||
|
||||
@@ -572,6 +572,38 @@ QUnit.module('relational_fields', {
|
||||
form.destroy();
|
||||
});
|
||||
|
||||
QUnit.test('many2one field and list navigation', function (assert) {
|
||||
assert.expect(3);
|
||||
|
||||
var list = createView({
|
||||
View: ListView,
|
||||
model: 'partner',
|
||||
data: this.data,
|
||||
arch: '<tree editable="bottom"><field name="trululu"/></tree>',
|
||||
});
|
||||
|
||||
// edit first input, to trigger autocomplete
|
||||
list.$('.o_data_row .o_data_cell').first().click();
|
||||
list.$('.o_data_cell input').val('').trigger('input');
|
||||
|
||||
// press keydown, to select first choice
|
||||
list.$('.o_data_cell input').focus().trigger($.Event('keydown', {
|
||||
which: $.ui.keyCode.DOWN,
|
||||
keyCode: $.ui.keyCode.DOWN,
|
||||
}));
|
||||
|
||||
// we now check that the dropdown is open (and that the focus did not go
|
||||
// to the next line)
|
||||
var $dropdown = list.$('.o_field_many2one input').autocomplete('widget');
|
||||
assert.ok($dropdown.is(':visible'), "dropdown should be visible");
|
||||
assert.ok(list.$('.o_data_row:eq(0)').hasClass('o_selected_row'),
|
||||
'first data row should still be selected');
|
||||
assert.ok(!list.$('.o_data_row:eq(1)').hasClass('o_selected_row'),
|
||||
'second data row should not be selected');
|
||||
|
||||
list.destroy();
|
||||
});
|
||||
|
||||
QUnit.test('standalone many2one field', function (assert) {
|
||||
assert.expect(3);
|
||||
var done = assert.async();
|
||||
|
||||
@@ -241,6 +241,7 @@
|
||||
|
||||
<template id="template_location">
|
||||
<t t-call="website_event.layout">
|
||||
<div class="oe_structure"/>
|
||||
<section class="container">
|
||||
<h1 class="text-center">Event Location</h1>
|
||||
</section>
|
||||
@@ -249,6 +250,7 @@
|
||||
"widget": "contact",
|
||||
"fields": ["name", "address", "phone", "mobile"]
|
||||
}'/>
|
||||
<div class="oe_structure"/>
|
||||
</t>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
|
||||
<template id="agenda">
|
||||
<t t-call="website_event.layout">
|
||||
<div class="oe_structure"/>
|
||||
<section class="container">
|
||||
<h1 class="text-center" t-field="event.name"/>
|
||||
<div class="form-inline pull-right">
|
||||
@@ -107,12 +108,14 @@
|
||||
</tr>
|
||||
</table>
|
||||
</section>
|
||||
<div class="oe_structure"/>
|
||||
</t>
|
||||
</template>
|
||||
|
||||
|
||||
<template id="tracks">
|
||||
<t t-call="website_event.event_details">
|
||||
<div class="oe_structure"/>
|
||||
<div id="left_column">
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@@ -151,6 +154,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="oe_structure"/>
|
||||
</t>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -77,12 +77,13 @@ class Website(models.Model):
|
||||
:param bool show_visible: if True, we don't display pricelist where selectable is False (Eg: Code promo)
|
||||
:returns: pricelist recordset
|
||||
"""
|
||||
website = request and request.website or None
|
||||
website = request and hasattr(request, 'website') and request.website or None
|
||||
if not website:
|
||||
if self.env.context.get('website_id'):
|
||||
website = self.browse(self.env.context['website_id'])
|
||||
else:
|
||||
website = self.search([], limit=1)
|
||||
# In the weird case we are coming from the backend (https://github.com/odoo/odoo/issues/20245)
|
||||
website = len(self) == 1 and self or self.search([], limit=1)
|
||||
isocountry = request and request.session.geoip and request.session.geoip.get('country_code') or False
|
||||
partner = self.env.user.partner_id
|
||||
order_pl = partner.last_website_so_id and partner.last_website_so_id.state == 'draft' and partner.last_website_so_id.pricelist_id
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
<!-- PDF Viewer Body : contains the canvas, the loader, or the image-->
|
||||
<div id="PDFSlideViewer" style="position:relative;"
|
||||
t-attf-data-slideid="#{slide.id}"
|
||||
t-attf-data-slideurl="/slides/slide/#{slide.id}/pdf_content"
|
||||
t-attf-data-slideurl="/slides/slide/#{slug(slide)}/pdf_content"
|
||||
t-attf-data-downloadable="#{slide.download_security}"
|
||||
t-att-data-defaultpage="page">
|
||||
<t t-if="is_embedded">
|
||||
@@ -133,7 +133,7 @@
|
||||
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 text-center"></div>
|
||||
</div>
|
||||
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 pull-right text-right">
|
||||
<a t-if="slide.download_security and not is_embedded" target="_top" t-attf-href="/slides/slide/#{slide.id}/download" title="Download" id="download">
|
||||
<a t-if="slide.download_security and not is_embedded" target="_top" t-attf-href="/slides/slide/#{slug(slide)}/download" title="Download" id="download">
|
||||
<i class="fa fa-download fa-2x"></i>
|
||||
</a>
|
||||
<span id="fullscreen" title="View fullscreen">
|
||||
|
||||
@@ -277,7 +277,7 @@ Possible children elements of the list view are:
|
||||
filled, and a cross if it is not
|
||||
``handle``
|
||||
for ``sequence`` fields, instead of displaying the field's value
|
||||
just displays a dra&drop icon
|
||||
just displays a drag&drop icon
|
||||
``sum``, ``avg``
|
||||
displays the corresponding aggregate at the bottom of the column. The
|
||||
aggregation is only computed on *currently displayed* records. The
|
||||
@@ -1170,7 +1170,7 @@ Possible children elements of the search view are:
|
||||
fields don't generate domains.
|
||||
|
||||
.. note:: the domain and context are inclusive and both are generated
|
||||
if if a ``context`` is specified. To only generate context
|
||||
if a ``context`` is specified. To only generate context
|
||||
values, set ``filter_domain`` to an empty list:
|
||||
``filter_domain="[]"``
|
||||
``groups``
|
||||
|
||||
@@ -26,6 +26,7 @@ import odoo
|
||||
from odoo import api, fields, models, modules, tools, _
|
||||
from odoo.exceptions import AccessDenied, UserError
|
||||
from odoo.tools.parse_version import parse_version
|
||||
from odoo.tools.misc import topological_sort
|
||||
from odoo.http import request
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
@@ -844,7 +845,13 @@ class Module(models.Model):
|
||||
filter_lang = [lang.code for lang in langs]
|
||||
elif not isinstance(filter_lang, (list, tuple)):
|
||||
filter_lang = [filter_lang]
|
||||
mod_names = [mod.name for mod in self if mod.state in ('installed', 'to install', 'to upgrade')]
|
||||
|
||||
update_mods = self.filtered(lambda r: r.state in ('installed', 'to install', 'to upgrade'))
|
||||
mod_dict = {
|
||||
mod.name: mod.dependencies_id.mapped('name')
|
||||
for mod in update_mods
|
||||
}
|
||||
mod_names = topological_sort(mod_dict)
|
||||
self.env['ir.translation'].load_module_terms(mod_names, filter_lang)
|
||||
|
||||
@api.multi
|
||||
|
||||
@@ -305,13 +305,12 @@ class test_m2o(CreatorCase):
|
||||
[[False]])
|
||||
|
||||
def test_basic(self):
|
||||
""" Exported value is the name_get of the related object
|
||||
""" Exported value is empty
|
||||
"""
|
||||
record = self.env['export.integer'].create({'value': 42})
|
||||
name = dict(record.name_get())[record.id]
|
||||
self.assertEqual(
|
||||
self.export(record.id),
|
||||
[[name]])
|
||||
[['']])
|
||||
|
||||
def test_path(self):
|
||||
""" Can recursively export fields of m2o via path
|
||||
@@ -353,14 +352,13 @@ class test_o2m(CreatorCase):
|
||||
def test_single(self):
|
||||
self.assertEqual(
|
||||
self.export([(0, False, {'value': 42})]),
|
||||
# name_get result
|
||||
[[u'export.one2many.child:42']])
|
||||
[['']])
|
||||
|
||||
def test_single_subfield(self):
|
||||
self.assertEqual(
|
||||
self.export([(0, False, {'value': 42})],
|
||||
fields=['value', 'value/value']),
|
||||
[[u'export.one2many.child:42', u'42']])
|
||||
[['', u'42']])
|
||||
|
||||
def test_integrate_one_in_parent(self):
|
||||
self.assertEqual(
|
||||
@@ -382,9 +380,13 @@ class test_o2m(CreatorCase):
|
||||
def test_multiple_records_name(self):
|
||||
self.assertEqual(
|
||||
self.export(self.commands, fields=['const', 'value']),
|
||||
[[
|
||||
u'4', u','.join(self.names)
|
||||
]])
|
||||
[
|
||||
[u'4', ''],
|
||||
['', ''],
|
||||
['', ''],
|
||||
['', ''],
|
||||
['', ''],
|
||||
])
|
||||
|
||||
def test_multiple_records_id(self):
|
||||
export = self.export(self.commands, fields=['const', 'value/.id'])
|
||||
@@ -402,14 +404,18 @@ class test_o2m(CreatorCase):
|
||||
def test_multiple_records_with_name_before(self):
|
||||
self.assertEqual(
|
||||
self.export(self.commands, fields=['const', 'value', 'value/value']),
|
||||
[[ # exports sub-fields of very first o2m
|
||||
u'4', u','.join(self.names), u'4'
|
||||
]])
|
||||
[
|
||||
[u'4', '', u'4'],
|
||||
['', '', u'42'],
|
||||
['', '', u'36'],
|
||||
['', '', u'4'],
|
||||
['', '', u'13'],
|
||||
])
|
||||
|
||||
def test_multiple_records_with_name_after(self):
|
||||
self.assertEqual(
|
||||
self.export(self.commands, fields=['const', 'value/value', 'value']),
|
||||
[ # completely ignores name_get request
|
||||
[
|
||||
[u'4', u'4', ''],
|
||||
['', u'42', ''],
|
||||
['', u'36', ''],
|
||||
@@ -460,16 +466,16 @@ class test_o2m_multiple(CreatorCase):
|
||||
def test_single_per_side(self):
|
||||
self.assertEqual(
|
||||
self.export(child1=False, child2=[(0, False, {'value': 42})]),
|
||||
[[False, u'export.one2many.child.2:42']])
|
||||
[[False, '']])
|
||||
|
||||
self.assertEqual(
|
||||
self.export(child1=[(0, False, {'value': 43})], child2=False),
|
||||
[[u'export.one2many.child.1:43', False]])
|
||||
[['', False]])
|
||||
|
||||
self.assertEqual(
|
||||
self.export(child1=[(0, False, {'value': 43})],
|
||||
child2=[(0, False, {'value': 42})]),
|
||||
[[u'export.one2many.child.1:43', u'export.one2many.child.2:42']])
|
||||
[['', '']])
|
||||
|
||||
def test_single_integrate_subfield(self):
|
||||
fields = ['const', 'child1/value', 'child2/value']
|
||||
@@ -556,14 +562,13 @@ class test_m2m(CreatorCase):
|
||||
def test_single(self):
|
||||
self.assertEqual(
|
||||
self.export([(0, False, {'value': 42})]),
|
||||
# name_get result
|
||||
[[u'export.many2many.other:42']])
|
||||
[['']])
|
||||
|
||||
def test_single_subfield(self):
|
||||
self.assertEqual(
|
||||
self.export([(0, False, {'value': 42})],
|
||||
fields=['value', 'value/value']),
|
||||
[[u'export.many2many.other:42', u'42']])
|
||||
[['', u'42']])
|
||||
|
||||
def test_integrate_one_in_parent(self):
|
||||
self.assertEqual(
|
||||
@@ -585,10 +590,13 @@ class test_m2m(CreatorCase):
|
||||
def test_multiple_records_name(self):
|
||||
self.assertEqual(
|
||||
self.export(self.commands, fields=['const', 'value']),
|
||||
[[ # FIXME: hardcoded comma, import uses config.csv_internal_sep
|
||||
# resolution: remove configurable csv_internal_sep
|
||||
u'4', u','.join(self.names)
|
||||
]])
|
||||
[
|
||||
[u'4', ''],
|
||||
['', ''],
|
||||
['', ''],
|
||||
['', ''],
|
||||
['', ''],
|
||||
])
|
||||
|
||||
# essentially same as o2m, so boring
|
||||
|
||||
|
||||
+2
-8
@@ -697,14 +697,8 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})):
|
||||
for j, val in enumerate(lines2[0]):
|
||||
if val or isinstance(val, bool):
|
||||
current[j] = val
|
||||
# check value of current field
|
||||
if not current[i] and not isinstance(current[i], bool):
|
||||
# assign xml_ids, and forget about remaining lines
|
||||
xml_ids = [item[1] for item in value.name_get()]
|
||||
current[i] = ','.join(xml_ids)
|
||||
else:
|
||||
# append the other lines at the end
|
||||
lines += lines2[1:]
|
||||
# append the other lines at the end
|
||||
lines += lines2[1:]
|
||||
else:
|
||||
current[i] = False
|
||||
|
||||
|
||||
Reference in New Issue
Block a user