mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-26 01:53:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Made invoice optional from store config checkbox, updated and regen database script, few config fixes (#410)

Browse Source
This commit is contained in:
FrancescoUK
2016-04-24 17:11:37 +01:00
parent b88575b2a5
commit 34d09bc575
15 changed files with 247 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
application/controllers/Reports.php
View File

@@ -76,9 +76,15 @@ class Reports extends Secure_area
$report_data['employee_name'],
$report_data['supplier_name'],
to_currency($report_data['total']),
$report_data['payment_type'],
$report_data['invoice_number'],
$report_data['comment']);
$report_data['payment_type']
);
if($this->config->item('invoice_enable') == TRUE)
{
$summary_data[] = $report_data['invoice_number'];
}
$summary_data[] = $report_data['comment'];
echo get_detailed_data_row($summary_data, $this);
}
@@ -949,7 +955,35 @@ class Reports extends Secure_area
foreach($report_data['summary'] as $key=>$row)
{
$summary_data[] = array(anchor('receivings/edit/'.$row['receiving_id'], 'RECV '.$row['receiving_id'], array('class'=>'modal-dlg modal-btn-delete modal-btn-submit')), $row['receiving_date'], to_quantity_decimals($row['items_purchased']), $row['employee_name'], $row['supplier_name'], to_currency($row['total']), $row['payment_type'], $row['invoice_number'], $row['comment']);
if($this->config->item('invoice_enable') == TRUE)
{
$summary_data[] = array(
anchor('receivings/edit/'.$row['receiving_id'],
'RECV '.$row['receiving_id'],
array('class'=>'modal-dlg modal-btn-delete modal-btn-submit')),
$row['receiving_date'],
to_quantity_decimals($row['items_purchased']),
$row['employee_name'], $row['supplier_name'],
to_currency($row['total']),
$row['payment_type'],
$row['invoice_number'],
$row['comment']
);
}
else
{
$summary_data[] = array(
anchor('receivings/edit/'.$row['receiving_id'],
'RECV '.$row['receiving_id'],
array('class'=>'modal-dlg modal-btn-delete modal-btn-submit')),
$row['receiving_date'],
to_quantity_decimals($row['items_purchased']),
$row['employee_name'], $row['supplier_name'],
to_currency($row['total']),
$row['payment_type'],
$row['comment']
);
}
foreach($report_data['details'][$key] as $drow)
{