-
-
+
+
e.g: 1 * (reference unit) = ratio * (this unit)
diff --git a/openerp/addons/base/test/base_test.yml b/openerp/addons/base/test/base_test.yml
index e73d8177fc0..3a4ccf1c0bd 100644
--- a/openerp/addons/base/test/base_test.yml
+++ b/openerp/addons/base/test/base_test.yml
@@ -199,8 +199,7 @@
!python {model: res.currency}: |
from openerp.tools import float_compare, float_is_zero, float_round, float_repr
def try_round(amount, expected, precision_digits=3, float_round=float_round, float_repr=float_repr):
- result = float_repr(float_round(amount, precision_digits=precision_digits),
- precision_digits=precision_digits)
+ result = float_repr(float_round(amount, precision_digits=precision_digits, rounding_method=rounding_method),
assert result == expected, 'Rounding error: got %s, expected %s' % (result, expected)
try_round(2.6745, '2.675')
try_round(-2.6745, '-2.675')
@@ -213,6 +212,18 @@
try_round(457.4554, '457.455')
try_round(-457.4554, '-457.455')
+ # Try some rounding value with rounding method UP instead of HALF-UP
+ # We use 8.175 because when normalizing 8.175 with precision_digits=3 it gives
+ # us 8175,0000000001234 as value, and if not handle correctly the rounding UP
+ # value will be incorrect (should be 8,175 and not 8,176)
+ try_round(8.175, '8.175', rounding_method='UP')
+ try_round(8.1751, '8.176', rounding_method='UP')
+ try_round(-8.175, '-8.175', rounding_method='UP')
+ try_round(-8.1751, '-8.176', rounding_method='UP')
+ try_round(-6.000, '-6.000', rounding_method='UP')
+ try_round(1.8, '2', 0, rounding_method='UP')
+ try_round(-1.8, '-2', 0, rounding_method='UP')
+
# Extended float range test, inspired by Cloves Almeida's test on bug #882036.
fractions = [.0, .015, .01499, .675, .67499, .4555, .4555, .45555]
expecteds = ['.00', '.02', '.01', '.68', '.67', '.46', '.456', '.4556']
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index bcec1ac98f0..62ef9eba902 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -597,7 +597,12 @@ def get_pg_type(f, type_override=None):
if field_type in FIELDS_TO_PGTYPES:
pg_type = (FIELDS_TO_PGTYPES[field_type], FIELDS_TO_PGTYPES[field_type])
elif issubclass(field_type, fields.float):
- if f.digits:
+ # Explicit support for "falsy" digits (0, False) to indicate a
+ # NUMERIC field with no fixed precision. The values will be saved
+ # in the database with all significant digits.
+ # FLOAT8 type is still the default when there is no precision because
+ # it is faster for most operations (sums, etc.)
+ if f.digits is not None:
pg_type = ('numeric', 'NUMERIC')
else:
pg_type = ('float8', 'DOUBLE PRECISION')
diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py
index 61eedafb59e..dab7ee53fd2 100644
--- a/openerp/report/render/rml2pdf/trml2pdf.py
+++ b/openerp/report/render/rml2pdf/trml2pdf.py
@@ -91,7 +91,6 @@ class NumberedCanvas(canvas.Canvas):
self._saved_page_states = []
def showPage(self):
- self._saved_page_states.append(dict(self.__dict__))
self._startPage()
def save(self):
@@ -126,6 +125,8 @@ class PageCount(platypus.Flowable):
class PageReset(platypus.Flowable):
def draw(self):
+ """Flag to close current story page numbering and prepare for the next
+ should be executed after the rendering of the full story"""
self.canv._doPageReset = True
class _rml_styles(object,):
@@ -936,6 +937,9 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
self.handle_frameBegin()
def afterPage(self):
+ if isinstance(self.canv, NumberedCanvas):
+ # save current page states before eventual reset
+ self.canv._saved_page_states.append(dict(self.canv.__dict__))
if self.canv._doPageReset:
# Following a
tag:
# - we reset page number to 0
@@ -1009,10 +1013,10 @@ class _rml_template(object):
story_cnt = 0
for node_story in node_stories:
if story_cnt > 0:
- # Reset Page Number with new story tag
- fis.append(PageReset())
fis.append(platypus.PageBreak())
fis += r.render(node_story)
+ # end of story numbering computation
+ fis.append(PageReset())
story_cnt += 1
try:
if self.localcontext and self.localcontext.get('internal_header',False):
diff --git a/openerp/tools/float_utils.py b/openerp/tools/float_utils.py
index 5c934114e3c..9f7b49974f4 100644
--- a/openerp/tools/float_utils.py
+++ b/openerp/tools/float_utils.py
@@ -29,10 +29,11 @@ def _float_check_precision(precision_digits=None, precision_rounding=None):
return 10 ** -precision_digits
return precision_rounding
-def float_round(value, precision_digits=None, precision_rounding=None):
- """Return ``value`` rounded to ``precision_digits``
- decimal digits, minimizing IEEE-754 floating point representation
- errors, and applying HALF-UP (away from zero) tie-breaking rule.
+def float_round(value, precision_digits=None, precision_rounding=None, rounding_method='HALF-UP'):
+ """Return ``value`` rounded to ``precision_digits`` decimal digits,
+ minimizing IEEE-754 floating point representation errors, and applying
+ the tie-breaking rule selected with ``rounding_method``, by default
+ HALF-UP (away from zero).
Precision must be given by ``precision_digits`` or ``precision_rounding``,
not both!
@@ -41,6 +42,9 @@ def float_round(value, precision_digits=None, precision_rounding=None):
:param float precision_rounding: decimal number representing the minimum
non-zero value at the desired precision (for example, 0.01 for a
2-digit precision).
+ :param rounding_method: the rounding method used: 'HALF-UP' or 'UP', the first
+ one rounding up to the closest number with the rule that number>=0.5 is
+ rounded up to 1, and the latest one always rounding up.
:return: rounded float
"""
rounding_factor = _float_check_precision(precision_digits=precision_digits,
@@ -52,7 +56,7 @@ def float_round(value, precision_digits=None, precision_rounding=None):
# we normalize the value before rounding it as an integer, and de-normalize
# after rounding: e.g. float_round(1.3, precision_rounding=.5) == 1.5
- # TIE-BREAKING: HALF-UP
+ # TIE-BREAKING: HALF-UP (for normal rounding)
# We want to apply HALF-UP tie-breaking rules, i.e. 0.5 rounds away from 0.
# Due to IEE754 float/double representation limits, the approximation of the
# real value may be slightly below the tie limit, resulting in an error of
@@ -66,8 +70,23 @@ def float_round(value, precision_digits=None, precision_rounding=None):
normalized_value = value / rounding_factor # normalize
epsilon_magnitude = math.log(abs(normalized_value), 2)
epsilon = 2**(epsilon_magnitude-53)
- normalized_value += cmp(normalized_value,0) * epsilon
- rounded_value = round(normalized_value) # round to integer
+ if rounding_method == 'HALF-UP':
+ normalized_value += cmp(normalized_value,0) * epsilon
+ rounded_value = round(normalized_value) # round to integer
+
+ # TIE-BREAKING: UP (for ceiling operations)
+ # When rounding the value up, we instead subtract the epsilon value
+ # as the the approximation of the real value may be slightly *above* the
+ # tie limit, this would result in incorrectly rounding up to the next number
+ # The math.ceil operation is applied on the absolute value in order to
+ # round "away from zero" and not "towards infinity", then the sign is
+ # restored.
+
+ elif rounding_method == 'UP':
+ sign = cmp(normalized_value, 0)
+ normalized_value -= sign*epsilon
+ rounded_value = math.ceil(abs(normalized_value))*sign # ceil to integer
+
result = rounded_value * rounding_factor # de-normalize
return result