diff --git a/addons/account/models/account_analytic_line.py b/addons/account/models/account_analytic_line.py
index 83faccaa15c..c5c0d5ed746 100644
--- a/addons/account/models/account_analytic_line.py
+++ b/addons/account/models/account_analytic_line.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from openerp import api, fields, models, _
+from math import copysign
class AccountAnalyticLine(models.Model):
@@ -20,8 +21,12 @@ class AccountAnalyticLine(models.Model):
help='Utility field to express amount currency')
currency_id = fields.Many2one('res.currency', related='move_id.currency_id', string='Account Currency', store=True, help="The related account currency if not equal to the company one.", readonly=True)
amount_currency = fields.Monetary(related='move_id.amount_currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True)
+ analytic_amount_currency = fields.Monetary(string='Amount Currency', compute="_get_analytic_amount_currency", help="The amount expressed in the related account currency if not equal to the company one.", readonly=True)
partner_id = fields.Many2one('res.partner', related='account_id.partner_id', string='Partner', store=True, readonly=True)
+ def _get_analytic_amount_currency(self):
+ self.analytic_amount_currency = abs(self.amount_currency) * copysign(1, self.amount)
+
@api.v8
@api.onchange('product_id', 'product_uom_id', 'unit_amount', 'currency_id')
def on_change_unit_amount(self):
diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 0deff04529b..e07cada8e2e 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -1263,7 +1263,7 @@ class AccountMoveLine(models.Model):
""" Prepare the values used to create() an account.analytic.line upon validation of an account.move.line having
an analytic account. This method is intended to be extended in other modules.
"""
- amount = (self.debit or 0.0) - (self.credit or 0.0)
+ amount = (self.credit or 0.0) - (self.debit or 0.0)
return {
'name': self.name,
'date': self.date,
diff --git a/addons/account/views/account_analytic_view.xml b/addons/account/views/account_analytic_view.xml
index 8b4af3f9bcf..71a3d48ad7b 100644
--- a/addons/account/views/account_analytic_view.xml
+++ b/addons/account/views/account_analytic_view.xml
@@ -15,7 +15,8 @@
-
+
+
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 09f270c3b3d..58bc567625c 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -280,7 +280,7 @@ var ScaleScreenWidget = ScreenWidget.extend({
return self.pos.proxy.scale_read().then(function(weight){
self.set_weight(weight.weight);
});
- },{duration:50, repeat: true});
+ },{duration:150, repeat: true});
},
get_product: function(){
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index a27f8bfdb05..3c4c9d5f4ce 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -90,5 +90,5 @@ class AccountInvoiceLine(models.Model):
prod_quantity = factor * quantity
average_price_unit += self._compute_average_price(prod_qty_done, prod_quantity, prod_moves)
price_unit = average_price_unit or price_unit
- price_unit = uom_obj._compute_qty_obj(self.uom_id, price_unit, self.product_id.uom_id, round=False)
+ price_unit = self.product_id.uom_id._compute_price(self.product_id.uom_id.id, price_unit, to_uom_id=self.uom_id.id)
return price_unit
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 718dd84da55..bc107a37a00 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -379,7 +379,7 @@ class AccountInvoiceLine(models.Model):
# on the moves we encounter.
average_price_unit = self._compute_average_price(qty_done, quantity, moves)
price_unit = average_price_unit or price_unit
- price_unit = uom_obj._compute_qty_obj(self.uom_id, price_unit, self.product_id.uom_id, round=False)
+ price_unit = self.product_id.uom_id._compute_price(self.product_id.uom_id.id, price_unit, to_uom_id=self.uom_id.id)
return price_unit
def _compute_average_price(self, qty_done, quantity, moves):
diff --git a/addons/stock/models/stock_location.py b/addons/stock/models/stock_location.py
index 5763903b071..f71f82df366 100644
--- a/addons/stock/models/stock_location.py
+++ b/addons/stock/models/stock_location.py
@@ -25,7 +25,6 @@ class Location(models.Model):
return res
name = fields.Char('Location Name', required=True, translate=True)
- # TDE CLEAME: unnecessary field, use name_get instead
complete_name = fields.Char("Full Location Name", compute='_compute_complete_name', store=True)
active = fields.Boolean('Active', default=True, help="By unchecking the active field, you may hide a location without deleting it.")
usage = fields.Selection([
@@ -75,14 +74,22 @@ class Location(models.Model):
""" Forms complete name of location from parent location to child location. """
name = self.name
current = self
- while current.location_id and current.usage != 'view':
+ while current.location_id:
current = current.location_id
name = '%s/%s' % (current.name, name)
self.complete_name = name
@api.multi
def name_get(self):
- return [(location.id, location.complete_name) for location in self]
+ ret_list = []
+ for location in self:
+ orig_location = location
+ name = location.name
+ while location.location_id and location.usage != 'view':
+ location = location.location_id
+ name = location.name + "/" + name
+ ret_list.append((orig_location.id, name))
+ return ret_list
def get_putaway_strategy(self, product):
''' Returns the location where the product has to be put, if any compliant putaway strategy is found. Otherwise returns None.'''
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 51b22be1e8e..1c450e90411 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -869,7 +869,7 @@ class Picking(models.Model):
moves_reassign = any(x.origin_returned_move_id or x.move_orig_ids for x in picking.move_lines if x.state not in ['done', 'cancel'])
if moves_reassign and picking.location_id.usage not in ("supplier", "production", "inventory"):
# unnecessary to assign other quants than those involved with pack operations as they will be unreserved anyways.
- picking.with_context(reserve_only_ops=True, no_state_change=True).rereserve_quants(move_ids=todo_moves.ids)
+ picking.with_context(reserve_only_ops=True, no_state_change=True).rereserve_quants(move_ids=picking.move_lines.ids)
picking.do_recompute_remaining_quantities()
# split move lines if needed
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index e92ae8a65c9..a76f468423d 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -202,6 +202,7 @@
+
diff --git a/addons/stock_account/stock_account.py b/addons/stock_account/stock_account.py
index b545b44ce67..2e837a2c918 100644
--- a/addons/stock_account/stock_account.py
+++ b/addons/stock_account/stock_account.py
@@ -31,7 +31,11 @@ class account_invoice_line(osv.osv):
def _get_anglo_saxon_price_unit(self):
self.ensure_one()
- return self.product_id.standard_price
+ price = self.product_id.standard_price
+ if not self.uom_id or self.product_id.uom_id == self.uom_id:
+ return price
+ else:
+ return self.product_id.uom_id._compute_price(self.product_id.uom_id.id, price, to_uom_id=self.uom_id.id)
def _get_price(self, cr, uid, inv, company_currency, i_line, price_unit):
cur_obj = self.pool.get('res.currency')
@@ -107,7 +111,6 @@ class account_invoice(osv.osv):
]
return []
-
#----------------------------------------------------------
# Stock Location
#----------------------------------------------------------
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 00bbd8b3c24..6fe184b2baf 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -1208,7 +1208,7 @@ var One2ManyListView = X2ManyListView.extend({
this.dataset.x2m.internal_dataset_changed = false;
var self = this;
- return this.save_edition().done(function () {
+ return this.save_edition(true).done(function () {
if (self._dataset_changed) {
self.dataset.trigger('dataset_changed');
}
diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js
index 234edb9e41e..3f5d39e60e1 100644
--- a/addons/web/static/src/js/views/list_view_editable.js
+++ b/addons/web/static/src/js/views/list_view_editable.js
@@ -448,7 +448,7 @@ ListView.include(/** @lends instance.web.ListView# */{
/**
* @return {jQuery.Deferred}
*/
- save_edition: function () {
+ save_edition: function (cancel_onfail) {
var self = this;
return self.saving_mutex.exec(function() {
if (!self.editor.is_editing()) {
@@ -483,7 +483,9 @@ ListView.include(/** @lends instance.web.ListView# */{
return {created: created, record: record};
});
}, function() {
- return self.cancel_edition();
+ if (cancel_onfail) {
+ return self.cancel_edition();
+ }
});
});
});
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index 3b414d45cb5..17ce8c3c1a1 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -161,11 +161,6 @@ var FieldTextHtmlSimple = widget.extend({
return !this.get('value') || this.get('value') === "
" || !this.get('value').match(/\S/);
},
commit_value: function () {
- // leave code view before saving
- if (this.$content.prev('textarea').length === 1) {
- var layoutInfo = { 'editor': function() { return this.$content; }.bind(this) };
- $.summernote.pluginEvents.codeview(undefined, undefined, layoutInfo);
- }
if (this.options['style-inline']) {
transcoder.class_to_style(this.$content);
transcoder.font_to_img(this.$content);
@@ -379,11 +374,6 @@ var FieldTextHtml = widget.extend({
this._dirty_flag = false;
return this.editor.save();
} else if (this._dirty_flag && this.editor && this.editor.buildingBlock) {
- // leave code view before saving
- if (this.$content.prev('textarea').length === 1) {
- var layoutInfo = { 'editor': function() { return this.$content; }.bind(this) };
- $.summernote.pluginEvents.codeview(undefined, undefined, layoutInfo);
- }
this.editor.buildingBlock.clean_for_save();
this.internal_set_value( this.$content.html() );
}
diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js
index 5c621ebbe70..a83e9136a06 100644
--- a/addons/web_editor/static/src/js/rte.summernote.js
+++ b/addons/web_editor/static/src/js/rte.summernote.js
@@ -538,8 +538,6 @@ function prettify_html(html) {
}
return result;
}
-
-// Change Warning: called with dummy arguments to quit code view before saving
$.summernote.pluginEvents.codeview = function (event, editor, layoutInfo) {
if (layoutInfo.toolbar) {
return eventHandler.modules.codeview.toggle(layoutInfo);
diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index c94bfd77fc0..59c7cf7b513 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -902,7 +902,7 @@ class IrActionsServer(models.Model):
self._cr.execute("""
INSERT INTO ir_logging(create_date, create_uid, type, dbname, name, level, message, path, line, func)
VALUES (NOW() at time zone 'UTC', %s, %s, %s, %s, %s, %s, %s, %s, %s)
- """, ('server', self._cr.dbname, __name__, level, message, "action", action.id, action.name))
+ """, (self._uid, 'server', self._cr.dbname, __name__, level, message, "action", action.id, action.name))
eval_context = super(IrActionsServer, self)._get_eval_context(action=action)
model = self.env[action.model_id.model]
diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index a34e5ce2b8f..67e48ec8801 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -5,7 +5,7 @@ import logging
from collections import defaultdict
from difflib import get_close_matches
-from odoo import api, fields, models, tools, _
+from odoo import api, fields, models, tools, SUPERUSER_ID, _
from odoo.exceptions import AccessError, UserError, ValidationError
from odoo.modules import get_module_path, get_module_resource
@@ -121,12 +121,21 @@ class IrTranslationImport(object):
# referencing non-existent data.
cr.execute("DELETE FROM %s WHERE res_id IS NULL AND module IS NOT NULL" % self._table)
+ # detect the xml_translate fields, where the src must be the same
+ env = api.Environment(cr, SUPERUSER_ID, {})
+ src_relevant_fields = []
+ for model in env:
+ for field_name, field in env[model]._fields.items():
+ if hasattr(field, 'translate') and callable(field.translate):
+ src_relevant_fields.append("%s,%s" % (model, field_name))
+
find_expr = """
irt.lang = ti.lang
AND irt.type = ti.type
AND irt.name = ti.name
AND (
- (ti.type = 'model' AND ti.res_id = irt.res_id AND irt.src = ti.src)
+ (ti.type = 'model' AND ti.res_id = irt.res_id AND ti.name IN %s AND irt.src = ti.src)
+ OR (ti.type = 'model' AND ti.res_id = irt.res_id AND ti.name NOT IN %s)
OR (ti.type = 'view' AND (irt.res_id IS NULL OR ti.res_id = irt.res_id) AND irt.src = ti.src)
OR (ti.type = 'field')
OR (ti.type = 'help')
@@ -142,20 +151,23 @@ class IrTranslationImport(object):
state = 'translated'
FROM %s AS ti
WHERE %s AND ti.value IS NOT NULL AND ti.value != ''
- """ % (self._model_table, self._table, find_expr))
+ """ % (self._model_table, self._table, find_expr),
+ (tuple(src_relevant_fields), tuple(src_relevant_fields)))
# Step 3: insert new translations
cr.execute(""" INSERT INTO %s(name, lang, res_id, src, type, value, module, state, comments)
SELECT name, lang, res_id, src, type, value, module, state, comments
FROM %s AS ti
WHERE NOT EXISTS(SELECT 1 FROM ONLY %s AS irt WHERE %s);
- """ % (self._model_table, self._table, self._model_table, find_expr))
+ """ % (self._model_table, self._table, self._model_table, find_expr),
+ (tuple(src_relevant_fields), tuple(src_relevant_fields)))
if self._debug:
cr.execute("SELECT COUNT(*) FROM ONLY %s" % self._model_table)
total = cr.fetchone()[0]
cr.execute("SELECT COUNT(*) FROM ONLY %s AS irt, %s AS ti WHERE %s" % \
- (self._model_table, self._table, find_expr))
+ (self._model_table, self._table, find_expr),
+ (tuple(src_relevant_fields), tuple(src_relevant_fields)))
count = cr.fetchone()[0]
_logger.debug("ir.translation.cursor: %d entries now in ir.translation, %d common entries with tmp", total, count)
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index e5ace609c71..7b8edcd3ee8 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -358,7 +358,7 @@ class Users(models.Model):
if 'company_id' in values:
for user in self:
# if partner is global we keep it that way
- if user.partner_id.company_id.id != values['company_id']:
+ if user.partner_id.company_id and user.partner_id.company_id.id != values['company_id']:
user.partner_id.write({'company_id': user.company_id.id})
# clear default ir values when company changes
self.env['ir.values'].get_defaults_dict.clear_cache(self.env['ir.values'])