Fix warning in specific discount report (add category to query)

Add grant for default stock location in sql
This commit is contained in:
jekkos-t520 committed 2014-10-12 03:18:19 +02:00
1 parent ac667a23dc
commit de06b64e4e
3 files changed
+3 -2

No files matched your search

+1 -1
View File
@@ -790,7 +790,7 @@ class Reports extends Secure_area
foreach($report_data['details'][$key] as $drow)
{
$details_data[$key][] = array($drow['name'], $drow['category'], $drow['description'], $drow['quantity_purchased'], to_currency($drow['subtotal']), to_currency($drow['total']), to_currency($drow['tax']),/*to_currency($drow['profit']),*/ $drow['discount_percent'].'%');
$details_data[$key][] = array($drow['name'], $drow['description'], $drow['quantity_purchased'], to_currency($drow['subtotal']), to_currency($drow['total']), to_currency($drow['tax']),/*to_currency($drow['profit']),*/ $drow['discount_percent'].'%');
}
}
@@ -39,7 +39,7 @@ class Specific_discount extends Report
foreach($data['summary'] as $key=>$value)
{
$this->db->select('name, serialnumber, sales_items_temp.description, quantity_purchased, subtotal,total, tax, profit, discount_percent');
$this->db->select('name, serialnumber, category, sales_items_temp.description, quantity_purchased, subtotal,total, tax, profit, discount_percent');
$this->db->from('sales_items_temp');
$this->db->join('items', 'sales_items_temp.item_id = items.item_id');
$this->db->where('sale_id = '.$value['sale_id'] . " AND discount_percent >= " . $inputs['discount']);
+1
View File
@@ -379,6 +379,7 @@ INSERT INTO `ospos_grants` (`permission_id`, `person_id`) VALUES
('reports', 1),
('sales', 1),
('config', 1),
('items_stock', 1),
('suppliers', 1);
--