X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=bde06e22ade0f6352d9fcb66af3954920e30d8d3;hb=f4737ea725de62440c8bf58a7b4d7b187268fe93;hp=6362fe74a51e444bbf6b3e9a0ff7e829b091360b;hpb=8864b1ec0fd3321e510511ef22614bc36845540e;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 6362fe74..bde06e22 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -710,17 +710,20 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
 	$sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit,
 			 i.inactive
 			FROM
+			".TB_PREF."stock_master s,
 			".TB_PREF."item_codes i
 			LEFT JOIN
 			".TB_PREF."stock_category c
-			ON i.category_id=c.category_id";
+			ON i.category_id=c.category_id
+			WHERE i.stock_id=s.stock_id";
 
+	
 	if ($type == 'local')	{ // exclude foreign codes
-		$sql .=	" WHERE !i.is_foreign"; 
+		$sql .=	" AND !i.is_foreign"; 
 	} elseif ($type == 'kits') { // sales kits
-		$sql .=	" WHERE !i.is_foreign AND i.item_code!=i.stock_id";
+		$sql .=	" AND !i.is_foreign AND i.item_code!=i.stock_id";
 	}
-	$sql .= " AND !i.inactive";
+	$sql .= " AND !i.inactive AND !s.inactive AND !s.no_sale";
 	$sql .= " GROUP BY i.item_code";
 
 	return combo_input($name, $selected_id, $sql, 'i.item_code', 'c.description',
@@ -1872,6 +1875,32 @@ function systypes_list_cells($label, $name, $value=null, $submit_on_change=false
 	return $str;
 }
 
+function journal_types_list_cells($label, $name, $value=null, $submit_on_change=false)
+{
+	global $systypes_array;
+
+	if ($label != null)
+		echo "<td>$label</td>\n";
+	echo "<td>";
+
+	$items = array();
+	foreach ($systypes_array as $key=>$type)
+		// exclude orders and dimensions
+		if (!in_array($key, array(18,26,30,40)))
+			$items[$key] = $type['name'];
+	
+	$str = array_selector($name, $value, $items, 
+		array( 
+			'spec_option'=> _("All"),
+			'spec_id' => -1,
+			'select_submit'=> $submit_on_change,
+			'async' => false
+			)
+	);
+	echo "</td>\n";
+	return $str;
+}
+
 function systypes_list_row($label, $name, $value=null, $submit_on_change=false)
 {
 	echo "<tr>\n";