From 9f7831bafe628932a9a7cdb207518752c4908b7d Mon Sep 17 00:00:00 2001
From: gamonoid <contact@gamonoid.com>
Date: Sun, 8 Oct 2017 16:51:05 +0200
Subject: [PATCH] Order payroll columns by calculation group

---
 admin/payroll/index.php | 2 +-
 admin/payroll/lib.js    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/admin/payroll/index.php b/admin/payroll/index.php
index ddccd7e8..2f5d348f 100644
--- a/admin/payroll/index.php
+++ b/admin/payroll/index.php
@@ -109,7 +109,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
     modJsList['tabPayrollData'].setColumnFieldName('payroll_item');
     modJsList['tabPayrollData'].setTables('PayrollEmployee','PayrollColumn','PayrollData');
 
-    modJsList['tabPayrollColumn'] = new PayrollColumnAdapter('PayrollColumn','PayrollColumn','','name, colorder');
+    modJsList['tabPayrollColumn'] = new PayrollColumnAdapter('PayrollColumn','PayrollColumn','','deduction_group, colorder');
     modJsList['tabPayrollColumn'].setRemoteTable(true);
     //modJsList['tabPayrollColumnTemplate'] = new PayrollColumnTemplateAdapter('PayrollColumnTemplate','PayrollColumnTemplate');
 
diff --git a/admin/payroll/lib.js b/admin/payroll/lib.js
index b3ce4a8b..5a5752bd 100644
--- a/admin/payroll/lib.js
+++ b/admin/payroll/lib.js
@@ -297,6 +297,7 @@ PayrollColumnAdapter.method('getDataMapping', function() {
         "name",
         "colorder",
         "calculation_hook",
+        "deduction_group",
         "editable",
         "enabled"
     ];
@@ -308,6 +309,7 @@ PayrollColumnAdapter.method('getHeaders', function() {
         { "sTitle": "Name"},
         { "sTitle": "Column Order"},
         { "sTitle": "Calculation Method"},
+        { "sTitle": "Calculation Group"},
         { "sTitle": "Editable"},
         { "sTitle": "Enabled"}
     ];
@@ -334,6 +336,7 @@ PayrollColumnAdapter.method('getFormFields', function() {
         [ "id", {"label":"ID","type":"hidden"}],
         [ "name", {"label":"Name","type":"text","validation":""}],
         [ "calculation_hook", {"label":"Predefined Calculations","type":"select2","allow-null":true,"null-label":"None","remote-source":["CalculationHook","code","name"]}],
+        [ "deduction_group", {"label":"Calculation Group","type":"select2","allow-null":true,"null-label":"Common","remote-source":["DeductionGroup","id","name"]}],
         [ "salary_components", {"label":"Salary Components","type":"select2multi","remote-source":["SalaryComponent","id","name"]}],
         [ "deductions", {"label":"Calculation Method","type":"select2multi","remote-source":["Deduction","id","name"]}],
         [ "add_columns", {"label":"Columns to Add","type":"select2multi","remote-source":["PayrollColumn","id","name"]}],
@@ -347,6 +350,12 @@ PayrollColumnAdapter.method('getFormFields', function() {
     ];
 });
 
+PayrollColumnAdapter.method('getFilters', function() {
+    return [
+        [ "deduction_group", {"label":"Calculation Group","type":"select2","allow-null":true,"null-label":"Any","remote-source":["DeductionGroup","id","name"]}]
+    ];
+});
+