Fix: Changed formula of Service Charge to update the new way of keeping accounts

Fix: Changed the limit of ESI in line with govt. regulations

brewman/views/services/voucher/__init__.py

@@ -330,7 +330,7 @@ def service_charge_employees(date, dbsession):
         .filter(Voucher.type != VoucherType.by_name('Issue').id) \
         .filter(Journal.account_id == Account.service_charge_id()) \
         .scalar()
-    amount = 0 if amount is None else amount * Decimal(.7) * Decimal(.9) * -1
+    amount = 0 if amount is None else amount * Decimal(.9) * -1
     return details, amount
 
 

brewman/views/services/voucher/salary_deduction.py

@@ -91,7 +91,7 @@ def add_salary_deduction(item, days_in_month, voucher, dbsession):
 
 
 def esi_contribution(gross_salary, days_worked, days_in_month):
-    limit = 15000
+    limit = 21000
     employee_rate = .0175
     employer_rate = .0475
     employee = 0 if gross_salary > limit else ceil(employee_rate * gross_salary * days_worked / days_in_month)

brewman/views/services/voucher/service_charge.py

@@ -18,7 +18,7 @@ def service_charge_create_voucher(json, user, dbsession):
 
     employees = get_employees(get_first_day(date), date + datetime.timedelta(1), json['incentives'],
                               dbsession=dbsession)
-    amount = balance(date, dbsession=dbsession) * Decimal(.7) * Decimal(.9)
+    amount = balance(date, dbsession=dbsession) * Decimal(.9)
 
     total_points = 0
     for item in employees:
@@ -59,7 +59,7 @@ def service_charge_update_voucher(voucher, json, user, dbsession):
         voucher.journals,
         dbsession=dbsession
     )
-    amount = balance(date, voucher.id, dbsession) * Decimal(.7) * Decimal(.9)
+    amount = balance(date, voucher.id, dbsession) * Decimal(.9)
 
     total_points = 0
     for item in employees:

overlord/src/app/employee-benefits/employee-benefits.component.ts

@@ -150,7 +150,7 @@ export class EmployeeBenefitsComponent implements OnInit, AfterViewInit {
   }
 
   getEsi(grossSalary, daysWorked, daysInMonth) {
-    const limit = 15000,
+    const limit = 21000,
       employeeRate = 0.0175,
       employerRate = 0.0475,
       employee = (grossSalary > limit) ? 0 : Math.ceil(employeeRate * grossSalary * daysWorked / daysInMonth),