[Erp5-report] r18168 - /erp5/trunk/products/ERP5/Document/PaySheetTransaction.py

[nobody at svn.erp5.org]

Author: fabien
Date: Mon Dec 10 12:12:52 2007
New Revision: 18168

URL: http://svn.erp5.org?rev=18168&view=rev
Log:
invert tax_category and salary_range and remove some unused lines

Modified:
    erp5/trunk/products/ERP5/Document/PaySheetTransaction.py

Modified: erp5/trunk/products/ERP5/Document/PaySheetTransaction.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaySheetTransaction.py?rev=18168&r1=18167&r2=18168&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaySheetTransaction.py (original)
+++ erp5/trunk/products/ERP5/Document/PaySheetTransaction.py Mon Dec 10 12:12:52 2007
@@ -178,22 +178,12 @@
       model_line = paysheet.getPortalObject().restrictedTraverse(\
                                                           cell['model_line'])
       model_line_id = model_line.getId()
-      service      = model_line.getResourceValue()
-      service_id   = service.getId()
       quantity     = cell['quantity']
       price        = cell['price']
       tax_category = cell['tax_category_relative_url']
       salary_range = cell['salary_range_relative_url']
 
-      variation_category_list = model_line.getVariationCategoryList(\
-                                            base_category_list='salary_range')
-      salary_range_categories = []
-      #for category in resource_variation_category_list:
-      for category in variation_category_list:
-        if category.startswith('salary_range/'): 
-          salary_range_categories.append(category)
-
-      new_cell = { 'axe_list' : [tax_category,salary_range],
+      new_cell = { 'axe_list' : [salary_range, tax_category],
                    'quantity' : quantity,
                    'price'    : price,
                  }