diff --git a/application/language/ar-EG/reports_lang.php b/application/language/ar-EG/reports_lang.php index 0d8469e93..1882fe6c9 100644 --- a/application/language/ar-EG/reports_lang.php +++ b/application/language/ar-EG/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "السعر"; $lang["reports_used"] = "النقاط المستخدمة"; $lang["reports_work_orders"] = "طلبات عمل"; $lang["reports_zero_and_less"] = "صفر و أقل"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/az-AZ/reports_lang.php b/application/language/az-AZ/reports_lang.php index 943acbaf9..782ef1dd4 100644 --- a/application/language/az-AZ/reports_lang.php +++ b/application/language/az-AZ/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Pərakəndə Qiyməti"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = "İstifadə Olunan Ballar"; $lang["reports_zero_and_less"] = "Sıfır və Aşağı"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/bg/reports_lang.php b/application/language/bg/reports_lang.php index e3e874b8d..718865648 100644 --- a/application/language/bg/reports_lang.php +++ b/application/language/bg/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Retail Price"; $lang["reports_used"] = "Points Used"; $lang["reports_work_orders"] = "Work Orders"; $lang["reports_zero_and_less"] = "Zero and less"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/de-CH/reports_lang.php b/application/language/de-CH/reports_lang.php index e891115cc..c0a625ec5 100644 --- a/application/language/de-CH/reports_lang.php +++ b/application/language/de-CH/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Verkaufspreis"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = "Null und weniger"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/de/reports_lang.php b/application/language/de/reports_lang.php index d31e3047d..c7a26d97a 100644 --- a/application/language/de/reports_lang.php +++ b/application/language/de/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Verkaufspreis"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = "Null und weniger"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/en-GB/reports_lang.php b/application/language/en-GB/reports_lang.php index b3bbe16fe..f1421885a 100644 --- a/application/language/en-GB/reports_lang.php +++ b/application/language/en-GB/reports_lang.php @@ -119,3 +119,5 @@ $lang["reports_unit_price"] = "Sell Price"; $lang["reports_used"] = "Points Used"; $lang["reports_work_orders"] = "Work Orders"; $lang["reports_zero_and_less"] = "Zero and Less"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/en-US/reports_lang.php b/application/language/en-US/reports_lang.php index 7ecbbd89f..a09100681 100644 --- a/application/language/en-US/reports_lang.php +++ b/application/language/en-US/reports_lang.php @@ -119,3 +119,5 @@ $lang["reports_unit_price"] = "Retail Price"; $lang["reports_used"] = "Points Used"; $lang["reports_work_orders"] = "Work Orders"; $lang["reports_zero_and_less"] = "Zero and less"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/es/reports_lang.php b/application/language/es/reports_lang.php index 18220447f..fe5d33257 100644 --- a/application/language/es/reports_lang.php +++ b/application/language/es/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Precio de Venta"; $lang["reports_used"] = "Puntos usados"; $lang["reports_work_orders"] = "Ordenes"; $lang["reports_zero_and_less"] = "Cero y negativos"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/fr/reports_lang.php b/application/language/fr/reports_lang.php index 4c9310092..a447e43c2 100644 --- a/application/language/fr/reports_lang.php +++ b/application/language/fr/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Prix au Détail"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = "Zéro ou moin"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/hr-HR/reports_lang.php b/application/language/hr-HR/reports_lang.php index 90a2f9e02..ee0c9b270 100644 --- a/application/language/hr-HR/reports_lang.php +++ b/application/language/hr-HR/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Jedinična cijena"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = "Nula i manje"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/hu-HU/reports_lang.php b/application/language/hu-HU/reports_lang.php index 5ce0ca051..35c4d9aba 100644 --- a/application/language/hu-HU/reports_lang.php +++ b/application/language/hu-HU/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Kisker. ár"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = "Nulla és kevesebb"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/id/reports_lang.php b/application/language/id/reports_lang.php index ff28ea69c..6cd6c5588 100644 --- a/application/language/id/reports_lang.php +++ b/application/language/id/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Harga Jual"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = "Stok habis dan minus"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/it/reports_lang.php b/application/language/it/reports_lang.php index 637b08263..0d45d36a9 100644 --- a/application/language/it/reports_lang.php +++ b/application/language/it/reports_lang.php @@ -121,3 +121,5 @@ $lang["reports_unit_price"] = "Prezzo al dettaglio"; $lang["reports_used"] = "Punti Usati"; $lang["reports_work_orders"] = "Ordini di lavoro"; $lang["reports_zero_and_less"] = "Zero e meno"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/km/reports_lang.php b/application/language/km/reports_lang.php index caf0c0b0b..49f468fb3 100644 --- a/application/language/km/reports_lang.php +++ b/application/language/km/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = ""; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = ""; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/lo/reports_lang.php b/application/language/lo/reports_lang.php index e3e874b8d..718865648 100644 --- a/application/language/lo/reports_lang.php +++ b/application/language/lo/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Retail Price"; $lang["reports_used"] = "Points Used"; $lang["reports_work_orders"] = "Work Orders"; $lang["reports_zero_and_less"] = "Zero and less"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/nl-BE/reports_lang.php b/application/language/nl-BE/reports_lang.php index e77a52476..d43af7ec0 100755 --- a/application/language/nl-BE/reports_lang.php +++ b/application/language/nl-BE/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Verkoopprijs"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = "Nul en minder"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/pt-BR/reports_lang.php b/application/language/pt-BR/reports_lang.php index 8c4a42bb1..bae693b94 100644 --- a/application/language/pt-BR/reports_lang.php +++ b/application/language/pt-BR/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Preço Varejo"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = "Zero e menor"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/ru/reports_lang.php b/application/language/ru/reports_lang.php index 5ec4f1b1c..68bd34eeb 100644 --- a/application/language/ru/reports_lang.php +++ b/application/language/ru/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Розничная Цена"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = ""; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/sv/reports_lang.php b/application/language/sv/reports_lang.php index 8e5d1c4dc..a404682a9 100644 --- a/application/language/sv/reports_lang.php +++ b/application/language/sv/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Försäljningspris"; $lang["reports_used"] = "Poäng som använts"; $lang["reports_work_orders"] = "Arbetsorders"; $lang["reports_zero_and_less"] = "Noll eller mindre"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/th/reports_lang.php b/application/language/th/reports_lang.php index 0d07be78e..33760f83e 100644 --- a/application/language/th/reports_lang.php +++ b/application/language/th/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "ราคาขาย"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = "Zero and less"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/tr/reports_lang.php b/application/language/tr/reports_lang.php index f3e908148..4b49c501a 100644 --- a/application/language/tr/reports_lang.php +++ b/application/language/tr/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Satış Fiyatı"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = "Sıfır ve sıfırdan az"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/vi/reports_lang.php b/application/language/vi/reports_lang.php index abefe2e94..b6daec451 100644 --- a/application/language/vi/reports_lang.php +++ b/application/language/vi/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "Giá bán lẻ"; $lang["reports_used"] = "Các điểm bán hàng đã dùng"; $lang["reports_work_orders"] = "Giấy giao việc"; $lang["reports_zero_and_less"] = "Không hay nhỏ hơn"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/language/zh/reports_lang.php b/application/language/zh/reports_lang.php index 758d40e09..239b46a8f 100755 --- a/application/language/zh/reports_lang.php +++ b/application/language/zh/reports_lang.php @@ -118,3 +118,5 @@ $lang["reports_unit_price"] = "單價"; $lang["reports_used"] = ""; $lang["reports_work_orders"] = ""; $lang["reports_zero_and_less"] = "Zero and less"; +$lang["reports_total_retail"] = "Total Inv. Retail Value"; +$lang["reports_total_quantity"] = "Total Quantity"; \ No newline at end of file diff --git a/application/models/reports/Inventory_summary.php b/application/models/reports/Inventory_summary.php index 90bdf534e..51c4e2004 100644 --- a/application/models/reports/Inventory_summary.php +++ b/application/models/reports/Inventory_summary.php @@ -54,11 +54,13 @@ class Inventory_summary extends Report */ public function getSummaryData(array $inputs) { - $return = array('total_inventory_value' => 0); + $return = array('total_inventory_value' => 0, 'total_quantity' => 0, 'total_retail' => 0); foreach($inputs as $input) { $return['total_inventory_value'] += $input['sub_total_value']; + $return['total_quantity'] += $input['quantity']; + $return['total_retail'] += $input['unit_price'] * $input['quantity']; } return $return; diff --git a/application/views/reports/tabular.php b/application/views/reports/tabular.php index 26694d3f2..201db745f 100644 --- a/application/views/reports/tabular.php +++ b/application/views/reports/tabular.php @@ -15,10 +15,19 @@