diff --git a/application/helpers/report_helper.php b/application/helpers/report_helper.php index 7b3c21d37..191e818aa 100644 --- a/application/helpers/report_helper.php +++ b/application/helpers/report_helper.php @@ -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)') { ?>
  • diff --git a/application/libraries/Receiving_lib.php b/application/libraries/Receiving_lib.php index 38eb70358..e74040a06 100644 --- a/application/libraries/Receiving_lib.php +++ b/application/libraries/Receiving_lib.php @@ -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;