add int_index on Pay Sheet Model Line. Now the calclation will be made in the order of

the Pay Sheet Model Lines int_index. int_index have been added in the Pay Sheet
Line in order to be displayed in a particular order on the paysheet.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17693 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Document/PaySheetTransaction.py

@@ -29,6 +29,7 @@
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5.Document.Invoice import Invoice
+from zLOG import LOG
 
 class PaySheetTransaction(Invoice):
   """
@@ -278,31 +279,6 @@ class PaySheetTransaction(Invoice):
     column, row = getDictList(['tax_category', 'base_amount'])
     base_amount_table = getEmptyTwoDimentionalTable(nb_columns=len(column),
                                                     nb_rows=len(row))
-    # XXX currently, there is a problem not resolved yet :
-    # if a tax_category have a base_application ('non_deductible_tax','bonus')
-    # and if a bonus have a base_application ('base_salary',), calculation 
-    # must be made in a particular order, and sometimes, it's possible to 
-    # have circular dependencies and so, impossible to resove this cases.
-    # The best, will to do calculation with understanding dependencies and 
-    # raise an error if there is circular dependence. Currently, caluls are 
-    # made in a paticular order defined by the list order_of_calculation 
-    # so dependencies are not taken into account. 
-    # And result are wrong in some cases.
-    # solutions :
-    #  1 - do calculation without any order and redo evry calculs while a value
-    #  in the base_amount_table have changed. This is a little slow but safe.
-    #  2 - determine an order using dependencies graph, but this solution 
-    #  is not evolutive and safe, because it not take into account the new 
-    #  categories
-    #  3 - add an order field in paysheet lines and model lines : the user 
-    #  must determine an order manually and it will be easy to apply it
-    # in my opinion, the best solution for the accountant is the first, but it 
-    # will be slow, the easier is the 3.
-
-
-    # It's important to do calculation in a precise order,
-    # most of time, a tax could depend on base_salary and bonus, 
-    # so they must be calculated before
 
     def sortByIntIndex(a, b):
       return cmp(a.getIntIndex(),
@@ -311,13 +287,10 @@ class PaySheetTransaction(Invoice):
 
     base_amount_list = self.portal_categories['base_amount'].contentValues()
     base_amount_list.sort(sortByIntIndex)
-    order_of_calculation = [x.getRelativeUrl() for x in base_amount_list]
-    #order_of_calculation = ('base_amount/base_salary', 'base_amount/bonus', 
-    #                        'base_amount/non_deductible_tax', 
-    #                        'base_amount/deductible_tax')
 
     # it's important to get the editable lines to know if they contribute to
-    # a base_amount (this is required to do the calcul later
+    # a base_amount (this is required to do the calcul later)
+
     # get edited lines:
     paysheetline_list = self.contentValues(portal_type = ['Pay Sheet Line'])
 
@@ -342,35 +315,15 @@ class PaySheetTransaction(Invoice):
 
     # get not editables model lines
     model = self.getSpecialiseValue()
-    model_line_list = model.contentValues(portal_type='Pay Sheet Model Line')
+    model_line_list = model.contentValues(portal_type='Pay Sheet Model Line',
+                                               sort_on='int_index')
+    model_line_list = [line for line in model_line_list if not line.getEditable()]
 
     pay_sheet_line_list = []
     employee_tax_amount = 0
 
-    # initilise a dict with model_line relative url and 0 value to know
-    # if a contribution have already been calculated
-    already_calculate = dict([[model_line.getRelativeUrl(), 0] \
-        for model_line in model_line_list])
-
     # main loop : find all informations and create cell and PaySheetLines
-    for base_ordered in order_of_calculation:
     for model_line in model_line_list:
-
-        # get only not editables model lines
-        if model_line.getEditable():
-          continue
-        if model_line.getResourceValue().getBaseAmountList(base=1) and \
-            base_ordered not in \
-            model_line.getResourceValue().getBaseAmountList(base=1):
-            continue
-        if already_calculate[model_line.getRelativeUrl()]:
-          continue
-        else:
-          already_calculate[model_line.getRelativeUrl()] = 1
-        # this prevent to calculate two times the same model line if it's 
-        # resource have many Base Participation, it will be calculate 
-        # many times. 
-
       cell_list       = []
       # test with predicate if this model line could be applied
       if not model_line.test(self,):
@@ -451,8 +404,11 @@ class PaySheetTransaction(Invoice):
             cell_list.append(new_cell)
 
             #XXX this is a hack to have the net salary
+            base_list = model_line.getResourceValue().getBaseAmountList()
             if price is not None and 'employee_share' in share and\
-                  base_ordered not in ('base_salary', 'bonus') :
+                not ('base_salary' in base_list or\
+                    'bonus' in base_list or\
+                    'gross_salary' in base_list):
               employee_tax_amount += round((price * quantity), precision)
 
             # update base participation
@@ -474,7 +430,7 @@ class PaySheetTransaction(Invoice):
                 base_amount_table[column[share]][row[base_participation]] = \
                                                                       new_val
 
-            # decrease the base_application used for this model line if 
+          # decrease the base_application used for this model line 
           if cell is not None :
             base_application -= quantity