Skip to content
Permalink
Browse files

[MERGE] forward port branch 10.0 up to 69719f5

  • Loading branch information...
KangOl committed Feb 14, 2019
2 parents 18228f9 + 69719f5 commit c1fe9f18d5a1f6c13548ea2af964bde40b3b6861
@@ -132,6 +132,11 @@ msgstr ""
msgid "No file sent."
msgstr ""

#. module: base_import_module
#: model:ir.ui.view,arch_db:base_import_module.view_base_module_import
msgid "Note: you can only import data modules (.xml files and static assets)"
msgstr ""

#. module: base_import_module
#: code:addons/base_import_module/controllers/main.py:25
#, python-format
@@ -8,6 +8,7 @@
<form string="Import module">
<field name="state" invisible="1"/>
<separator string="Import Module" colspan="4"/>
<p class="alert alert-warning">Note: you can only import data modules (.xml files and static assets)</p>
<group states="init" col="4">
<label string="Select module package to import (.zip file):" colspan="4"/>
<field name="module_file" colspan="4"/>
@@ -443,7 +443,9 @@ def update_from_google(self, event, single_event_dict, type):
if google_attendee.get('found'):
continue

attendee = ResPartner.search([('email', '=', google_attendee['email'])], limit=1)
attendee = ResPartner.search([('email', '=ilike', google_attendee['email']), ('user_ids', '!=', False)], limit=1)
if not attendee:
attendee = ResPartner.search([('email', '=ilike', google_attendee['email'])], limit=1)
if not attendee:
data = {
'email': partner_email,
@@ -13,7 +13,7 @@
Italian accounting chart and localization.
""",
'category': 'Localization',
'website': 'http://www.openerp-italia.org/',
'website': 'http://www.odoo.com/',
'data': [
'data/l10n_it_chart_data.xml',
'data/account.account.template.csv',
@@ -391,13 +391,11 @@ def _reconcile_payments(self):
aml = order.statement_ids.mapped('journal_entry_ids') | order.account_move.line_ids | order.invoice_id.move_id.line_ids
aml = aml.filtered(lambda r: not r.reconciled and r.account_id.internal_type == 'receivable' and r.partner_id == order.partner_id.commercial_partner_id)

# Reconcile returns first
# to avoid mixing up the credit of a payment and the credit of a return
# in the receivable account
aml_returns = aml.filtered(lambda l: (l.journal_id.type == 'sale' and l.credit) or (l.journal_id.type != 'sale' and l.debit))
try:
aml_returns.reconcile()
(aml - aml_returns).reconcile()
# Cash returns will be well reconciled
# Whereas freight returns won't be
# "c'est la vie..."
aml.reconcile()
except Exception:
# There might be unexpected situations where the automatic reconciliation won't
# work. We don't want the user to be blocked because of this, since the automatic
@@ -262,7 +262,9 @@ def _search_product_quantity(self, operator, value, field):

# TODO: Still optimization possible when searching virtual quantities
ids = []
for product in self.search([]):
# Order the search on `id` to prevent the default order on the product name which slows
# down the search because of the join on the translation table to get the translated names.
for product in self.search([], order='id'):
if OPERATORS[operator](product[field], value):
ids.append(product.id)
return [('id', 'in', ids)]
@@ -55,8 +55,8 @@
<field name="use_existing_lots" groups="stock.group_production_lot"/>
</group>
<group string="Locations">
<field name="default_location_src_id" attrs="{'required': [('code', '=', 'internal')]}"/>
<field name="default_location_dest_id" attrs="{'required': [('code', 'in', ('internal', 'incoming'))]}"/>
<field name="default_location_src_id" attrs="{'required': [('code', '=', 'internal')]}" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/>
<field name="default_location_dest_id" attrs="{'required': [('code', 'in', ('internal', 'incoming'))]}" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/>
</group>
</group>
</sheet>
@@ -229,8 +229,8 @@
<group>
<group>
<field name="partner_id" attrs="{'invisible': [('picking_type_code', '=', 'internal')]}"/>
<field name="location_id" groups="stock.group_stock_multi_locations" attrs="{'invisible': [('picking_type_code', '=', 'outgoing')]}"/>
<field name="location_dest_id" groups="stock.group_stock_multi_locations" attrs="{'invisible': [('picking_type_code', '=', 'incoming')]}"/>
<field name="location_id" groups="stock.group_stock_multi_locations" attrs="{'invisible': [('picking_type_code', '=', 'outgoing')]}" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/>
<field name="location_dest_id" groups="stock.group_stock_multi_locations" attrs="{'invisible': [('picking_type_code', '=', 'incoming')]}" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/>
<field name="backorder_id" readonly="1" attrs="{'invisible': [('backorder_id','=',False)]}"/>
</group>
<group>
@@ -207,11 +207,15 @@ define([
var layoutInfo = dom.makeLayoutInfo(target);
/* ODOO: (start_modification */
var $editable = layoutInfo.editable();
if (!event.isDefaultPrevented()) {
modules.editor.saveRange($editable);
if (event.setStyleInfoFromEditable) {
var styleInfo = modules.editor.styleFromNode($editable);
} else {
if (!event.isDefaultPrevented()) {
modules.editor.saveRange($editable);
}
var styleInfo = modules.editor.currentStyle(target);
}
/* ODOO: end_modification) */
var styleInfo = modules.editor.currentStyle(target);
self.updateStyleInfo(styleInfo, layoutInfo);
}, 0);
};
@@ -57,7 +57,8 @@ var FieldTextHtmlSimple = widget.extend({
this.$translate.remove();
this.$translate = $();
// Triggers a mouseup to refresh the editor toolbar
this.$content.trigger('mouseup');
var mouseupEvent = $.Event('mouseup', {'setStyleInfoFromEditable': true});
this.$content.trigger(mouseupEvent);
return def;
},
initialize_content: function () {
@@ -170,7 +171,11 @@ var FieldTextHtmlSimple = widget.extend({
transcoder.class_to_style(this.$content);
transcoder.font_to_img(this.$content);
}
this.internal_set_value(this.$content.html());
var value = this.$content.html();
if (this.get('value') === false && value === '<p><br></p>') {
value = false;
}
this.internal_set_value(value);
},
destroy_content: function () {
$(".oe-view-manager-content").off("scroll");
@@ -0,0 +1,11 @@
Lithuania, 2019-02-09

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,

Naglis Jonaitis naglis@mailbox.org https://github.com/naglis
@@ -443,6 +443,13 @@ def _get(self, model_name, name):
"""
return self.sudo().search([('model', '=', model_name), ('name', '=', name)])

@tools.ormcache('model_name', 'name')
def _get_id(self, model_name, name):
self.env.cr.execute("SELECT id FROM ir_model_fields WHERE model=%s AND name=%s",
(model_name, name))
result = self.env.cr.fetchone()
return result and result[0]

@api.multi
def _drop_column(self):
tables_to_drop = set()
@@ -276,6 +276,16 @@ def test_13_inverse(self):
self.assertEqual(record.bar, 'Ho')
self.assertEqual(record.counts, {'compute': 0, 'inverse': 1})

def test_13_inverse_access(self):
""" test access rights on inverse fields """
foo = self.env['test_new_api.category'].create({'name': 'Foo'})
user = self.env['res.users'].create({'name': 'Foo', 'login': 'foo'})
self.assertFalse(user.has_group('base.group_system'))
# add group on non-stored inverse field
self.patch(type(foo).display_name, 'groups', 'base.group_system')
with self.assertRaises(AccessError):
foo.sudo(user).display_name = 'Forbidden'

def test_14_search(self):
""" test search on computed fields """
discussion = self.env.ref('test_new_api.discussion_0')
@@ -572,6 +582,10 @@ def test_27_company_dependent(self):
self.env['ir.property'].create({'name': 'foo', 'fields_id': field.id,
'value': 'default', 'type': 'char'})

# assumption: users don't have access to 'ir.property'
accesses = self.env['ir.model.access'].search([('model_id.model', '=', 'ir.property')])
accesses.write(dict.fromkeys(['perm_read', 'perm_write', 'perm_create', 'perm_unlink'], False))

# create/modify a record, and check the value for each user
record = self.env['test_new_api.company'].create({'foo': 'main'})
record.invalidate_cache()
@@ -591,6 +605,13 @@ def test_27_company_dependent(self):
self.assertEqual(record.sudo(user1).foo, False)
self.assertEqual(record.sudo(user2).foo, 'default')

# set field with 'force_company' in context
record.sudo(user0).with_context(force_company=company1.id).foo = 'beta'
record.invalidate_cache()
self.assertEqual(record.sudo(user0).foo, 'main')
self.assertEqual(record.sudo(user1).foo, 'beta')
self.assertEqual(record.sudo(user2).foo, 'default')

# create company record and attribute
company_record = self.env['test_new_api.company'].create({'foo': 'ABC'})
attribute_record = self.env['test_new_api.company.attr'].create({
@@ -610,6 +631,26 @@ def test_27_company_dependent(self):
self.assertEqual(attribute_record.bar, 'DEFDEF')
self.assertFalse(self.env.has_todo())

# add group on company-dependent field
self.assertFalse(user0.has_group('base.group_system'))
self.patch(type(record).foo, 'groups', 'base.group_system')
with self.assertRaises(AccessError):
record.sudo(user0).foo = 'forbidden'

user0.write({'groups_id': [(4, self.env.ref('base.group_system').id)]})
record.sudo(user0).foo = 'yes we can'

# add ir.rule to prevent access on record
self.assertTrue(user0.has_group('base.group_user'))
model_id = self.env['ir.model'].search([('model', '=', record._name)]).id
rule = self.env['ir.rule'].create({
'model_id': model_id,
'groups': [self.env.ref('base.group_user').id],
'domain_force': str([('id', '!=', record.id)]),
})
with self.assertRaises(AccessError):
record.sudo(user0).foo = 'forbidden'

def test_28_sparse(self):
""" test sparse fields. """
record = self.env['test_new_api.sparse'].create({})
@@ -661,13 +661,25 @@ def _default_company_dependent(self, model):
return model.env['ir.property'].get(self.name, self.model_name)

def _compute_company_dependent(self, records):
Property = records.env['ir.property']
# read property as superuser, as the current user may not have access
context = records.env.context
if 'force_company' not in context:
field_id = records.env['ir.model.fields']._get_id(self.model_name, self.name)
company = records.env['res.company']._company_default_get(self.model_name, field_id)
context = dict(context, force_company=company.id)
Property = records.env(user=SUPERUSER_ID, context=context)['ir.property']
values = Property.get_multi(self.name, self.model_name, records.ids)
for record in records:
record[self.name] = values.get(record.id)

def _inverse_company_dependent(self, records):
Property = records.env['ir.property']
# update property as superuser, as the current user may not have access
context = records.env.context
if 'force_company' not in context:
field_id = records.env['ir.model.fields']._get_id(self.model_name, self.name)
company = records.env['res.company']._company_default_get(self.model_name, field_id)
context = dict(context, force_company=company.id)
Property = records.env(user=SUPERUSER_ID, context=context)['ir.property']
values = {
record.id: self.convert_to_write(record[self.name], record)
for record in records
@@ -3533,10 +3533,15 @@ def write(self, vals):
protected_fields = map(self._fields.get, new_vals)
with self.env.protecting(protected_fields, self):
# write old-style fields with (low-level) method _write
if old_vals:
if old_vals or new_vals:
# if log_access is enabled, this updates 'write_date' and
# 'write_uid' and check access rules, even when old_vals is
# empty
self._write(old_vals)

if new_vals:
self.check_field_access_rights('write', list(new_vals))

self.modified(set(new_vals) - set(old_vals))

# put the values of fields into cache, and inverse them

0 comments on commit c1fe9f1

Please sign in to comment.
You can’t perform that action at this time.