X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=2cc16888e5fdbd15a94e587fccbadc0ca1691843;hb=e3004d8581b1ea3c02bfe2b1e880990309c4459e;hp=df6e4b17796f06cdf8ad66816a83e792868984bb;hpb=d79955724a5808af20c6b256d1ba4c1b41e818ef;p=fa-stable.git
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index df6e4b17..2cc16888 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -214,11 +214,15 @@ $opts = array( // default options
}
$cat = $contact_row[$opts['category']];
if ($opts['category'] !== false && $cat != $lastcat){
+ if ($lastcat!==null)
+ $selector .= "";
$selector .= "";
db_free_result($result);
}
@@ -368,7 +372,6 @@ $opts = array( // default options
if ($first_id!==false) {
$sel = ($found===$first_id) || ($found===false && ($spec_option===false)) ? "selected='selected'" : '';
- $selector = sprintf($first_opt, $sel).$selector;
}
// Prepend special option.
if ($spec_option !== false) { // if special option used - add it
@@ -417,26 +420,19 @@ function _format_add_curr($row)
'' : (" - " . $row[2]));
}
-function add_edit_combo($combo_name,$url,$key_param='',$restrict_pages='')
+function add_edit_combo($type)
{
- global $path_to_root, $page_security;
+ global $path_to_root, $popup_editors, $use_icon_for_editkey;
+ if (!isset($use_icon_for_editkey) || $use_icon_for_editkey==0)
+ return "";
// Derive theme path
$theme_path = $path_to_root . '/themes/' . user_theme();
- // Check if $url already has other parameters
- if ($key_param) {
- $key_param = ((strpos($url,'?')) ? '&' : '?') . $key_param;
- }
-
- $return_url = ($key_param) ? "" : "
";
-
- // Don't pass edit button code If restrict_pages contains instructions but fails security check
- if ($restrict_pages && strpos($restrict_pages, $page_security) === false) {
- return '';
- }
-
- return $return_url;
+ $key = $popup_editors[$type][1];
+ $onclick = "onclick=\"javascript:callEditor($key); return false;\"";
+ $img = "
";
+ return "$img";
}
function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
@@ -457,6 +453,7 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
'order' => array('supp_ref'),
'search_box' => $mode!=0,
'type' => 1,
+ 'search' => array("supp_ref","supp_name","gst_no"),
'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option,
'spec_id' => $all_items,
'select_submit'=> $submit_on_change,
@@ -466,10 +463,7 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
'show_inactive'=>$all
));
if ($editkey)
- {
- global $path_to_root;
- $ret .= add_edit_combo('supplier_id',"$path_to_root/purchasing/manage/suppliers.php?popup=1",'supplier_id');
- }
+ $ret .= add_edit_combo('supplier');
return $ret;
}
@@ -512,6 +506,7 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_
'search_box' => $mode!=0,
'type' => 1,
'size' => 20,
+ 'search' => array("debtor_ref","name","tax_id"),
'spec_option' => $spec_option === true ? _("All Customers") : $spec_option,
'spec_id' => $all_items,
'select_submit'=> $submit_on_change,
@@ -521,10 +516,7 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_
'show_inactive' => $show_inactive
) );
if ($editkey)
- {
- global $path_to_root;
- $ret .= add_edit_combo('customer_id',"$path_to_root/sales/manage/customers.php?popup=1", "debtor_no");
- }
+ $ret .= add_edit_combo('customer');
return $ret;
}
@@ -575,8 +567,7 @@ function customer_branches_list($customer_id, $name, $selected_id=null,
) );
if ($editkey)
{
- global $path_to_root;
- $ret .= add_edit_combo('branch_id',"$path_to_root/sales/manage/customer_branches.php?popup=1",'SelectedBranch');
+ $ret .= add_edit_combo('branch');
}
return $ret;
}
@@ -687,7 +678,7 @@ return combo_input($name, $selected_id, $sql, 'id', '',
function _format_fiscalyears($row)
{
return sql2date($row[1]) . " - " . sql2date($row[2])
- . " " . ($row[3] ? _('Closed') : _('Active')) . "\n";
+ . " " . ($row[3] ? _('Closed') : _('Active'));
}
function fiscalyears_list_cells($label, $name, $selected_id=null)
@@ -723,7 +714,7 @@ $options = array(
if (!$showclosed)
$options['where'][] = "closed=0";
if($showtype)
- $options['where'][] = "type_=$showtype";
+ $options['where'][] = "type_=".db_escape($showtype);
return combo_input($name, $selected_id, $sql, 'id', 'ref', $options);
}
@@ -775,10 +766,7 @@ function stock_items_list($name, $selected_id=null, $all_option=false,
'order' => array('c.description','stock_id')
), $opts) );
if ($editkey)
- {
- global $path_to_root;
- $ret .= add_edit_combo('stock_id',"$path_to_root/inventory/manage/items.php?popup=1",'stock_id');
- }
+ $ret .= add_edit_combo('item');
return $ret;
}
@@ -850,8 +838,11 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
), $opts) );
}
-function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $editkey=false)
{
+ if ($editkey)
+ set_editor('item', $name, $editkey);
+
if ($label != null)
echo "