From 752f43a3cd8a9f6ac0dce0fc13be2807f0004fe7 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 13 Jun 2018 15:01:08 +0530 Subject: [PATCH] advance payment and receipt --- application/config/constants.php | 6 ++++++ application/models/cashbook_model.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/application/config/constants.php b/application/config/constants.php index bd5fd9de..2c7488c7 100755 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -338,5 +338,11 @@ define('RawMaterial', 'Raw Material'); define('Packingmaterial', 'Packing material'); define('FinalProduct', 'Final Product'); + + +//Adavnce Payments and Receipts +define('Apayment', '0009'); +define('AReceipt', '0013'); + /* End of file constants.php */ /* Location: ./application/config/constants.php */ diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php index c66435c0..67be6b3d 100755 --- a/application/models/cashbook_model.php +++ b/application/models/cashbook_model.php @@ -133,7 +133,7 @@ function finyear(){ $this->db->join('T_Employee_Details','tbl_users.EmpID=T_Employee_Details.EmpID','left'); $this->db->join('T_SupplierDetailsN','T_SupplierDetailsN.SupplierID=t_income_expense.Supplier_id' ); $this->db->order_by("date","desc"); - $this->db->where('t_accountcode.code','ADV003'); + $this->db->where_in('t_accountcode.code',[AReceipt,Apayment]); if(!empty($i)) { $this->db->where('t_income_expense.id',$i);