minor fix

payroll.py

@@ -331,8 +331,7 @@ class Payroll(Workflow, ModelSQL, ModelView):
             if not line.wage_type:
                 continue
             if line.wage_type.expense_formula:
-                salary_args = self.get_salary_full(line.wage_type)
-                expense = line.wage_type.compute_expense(salary_args)
+                expense = line.get_expense_amount()
 
             if line.wage_type.definition == 'payment':
                 amount_debit = line.amount + expense
@@ -413,17 +412,19 @@ class Payroll(Workflow, ModelSQL, ModelView):
         config = Pool().get('staff.configuration')(1)
         values = []
         salary_args = {}
+        salary_in_date = self.contract.get_salary_in_date(
+            self.end)
         for wage, party in wages:
             if wage.salary_constitute:
                 if wage.amount_required:
                     salary_args = self.get_salary_full(wage)
                 else:
-                    salary_args['salary'] = self.employee.salary
+                    salary_args['salary'] = salary_in_date
             else:
                 salary_args = self.get_salary_full(wage)
 
             if config and config.minimum_salary and wage.type_concept == 'transport' and \
-                self.employee.salary >= (config.minimum_salary * 2):
+                salary_in_date >= (config.minimum_salary * 2):
                 unit_value = 0
             else:
                 unit_value = wage.compute_unit_price(salary_args)
@@ -436,7 +437,7 @@ class Payroll(Workflow, ModelSQL, ModelView):
                 qty = self.get_line_quantity(wage, self.start, self.end,
                     extras, discount)
             values.append(self.get_line(wage, qty, unit_value, party))
-        print(values)
+
         PayrollLine.create(values)
 
     def set_preliquidation(self, extras, discounts=None):
@@ -733,6 +734,13 @@ class PayrollLine(ModelSQL, ModelView):
             move_line['credit'] += values['credit']
         return move_line
 
+    def get_expense_amount(self):
+        expense = 0
+        if self.wage_type.expense_formula:
+            salary_args = self.payroll.get_salary_full(self.wage_type)
+            expense = self.wage_type.compute_expense(salary_args)
+        return expense
+
 
 class PayrollReport(CompanyReport):
     __name__ = 'staff.payroll'