X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=b2332aeab064e42ad5981ff045a663fde8260c03;hb=cf7be1f00c6abe59755286e0c3108d9d3c0356da;hp=8f10f156f5913bc79bb114506afa9835cb946a2e;hpb=0b253e5e0d23400838d3bfb4f27fb3fb2637b3ab;p=fa-stable.git
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 8f10f156..b2332aea 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -41,7 +41,6 @@ $opts = array( // default options
// submit on select parameters
'default' => '', // default value when $_POST is not set
'select_submit' => false, //submit on select: true/false
- 'edit_submit' => false, // call editor on F4
'async' => true, // select update via ajax (true) vs _page_body reload
// search box parameters
'sel_hint' => null,
@@ -69,7 +68,7 @@ $opts = array( // default options
$search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box'];
$search_submit = $opts['search_submit']===true ? '_'.$name.'_button' : $opts['search_submit'];
- $select_submit = $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit'];
+ $select_submit = $opts['select_submit'];
$spec_id = $opts['spec_id'];
$spec_option = $opts['spec_option'];
$by_id = ($opts['type'] == 0);
@@ -95,7 +94,7 @@ $opts = array( // default options
$rel = '';
$limit = '';
- if (isset($_POST[$select_submit])) {
+ if (isset($_POST['_'.$name.'_update'])) {
if ($by_id) $txt = $_POST[$name];
if (!$opts['async'])
@@ -209,9 +208,8 @@ $opts = array( // default options
$txt = $found;
$Ajax->addUpdate($name, $search_box, $txt ? $txt : '');
}
- $aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
$selector = "\n";
+ . $opts['sel_hint']."' $rel>".$selector."\n";
$Ajax->addUpdate($name, "_{$name}_sel", $selector);
@@ -224,7 +222,7 @@ $opts = array( // default options
// button class selects form reload/ajax selector update
$selector .= sprintf($_select_button, $disabled, user_theme(),
(fallback_mode() ? '' : 'display:none;'),
- $select_submit)."\n";
+ '_'.$name.'_update')."\n";
}
// ------ make combo ----------
@@ -243,7 +241,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 | ";
@@ -274,7 +272,6 @@ $opts = array( // default options
'spec_option'=>false, // option text or false
'spec_id' => 0, // option id
'select_submit' => false, //submit on select: true/false
- 'edit_submit' => false, // call editor on F4
'async' => true, // select update via ajax (true) vs _page_body reload
'default' => '', // default value when $_POST is not set
// search box parameters
@@ -284,7 +281,7 @@ $opts = array( // default options
// ------ merge options with defaults ----------
if($options != null)
$opts = array_merge($opts, $options);
- $select_submit = $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit'];
+ $select_submit = $opts['select_submit'];
$spec_id = $opts['spec_id'];
$spec_option = $opts['spec_option'];
$disabled = $opts['disabled'] ? "disabled" : '';
@@ -293,7 +290,7 @@ $opts = array( // default options
$selected_id = get_post($name, $opts['default']);
}
- if (isset($_POST[$select_submit])) {
+ if (isset($_POST[ '_'.$name.'_update'])) {
if (!$opts['async'])
$Ajax->activate('_page_body');
else
@@ -307,7 +304,7 @@ $opts = array( // default options
//if($name=='SelectStockFromList') display_error($sql);
foreach($items as $value=>$descr) {
$sel = '';
- if ($selected_id == $value) {
+ if ((string)$selected_id === (string)$value) {
$sel = 'selected';
$found = $value;
}
@@ -328,12 +325,12 @@ $opts = array( // default options
}
if ($found === false) {
- $_POST[$name] = $first_id;
+ $selected_id = $first_id;
}
+ $_POST[$name] = $selected_id;
- $aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
$selector = "\n";
+ . $opts['sel_hint']."'>".$selector."\n";
$Ajax->addUpdate($name, "_{$name}_sel", $selector);
@@ -343,7 +340,7 @@ $opts = array( // default options
global $_select_button;
$selector .= sprintf($_select_button, $disabled, user_theme(),
(fallback_mode() ? '' : 'display:none;'),
- $select_submit)."\n";
+ '_'.$name.'_update')."\n";
}
default_focus($name);
echo $selector;
@@ -365,7 +362,7 @@ function _format_add_curr($row)
}
function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
- $all=false)
+ $all=false, $editkey = false)
{
global $all_items;
@@ -373,11 +370,13 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
$mode = get_company_pref('no_supplier_list');
+ if ($editkey)
+ set_editor('supplier', $name, $editkey);
+
return combo_input($name, $selected_id, $sql, 'supplier_id', 'supp_name',
array(
'format' => '_format_add_curr',
'search_box' => $mode!=0,
- 'edit_submit' => true,
'type' => 1,
'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option,
'spec_id' => $all_items,
@@ -390,25 +389,29 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
}
function supplier_list_cells($label, $name, $selected_id=null, $all_option=false,
- $submit_on_change=false, $all=false)
+ $submit_on_change=false, $all=false, $editkey = false)
{
if ($label != null)
echo "$label | \n";
- $str = supplier_list($name, $selected_id, $all_option, $submit_on_change, $all);
+ $str = supplier_list($name, $selected_id, $all_option, $submit_on_change,
+ $all, $editkey);
echo " | \n";
return $str;
}
-function supplier_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
+function supplier_list_row($label, $name, $selected_id=null, $all_option = false,
+ $submit_on_change=false, $all=false, $editkey = false)
{
echo "| $label | ";
- $str = supplier_list($name, $selected_id, $all_option, $submit_on_change );
+ $str = supplier_list($name, $selected_id, $all_option, $submit_on_change,
+ $all, $editkey);
echo " |
\n";
return $str;
}
//----------------------------------------------------------------------------------------------
-function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, $show_inactive=false)
+function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
+ $show_inactive=false, $editkey = false)
{
global $all_items;
@@ -416,6 +419,9 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_
$mode = get_company_pref('no_customer_list');
+ if ($editkey)
+ set_editor('customer', $name, $editkey);
+
return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
array(
'format' => '_format_add_curr',
@@ -425,32 +431,31 @@ return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
'spec_option' => $spec_option === true ? _("All Customers") : $spec_option,
'spec_id' => $all_items,
'select_submit'=> $submit_on_change,
- 'edit_submit' => true, // call editor on F4
'async' => false,
- 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F4 - entry new customer') :
+ 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F2 - entry new customer') :
_('Select customer'),
'show_inactive' => $show_inactive
) );
}
function customer_list_cells($label, $name, $selected_id=null, $all_option=false,
- $submit_on_change=false, $show_inactive=false)
+ $submit_on_change=false, $show_inactive=false, $editkey = false)
{
if ($label != null)
echo "$label | \n";
echo "";
$str = customer_list($name, $selected_id, $all_option, $submit_on_change,
- $show_inactive);
+ $show_inactive, $editkey);
echo " | \n";
return $str;
}
function customer_list_row($label, $name, $selected_id=null, $all_option = false,
- $submit_on_change=false, $show_inactive=false)
+ $submit_on_change=false, $show_inactive=false, $editkey = false)
{
echo "| $label | ";
$str = customer_list($name, $selected_id, $all_option, $submit_on_change,
- $show_inactive);
+ $show_inactive, $editkey);
echo " | \n
\n";
return $str;
}
@@ -458,13 +463,16 @@ function customer_list_row($label, $name, $selected_id=null, $all_option = false
//------------------------------------------------------------------------------------------------
function customer_branches_list($customer_id, $name, $selected_id=null,
- $spec_option = true, $enabled=true, $submit_on_change=false)
+ $spec_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
{
global $all_items;
$sql = "SELECT branch_code, br_name FROM ".TB_PREF."cust_branch
WHERE debtor_no='" . $customer_id . "' ";
+ if ($editkey)
+ set_editor('branch', $name, $editkey);
+
$where = $enabled ? array("disable_trans = 0") : array();
return combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
array(
@@ -477,20 +485,24 @@ return combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
}
//------------------------------------------------------------------------------------------------
-function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false)
+function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null,
+ $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
{
if ($label != null)
echo "$label | \n";
echo "";
- $ret = customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+ $ret = customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled,
+ $submit_on_change, $editkey);
echo " | \n";
return $ret;
}
-function customer_branches_list_row($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false)
+function customer_branches_list_row($label, $customer_id, $name, $selected_id=null,
+ $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
{
echo "";
- $ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+ $ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id,
+ $all_option, $enabled, $submit_on_change, $editkey);
echo "
";
return $ret;
}
@@ -620,7 +632,7 @@ $options = array(
'async' => false,
);
- if ($showclosed)
+ if (!$showclosed)
$options['where'][] = "closed=0";
if($showtype)
$options['where'][] = "type_=$showtype";
@@ -652,13 +664,16 @@ 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())
+ $submit_on_change=false, $opts=array(), $editkey = false)
{
global $all_items;
$sql = "SELECT stock_id, s.description, c.description, s.inactive
FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
+ if ($editkey)
+ set_editor('item', $name, $editkey);
+
return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
array_merge(
array(
@@ -681,12 +696,12 @@ function _format_stock_items($row)
}
function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false,
- $submit_on_change=false, $all=false)
+ $submit_on_change=false, $all=false, $editkey = false)
{
if ($label != null)
echo "$label | \n";
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('cells'=>true, 'show_inactive'=>$all));
+ array('cells'=>true, 'show_inactive'=>$all), $editkey);
return $str;
}
/*
@@ -710,17 +725,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',
@@ -768,58 +786,12 @@ function sales_local_items_list_row($label, $name, $selected_id=null, $all_optio
}
//------------------------------------------------------------------------------------
-function base_stock_items_list($where, $name, $selected_id=null,
- $all_option=false, $submit_on_change=false)
-{
- global $all_items;
-
- $sql = "SELECT stock_id, s.description, c.description, s.inactive
- FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE
- s.category_id=c.category_id";
-
- return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
- array(
- 'format' => '_format_stock_items',
- 'spec_option' => $all_option==true ? _("All Items") : $all_option,
- 'spec_id' => $all_items,
- 'select_submit'=> $submit_on_change,
- 'where' => $where,
- 'category' => 2 ) );
-}
-//------------------------------------------------------------------------------------
-
-function stock_bom_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
-{
-
- return base_stock_items_list("(s.mb_flag='M' OR s.mb_flag='K')",
- $name, $selected_id, $all_option, $submit_on_change);
-}
-/*
-function stock_bom_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
-{
- if ($label != null)
- echo "$label | \n";
- echo "";
- $str = stock_bom_items_list($name, $selected_id, $all_option, $submit_on_change);
- echo " | \n";
- return $str;
-}
-
-function stock_bom_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
-{
- echo "\n";
- $str = stock_bom_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
- echo "
\n";
- return $str;
-}
-*/
-//------------------------------------------------------------------------------------
-
function stock_manufactured_items_list($name, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
- return base_stock_items_list("s.mb_flag='M'",
- $name, $selected_id, $all_option, $submit_on_change);
+ $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('where'=>array("mb_flag= 'M'")));
+ return $str;
}
function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
@@ -828,8 +800,7 @@ function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
if ($label != null)
echo "$label | \n";
echo "";
- $str = stock_manufactured_items_list($name, $selected_id, $all_option,
- $submit_on_change);
+ $str = stock_manufactured_items_list($name, $selected_id, $all_option, $submit_on_change);
echo " | \n";
return $str;
}
@@ -838,28 +809,28 @@ function stock_manufactured_items_list_row($label, $name, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
echo "\n";
- $str = stock_manufactured_items_list_cells($label, $name, $selected_id,
- $all_option, $submit_on_change);
+ $str = stock_manufactured_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
echo "
\n";
return $str;
}
//------------------------------------------------------------------------------------
function stock_component_items_list($name, $parent_stock_id, $selected_id=null,
- $all_option=false, $submit_on_change=false)
+ $all_option=false, $submit_on_change=false, $editkey = false)
{
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("stock_id != '$parent_stock_id'")));
+ array('where'=>array("stock_id != '$parent_stock_id'")), $editkey);
return $str;
}
function stock_component_items_list_cells($label, $name, $parent_stock_id,
- $selected_id=null, $all_option=false, $submit_on_change=false)
+ $selected_id=null, $all_option=false, $submit_on_change=false, $editkey = false)
{
if ($label != null)
echo "$label | \n";
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true));
+ array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true),
+ $editkey);
return $str;
}
//------------------------------------------------------------------------------------
@@ -884,33 +855,31 @@ 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=false)
+ $all_option=false, $submit_on_change=false, $all=false, $editkey=false)
{
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
array('where'=>array("mb_flag!= 'M'"),
- 'edit_submit' => true,
- 'show_inactive'=>$all));
+ 'show_inactive'=>$all), $editkey);
return $str;
}
function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
- $all_option=false, $submit_on_change=false, $all=false)
+ $all_option=false, $submit_on_change=false, $editkey=false)
{
if ($label != null)
echo "$label | \n";
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
array('where'=>array("mb_flag!= 'M'"),
- 'edit_submit' => true,
- 'cells'=>true));
+ 'cells'=>true), $editkey);
return $str;
}
function stock_purchasable_items_list_row($label, $name, $selected_id=null,
- $all_option=false, $submit_on_change=false)
+ $all_option=false, $submit_on_change=false, $editkey=false)
{
echo "\n";
$ret = stock_purchasable_items_list_cells($label, $name, $selected_id=null,
- $all_option, $submit_on_change);
+ $all_option, $submit_on_change, $editkey);
echo "
\n";
return $ret;
}
@@ -944,10 +913,7 @@ function stock_units_list_row($label, $name, $value=null, $enabled=true)
while($unit = db_fetch($result))
$units[$unit['abbr']] = $unit['name'];
- array_selector($name, $value, $units,
- array(
- 'select_submit'=> true,
- 'disabled' => !$enabled) );
+ array_selector($name, $value, $units, array( 'disabled' => !$enabled) );
echo "\n";
}
@@ -1624,8 +1590,8 @@ function gl_all_accounts_list_row($label, $name, $selected_id=null,
function yesno_list($name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
{
$items = array();
- $items['1'] = strlen($name_yes) ? $name_yes : _("Yes");
$items['0'] = strlen($name_no) ? $name_no : _("No");
+ $items['1'] = strlen($name_yes) ? $name_yes : _("Yes");
return array_selector($name, $selected_id, $items,
array(
@@ -1721,7 +1687,8 @@ function payment_person_types_list($name, $selected_id=null, $submit_on_change=f
{
if (payment_person_types::has_items($type['id']))
{
- $items[$type['id']] = $type['name'];
+ if ($type['id'] != payment_person_types::WorkOrder())
+ $items[$type['id']] = $type['name'];
}
}
@@ -1872,6 +1839,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";
@@ -2091,4 +2084,17 @@ function record_status_list_row($label, $name) {
return yesno_list_row($label, $name, null, _('Inactive'), _('Active'));
}
+function class_types_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+ global $class_types;
+
+ echo "
| $label | ";
+ array_selector($name, $selected_id, $class_types,
+ array(
+ 'select_submit'=> $submit_on_change
+ ) );
+ echo " |
\n";
+}
+
+
?>
\ No newline at end of file