modul: bug komponen tidak tetap

status: selesai
keterangan:
bug fix penyesuaian komponen dengan master komponen

application/models/payroll/data_komponen_tdk_tetap/Data_komponen_m.php

@@ -95,9 +95,9 @@ class Data_komponen_m extends CI_Model
         ')
             ->from($this->pendapatan . ' as p')
             ->join($this->master . ' as master', 'master.id_item = p.id_item')
+            ->where('master.id_company', $this->id_company)
             ->where('p.jenis_komponen', 'tidak tetap')
             ->where('p.periode', date('Y-m', strtotime('01-' . $bulan)))
-            ->where('p.id_company', $this->id_company)
             ->group_by('p.id_item')
             ->order_by('master.no_urut ASC')
             ->get()
@@ -124,9 +124,9 @@ class Data_komponen_m extends CI_Model
         ')
             ->from($this->potongan . ' as p')
             ->join($this->master . ' as master', 'master.id_item = p.id_item')
+            ->where('master.id_company', $this->id_company)
             ->where('p.jenis_komponen', 'tidak tetap')
             ->where('p.periode', date('Y-m', strtotime('01-' . $bulan)))
-            ->where('p.id_company', $this->id_company)
             ->group_by('p.id_item')
             ->order_by('master.no_urut ASC')
             ->get()
@@ -169,7 +169,7 @@ class Data_komponen_m extends CI_Model
         ')
             ->from($this->pendapatan . ' as p')
             ->join($this->master . ' as master', 'master.id_item = p.id_item')
-            ->where('p.id_company', $this->id_company)
+            ->where('master.id_company', $this->id_company)
             ->where('p.jenis_komponen', 'tidak tetap')
             ->where('p.periode', date('Y-m', strtotime('01-' . $bulan)))
             ->order_by('master.no_urut ASC')
@@ -217,7 +217,7 @@ class Data_komponen_m extends CI_Model
         ')
             ->from($this->potongan . ' as p')
             ->join($this->master . ' as master', 'master.id_item = p.id_item')
-            ->where('p.id_company', $this->id_company)
+            ->where('master.id_company', $this->id_company)
             ->where('p.jenis_komponen', 'tidak tetap')
             ->where('p.periode', date('Y-m', strtotime('01-' . $bulan)))
             ->order_by('master.no_urut ASC')