');
self.$('.oe_pad_readonly').html(data);
}).fail(function() {
@@ -54,21 +67,37 @@ var FieldPad = form_common.AbstractField.extend(form_common.ReinitializeWidgetMi
}
}
else {
- var def = $.when();
+ var def = $.Deferred();
if (! value || !_.str.startsWith(value, 'http')) {
- def = self.view.dataset.call('pad_generate_url', {
- context: {
- model: self.view.model,
- field_name: self.name,
- object_id: self.view.datarecord.id
- },
- }).then(function(data) {
- if (! data.url) {
- self.set("configured", false);
- } else {
- self.internal_set_value(data.url);
- }
+ var deferreds = [
+ self.view.dataset.call('pad_generate_url', {
+ context: {
+ model: self.view.model,
+ field_name: self.name,
+ object_id: self.view.datarecord.id
+ }
+ }),
+ // change record only after record_loaded and its call stack is finished
+ self.view.record_loaded.then(function() {
+ var call_stack_ended = $.Deferred();
+ _.defer(call_stack_ended.resolve);
+ return call_stack_ended;
+ })
+ ];
+ // delay onchange after x2many views are loaded
+ deferreds = deferreds.concat(_.compact(_.pluck(self.view.fields, 'is_loaded')));
+ $.when.apply($, deferreds).then(function(data) {
+ // update value only if loading_def has not been previously rejected
+ loading_def.resolve().done(function(){
+ if (! data.url) {
+ self.set("configured", false);
+ } else {
+ self.internal_set_value(data.url);
+ }
+ }).then(def.resolve, def.reject);
});
+ } else {
+ def.resolve();
}
def.then(function() {
value = self.get('value');
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 349fef31031..859ed9dd146 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1369,7 +1369,7 @@ exports.Orderline = Backbone.Model.extend({
}
return false;
},
- compute_all: function(taxes, price_unit, quantity, currency_rounding) {
+ compute_all: function(taxes, price_unit, quantity, currency_rounding, no_map_tax) {
var self = this;
var list_taxes = [];
var currency_rounding_bak = currency_rounding;
@@ -1380,7 +1380,9 @@ exports.Orderline = Backbone.Model.extend({
var total_included = total_excluded;
var base = total_excluded;
_(taxes).each(function(tax) {
- tax = self._map_tax_fiscal_position(tax);
+ if (!no_map_tax){
+ tax = self._map_tax_fiscal_position(tax);
+ }
if (tax.amount_type === 'group'){
var ret = self.compute_all(tax.children_tax_ids, price_unit, quantity, currency_rounding);
total_excluded = ret.total_excluded;
@@ -1841,6 +1843,27 @@ exports.Order = Backbone.Model.extend({
this.orderlines.remove(line);
this.select_orderline(this.get_last_orderline());
},
+
+ fix_tax_included_price: function(line){
+ if(this.fiscal_position){
+ var unit_price = line.price;
+ var taxes = line.get_taxes();
+ var mapped_included_taxes = [];
+ _(taxes).each(function(tax) {
+ var line_tax = line._map_tax_fiscal_position(tax);
+ if(tax.price_include && tax.id != line_tax.id){
+
+ mapped_included_taxes.push(tax);
+ }
+ })
+
+ unit_price = line.compute_all(mapped_included_taxes, unit_price, 1, this.pos.currency.rounding, true).total_excluded;
+
+ line.set_unit_price(unit_price);
+ }
+
+ },
+
add_product: function(product, options){
if(this._printed){
this.destroy();
@@ -1856,9 +1879,14 @@ exports.Order = Backbone.Model.extend({
if(options.quantity !== undefined){
line.set_quantity(options.quantity);
}
+
if(options.price !== undefined){
line.set_unit_price(options.price);
}
+
+ //To substract from the unit price the included taxes mapped by the fiscal position
+ this.fix_tax_included_price(line);
+
if(options.discount !== undefined){
line.set_discount(options.discount);
}
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index f1ba88a1f3e..0c9fc83b63c 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -171,7 +171,7 @@ class resource_calendar(osv.osv):
def get_weekdays(self, cr, uid, id, default_weekdays=None, context=None):
""" Return the list of weekdays that contain at least one working interval.
If no id is given (no calendar), return default weekdays. """
- if id is None:
+ if not id:
return default_weekdays if default_weekdays is not None else [0, 1, 2, 3, 4]
calendar = self.browse(cr, uid, id, context=None)
weekdays = set()
@@ -321,7 +321,7 @@ class resource_calendar(osv.osv):
work_dt = start_dt.replace(hour=0, minute=0, second=0)
# no calendar: try to use the default_interval, then return directly
- if id is None:
+ if not id:
working_interval = []
if default_interval:
working_interval = (start_dt.replace(hour=default_interval[0], minute=0, second=0),
@@ -445,7 +445,7 @@ class resource_calendar(osv.osv):
working_intervals = self.get_working_intervals_of_day(cr, uid, id, **call_args)
- if id is None and not working_intervals: # no calendar -> consider working 8 hours
+ if not id and not working_intervals: # no calendar -> consider working 8 hours
remaining_hours -= 8.0
elif working_intervals:
if backwards:
@@ -539,7 +539,7 @@ class resource_calendar(osv.osv):
compute_leaves=compute_leaves, resource_id=resource_id,
default_interval=default_interval,
context=context)
- if id is None or working_intervals: # no calendar -> no working hours, but day is considered as worked
+ if not id or working_intervals: # no calendar -> no working hours, but day is considered as worked
planned_days += 1
intervals += working_intervals
# get next day
diff --git a/openerp/addons/base/tests/test_views.py b/openerp/addons/base/tests/test_views.py
index 02cd3a98742..648389c50a0 100644
--- a/openerp/addons/base/tests/test_views.py
+++ b/openerp/addons/base/tests/test_views.py
@@ -9,6 +9,7 @@ from lxml.builder import E
from psycopg2 import IntegrityError
+from openerp.osv.orm import modifiers_tests
from openerp.exceptions import ValidationError
from openerp.tests import common
import openerp.tools
@@ -890,6 +891,10 @@ class test_views(ViewCase):
string="Replacement title", version="7.0"
))
+ def test_modifiers(self):
+ # implemeted elsewhere...
+ modifiers_tests()
+
class ViewModeField(ViewCase):
"""
This should probably, eventually, be folded back into other test case
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 7b4c983bcb0..80161e03fc7 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -118,13 +118,13 @@ def test_modifiers(what, expected):
node = etree.fromstring(what)
transfer_node_to_modifiers(node, modifiers)
simplify_modifiers(modifiers)
- json = json.dumps(modifiers)
- assert json == expected, "%s != %s" % (json, expected)
+ dumped = json.dumps(modifiers)
+ assert dumped == expected, "%s != %s" % (dumped, expected)
elif isinstance(what, dict):
transfer_field_to_modifiers(what, modifiers)
simplify_modifiers(modifiers)
- json = json.dumps(modifiers)
- assert json == expected, "%s != %s" % (json, expected)
+ dumped = json.dumps(modifiers)
+ assert dumped == expected, "%s != %s" % (dumped, expected)
# To use this test: