X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_lists.inc;h=bde06e22ade0f6352d9fcb66af3954920e30d8d3;hb=a1e0df1ef259550f26bc150cf912fd518c7344e3;hp=8f10f156f5913bc79bb114506afa9835cb946a2e;hpb=0b253e5e0d23400838d3bfb4f27fb3fb2637b3ab;p=fa-stable.git
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 8f10f156..bde06e22 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -243,7 +243,7 @@ $opts = array( // default options
$search_submit)."\n";
}
}
- default_focus($search_box ? $search_box : $name);
+ default_focus(($search_box && $by_id) ? $search_box : $name);
$str = $selector;
if ($search_box && $opts['cells'])
echo ($edit_entry!='' ? "
$edit_entry | " : '')."$selector | ";
@@ -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 "$label | \n";
+ echo "";
+
+ $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 " | \n";
+ return $str;
+}
+
function systypes_list_row($label, $name, $value=null, $submit_on_change=false)
{
echo "\n";