Update besar apk finance

application/controllers/Neraca.php

@@ -2,7 +2,7 @@
 
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-class Neraca extends CI_Controller {
+class Neraca extends MY_Admin_Controller {
     
     public function __construct()
     {
@@ -39,6 +39,7 @@ class Neraca extends CI_Controller {
         $this->db->from('accounts');
         $this->db->join('journal_details jd','jd.account_id = accounts.id','LEFT');
         $this->db->join('journals j','j.id = jd.journal_id','LEFT');
+        $this->db->where("(j.status IN ('posted','reversed') OR jd.id IS NULL)", null, false);
 
         $this->db->where_in('accounts.tipe',['revenue','expense']);
 
@@ -88,6 +89,7 @@ class Neraca extends CI_Controller {
         $this->db->from('accounts a');
         $this->db->join('journal_details jd','jd.account_id = a.id','LEFT');
         $this->db->join('journals j','j.id = jd.journal_id','LEFT');
+        $this->db->where("(j.status IN ('posted','reversed') OR jd.id IS NULL)", null, false);
 
         $this->db->where('a.kategori','neraca');
 
@@ -129,7 +131,7 @@ class Neraca extends CI_Controller {
             }
 
             // ================= LABA BERJALAN
-            if ($r->kode_akun == '302') {
+            if ($r->kode_akun == '3020') {
                 $saldo = $laba;
             }
 
@@ -167,4 +169,4 @@ class Neraca extends CI_Controller {
             'selisih' => $total_activa - $total_pasiva
         ]);
     }
-}
+}