Opraveny nesmyslny vypocty ceny nepocitatelnych polozek

diff --git a/assistants/sell.inc.php b/assistants/sell.inc.php
index 20444e06819f83f8918840bcd8dfb745d312b2e1..26f963150170a6a13b4130a04e3eaaa47d2d54a0 100644 (file)
--- a/assistants/sell.inc.php
+++ b/assistants/sell.inc.php
@@ -52,8 +52,8 @@ switch($SUBPATH[0]) {
                        echo("Stock: ".$quantity_stored."<br />Disposing/Selling: ".$quantity_removed."<br />Keeping: ".$item_quantity);
 
                        $current[$item_id]['item_quantity'] = $item_quantity;
-                       $current[$item_id]['item_price_in'] =  $item_quantity * $model_price_in;
-                       $current[$item_id]['item_price_out'] =  $item_quantity * $model_price_out;
+                       $current[$item_id]['item_price_in'] -=  $quantity_removed * $model_price_in;
+                       $current[$item_id]['item_price_out'] -=  $quantity_removed * $model_price_out;
 
                        $forked_item[$item_id]['item_id'] = '';
                        $forked_item[$item_id]['item_serial'] .= '@'.time();

diff --git a/assistants/store.inc.php b/assistants/store.inc.php
index cf482920b1001540b2a6bb24d0f4f72fc412d57f..fcc420f55aadaf440831f5a135bb02281504c7ff 100644 (file)
--- a/assistants/store.inc.php
+++ b/assistants/store.inc.php
@@ -21,6 +21,10 @@ switch($SUBPATH[0]) {
                        if($quantity_added <= 0) $this->post_redirect_get("$URL_INTERNAL/1","Can't store non-possitive amount of items!");
                        if(!is_numeric($quantity_added)) $quantity_added = 1;
                        $quantity_stored = $this->db->map_unique('item_serial', $_GET['barcode'], 'item_quantity', 'item', false);
+                       $item_price_in = $this->db->map_unique('item_serial', $_GET['barcode'], 'item_price_in', 'item', false);
+                       $item_price_out = $this->db->map_unique('item_serial', $_GET['barcode'], 'item_price_out', 'item', false);
+                       $model_price_in = $this->db->map_unique('model_barcode', $_GET['barcode'], 'model_price_in', 'model');
+                       $model_price_out = $this->db->map_unique('model_barcode', $_GET['barcode'], 'model_price_out', 'model');
                        if(!is_numeric($quantity_stored)) $quantity_stored = 0;
                        echo("Quantity stored: ".$quantity_stored);
 
@@ -39,8 +43,8 @@ switch($SUBPATH[0]) {
                        'item_serial' => $item_serial,
                        'item_quantity' => $item_quantity,
                        'status_id' => 1,
-                       'item_price_in' => $this->db->map_unique('model_barcode', $_GET['barcode'], 'model_price_in', 'model'),
-                       'item_price_out' => $this->db->map_unique('model_barcode', $_GET['barcode'], 'model_price_out', 'model'),
+                       'item_price_in' => $item_price_in + ($quantity_added * $model_price_in),
+                       'item_price_out' => $item_price_out + ($quantity_added * $model_price_out),
                        'item_author' => $this->db->auth->get_user_id()
                ));