invert tax_category and salary_range and remove some unused lines

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

product/ERP5/Document/PaySheetTransaction.py

@@ -178,22 +178,12 @@ class PaySheetTransaction(Invoice):
       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,
                  }