X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_lists.inc;h=bde06e22ade0f6352d9fcb66af3954920e30d8d3;hb=f4737ea725de62440c8bf58a7b4d7b187268fe93;hp=1ef967057fddcb47b096ad48ce8abe83cd2dbaa4;hpb=e1c41b82acc4ea68f59acb1f70b12800c0c7683d;p=fa-stable.git
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 1ef96705..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 | ";
@@ -364,7 +364,8 @@ function _format_add_curr($row)
'' : (" - " . $row[2]));
}
-function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
+function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
+ $all=false)
{
global $all_items;
@@ -383,15 +384,17 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
'select_submit'=> $submit_on_change,
'async' => false,
'sel_hint' => $mode ? _('Press Space tab to filter by name fragment') :
- _('Select supplier')
+ _('Select supplier'),
+ 'show_inactive'=>$all
));
}
-function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function supplier_list_cells($label, $name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $all=false)
{
if ($label != null)
echo "$label | \n";
- $str = supplier_list($name, $selected_id, $all_option, $submit_on_change);
+ $str = supplier_list($name, $selected_id, $all_option, $submit_on_change, $all);
echo " | \n";
return $str;
}
@@ -648,7 +651,8 @@ function dimensions_list_row($label, $name, $selected_id=null, $no_option=false,
//---------------------------------------------------------------------------------------------------
-function stock_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false, $opts=array())
+function stock_items_list($name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $opts=array())
{
global $all_items;
@@ -676,12 +680,13 @@ function _format_stock_items($row)
return (user_show_codes() ? ($row[0] . " - ") : "") . $row[1];
}
-function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $all=false)
{
if ($label != null)
echo "$label | \n";
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('cells'=>true));
+ array('cells'=>true, 'show_inactive'=>$all));
return $str;
}
/*
@@ -705,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 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',
@@ -879,16 +887,17 @@ function stock_costable_items_list_cells($label, $name, $selected_id=null,
//------------------------------------------------------------------------------------
function stock_purchasable_items_list($name, $selected_id=null,
- $all_option=false, $submit_on_change=false)
+ $all_option=false, $submit_on_change=false, $all=false)
{
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
array('where'=>array("mb_flag!= 'M'"),
- 'edit_submit' => true));
+ 'edit_submit' => true,
+ 'show_inactive'=>$all));
return $str;
}
function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
- $all_option=false, $submit_on_change=false)
+ $all_option=false, $submit_on_change=false, $all=false)
{
if ($label != null)
echo "$label | \n";
@@ -1556,7 +1565,7 @@ function gl_account_types_list_row($label, $name, $selected_id=null, $all_option
//-----------------------------------------------------------------------------------------------
function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false,
- $cells=false, $all_option=false, $submit_on_change=false)
+ $cells=false, $all_option=false, $submit_on_change=false, $all=false)
{
if ($skip_bank_accounts)
$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive
@@ -1583,7 +1592,8 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
'cells' => true,
'select_submit'=> $submit_on_change,
'async' => false,
- 'category' => 2
+ 'category' => 2,
+ 'show_inactive' => $all
) );
}
@@ -1594,13 +1604,14 @@ function _format_account($row)
}
function gl_all_accounts_list_cells($label, $name, $selected_id=null,
- $skip_bank_accounts=false, $cells=false, $all_option=false)
+ $skip_bank_accounts=false, $cells=false, $all_option=false,
+ $submit_on_change=false, $all=false)
{
if ($label != null)
echo "$label | \n";
echo "";
gl_all_accounts_list($name, $selected_id,
- $skip_bank_accounts, $cells, $all_option);
+ $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all);
echo " | \n";
}
@@ -1864,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";