mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-05-24 16:28:40 -04:00
linked expenses with suppliers
This commit is contained in:
committed by
FrancescoUK
parent
1627a26bf6
commit
18db2e5c82
@@ -71,7 +71,7 @@ class Expense extends CI_Model
|
||||
$this->db->select('
|
||||
expenses.expense_id,
|
||||
MAX(expenses.date) AS date,
|
||||
MAX(expenses.supplier_name) AS supplier_name,
|
||||
MAX(suppliers.company_name) AS supplier_name,
|
||||
MAX(expenses.supplier_tax_code) AS supplier_tax_code,
|
||||
MAX(expenses.amount) AS amount,
|
||||
MAX(expenses.tax_amount) AS tax_amount,
|
||||
@@ -86,6 +86,7 @@ class Expense extends CI_Model
|
||||
$this->db->from('expenses AS expenses');
|
||||
$this->db->join('people AS employees', 'employees.person_id = expenses.employee_id', 'LEFT');
|
||||
$this->db->join('expense_categories AS expense_categories', 'expense_categories.expense_category_id = expenses.expense_category_id', 'LEFT');
|
||||
$this->db->join('suppliers AS suppliers', 'suppliers.person_id = expenses.supplier_id', 'INNER');
|
||||
|
||||
$this->db->group_start();
|
||||
$this->db->like('employees.first_name', $search);
|
||||
@@ -162,7 +163,8 @@ class Expense extends CI_Model
|
||||
$this->db->select('
|
||||
expenses.expense_id AS expense_id,
|
||||
expenses.date AS date,
|
||||
expenses.supplier_name AS supplier_name,
|
||||
suppliers.company_name AS supplier_name,
|
||||
expenses.supplier_id AS supplier_id,
|
||||
expenses.supplier_tax_code AS supplier_tax_code,
|
||||
expenses.amount AS amount,
|
||||
expenses.tax_amount AS tax_amount,
|
||||
@@ -178,6 +180,7 @@ class Expense extends CI_Model
|
||||
$this->db->from('expenses AS expenses');
|
||||
$this->db->join('people AS employees', 'employees.person_id = expenses.employee_id', 'LEFT');
|
||||
$this->db->join('expense_categories AS expense_categories', 'expense_categories.expense_category_id = expenses.expense_category_id', 'LEFT');
|
||||
$this->db->join('suppliers AS suppliers', 'suppliers.person_id = expenses.supplier_id', 'INNER');
|
||||
$this->db->where('expense_id', $expense_id);
|
||||
|
||||
$query = $this->db->get();
|
||||
@@ -196,6 +199,8 @@ class Expense extends CI_Model
|
||||
$expenses_obj->$field = '';
|
||||
}
|
||||
|
||||
$expenses_obj->supplier_name = '';
|
||||
|
||||
return $expenses_obj;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user