Bug: Fix Display of data relating to agent holidays on payslips

Third-Culture-Software · Dec 4, 2020 · c26bcd7 · c26bcd7
1 parent b3c5d8d
commit c26bcd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/controllers/payroll/reports/payslipGenerator.handlebars b/server/controllers/payroll/reports/payslipGenerator.handlebars
@@ -33,8 +33,8 @@
             <th style="background-color:#efefef;" class="text-center" colspan="5"> <strong> {{translate 'TABLE.COLUMNS.BASIC_SALARY'}} </strong></th>
           </tr>
           <tr>
-            <td style="width: 40%;">{{translate "TABLE.COLUMNS.RUBRICS"}}</td>
-            <td style="width: 5%;" class="text-center">{{translate 'TABLE.COLUMNS.RATE'}} ( % )</td>
+            <td style="width: 37%;">{{translate "TABLE.COLUMNS.RUBRICS"}}</td>
+            <td style="width: 8%;" class="text-center">{{translate 'TABLE.COLUMNS.RATE'}} ( % )</td>
             <td style="width: 5%;" class="text-center">{{translate 'TABLE.COLUMNS.DAYS'}} </td>       
             <td style="width: 25%;" class="text-center">{{translate 'TABLE.COLUMNS.DAILY_RATE'}} </td>
             <td style="width: 25%;" class="text-center"> {{translate "TABLE.COLUMNS.RESULT"}}</td>

diff --git a/server/controllers/payroll/reports/payslipGenerator.js b/server/controllers/payroll/reports/payslipGenerator.js
@@ -235,13 +235,13 @@ function build(req, res, next) {
         });
         TotalChargeEnterprise += somChargeEnterprise;
         holidays.forEach(holiday => {
-          if (employee.uuid === holiday.paiement_uuid) {
+          if (employee.paiement_uuid === holiday.paiement_uuid) {
             holiday.dailyRate = holiday.value / holiday.holiday_nbdays;
             employee.holidaysPaid.push(holiday);
           }
         });
         offDays.forEach(offDay => {
-          if (employee.uuid === offDay.paiement_uuid) {
+          if (employee.paiement_uuid === offDay.paiement_uuid) {
             employee.offDaysPaid.push(offDay);
           }
         });