Commit ba85a5db by Lalang Trendy Buana Committed by nurchamim

modul: bug payroll hitung gaji

status: selesai
keterangan: bug fix potongan komponen tidak tetap yang tidak masuk dalam hitungan pph21
parent 3de0e652
...@@ -707,11 +707,11 @@ class Gaji_m extends CI_Model ...@@ -707,11 +707,11 @@ class Gaji_m extends CI_Model
ppt.id_karyawan, ppt.id_karyawan,
ppt.id_item, ppt.id_item,
ppt.flag_pph21, ppt.flag_pph21,
SUM(nominal_potongan) as nominal nominal_potongan as nominal
"); ");
$this->db->join("data_karyawan as dk", "dk.id_karyawan = ppt.id_karyawan"); $this->db->join("data_karyawan as dk", "dk.id_karyawan = ppt.id_karyawan");
$this->db->where("ppt.id_company", $this->id_company); $this->db->where("ppt.id_company", $this->id_company);
$this->db->group_by("ppt.id_karyawan"); // $this->db->group_by("ppt.id_karyawan");
$this->db->order_by("ppt.id_karyawan", "ASC"); $this->db->order_by("ppt.id_karyawan", "ASC");
$select_pot_tetap = $this->db->get("payroll_pot_tetap_m as ppt")->result(); $select_pot_tetap = $this->db->get("payroll_pot_tetap_m as ppt")->result();
...@@ -743,12 +743,12 @@ class Gaji_m extends CI_Model ...@@ -743,12 +743,12 @@ class Gaji_m extends CI_Model
pptt.id_karyawan, pptt.id_karyawan,
pptt.id_item, pptt.id_item,
pptt.flag_pph21, pptt.flag_pph21,
SUM(nominal_potongan) as nominal pptt.nominal_potongan as nominal
"); ");
$this->db->join("data_karyawan as dk", "dk.id_karyawan = pptt.id_karyawan"); $this->db->join("data_karyawan as dk", "dk.id_karyawan = pptt.id_karyawan");
$this->db->where("pptt.periode", $bulan); $this->db->where("pptt.periode", $bulan);
$this->db->where("pptt.id_company", $this->id_company); $this->db->where("pptt.id_company", $this->id_company);
$this->db->group_by("pptt.id_karyawan"); // $this->db->group_by("pptt.id_karyawan");
$this->db->order_by("pptt.id_karyawan", "ASC"); $this->db->order_by("pptt.id_karyawan", "ASC");
$select_pot_tdk_tetap = $this->db->get("payroll_pot_tdk_tetap_m as pptt")->result(); $select_pot_tdk_tetap = $this->db->get("payroll_pot_tdk_tetap_m as pptt")->result();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment