")).then(function () {
self.$searchview_buttons = self.searchview.$buttons.contents();
+ // manually call do_search to generate the initial domain and filter
+ // the messages in the default channel
+ self.searchview.do_search();
});
},
/**
@@ -908,7 +911,12 @@ var ChatAction = Widget.extend(ControlPanelMixin, {
contexts: [session.user_context],
});
this.domain = result.domain;
- this._fetchAndRenderThread();
+ if (this.channel) {
+ // initially (when _onSearch is called manually), there is no
+ // channel set yet, so don't try to fetch and render the thread as
+ // this will be done as soon as the default channel is set
+ this._fetchAndRenderThread();
+ }
},
/**
* @private
diff --git a/addons/mail/static/src/js/many2many_tags_email.js b/addons/mail/static/src/js/many2many_tags_email.js
index eaf0f89d546..f10d7d76701 100644
--- a/addons/mail/static/src/js/many2many_tags_email.js
+++ b/addons/mail/static/src/js/many2many_tags_email.js
@@ -21,9 +21,9 @@ BasicModel.include({
* @param {Object} record - an element from the localData
* @param {string} fieldName
* @return {Deferred
-
+
- Unused
+
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index 6118c6c817b..1d5d3a79f3f 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index 016fa5bad8e..a4bd7dda110 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -47,7 +47,7 @@
-
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index f7406b79ca3..ae87017d08b 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-13 14:36+0000\n"
-"PO-Revision-Date: 2017-12-13 14:36+0000\n"
+"POT-Creation-Date: 2018-01-10 07:39+0000\n"
+"PO-Revision-Date: 2018-01-10 07:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -548,6 +548,7 @@ msgid "Basic"
msgstr ""
#. module: project
+#: code:addons/project/models/project.py:29
#: model:project.task,legend_blocked:project.project_task_data_0
#: model:project.task,legend_blocked:project.project_task_data_1
#: model:project.task,legend_blocked:project.project_task_data_11
@@ -564,6 +565,7 @@ msgstr ""
#: model:project.task.type,legend_blocked:project.project_stage_data_1
#: model:project.task.type,legend_blocked:project.project_stage_data_2
#: selection:report.project.task.user,state:0
+#, python-format
msgid "Blocked"
msgstr ""
@@ -1114,6 +1116,7 @@ msgid "If the active field is set to False, it will allow you to hide the projec
msgstr ""
#. module: project
+#: code:addons/project/models/project.py:35
#: model:project.task,legend_normal:project.project_task_data_0
#: model:project.task,legend_normal:project.project_task_data_1
#: model:project.task,legend_normal:project.project_task_data_11
@@ -1130,6 +1133,7 @@ msgstr ""
#: model:project.task.type,legend_normal:project.project_stage_data_1
#: model:project.task.type,legend_normal:project.project_stage_data_2
#: selection:report.project.task.user,state:0
+#, python-format
msgid "In Progress"
msgstr ""
@@ -1650,6 +1654,7 @@ msgstr ""
#: model:ir.actions.act_window,name:project.rating_rating_action_view_project_rating
#: model:ir.ui.view,arch_db:project.view_task_form2
msgid "Rating"
+#, python-format
msgstr ""
#. module: project
diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index 4b187aee8d2..d5f1866ec94 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -27,13 +27,13 @@ class ProjectTaskType(models.Model):
string='Starred Explanation', translate=True,
help='Explanation text to help users using the star on tasks or issues in this stage.')
legend_blocked = fields.Char(
- 'Red Kanban Label', default='Blocked', translate=True, required=True,
+ 'Red Kanban Label', default=lambda s: _('Blocked'), translate=True, required=True,
help='Override the default value displayed for the blocked state for kanban selection, when the task or issue is in that stage.')
legend_done = fields.Char(
- 'Green Kanban Label', default='Ready for Next Stage', translate=True, required=True,
+ 'Green Kanban Label', default=lambda s: _('Ready for Next Stage'), translate=True, required=True,
help='Override the default value displayed for the done state for kanban selection, when the task or issue is in that stage.')
legend_normal = fields.Char(
- 'Grey Kanban Label', default='In Progress', translate=True, required=True,
+ 'Grey Kanban Label', default=lambda s: _('In Progress'), translate=True, required=True,
help='Override the default value displayed for the normal state for kanban selection, when the task or issue is in that stage.')
mail_template_id = fields.Many2one(
'mail.template',
diff --git a/addons/purchase/views/account_invoice_views.xml b/addons/purchase/views/account_invoice_views.xml
index 11ca251f357..25d7ad51592 100644
--- a/addons/purchase/views/account_invoice_views.xml
+++ b/addons/purchase/views/account_invoice_views.xml
@@ -59,7 +59,7 @@
-
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index de2307e9140..fccd37d4e5f 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -826,6 +826,18 @@ class SaleOrderLine(models.Model):
precision = self.env['decimal.precision'].precision_get('Product Unit of Measure')
self.filtered(
lambda r: r.state == 'sale' and float_compare(r.product_uom_qty, values['product_uom_qty'], precision_digits=precision) != 0)._update_line_quantity(values)
+
+ # Prevent writing on a locked SO.
+ protected_fields = self._get_protected_fields()
+ if 'done' in self.mapped('order_id.state') and any(f in values.keys() for f in protected_fields):
+ fields = self.env['ir.model.fields'].search([
+ ('name', 'in', protected_fields), ('model', '=', self._name)
+ ])
+ raise UserError(
+ _('It is forbidden to modify the following fields in a locked order:\n%s')
+ % '\n'.join(fields.mapped('field_description'))
+ )
+
result = super(SaleOrderLine, self).write(values)
return result
@@ -1112,6 +1124,12 @@ class SaleOrderLine(models.Model):
return product[field_name] * uom_factor * cur_factor, currency_id.id
+ def _get_protected_fields(self):
+ return [
+ 'product_id', 'name', 'price_unit', 'product_uom', 'product_uom_qty',
+ 'tax_id', 'analytic_tag_ids'
+ ]
+
@api.onchange('product_id', 'price_unit', 'product_uom', 'product_uom_qty', 'tax_id')
def _onchange_discount(self):
self.discount = 0.0
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 6a0fb56c42e..973ea404549 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -78,12 +78,14 @@ class SaleAdvancePaymentInv(models.TransientModel):
if self.amount <= 0.00:
raise UserError(_('The value of the down payment amount must be positive.'))
+ context = {'lang': order.partner_id.lang}
if self.advance_payment_method == 'percentage':
amount = order.amount_untaxed * self.amount / 100
name = _("Down payment of %s%%") % (self.amount,)
else:
amount = self.amount
name = _('Down Payment')
+ del context
taxes = self.product_id.taxes_id.filtered(lambda r: not order.company_id or r.company_id == order.company_id)
if order.fiscal_position_id and taxes:
tax_ids = order.fiscal_position_id.map_tax(taxes).ids
@@ -154,6 +156,7 @@ class SaleAdvancePaymentInv(models.TransientModel):
tax_ids = order.fiscal_position_id.map_tax(taxes).ids
else:
tax_ids = taxes.ids
+ context = {'lang': order.partner_id.lang}
so_line = sale_line_obj.create({
'name': _('Advance: %s') % (time.strftime('%m %Y'),),
'price_unit': amount,
@@ -165,6 +168,7 @@ class SaleAdvancePaymentInv(models.TransientModel):
'tax_id': [(6, 0, tax_ids)],
'is_downpayment': True,
})
+ del context
self._create_invoice(order, so_line, amount)
if self._context.get('open_invoices', False):
return sale_orders.action_view_invoice()
diff --git a/addons/sale_mrp/tests/test_sale_mrp_flow.py b/addons/sale_mrp/tests/test_sale_mrp_flow.py
index c67f41660b9..f6268534ef7 100644
--- a/addons/sale_mrp/tests/test_sale_mrp_flow.py
+++ b/addons/sale_mrp/tests/test_sale_mrp_flow.py
@@ -335,8 +335,15 @@ class TestSaleMrpFlow(common.TransactionCase):
product.invoice_policy = 'delivery'
# Remove the MTO route as purchase is not installed and since the procurement removal the exception is directly raised
product.write({'route_ids': [(6, 0, [self.warehouse.manufacture_pull_id.route_id.id])]})
+
+ partner = self.env.ref('base.res_partner_1')
+ # if `delivery` module is installed, a default property is set for the carrier to use
+ # However this will lead to an extra line on the SO (the delivery line), which will force
+ # the SO to have a different flow (and `invoice_state` value)
+ partner.property_delivery_carrier_id = False
+
f = Form(self.env['sale.order'])
- f.partner_id = self.env.ref('base.res_partner_1')
+ f.partner_id = partner
with f.order_line.new() as line:
line.product_id = product
line.product_uom_qty = 5
diff --git a/addons/sale_payment/models/payment.py b/addons/sale_payment/models/payment.py
index 94c58752618..410d287b247 100644
--- a/addons/sale_payment/models/payment.py
+++ b/addons/sale_payment/models/payment.py
@@ -13,6 +13,7 @@ class PaymentTransaction(models.Model):
# YTI FIXME: The auto_join seems useless
sale_order_id = fields.Many2one('sale.order', string='Sales Order', auto_join=True)
+ so_state = fields.Selection('sale.order', string='Sale Order State', related='sale_order_id.state')
@api.model
def form_feedback(self, data, acquirer_name):
diff --git a/addons/sale_stock/tests/test_sale_stock.py b/addons/sale_stock/tests/test_sale_stock.py
index 13bfc849a5e..5a6e43377fe 100644
--- a/addons/sale_stock/tests/test_sale_stock.py
+++ b/addons/sale_stock/tests/test_sale_stock.py
@@ -176,14 +176,14 @@ class TestSaleStock(TestSale):
# Check invoice
self.assertEqual(self.so.invoice_status, 'to invoice', 'Sale Stock: so invoice_status should be "to invoice" instead of "%s" after picking return' % self.so.invoice_status)
- self.assertEqual(self.so.order_line[0].qty_delivered, 3.0, 'Sale Stock: delivered quantity should be 3.0 instead of "%s" after picking return' % self.so.order_line[0].qty_delivered)
+ self.assertAlmostEqual(self.so.order_line[0].qty_delivered, 3.0, 'Sale Stock: delivered quantity should be 3.0 instead of "%s" after picking return' % self.so.order_line[0].qty_delivered)
# let's do an invoice with refunds
adv_wiz = self.env['sale.advance.payment.inv'].with_context(active_ids=[self.so.id]).create({
'advance_payment_method': 'all',
})
adv_wiz.with_context(open_invoices=True).create_invoices()
self.inv_2 = self.so.invoice_ids.filtered(lambda r: r.state == 'draft')
- self.assertEqual(self.inv_2.invoice_line_ids[0].quantity, 2.0, 'Sale Stock: refund quantity on the invoice should be 2.0 instead of "%s".' % self.inv_2.invoice_line_ids[0].quantity)
+ self.assertAlmostEqual(self.inv_2.invoice_line_ids[0].quantity, 2.0, 'Sale Stock: refund quantity on the invoice should be 2.0 instead of "%s".' % self.inv_2.invoice_line_ids[0].quantity)
self.assertEqual(self.so.invoice_status, 'no', 'Sale Stock: so invoice_status should be "no" instead of "%s" after invoicing the return' % self.so.invoice_status)
def test_03_sale_stock_delivery_partial(self):
@@ -303,4 +303,3 @@ class TestSaleStock(TestSale):
self.assertEqual(len(so1.picking_ids), 2)
picking2 = so1.picking_ids.filtered(lambda p: p.state != 'cancel')
self.assertEqual(picking2.partner_id.id, partner2)
-
diff --git a/addons/sale_timesheet/models/sale_order.py b/addons/sale_timesheet/models/sale_order.py
index a3aa9faa7c9..8e662b21ee6 100644
--- a/addons/sale_timesheet/models/sale_order.py
+++ b/addons/sale_timesheet/models/sale_order.py
@@ -226,6 +226,7 @@ class SaleOrderLine(models.Model):
'project_id': project.id,
'sale_line_id': self.id,
'company_id': self.company_id.id,
+ 'email_from': self.order_id.partner_id.email,
'user_id': False, # force non assigned task, as created as sudo()
}
diff --git a/addons/sale_timesheet/tests/test_sale_service.py b/addons/sale_timesheet/tests/test_sale_service.py
index c856a6bb167..a1fa081c102 100644
--- a/addons/sale_timesheet/tests/test_sale_service.py
+++ b/addons/sale_timesheet/tests/test_sale_service.py
@@ -37,6 +37,7 @@ class TestSaleService(CommonTest):
task = project.task_ids.filtered(lambda t: t.name == '%s:%s' % (sale_order.name, self.product_delivery_timesheet2.name))
self.assertTrue(task, 'Sale Service: task is not created')
self.assertEqual(task.partner_id, sale_order.partner_id, 'Sale Service: customer should be the same on task and on SO')
+ self.assertEqual(task.email_from, sale_order.partner_id.email, 'Sale Service: Task Email should be the same as the SO customer Email')
# register timesheet on task
self.env['account.analytic.line'].create({
'name': 'Test Line',
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index ab286a11c33..7ab39cb718d 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -15,6 +15,22 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: stock
+#: code:addons/stock/models/stock_move.py:230
+#, python-format
+msgid "\n"
+"\n"
+"%s --> Product UoM is %s (%s) - Move UoM is %s (%s)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_move.py:231
+#, python-format
+msgid "\n"
+"\n"
+"Blocking: %s"
+msgstr ""
+
#. module: stock
#: code:addons/stock/models/stock_move.py:308
#, python-format
diff --git a/addons/stock/models/res_config_settings.py b/addons/stock/models/res_config_settings.py
index 281b1bd8ea5..68819f5ef63 100644
--- a/addons/stock/models/res_config_settings.py
+++ b/addons/stock/models/res_config_settings.py
@@ -72,6 +72,8 @@ class ResConfigSettings(models.TransientModel):
@api.multi
def set_values(self):
super(ResConfigSettings, self).set_values()
+ if not self.user_has_groups('stock.group_stock_manager'):
+ return
self.env['ir.config_parameter'].sudo().set_param('stock.use_propagation_minimum_delta', self.use_propagation_minimum_delta)
""" If we are not in multiple locations, we can deactivate the internal
operation types of the warehouses, so they won't appear in the dashboard.
diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index e6597978c7a..921aacdb6ac 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -316,10 +316,12 @@ class StockMove(models.Model):
@api.constrains('product_uom')
def _check_uom(self):
- moves_error = self.filtered(lambda move: move.product_id.uom_id.category_id.id != move.product_uom.category_id.id)
+ moves_error = self.filtered(lambda move: move.product_id.uom_id.category_id != move.product_uom.category_id)
if moves_error:
user_warning = _('You try to move a product using a UoM that is not compatible with the UoM of the product moved. Please use an UoM in the same UoM category.')
- user_warning += '\n\nBlocking: %s' % ' ,'.join(moves_error.mapped('name'))
+ for move in moves_error:
+ user_warning += _('\n\n%s --> Product UoM is %s (%s) - Move UoM is %s (%s)') % (move.product_id.display_name, move.product_id.uom_id.name, move.product_id.uom_id.category_id.name, move.product_uom.name, move.product_uom.category_id.name)
+ user_warning += _('\n\nBlocking: %s') % ' ,'.join(moves_error.mapped('name'))
raise UserError(user_warning)
@api.model_cr
diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py
index d2025ebe373..4582c907575 100644
--- a/addons/stock/models/stock_move_line.py
+++ b/addons/stock/models/stock_move_line.py
@@ -496,7 +496,7 @@ class StockMoveLine(models.Model):
candidate.product_qty - quantity,
precision_rounding=self.product_uom_id.rounding,
rounding_method='UP')
- candidate.product_uom_qty = self.product_id.uom_id._compute_quantity(quantity_split, self.product_uom_id, rounding_method='HALF-UP')
+ candidate.product_uom_qty = self.product_id.uom_id._compute_quantity(quantity_split, candidate.product_uom_id, rounding_method='HALF-UP')
quantity -= quantity_split
move_to_recompute_state |= candidate.move_id
if quantity == 0.0:
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 35045577cd7..fc36deba800 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -405,10 +405,12 @@ class Picking(models.Model):
"""
for picking in self:
packages = self.env['stock.quant.package']
- for ml in picking.move_line_ids:
- if ml.package_id.id == ml.result_package_id.id:
- if picking.state in ('done', 'cancel') or picking._check_move_lines_map_quant_package(ml.package_id):
- packages |= ml.package_id
+ packages_to_check = picking.move_line_ids\
+ .filtered(lambda ml: ml.result_package_id and ml.package_id.id == ml.result_package_id.id)\
+ .mapped('package_id')
+ for package_to_check in packages_to_check:
+ if picking.state in ('done', 'cancel') or picking._check_move_lines_map_quant_package(package_to_check):
+ packages |= package_to_check
picking.entire_package_ids = packages
picking.entire_package_detail_ids = packages
@@ -635,7 +637,12 @@ class Picking(models.Model):
self.write({'date_done': fields.Datetime.now()})
return True
- do_transfer = action_done #TODO:replace later
+ # Backward compatibility
+ # Problem with fixed reference to a function:
+ # it doesn't allow for overriding action_done() through do_transfer
+ # get rid of me in master (and make me private ?)
+ def do_transfer(self):
+ return self.action_done()
def _check_move_lines_map_quant_package(self, package):
""" This method checks that all product of the package (quant) are well present in the move_line_ids of the picking. """
diff --git a/addons/stock/models/stock_warehouse.py b/addons/stock/models/stock_warehouse.py
index 800d8af3c11..73368db6ad4 100644
--- a/addons/stock/models/stock_warehouse.py
+++ b/addons/stock/models/stock_warehouse.py
@@ -455,6 +455,7 @@ class Warehouse(models.Model):
self.Routing(warehouse.lot_stock_id, warehouse.wh_pack_stock_loc_id, warehouse.pick_type_id),
self.Routing(warehouse.wh_pack_stock_loc_id, warehouse.wh_output_stock_loc_id, warehouse.pack_type_id),
self.Routing(warehouse.wh_output_stock_loc_id, customer_loc, warehouse.out_type_id)],
+ 'company_id': warehouse.company_id.id,
}) for warehouse in self)
def _get_reception_delivery_route_values(self, route_type):
@@ -495,7 +496,8 @@ class Warehouse(models.Model):
'product_categ_selectable': True,
'active': self.delivery_steps != 'ship_only' and self.reception_steps != 'one_step',
'company_id': self.company_id.id,
- 'sequence': 20}
+ 'sequence': 20,
+ }
# Pull / Push tools
# ------------------------------------------------------------
diff --git a/addons/stock/tests/test_move.py b/addons/stock/tests/test_move.py
index 39394a749fa..0e52a87d1ca 100644
--- a/addons/stock/tests/test_move.py
+++ b/addons/stock/tests/test_move.py
@@ -2690,6 +2690,47 @@ class StockMove(TransactionCase):
scrapped_move.quantity_done = 8
self.assertEqual(scrap.scrap_qty, 8, 'Scrap quantity is not updated.')
+ def test_scrap_5(self):
+ """ Scrap the product of a reserved move line where the product is reserved in another
+ unit of measure. Check that the move line is correctly updated after the scrap.
+ """
+ # 4 units are available in stock
+ self.env['stock.quant']._update_available_quantity(self.product1, self.stock_location, 4)
+
+ # try to reserve a dozen
+ partner = self.env['res.partner'].create({'name': 'Kimberley'})
+ picking = self.env['stock.picking'].create({
+ 'name': 'A single picking with one move to scrap',
+ 'location_id': self.stock_location.id,
+ 'location_dest_id': self.customer_location.id,
+ 'partner_id': partner.id,
+ 'picking_type_id': self.env.ref('stock.picking_type_out').id,
+ })
+ move1 = self.env['stock.move'].create({
+ 'name': 'A move to confirm and scrap its product',
+ 'location_id': self.stock_location.id,
+ 'location_dest_id': self.customer_location.id,
+ 'product_id': self.product1.id,
+ 'product_uom': self.uom_dozen.id,
+ 'product_uom_qty': 1.0,
+ 'picking_id': picking.id,
+ })
+ move1._action_confirm()
+ move1._action_assign()
+ self.assertEqual(move1.reserved_availability, 0.33)
+
+ # scrap a unit
+ scrap = self.env['stock.scrap'].create({
+ 'product_id': self.product1.id,
+ 'product_uom_id': self.product1.uom_id.id,
+ 'scrap_qty': 1,
+ 'picking_id': picking.id,
+ })
+ scrap.action_validate()
+
+ self.assertEqual(scrap.state, 'done')
+ self.assertEqual(move1.reserved_availability, 0.25)
+
def test_in_date_1(self):
""" Check that moving a tracked quant keeps the incoming date.
"""
diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index 24db282431d..d60f889b1af 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -117,7 +117,9 @@ class ProductProduct(models.Model):
""" Changes the Standard Price of Product and creates an account move accordingly."""
AccountMove = self.env['account.move']
- locations = self.env['stock.location'].search([('usage', '=', 'internal'), ('company_id', '=', self.env.user.company_id.id)])
+ quant_locs = self.env['stock.quant'].sudo().read_group([('product_id', 'in', self.ids)], ['location_id'], ['location_id'])
+ quant_loc_ids = [loc['location_id'][0] for loc in quant_locs]
+ locations = self.env['stock.location'].search([('usage', '=', 'internal'), ('company_id', '=', self.env.user.company_id.id), ('id', 'in', quant_loc_ids)])
product_accounts = {product.id: product.product_tmpl_id.get_product_accounts() for product in self}
diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml
index 9de57f6fe82..5491d63a6bd 100644
--- a/addons/stock_account/views/product_views.xml
+++ b/addons/stock_account/views/product_views.xml
@@ -41,7 +41,7 @@
+
',
+ res_id: 1,
+ session: {
+ currencies: _.indexBy(this.data.currency.records, 'id'),
+ },
+ });
+
+ // Non-breaking space between the currency and the amount
+ assert.strictEqual(form.$('.o_field_widget').first().text(), '$\u00a0-8.9',
+ 'The value should be displayed properly.');
+
+ form.$buttons.find('.o_form_button_edit').click();
+ assert.strictEqual(form.$('input').val(), '-8.9',
+ 'The input should be rendered without the currency symbol.');
+ assert.strictEqual(form.$('input').parent().children().first().text(), '$',
+ 'The input should be preceded by a span containing the currency symbol.');
+
+ form.$('input').val('109.2458938598598').trigger('input');
+ assert.strictEqual(form.$('input').val(), '109.2458938598598',
+ 'The value should not be formated yet.');
+
+ form.$buttons.find('.o_form_button_save').click();
+ // Non-breaking space between the currency and the amount
+ assert.strictEqual(form.$('.o_field_widget').first().text(), '$\u00a0109.2',
+ 'The new value should be rounded properly.');
+
+ form.destroy();
+ });
+
QUnit.module('FieldEmail');
QUnit.test('email field in form view', function (assert) {
@@ -1472,6 +1518,40 @@ QUnit.module('basic_fields', {
session.get_file = oldGetFile;
});
+ QUnit.test('download_link widget in list view', function (assert) {
+ assert.expect(5);
+
+ this.data.partner.fields.filename = { string: "Filename", type: "char" };
+ this.data.partner.records[0].filename = "document.txt";
+
+ var form = createView({
+ View: ListView,
+ model: 'partner',
+ data: this.data,
+ arch: '' +
+ ' ',
+ res_id: 1,
+ });
+
+ assert.ok(form.$('.o_data_cell').first().hasClass("o_download_link_cell"),
+ "this should be a download link cell");
+ assert.ok(form.$('.o_data_cell').first().find('a').eq(0),
+ "there should be a link in the cell");
+ assert.strictEqual(form.$('.o_data_cell').first().find('a').eq(0).attr('download'),
+ "document.txt",
+ "it should download a file named 'document.txt'");
+ assert.strictEqual(form.$('.o_data_cell').first().find('a').eq(0).attr('href').trim(),
+ "data:application/octet-stream;base64,coucou==",
+ "it should have the appropriate link of a binary");
+ assert.strictEqual(form.$('.o_data_cell').first().find('a').eq(0).text(),
+ "Download",
+ "the text of the link should be 'Download'");
+
+ form.destroy();
+ });
+
QUnit.test('text field rendering in list view', function (assert) {
assert.expect(1);
diff --git a/addons/web/static/tests/fields/field_utils_tests.js b/addons/web/static/tests/fields/field_utils_tests.js
index 1f8c27e7192..e24571ea1d8 100644
--- a/addons/web/static/tests/fields/field_utils_tests.js
+++ b/addons/web/static/tests/fields/field_utils_tests.js
@@ -127,6 +127,15 @@ QUnit.test('format one2many', function(assert) {
assert.strictEqual(fieldUtils.format.one2many({data: [1, 2]}), '2 records');
});
+QUnit.test('format binary', function (assert) {
+ assert.expect(1);
+
+ // base64 estimated size (bytes) = value.length / 1.37 (http://en.wikipedia.org/wiki/Base64#MIME)
+ // Here: 4 / 1.37 = 2.91970800 => 2.92 (rounded 2 decimals by utils.human_size)
+ assert.strictEqual(fieldUtils.format.binary('Cg=='), '2.92 Bytes');
+
+});
+
QUnit.test('parse float', function(assert) {
assert.expect(10);
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index 765166a52d4..a2be2447a07 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -5,6 +5,7 @@ var AbstractField = require('web.AbstractField');
var BasicModel = require('web.BasicModel');
var concurrency = require('web.concurrency');
var FormView = require('web.FormView');
+var ListRenderer = require('web.ListRenderer');
var ListView = require('web.ListView');
var relationalFields = require('web.relational_fields');
var StandaloneFieldManagerMixin = require('web.StandaloneFieldManagerMixin');
@@ -2081,6 +2082,39 @@ QUnit.module('relational_fields', {
form.destroy();
});
+ QUnit.test('transferring class attributes in one2many sub fields', function (assert) {
+ assert.expect(3);
+
+ var form = createView({
+ View: FormView,
+ model: 'partner',
+ data: this.data,
+ arch:'',
+ res_id: 1,
+ });
+
+ assert.strictEqual(form.$('td.hey').length, 1,
+ 'should have a td with the desired class');
+
+ form.$buttons.find('.o_form_button_edit').click();
+
+ assert.strictEqual(form.$('td.hey').length, 1,
+ 'should have a td with the desired class');
+
+ form.$('td.o_data_cell').click();
+
+ assert.strictEqual(form.$('input[name="turtle_foo"].hey').length, 1,
+ 'should have an input with the desired class');
+
+ form.destroy();
+ });
+
QUnit.test('one2many with date and datetime', function (assert) {
assert.expect(2);
@@ -2238,7 +2272,15 @@ QUnit.module('relational_fields', {
});
QUnit.test('embedded one2many with handle widget', function (assert) {
- assert.expect(7);
+ assert.expect(10);
+
+ var nbConfirmChange = 0;
+ testUtils.patch(ListRenderer, {
+ confirmChange: function () {
+ nbConfirmChange++;
+ return this._super.apply(this, arguments);
+ },
+ });
this.data.partner.records[0].turtles = [1, 2, 3];
@@ -2271,8 +2313,10 @@ QUnit.module('relational_fields', {
"should have the 3 rows in the correct order");
form.$buttons.find('.o_form_button_edit').click();
+
assert.strictEqual(form.$('td.o_data_cell:not(.o_handle_cell)').text(), "yopblipkawa",
"should still have the 3 rows in the correct order");
+ assert.strictEqual(nbConfirmChange, 0, "should not have confirmed any change yet");
// Drag and drop the second line in first position
testUtils.dragAndDrop(
@@ -2281,6 +2325,7 @@ QUnit.module('relational_fields', {
{position: 'top'}
);
+ assert.strictEqual(nbConfirmChange, 1, "should have confirmed changes only once");
assert.verifySteps(["0", "1"],
"sequences values should be incremental starting from the previous minimum one");
@@ -2288,9 +2333,20 @@ QUnit.module('relational_fields', {
"should have the 3 rows in the new order");
form.$buttons.find('.o_form_button_save').click();
+
+ assert.deepEqual(_.map(this.data.turtle.records, function(turtle) {
+ return _.pick(turtle, 'id', 'turtle_foo', 'turtle_int');
+ }), [
+ {id: 1, turtle_foo: "yop", turtle_int: 1},
+ {id: 2, turtle_foo: "blip", turtle_int:0},
+ {id: 3, turtle_foo: "kawa", turtle_int:21}
+ ], "should have save the changed sequence");
+
assert.strictEqual(form.$('td.o_data_cell:not(.o_handle_cell)').text(), "blipyopkawa",
"should still have the 3 rows in the new order");
+ testUtils.unpatch(ListRenderer);
+
form.destroy();
});
@@ -2382,7 +2438,7 @@ QUnit.module('relational_fields', {
res_id: 1,
mockRPC: function (route, args) {
if (args.method === 'write') {
- assert.deepEqual(args.args[1].turtles, [[1,1,{"turtle_int":2}],[4,2,false],[1,3,{"turtle_int":3}]],
+ assert.deepEqual(args.args[1].turtles, [[4,2,false],[1,1,{"turtle_int":2}],[1,3,{"turtle_int":3}]],
"should change all lines that have changed (the first one doesn't change because it has the same sequence)");
}
return this._super.apply(this, arguments);
@@ -2411,9 +2467,20 @@ QUnit.module('relational_fields', {
});
QUnit.test('onchange (with command 5) for embedded one2many with handle widget', function (assert) {
- assert.expect(2);
+ assert.expect(3);
- this.data.partner.records[0].turtles = [1, 2, 3];
+ var ids = [];
+ for (var i=10; i<50; i++) {
+ var id = 10 + i;
+ ids.push(id);
+ this.data.turtle.records.push({
+ id: id,
+ turtle_int: 0,
+ turtle_foo: "#" + id,
+ });
+ }
+ ids.push(1, 2, 3);
+ this.data.partner.records[0].turtles = ids;
this.data.partner.onchanges = {
turtles: function (obj) {
obj.turtles = [[5]].concat(obj.turtles);
@@ -2439,6 +2506,7 @@ QUnit.module('relational_fields', {
res_id: 1,
});
+ form.$('.o_pager_next').click();
assert.strictEqual(form.$('td.o_data_cell:not(.o_handle_cell)').text(), "yopblipkawa",
"should have the 3 rows in the correct order");
@@ -2453,7 +2521,10 @@ QUnit.module('relational_fields', {
{position: 'top'}
);
+ assert.strictEqual(form.$('.o_data_cell').text(), "blurpkawablip", "should display to record in 'turtle_int' order");
+
form.$buttons.find('.o_form_button_save').click();
+ form.$('.o_pager_next').click();
assert.strictEqual(form.$('.o_data_cell:not(.o_handle_cell)').text(), "blurpkawablip",
"should display to record in 'turtle_int' order");
@@ -2461,6 +2532,239 @@ QUnit.module('relational_fields', {
form.destroy();
});
+ QUnit.test('onchange with modifiers for embedded one2many on the second page', function (assert) {
+ assert.expect(7);
+
+ var data = this.data;
+ var ids = [];
+ for (var i=10; i<60; i++) {
+ var id = 10 + i;
+ ids.push(id);
+ data.turtle.records.push({
+ id: id,
+ turtle_int: 0,
+ turtle_foo: "#" + id,
+ });
+ }
+ ids.push(1, 2, 3);
+ data.partner.records[0].turtles = ids;
+ data.partner.onchanges = {
+ turtles: function (obj) {
+ // TODO: make this test more 'difficult'
+ // For now, the server only returns UPDATE commands (no LINK TO)
+ // even though it should do it (for performance reasons)
+ // var turtles = obj.turtles.splice(0, 20);
+
+ var turtles = [];
+ turtles.unshift([5]);
+ // create UPDATE commands for each records (this is the server
+ // usual answer for onchange)
+ for (var k in obj.turtles) {
+ var change = obj.turtles[k];
+ var record = _.findWhere(data.turtle.records, {id: change[1]});
+ if (change[0] === 1) {
+ _.extend(record, change[2]);
+ }
+ turtles.push([1, record.id, record]);
+ }
+ obj.turtles = turtles;
+ },
+ };
+
+ var form = createView({
+ View: FormView,
+ model: 'partner',
+ data: data,
+ arch:'',
+ res_id: 1,
+ });
+
+ form.$buttons.find('.o_form_button_edit').click();
+
+ assert.equal(form.$('.o_field_one2many td[class="o_data_cell"]').text(), "#20#21#22#23#24#25#26#27#28#29",
+ "should display the records in order");
+
+ form.$('.o_field_one2many .o_list_view tbody tr:first td:first').click();
+ form.$('.o_field_one2many .o_list_view tbody tr:first input:first').val('blurp').trigger('input');
+
+ // the domain fail if the widget does not use the allready loaded data.
+ form.$buttons.find('.o_form_button_cancel').click();
+
+ assert.equal(form.$('.o_field_one2many td[class="o_data_cell"]').text(), "blurp#21#22#23#24#25#26#27#28#29",
+ "should display the records in order with the changes");
+
+ $('.modal .modal-footer button:first').click();
+
+ assert.equal(form.$('.o_field_one2many td[class="o_data_cell"]').text(), "#20#21#22#23#24#25#26#27#28#29",
+ "should cancel changes and display the records in order");
+
+ form.$buttons.find('.o_form_button_edit').click();
+
+ // Drag and drop the third line in second position
+ testUtils.dragAndDrop(
+ form.$('.ui-sortable-handle').eq(2),
+ form.$('.o_field_one2many tbody tr').eq(1),
+ {position: 'top'}
+ );
+
+ assert.equal(form.$('.o_field_one2many td[class="o_data_cell"]').text(), "#20#30#31#32#33#34#35#36#37#38",
+ "should display the records in order after resequence (display record with turtle_int=0)");
+
+ // Drag and drop the third line in second position
+ testUtils.dragAndDrop(
+ form.$('.ui-sortable-handle').eq(2),
+ form.$('.o_field_one2many tbody tr').eq(1),
+ {position: 'top'}
+ );
+
+ assert.equal(form.$('.o_field_one2many td[class="o_data_cell"]').text(), "#20#39#40#41#42#43#44#45#46#47",
+ "should display the records in order after resequence (display record with turtle_int=0)");
+
+ form.$buttons.find('.o_form_button_cancel').click();
+
+ assert.equal(form.$('.o_field_one2many td[class="o_data_cell"]').text(), "#20#39#40#41#42#43#44#45#46#47",
+ "should display the records in order after resequence");
+
+ $('.modal .modal-footer button:first').click();
+
+ assert.equal(form.$('.o_field_one2many td[class="o_data_cell"]').text(), "#20#21#22#23#24#25#26#27#28#29",
+ "should cancel changes and display the records in order");
+
+ form.destroy();
+ });
+
+ QUnit.test('onchange followed by edition on the second page', function (assert) {
+ assert.expect(20);
+
+ var ids = [];
+ for (var i=1; i<85; i++) {
+ var id = 10 + i;
+ ids.push(id);
+ this.data.turtle.records.push({
+ id: id,
+ turtle_int: id/3|0,
+ turtle_foo: "#" + i,
+ });
+ }
+ ids.splice(41, 0, 1, 2, 3);
+ this.data.partner.records[0].turtles = ids;
+ this.data.partner.onchanges = {
+ turtles: function (obj) {
+ obj.turtles = [[5]].concat(obj.turtles);
+ },
+ };
+
+ var form = createView({
+ View: FormView,
+ model: 'partner',
+ data: this.data,
+ arch:'',
+ res_id: 1,
+ });
+
+ form.$buttons.find('.o_form_button_edit').click();
+ form.$('.o_pager_next').click();
+
+ form.$('.o_field_one2many .o_list_view tbody tr:eq(1) td:first').click();
+ form.$('.o_field_one2many .o_list_view tbody tr:eq(1) input:first').val('value 1').trigger('input');
+ form.$('.o_field_one2many .o_list_view tbody tr:eq(2) td:first').click();
+ form.$('.o_field_one2many .o_list_view tbody tr:eq(2) input:first').val('value 2').trigger('input');
+
+ assert.strictEqual(form.$('.o_data_row').length, 40, "should display 40 records");
+ assert.strictEqual(form.$('.o_data_row:has(.o_data_cell:contains(#39))').index(), 0, "should display '#39' at the first line");
+
+ form.$('.o_field_x2many_list_row_add a').click();
+
+ assert.strictEqual(form.$('.o_data_row').length, 40, "should display 39 records and the create line");
+ assert.strictEqual(form.$('.o_data_row:first .o_field_char').length, 1, "should display the create line in first position");
+ assert.strictEqual(form.$('.o_data_row:first .o_field_char').val(), "", "should an empty input");
+ assert.strictEqual(form.$('.o_data_row:has(.o_data_cell:contains(#39))').index(), 1, "should display '#39' at the second line");
+
+ form.$('.o_data_row input:first').val('value 3').trigger('input');
+
+ assert.strictEqual(form.$('.o_data_row:first .o_field_char').length, 1, "should display the create line in first position after onchange");
+ assert.strictEqual(form.$('.o_data_row:has(.o_data_cell:contains(#39))').index(), 1, "should display '#39' at the second line after onchange");
+
+ form.$('.o_field_x2many_list_row_add a').click();
+
+ assert.strictEqual(form.$('.o_data_row').length, 40, "should display 39 records and the create line");
+ assert.strictEqual(form.$('.o_data_row:first .o_field_char').length, 1, "should display the create line in first position");
+ assert.strictEqual(form.$('.o_data_row:has(.o_data_cell:contains(value 3))').index(), 1, "should display the created line at the second position");
+ assert.strictEqual(form.$('.o_data_row:has(.o_data_cell:contains(#39))').index(), 2, "should display '#39' at the third line");
+
+ form.destroy();
+
+ // bottom order
+
+ form = createView({
+ View: FormView,
+ model: 'partner',
+ data: this.data,
+ arch:'',
+ res_id: 1,
+ });
+
+ form.$buttons.find('.o_form_button_edit').click();
+ form.$('.o_pager_next').click();
+
+ form.$('.o_field_one2many .o_list_view tbody tr:eq(1) td:first').click();
+ form.$('.o_field_one2many .o_list_view tbody tr:eq(1) input:first').val('value 1').trigger('input');
+ form.$('.o_field_one2many .o_list_view tbody tr:eq(2) td:first').click();
+ form.$('.o_field_one2many .o_list_view tbody tr:eq(2) input:first').val('value 2').trigger('input');
+
+ assert.strictEqual(form.$('.o_data_row').length, 40, "should display 40 records");
+ assert.strictEqual(form.$('.o_data_row:has(.o_data_cell:contains(#77))').index(), 39, "should display '#77' at the last line");
+
+ form.$('.o_field_x2many_list_row_add a').click();
+
+ assert.strictEqual(form.$('.o_data_row').length, 40, "should display 39 records and the create line");
+ assert.strictEqual(form.$('.o_data_row:has(.o_data_cell:contains(#76))').index(), 38, "should display '#76' at the penultimate line");
+ assert.strictEqual(form.$('.o_data_row:has(.o_field_char)').index(), 39, "should display the create line at the last position");
+
+ form.$('.o_data_row input:first').val('value 3').trigger('input');
+ form.$('.o_field_x2many_list_row_add a').click();
+
+ assert.strictEqual(form.$('.o_data_row').length, 40, "should display 39 records and the create line");
+ assert.strictEqual(form.$('.o_data_row:has(.o_data_cell:contains(#76))').index(), 38, "should display '#76' at the penultimate line");
+ assert.strictEqual(form.$('.o_data_row:has(.o_field_char)').index(), 39, "should display the create line at the last position");
+
+ form.destroy();
+ });
+
QUnit.test('embedded one2many with handle widget with minimum setValue calls', function (assert) {
var done = assert.async();
assert.expect(20);
@@ -5137,6 +5441,38 @@ QUnit.module('relational_fields', {
form.destroy();
});
+ QUnit.test('id field in one2many in a new record', function (assert) {
+ assert.expect(1);
+
+ var form = createView({
+ View: FormView,
+ model: 'partner',
+ data: this.data,
+ arch: '',
+ mockRPC: function (route, args) {
+ if (args.method === 'create') {
+ var virtualID = args.args[0].turtles[0][1];
+ assert.deepEqual(args.args[0].turtles,
+ [[0, virtualID, {turtle_foo: "cat"}]],
+ 'should send proper commands');
+ }
+ return this._super.apply(this, arguments);
+ },
+ });
+ form.$('td.o_field_x2many_list_row_add a').click();
+ form.$('td input[name="turtle_foo"]').val('cat').trigger('input');
+ form.$buttons.find('.o_form_button_save').click();
+
+ form.destroy();
+ });
+
QUnit.test('sub form view with a required field', function (assert) {
assert.expect(2);
this.data.partner.fields.foo.required = true;
@@ -5629,9 +5965,9 @@ QUnit.module('relational_fields', {
// enable the many2many onchange and generate it
form.$('input.o_field_integer[name="int_field"]').val('10').trigger('input');
- assert.strictEqual(form.$('.o_data_cell.o_required_modifier').text(), "xphonexenomorphe",
+ assert.strictEqual(form.$('.o_data_cell.o_required_modifier').text(), "xenomorphexphone",
'should display the product xphone and xenomorphe');
- assert.strictEqual(form.$('.o_data_row').text().replace(/\s+/g, ' '), "new linexphone first record firstxenomorphe second record ",
+ assert.strictEqual(form.$('.o_data_row').text().replace(/\s+/g, ' '), "firstxenomorphe second record new linexphone first record ",
'should display the name, one2many and many2many value');
// disable the many2many onchange
@@ -5661,19 +5997,19 @@ QUnit.module('relational_fields', {
// put list in readonly mode
form.$('input.o_field_integer[name="int_field"]').click();
- assert.strictEqual(form.$('.o_data_cell.o_required_modifier').text(), "xphonexenomorphe",
+ assert.strictEqual(form.$('.o_data_cell.o_required_modifier').text(), "xenomorphexphone",
'should display the product xphone and xenomorphe');
- assert.strictEqual(form.$('.o_field_many2manytags:not(.o_input) .o_badge_text').text(), "first recordsecond record",
+ assert.strictEqual(form.$('.o_field_many2manytags:not(.o_input) .o_badge_text').text(), "second recordfirst record",
'should display the tag in readonly (first record and second record)');
form.$('input.o_field_integer[name="int_field"]').val('10').trigger('input');
- assert.strictEqual(form.$('.o_data_row').text().replace(/\s+/g, ' '), "new linexphone first record firstxenomorphe second record ",
+ assert.strictEqual(form.$('.o_data_row').text().replace(/\s+/g, ' '), "firstxenomorphe second record new linexphone first record ",
'should display the name, one2many and many2many value');
form.$buttons.find('.o_form_button_save').click();
- assert.strictEqual(form.$('.o_data_row').text().replace(/\s+/g, ' '), "new linexphone first record firstxenomorphe second record ",
+ assert.strictEqual(form.$('.o_data_row').text().replace(/\s+/g, ' '), "firstxenomorphe second record new linexphone first record ",
'should display the name, one2many and many2many value after save');
form.destroy();
@@ -6811,8 +7147,8 @@ QUnit.module('relational_fields', {
mockRPC: function (route, args) {
assert.step(args.method);
if (args.method === 'write') {
- assert.strictEqual(args.args[1].turtles[42][0], 0);
- assert.deepEqual(args.args[1].turtles[42][2], {turtle_foo: 'rainbow dash'});
+ assert.strictEqual(args.args[1].turtles[40][0], 0, 'should send a create command');
+ assert.deepEqual(args.args[1].turtles[40][2], {turtle_foo: 'rainbow dash'});
}
return this._super.apply(this, arguments);
},
@@ -6865,8 +7201,8 @@ QUnit.module('relational_fields', {
mockRPC: function (route, args) {
assert.step(args.method);
if (args.method === 'write') {
- assert.strictEqual(args.args[1].turtles[0][0], 0);
- assert.deepEqual(args.args[1].turtles[0][2], {turtle_foo: 'rainbow dash'});
+ assert.strictEqual(args.args[1].turtles[40][0], 0);
+ assert.deepEqual(args.args[1].turtles[40][2], {turtle_foo: 'rainbow dash'});
}
return this._super.apply(this, arguments);
},
@@ -6882,7 +7218,8 @@ QUnit.module('relational_fields', {
form.$('.o_field_x2many_list_row_add a').click();
assert.strictEqual(form.$('tr.o_data_row').length, 3,
- "should have 3 data rows on the current page");
+ "should have 3 data rows on the current page (2 records and the created line)");
+
assert.ok(form.$('tr.o_data_row').first().hasClass('o_selected_row'),
"first row should be selected");
diff --git a/addons/web/static/tests/views/list_tests.js b/addons/web/static/tests/views/list_tests.js
index 2993e393a4f..33b44948fca 100644
--- a/addons/web/static/tests/views/list_tests.js
+++ b/addons/web/static/tests/views/list_tests.js
@@ -989,7 +989,7 @@ QUnit.module('Views', {
});
QUnit.test('use default_order on editable tree: sort on demand', function (assert) {
- assert.expect(8);
+ assert.expect(11);
this.data.foo.records[0].o2m = [1, 3];
this.data.bar.fields = {name: {string: "Name", type: "char", sortable: true}};
@@ -1029,12 +1029,21 @@ QUnit.module('Views', {
"Value 2 should be third (shouldn't be sorted)");
form.$('.o_form_sheet_bg').click(); // validate the row before sorting
- $o2m.find('.o_column_sortable').click();
- assert.ok(form.$('tbody tr:first td:contains(Value 3)').length,
- "Value 3 should be first");
- assert.ok(form.$('tbody tr:eq(1) td:contains(Value 2)').length,
+
+ $o2m.find('.o_column_sortable').click(); // resort list after edition
+ assert.strictEqual(form.$('tbody tr:first').text(), 'Value 1',
+ "Value 1 should be first");
+ assert.strictEqual(form.$('tbody tr:eq(1)').text(), 'Value 2',
"Value 2 should be second (should be sorted after saving)");
- assert.ok(form.$('tbody tr:eq(2) td:contains(Value 1)').length,
+ assert.strictEqual(form.$('tbody tr:eq(2)').text(), 'Value 3',
+ "Value 3 should be third");
+
+ $o2m.find('.o_column_sortable').click();
+ assert.strictEqual(form.$('tbody tr:first').text(), 'Value 3',
+ "Value 3 should be first");
+ assert.strictEqual(form.$('tbody tr:eq(1)').text(), 'Value 2',
+ "Value 2 should be second (should be sorted after saving)");
+ assert.strictEqual(form.$('tbody tr:eq(2)').text(), 'Value 1',
"Value 1 should be third");
form.destroy();
@@ -1051,7 +1060,7 @@ QUnit.module('Views', {
ids.push(id);
this.data.bar.records.push({
id: id,
- name: "Value " + id,
+ name: "Value " + (id < 10 ? '0' : '') + id,
});
}
this.data.foo.records[0].o2m = ids;
@@ -1074,15 +1083,15 @@ QUnit.module('Views', {
// Change page
form.$('.o_pager_next').click();
- assert.ok(form.$('tbody tr:first td:contains(Value 44)').length,
+ assert.strictEqual(form.$('tbody tr:first').text(), 'Value 44',
"record 44 should be first");
- assert.ok(form.$('tbody tr:eq(4) td:contains(Value 48)').length,
+ assert.strictEqual(form.$('tbody tr:eq(4)').text(), 'Value 48',
"record 48 should be last");
form.$('.o_column_sortable').click();
- assert.ok(form.$('tbody tr:first td:contains(Value 48)').length,
+ assert.strictEqual(form.$('tbody tr:first').text(), 'Value 08',
"record 48 should be first");
- assert.ok(form.$('tbody tr:eq(4) td:contains(Value 44)').length,
+ assert.strictEqual(form.$('tbody tr:eq(4)').text(), 'Value 04',
"record 44 should be first");
form.destroy();
diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js
index f6011be282d..6c6a33edb8b 100644
--- a/addons/web_editor/static/src/js/editor/snippets.options.js
+++ b/addons/web_editor/static/src/js/editor/snippets.options.js
@@ -814,7 +814,9 @@ registry.background = SnippetOption.extend({
var $image = $('![]()
', {class: 'hidden', src: value}).appendTo(this.$target);
var _editor = new widget.MediaDialog(this, {}, null, $image[0]).open();
- _editor.$('[href="#editor-media-video"], [href="#editor-media-icon"]').addClass('hidden');
+ _editor.opened(function () {
+ _editor.$('[href="#editor-media-video"], [href="#editor-media-icon"]').addClass('hidden');
+ });
_editor.on('save', this, function () {
this._setCustomBackground($image.attr('src'));
diff --git a/addons/website/models/__init__.py b/addons/website/models/__init__.py
index e9e790cc0ca..750744ce7d1 100644
--- a/addons/website/models/__init__.py
+++ b/addons/website/models/__init__.py
@@ -11,3 +11,4 @@ from . import res_company
from . import res_partner
from . import res_config_settings
from . import ir_model_fields
+from . import ir_model
diff --git a/addons/website/models/ir_model.py b/addons/website/models/ir_model.py
new file mode 100644
index 00000000000..6d254374c38
--- /dev/null
+++ b/addons/website/models/ir_model.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details
+
+from odoo import api, models
+
+
+# This is a nasty hack, targeted for V11 only
+class IrModel(models.Model):
+ _inherit = 'ir.model'
+
+ @api.multi
+ def unlink(self):
+ self.env.cr.execute(
+ "DELETE FROM ir_model_fields WHERE name='website_id'")
+ return super(IrModel, self).unlink()
diff --git a/addons/website/models/res_config_settings.py b/addons/website/models/res_config_settings.py
index 60332d9e1a4..2cef7af3dce 100644
--- a/addons/website/models/res_config_settings.py
+++ b/addons/website/models/res_config_settings.py
@@ -13,6 +13,7 @@ class ResConfigSettings(models.TransientModel):
def _default_website(self):
return self.env['website'].search([], limit=1)
+ # FIXME: Set website_id to ondelete='cascade' in master
website_id = fields.Many2one('website', string="website", default=_default_website, required=True)
website_name = fields.Char('Website Name', related='website_id.name')
language_ids = fields.Many2many(related='website_id.language_ids', relation='res.lang')
diff --git a/addons/website/security/website_security.xml b/addons/website/security/website_security.xml
index 99264d4e460..6702d0878f1 100644
--- a/addons/website/security/website_security.xml
+++ b/addons/website/security/website_security.xml
@@ -15,6 +15,10 @@
+
+
website_designer: Manage Website and qWeb view
@@ -437,7 +437,7 @@ class Post(models.Model):
elif post.parent_id and not post.can_answer:
raise KarmaError('Not enough karma to answer to a question')
if not post.parent_id and not post.can_post:
- post.state = 'pending'
+ post.sudo().state = 'pending'
# add karma for posting new questions
if not post.parent_id and post.state == 'active':
@@ -466,11 +466,18 @@ class Post(models.Model):
@api.multi
def write(self, vals):
+ trusted_keys = ['active', 'is_correct', 'tag_ids'] # fields where security is checked manually
if 'content' in vals:
vals['content'] = self._update_content(vals['content'], self.forum_id.id)
if 'state' in vals:
- if vals['state'] in ['active', 'close'] and any(not post.can_close for post in self):
- raise KarmaError('Not enough karma to close or reopen a post.')
+ if vals['state'] in ['active', 'close']:
+ if any(not post.can_close for post in self):
+ raise KarmaError('Not enough karma to close or reopen a post.')
+ trusted_keys += ['state', 'closed_uid', 'closed_date', 'closed_reason_id']
+ elif vals['state'] == 'flagged':
+ if any(not post.can_flag for post in self):
+ raise KarmaError('Not enough karma to flag a post.')
+ trusted_keys += ['state', 'flag_user_id']
if 'active' in vals:
if any(not post.can_unlink for post in self):
raise KarmaError('Not enough karma to delete or reactivate a post')
@@ -487,7 +494,7 @@ class Post(models.Model):
tag_ids = set(tag.get('id') for tag in self.resolve_2many_commands('tag_ids', vals['tag_ids']))
if any(set(post.tag_ids) != tag_ids for post in self) and any(self.env.user.karma < post.forum_id.karma_edit_retag for post in self):
raise KarmaError(_('Not enough karma to retag.'))
- if any(key not in ['state', 'active', 'is_correct', 'closed_uid', 'closed_date', 'closed_reason_id', 'tag_ids'] for key in vals) and any(not post.can_edit for post in self):
+ if any(key not in trusted_keys for key in vals) and any(not post.can_edit for post in self):
raise KarmaError('Not enough karma to edit a post.')
res = super(Post, self).write(vals)
diff --git a/addons/website_forum/views/ir_qweb.xml b/addons/website_forum/views/ir_qweb.xml
index 671ae21944d..f823262d91b 100644
--- a/addons/website_forum/views/ir_qweb.xml
+++ b/addons/website_forum/views/ir_qweb.xml
@@ -5,9 +5,9 @@
Pay Now
Pay with
This channel is private and its content is restricted to some users.
" +msgstr "" + #. module: website_slides #: model:ir.ui.view,arch_db:website_slides.slide_detail_view msgid "0\n" diff --git a/addons/website_slides/models/slides.py b/addons/website_slides/models/slides.py index cb2d1836de2..b9d4aa2d757 100644 --- a/addons/website_slides/models/slides.py +++ b/addons/website_slides/models/slides.py @@ -102,7 +102,8 @@ class Channel(models.Model): string='Channel Groups', help="Groups allowed to see presentations in this channel") access_error_msg = fields.Html( 'Error Message', help="Message to display when not accessible due to access rights", - default="This channel is private and its content is restricted to some users.
", translate=html_translate, sanitize_attributes=False) + default=lambda s: _("This channel is private and its content is restricted to some users.
"), + translate=html_translate, sanitize_attributes=False) upload_group_ids = fields.Many2many( 'res.groups', 'rel_upload_groups', 'channel_id', 'group_id', string='Upload Groups', help="Groups allowed to upload presentations in this channel. If void, every user can upload.") diff --git a/odoo/addons/base/models/ir_model.py b/odoo/addons/base/models/ir_model.py index db8a27dd325..e45bf0037b2 100644 --- a/odoo/addons/base/models/ir_model.py +++ b/odoo/addons/base/models/ir_model.py @@ -860,6 +860,8 @@ class IrModelFields(models.Model): attrs['column1'] = field_data['column1'] or col1 attrs['column2'] = field_data['column2'] or col2 attrs['domain'] = safe_eval(field_data['domain'] or '[]') + elif field_data['ttype'] == 'monetary' and not self.pool.loaded: + return # add compute function if given if field_data['compute']: attrs['compute'] = make_compute(field_data['compute'], field_data['depends']) diff --git a/odoo/addons/base/tests/test_translate.py b/odoo/addons/base/tests/test_translate.py index 19405c3145d..dd70c9111ca 100644 --- a/odoo/addons/base/tests/test_translate.py +++ b/odoo/addons/base/tests/test_translate.py @@ -258,7 +258,7 @@ class TestTranslation(TransactionCase): category = self.customers.with_context({'lang': 'fr_FR'}).copy({'name': 'Clients (copie)'}) category_no = category.with_context({}) - self.assertEqual(category_no.name, 'Customers', "Duplication erased original untranslated value") + self.assertEqual(category_no.name, 'Clients (copie)', "Duplication should set untranslated value") category_fr = category.with_context({'lang': 'fr_FR'}) self.assertEqual(category_fr.name, 'Clients (copie)', "Did not used default value for translated value") diff --git a/odoo/models.py b/odoo/models.py index bd1fc1b415b..21397e83f04 100644 --- a/odoo/models.py +++ b/odoo/models.py @@ -3821,7 +3821,9 @@ class BaseModel(MetaModel('DummyModel', (object,), {'_register': False})): del vals['module'] # duplicated vals is not linked to any module vals['res_id'] = target_id if vals['lang'] == old.env.lang and field.translate is True: - vals['source'] = old_wo_lang[name] + # force a source if the new_val was not changed by copy override + if new_val == old[name]: + vals['source'] = old_wo_lang[name] # the value should be the new value (given by copy()) vals['value'] = new_val Translation.create(vals)