From 54855849b30f162c453ac19f5bb5508bb3c0623d Mon Sep 17 00:00:00 2001 From: jekkos Date: Thu, 16 Apr 2015 08:31:41 +0200 Subject: [PATCH] Show item number in order report Conflicts: application/controllers/reports.php database/database.sql --- application/controllers/reports.php | 2 +- application/models/reports/detailed_receivings.php | 4 ++-- database/database.sql | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/application/controllers/reports.php b/application/controllers/reports.php index e83d7b6a9..84c139b7d 100644 --- a/application/controllers/reports.php +++ b/application/controllers/reports.php @@ -896,7 +896,7 @@ class Reports extends Secure_area foreach($report_data['details'][$key] as $drow) { - $details_data[$key][] = array($drow['name'], $drow['category'], $drow['quantity_purchased'], to_currency($drow['total']), $drow['discount_percent'].'%'); + $details_data[$key][] = array($drow['item_number'], $drow['name'], $drow['category'], $drow['quantity_purchased'], to_currency($drow['total']), $drow['discount_percent'].'%'); } } diff --git a/application/models/reports/detailed_receivings.php b/application/models/reports/detailed_receivings.php index 5a67b6278..492308ba9 100644 --- a/application/models/reports/detailed_receivings.php +++ b/application/models/reports/detailed_receivings.php @@ -10,7 +10,7 @@ class Detailed_receivings extends Report public function getDataColumns() { return array('summary' => array($this->lang->line('reports_receiving_id'), $this->lang->line('reports_date'), $this->lang->line('reports_items_received'), $this->lang->line('reports_received_by'), $this->lang->line('reports_supplied_by'), $this->lang->line('reports_total'), $this->lang->line('reports_payment_type'), $this->lang->line('recvs_invoice_number'), $this->lang->line('reports_comments')), - 'details' => array($this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_quantity_purchased'), $this->lang->line('reports_total'), $this->lang->line('reports_discount')) + 'details' => array($this->lang->line('reports_item_number'), $this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_quantity_purchased'), $this->lang->line('reports_total'), $this->lang->line('reports_discount')) ); } @@ -52,7 +52,7 @@ class Detailed_receivings extends Report foreach($data['summary'] as $key=>$value) { - $this->db->select('name, category, quantity_purchased, serialnumber,total, discount_percent'); + $this->db->select('name, item_number, category, quantity_purchased, serialnumber,total, discount_percent'); $this->db->from('receivings_items_temp'); $this->db->join('items', 'receivings_items_temp.item_id = items.item_id'); $this->db->where('receiving_id = '.$value['receiving_id']); diff --git a/database/database.sql b/database/database.sql index 03366dd13..aaed1505d 100644 --- a/database/database.sql +++ b/database/database.sql @@ -168,7 +168,6 @@ CREATE TABLE `ospos_inventory` ( CREATE TABLE `ospos_items` ( `name` varchar(255) NOT NULL, - `category` varchar(255) NOT NULL, `supplier_id` int(11) DEFAULT NULL, `item_number` varchar(255) DEFAULT NULL, `description` varchar(255) NOT NULL,