mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-07 15:23:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace serial number with item_number (barcode) in detailed reports

Browse Source
This commit is contained in:
FrancescoUK
2020-01-18 15:32:12 +00:00
parent 0de4e51c41
commit 40d8ea0268
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/controllers/Reports.php
View File

@@ -972,7 +972,7 @@ class Reports extends Secure_Controller
$details_data[$row['sale_id']][] = $this->xss_clean(array(
$drow['name'],
$drow['category'],
$drow['serialnumber'],
$drow['item_number'],
$drow['description'],
to_quantity_decimals($drow['quantity_purchased']),
to_currency($drow['subtotal']),
@@ -1084,7 +1084,7 @@ class Reports extends Secure_Controller
$details_data[$row['sale_id']][] = $this->xss_clean(array(
$drow['name'],
$drow['category'],
$drow['serialnumber'],
$drow['item_number'],
$drow['description'],
to_quantity_decimals($drow['quantity_purchased']),
to_currency($drow['subtotal']),
@@ -1193,7 +1193,7 @@ class Reports extends Secure_Controller
$details_data[$row['sale_id']][] = $this->xss_clean(array(
$drow['name'],
$drow['category'],
$drow['serialnumber'],
$drow['item_number'],
$drow['description'],
to_quantity_decimals($drow['quantity_purchased']),
to_currency($drow['subtotal']),
@@ -1414,7 +1414,7 @@ class Reports extends Secure_Controller
$details_data[$row['sale_id']][] = $this->xss_clean(array_merge(array(
$drow['name'],
$drow['category'],
$drow['serialnumber'],
$drow['item_number'],
$drow['description'],
$quantity_purchased,
to_currency($drow['subtotal']),

4
application/models/reports/Detailed_sales.php
View File

@@ -30,7 +30,7 @@ class Detailed_sales extends Report
'details' => array(
$this->lang->line('reports_name'),
$this->lang->line('reports_category'),
$this->lang->line('reports_serial_number'),
$this->lang->line('reports_item_number'),
$this->lang->line('reports_description'),
$this->lang->line('reports_quantity'),
$this->lang->line('reports_subtotal'),
@@ -144,7 +144,7 @@ class Detailed_sales extends Report
foreach($data['summary'] as $key=>$value)
{
$this->db->select('name, category, quantity_purchased, item_location, serialnumber, description, subtotal, tax, total, cost, profit, discount, discount_type, sale_status');
$this->db->select('name, category, quantity_purchased, item_location, item_number, description, subtotal, tax, total, cost, profit, discount, discount_type, sale_status');
$this->db->from('sales_items_temp');
if(count($inputs['definition_ids']) > 0)
{

4
application/models/reports/Specific_customer.php
View File

@@ -29,7 +29,7 @@ class Specific_customer extends Report
'details' => array(
$this->lang->line('reports_name'),
$this->lang->line('reports_category'),
$this->lang->line('reports_serial_number'),
$this->lang->line('reports_item_number'),
$this->lang->line('reports_description'),
$this->lang->line('reports_quantity'),
$this->lang->line('reports_subtotal'),
@@ -127,7 +127,7 @@ class Specific_customer extends Report
foreach($data['summary'] as $key=>$value)
{
$this->db->select('name, category, serialnumber, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
$this->db->select('name, category, item_number, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
$this->db->from('sales_items_temp');
$this->db->where('sale_id', $value['sale_id']);
$data['details'][$key] = $this->db->get()->result_array();

4
application/models/reports/Specific_discount.php
View File

@@ -30,7 +30,7 @@ class Specific_discount extends Report
'details' => array(
$this->lang->line('reports_name'),
$this->lang->line('reports_category'),
$this->lang->line('reports_serial_number'),
$this->lang->line('reports_item_number'),
$this->lang->line('reports_description'),
$this->lang->line('reports_quantity'),
$this->lang->line('reports_subtotal'),
@@ -121,7 +121,7 @@ class Specific_discount extends Report
foreach($data['summary'] as $key=>$value)
{
$this->db->select('name, category, serialnumber, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
$this->db->select('name, category, item_number, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
$this->db->from('sales_items_temp');
$this->db->where('sale_id', $value['sale_id']);
$data['details'][$key] = $this->db->get()->result_array();

4
application/models/reports/Specific_employee.php
View File

@@ -29,7 +29,7 @@ class Specific_employee extends Report
'details' => array(
$this->lang->line('reports_name'),
$this->lang->line('reports_category'),
$this->lang->line('reports_serial_number'),
$this->lang->line('reports_item_number'),
$this->lang->line('reports_description'),
$this->lang->line('reports_quantity'),
$this->lang->line('reports_subtotal'),
@@ -118,7 +118,7 @@ class Specific_employee extends Report
foreach($data['summary'] as $key=>$value)
{
$this->db->select('name, category, serialnumber, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
$this->db->select('name, category, item_number, description, quantity_purchased, subtotal, tax, total, cost, profit, discount, discount_type');
$this->db->from('sales_items_temp');
$this->db->where('sale_id', $value['sale_id']);
$data['details'][$key] = $this->db->get()->result_array();