mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-20 07:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/receipt_config

Browse Source
This commit is contained in:
jekkos-t520 committed 2015-02-17 12:40:59 +01:00
2 parents 7ec4c21587 4bc1d87782
commit 2a07bbaef9
2 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

application/helpers/report_helper.php
+3 -2
View File
@@ -99,10 +99,11 @@ function show_report_if_allowed($report_prefix, $report_name, $person_id, $permi
function show_report($report_prefix, $report_name, $lang_key='')
{
$CI =& get_instance();
$report_label = $CI->lang->line(empty($lang_key) ? $report_name : $lang_key);
$lang_key = empty($lang_key) ? $report_name : $lang_key;
$report_label = $CI->lang->line($lang_key);
$report_prefix = empty($report_prefix) ? '' : $report_prefix . '_';
// no summary nor detailed reports for receivings
if (!empty($report_label))
if (!empty($report_label) && $report_label != $lang_key . ' (TBD)')
{
?>
<li><a href="<?php echo site_url('reports/' . $report_prefix . preg_replace('/reports_(.*)/', '$1', $report_name));?>"><?php echo $report_label; ?></a></li>
application/libraries/Receiving_lib.php
+1 -1
View File
@@ -366,7 +366,7 @@ class Receiving_lib
$total = 0;
foreach($this->get_cart() as $item)
{
$total += $this->get_item_total($item['quantity'], $item['price'], $item['discount']);
$total = bcadd($total, $this->get_item_total($item['quantity'], $item['price'], $item['discount']), PRECISION);
}
return $total;