Merge lp:~unifield-team/unifield-server/us-1463 into lp:unifield-server

[Quentin THEURET @Amaris]

=== modified file 'bin/addons/analytic_distribution/account_move_line.py'
--- bin/addons/analytic_distribution/account_move_line.py	2016-02-25 13:47:24 +0000
+++ bin/addons/analytic_distribution/account_move_line.py	2016-06-30 15:41:11 +0000
@@ -174,7 +174,15 @@
                         'amount': 0.,
                         'is': False,
                         'id': False,
+                        'iso': 0.,
                     }
+
+                    # US-1463/2: are all lines eguals by amount ?
+                    if distrib_lines:
+                        amounts = list(set([dl.percentage*amount/100 for dl in distrib_lines ]))
+                        if len(amounts) == 1:
+                            aji_greater_amount['iso'] = amounts[0]
+
                     dl_total_amount_rounded = 0.
                     for distrib_line in distrib_lines:
                         context.update({'date': obj_line.get('source_date', False) or obj_line.get('date', False)})
@@ -226,12 +234,23 @@
                             # US-119 deduce the rounding gap and apply it
                             # to the AJI of greater amount
                             # http://jira.unifield.org/browse/US-119?focusedCommentId=38217&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-38217
-                            fixed_amount = aji_greater_amount['amount'] - (dl_total_amount_rounded - amount)
+                            # and US-1463
+                            func_amount = None
+                            if aji_greater_amount['iso'] > 0:  # US-1463/2
+                                if len(distrib_lines) > 2:
+                                    fixed_amount = amount - round(aji_greater_amount['iso'], 2) * float(len(distrib_lines)-1)
+                                else:
+                                    diff = amount - (round(aji_greater_amount['iso'], 2) * len(distrib_lines))
+                                    fixed_amount = self.pool.get('finance.tools').truncate_amount(aji_greater_amount['iso'] - diff, 2)
+                            else:  # US-1463/1
+                                fixed_amount = aji_greater_amount['amount'] - (round(dl_total_amount_rounded, 2) - amount)
+                                func_amount = -1 * self.pool.get('res.currency').compute(cr, uid, obj_line.get('currency_id', [False])[0], company_currency, fixed_amount, round=False, context=context)
+                                func_amount = self.pool.get('finance.tools').truncate_amount(func_amount, 2)
                             fixed_amount_vals = {
-                                'amount': -1 * self.pool.get('res.currency').compute(cr, uid, obj_line.get('currency_id', [False])[0], company_currency,
-                                        fixed_amount, round=False, context=context),
                                 'amount_currency': -1 * fixed_amount,
                             }
+                            if func_amount is not None:
+                                fixed_amount_vals[ 'amount'] = func_amount
                             aal_obj.write(cr, uid, [aji_greater_amount['id']],
                                 fixed_amount_vals, context=context)
 

=== modified file 'bin/addons/msf_tools/msf_tools.py'
--- bin/addons/msf_tools/msf_tools.py	2016-05-26 12:24:52 +0000
+++ bin/addons/msf_tools/msf_tools.py	2016-06-30 15:41:11 +0000
@@ -30,6 +30,7 @@
 from datetime import datetime
 from datetime import date
 from decimal import Decimal, ROUND_UP
+import math
 
 import netsvc
 
@@ -853,5 +854,9 @@
                 msg = _('Document date should be in posting date FY')
             raise osv.except_osv(_('Error'), msg)
 
+    def truncate_amount(self, amount, digits):
+        stepper = pow(10.0, digits)
+        return math.trunc(stepper * amount) / stepper
+
 finance_tools()