X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=525c272194317093b5c48285ae19e62a2777fd76;hb=HEAD;hp=36c59f153fab4ef6b3c69b13768817ba5109417b;hpb=a5a2984d01d1a3596ff904b212f20999d5d6dbc4;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 36c59f1..525c272 100755
--- a/index.php
+++ b/index.php
@@ -216,15 +216,19 @@ class Sklad_HTML extends HTML { //TODO: Split into few more methods
 
 <style type="text/css">
 * { font-family: arial; }
-td,body { background-color: white; border: orange; }
-.tr_nobr td { border-top: 3px solid orange; }
-table { background-color: orange; border: orange; }
-td textarea { width:100%; height:100%; }
 a, a img { text-decoration:none; color: darkblue; border:none; }
 li a, a:hover { text-decoration:underline; }
+
+td,body { background-color: white; font-size: 75%; }
+table { background-color: orange; border-collapse: collapse; }
+
+td { border: 2px solid darkorange; }
+th { border: 2px solid darkorange; }
+td textarea { width:100%; height:100%; }
+
 .tr_even td { background-color: lemonchiffon; }
-.tr_nobr.tr_even td:first-child { border-left: 5px solid orange; }
-.tr_nobr.tr_odd td:first-child { border-left: 5px solid white; }
+/* table tr:nth-child(odd) td { background-color: lemonchiffon; } */
+
 .item_status_stored td { font-weight:bold; }
 .item_status_deleted td { text-decoration:line-through; }
 .item_status_destroyed td { font-style:italic; }
@@ -658,7 +662,9 @@ class Sklad_DB extends PDO {
 		);
 		$fields_search = array(
 			'item'	=> array('item_id','item_serial','model_name','barcode_name','model_descript','producer_name','vendor_name'),
-			'model' => array('model_id','model_name','barcode_name','model_descript','producer_name')
+			'barcode' => array('barcode_id','barcode_name'),
+			'model' => array('model_id','model_name','barcode_name','model_descript','producer_name'),
+			'location' => array('location_id','location_name')
 		); //TODO Autodetect
 		$group_concat = array(
 			'model' => array('barcode_name'=>'model_id')
@@ -780,7 +786,7 @@ class Sklad_DB extends PDO {
 
 	function columns_get_selectbox($columns, $class=false, $suffix_id='_id', $suffix_name='_name') {
 		$selectbox=array( //TODO: Hardcoded...
-			'model_countable' => array(0 => 'no', 1 => 'yes'),
+			'model_countable' => array(1 => 'yes'),
 			'model_eshop_hide' => array(0 => 'no', 1 => 'yes'),
 			'vendor_id' => array('COMPULSORY' => 'select...')
 		);
@@ -1052,7 +1058,8 @@ class Sklad_UI {
 	}
 
 	function check_locks() {
-		$result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+		$user = $this->db->quote($this->db->auth->get_user_id());
+		$result = $this->db->safe_query_fetch("SELECT * FROM `lock` WHERE `lock_author` != $user;");
 		if(!empty($result)) {
 			echo T('There are locks:').' '.$this->html->render_item_table($result, 'lock');
 			$this->post_redirect_get('', 'There are locks!', true);