X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=assistants%2Fstore.inc.php;h=6c11653b8554f44d2767586e947b30017fa3ce95;hb=eca3fc1db94c023c08354046b96cca0401fc49fc;hp=7b9bf27c65ae543eaba58fc8b2aceb4ea8c1f592;hpb=ea921a95b65ffaae5b008f864494553d73289612;p=mirrors%2FSokoMan.git

diff --git a/assistants/store.inc.php b/assistants/store.inc.php
index 7b9bf27..6c11653 100644
--- a/assistants/store.inc.php
+++ b/assistants/store.inc.php
@@ -5,24 +5,27 @@ switch($SUBPATH[0]) {
 		echo $this->html->form("$URL/2", 'GET', array(
 			array('barcode',$barcode,'text',false,'autofocus','model_barcode:'),
 			array('quantity','1','text',false,false,'quantity:'),
-			array('serials',$barcode,'textarea',false,'autofocus','serial(s):'),
+			array('serials','','textarea',false,'autofocus','serial(s):'),
 			array(false,'STORE','submit')
 		));
 		break;
 	case 2:
 		$barcode=$_GET['barcode'];
-		$countable = $this->db->map_unique('model_barcode', $barcode, 'model_countable', 'model');
+
+		$barcode_id = $this->db->map_unique('barcode_name', $barcode, 'barcode_id', 'barcode');
+		$model_id = $this->db->map_unique('barcode_id', $barcode_id, 'model_id', 'barcode');
+		$model_price_in = $this->db->map_unique('model_id', $model_id, 'model_price_in', 'model');
+		$model_price_out = $this->db->map_unique('model_id', $model_id, 'model_price_out', 'model');
+		$item_price_in = $this->db->map_unique('item_serial', $barcode, 'item_price_in', 'item', false);
+		$item_price_out = $this->db->map_unique('item_serial', $barcode, 'item_price_out', 'item', false);
+
+		$countable = $this->db->map_unique('model_id', $model_id, 'model_countable', 'model');
 
 		$serials=explode("\n",trim($_GET['serials']));
 		if(!$countable || trim($_GET['serials']) == '') $serials = array('');
 
 		foreach($serials as $serial) {
 			$serial=trim($serial);
-			$model_id = $this->db->map_unique('model_barcode', $barcode, 'model_id', 'model');
-			$item_price_in = $this->db->map_unique('item_serial', $barcode, 'item_price_in', 'item', false);
-			$item_price_out = $this->db->map_unique('item_serial', $barcode, 'item_price_out', 'item', false);
-			$model_price_in = $this->db->map_unique('model_barcode', $barcode, 'model_price_in', 'model');
-			$model_price_out = $this->db->map_unique('model_barcode', $barcode, 'model_price_out', 'model');
 
 			$disable_cols = array('status_id','item_price_out','item_customer', 'model_id','item_quantity','item_date_sold');
 			if($countable) {
@@ -52,7 +55,7 @@ switch($SUBPATH[0]) {
 			//print_r(array('<pre>', $selectbox));
 			//foreach($selectbox['model_id'] as $id => $name) if($id != $model_id) unset($selectbox['model_id'][$id]);
 			$current = array(array(
-				'model_id' => $model_id,
+				'barcode_id' => $barcode_id,
 				'item_serial' => $item_serial,
 				'item_quantity' => $item_quantity,
 				'status_id' => 1,