// Options are merged with defaults.
function combo_input($name, $selected_id, $sql, $valfield, $namefield,
- $options=null)
+ $options=null, $type=null)
{
-global $Ajax;
+global $Ajax, $path_to_root, $SysPrefs ;
$opts = array( // default options
'where'=> array(), // additional constraints
$found = false;
$lastcat = null;
$edit = false;
+ $pname = false;
+ if (($type === "customer" || $type === "supplier") && !empty($SysPrefs->prefs['shortname_name_in_list']))
+ $pname = true;
if($result = db_query($sql)) {
while ($contact_row = db_fetch($result)) {
$value = $contact_row[0];
$descr = $opts['format']==null ? $contact_row[1] :
- call_user_func($opts['format'], $contact_row);
+ call_user_func($opts['format'], $contact_row, $pname);
$sel = '';
if (get_post($search_button) && ($txt == $value)) {
$selected_id[] = $value;
$_POST[$name] = $multi ? $selected_id : $selected_id[0];
- $selector = "<select autocomplete='off' ".($multi ? "multiple" : '')
+ if ($SysPrefs->use_popup_search)
+ $selector = "<select id='$name' autocomplete='off' ".($multi ? "multiple" : '')
+ . ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
+ . "$disabled name='$name".($multi ? '[]':'')."' class='$class' title='"
+ . $opts['sel_hint']."' $rel>".$selector."</select>\n";
+ else
+ $selector = "<select autocomplete='off' ".($multi ? "multiple" : '')
. ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
. "$disabled name='$name".($multi ? '[]':'')."' class='$class' title='"
. $opts['sel_hint']."' $rel>".$selector."</select>\n";
-
if ($by_id && ($search_box != false || $opts['editable']) ) {
// on first display show selector list
if (isset($_POST[$search_box]) && $opts['editable'] && $edit) {
}
default_focus(($search_box && $by_id) ? $search_box : $name);
+ $img = "";
+ if ($SysPrefs->use_popup_search && (!isset($opts['fixed_asset']) || !$opts['fixed_asset']))
+ {
+ $img_title = "";
+ $link = "";
+ $id = $name;
+ if ($SysPrefs->use_popup_windows) {
+ switch (strtolower($type)) {
+ case "stock":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=all&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "stock_manufactured":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=manufactured&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "stock_purchased":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=purchasable&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "stock_sales":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=sales&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "stock_costable":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=costable&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "component":
+ $parent = $opts['parent'];
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=component&parent=".$parent."&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "kits":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=kits&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "customer":
+ $link = $path_to_root . "/sales/inquiry/customers_list.php?popup=1&client_id=" . $id;
+ $img_title = _("Search customers");
+ break;
+ case "branch":
+ $link = $path_to_root . "/sales/inquiry/customer_branches_list.php?popup=1&client_id=" . $id . "#customer_id";
+ $img_title = _("Search branches");
+ break;
+ case "supplier":
+ $link = $path_to_root . "/purchasing/inquiry/suppliers_list.php?popup=1&client_id=" . $id;
+ $img_title = _("Search suppliers");
+ break;
+ case "account":
+ $link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&client_id=" . $id;
+ $img_title = _("Search GL accounts");
+ break;
+ }
+ }
+
+ if ($link !=="") {
+ $theme = user_theme();
+ $img = '<img src="'.$path_to_root.'/themes/'.$theme.'/images/'.ICON_VIEW.
+ '" style="vertical-align:middle;width:12px;height:12px;border:0;" onclick="javascript:lookupWindow("'.
+ $link.'", "");" title="' . $img_title . '" style="cursor:pointer;" />';
+ }
+ }
+
if ($opts['editlink'])
$selector .= ' '.$opts['editlink'];
if ($search_box && $opts['cells'])
- $str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector</td>";
+ $str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector$img</td>";
else
- $str = $edit_entry.$selector;
+ $str = $edit_entry.$selector.$img;
return $str;
}
}
//----------------------------------------------------------------------------------------------
-function _format_add_curr($row)
+function _format_add_curr($row, $pname=false)
{
static $company_currency;
{
$company_currency = get_company_currency();
}
- return $row[1] . ($row[2] == $company_currency ?
- '' : (" - " . $row[2]));
+ if (!$pname)
+ {
+ return $row[1] . ($row[2] == $company_currency ? '' : (" - " . $row[2]));
+ }
+ else
+ {
+ return $row[1] . " - " . $row[2] . ($row[3] == $company_currency ? '' : (" - " . $row[3]));
+ }
}
function add_edit_combo($type)
function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
$all=false, $editkey = false)
{
-
- $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers ";
+ global $SysPrefs;
+ if (!empty($SysPrefs->prefs['shortname_name_in_list']))
+ $sql = "SELECT supplier_id, supp_ref, supp_name, curr_code, inactive FROM ".TB_PREF."suppliers ";
+ else
+ $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers ";
$mode = get_company_pref('no_supplier_list');
_('Select supplier'),
'show_inactive'=>$all,
'editlink' => $editkey ? add_edit_combo('supplier') : false
- ));
+ ), "supplier");
return $ret;
}
function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
$show_inactive=false, $editkey = false)
{
-
- $sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master ";
+ global $SysPrefs;
+ if (!empty($SysPrefs->prefs['shortname_name_in_list']))
+ $sql = "SELECT debtor_no, debtor_ref, name, curr_code, inactive FROM ".TB_PREF."debtors_master ";
+ else
+ $sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master ";
$mode = get_company_pref('no_customer_list');
_('Select customer'),
'show_inactive' => $show_inactive,
'editlink' => $editkey ? add_edit_combo('customer') : false
- ) );
+ ), "customer" );
return $ret;
}
'select_submit'=> $submit_on_change,
'sel_hint' => _('Select customer branch'),
'editlink' => $editkey ? add_edit_combo('branch') : false
- ) );
+ ), "branch" );
return $ret;
}
//------------------------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------------------
-function currencies_list($name, $selected_id=null, $submit_on_change=false)
+function currencies_list($name, $selected_id=null, $submit_on_change=false, $exclude_home_curr=false)
{
$sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies";
+ if ($exclude_home_curr)
+ $sql .= " WHERE curr_abrev!='".get_company_currency()."'";
// default to the company currency
return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
array(
'select_submit'=> $submit_on_change,
'default' => get_company_currency(),
- 'async' => false
+ 'async' => false
) );
}
//---------------------------------------------------------------------------------------------------
function stock_items_list($name, $selected_id=null, $all_option=false,
- $submit_on_change=false, $opts=array(), $editkey = false)
+ $submit_on_change=false, $opts=array(), $editkey = false, $type = "stock")
{
-
$sql = "SELECT stock_id, s.description, c.description, s.inactive, s.editable
FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
'spec_id' => ALL_TEXT,
'search_box' => true,
'search' => array("stock_id", "c.description","s.description"),
- 'search_submit' => get_company_pref('no_item_list')!=0,
+ 'search_submit' => get_company_pref('no_item_list')!=0 && (!isset($opts['fixed_asset']) || !$opts['fixed_asset']),
'size'=>10,
'select_submit'=> $submit_on_change,
'category' => 2,
'editlink' => $editkey ? add_edit_combo('item') : false,
'editable' => false,
'max' => 255
- ), $opts) );
+ ), $opts), $type );
return $ret;
}
'order' => array('c.description','i.item_code'),
'editable' => 30,
'max' => 255
- ), $opts) );
+ ), $opts), $type == 'kits' ? $type : "stock_sales" );
}
function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $editkey=false)
$all_option=false, $submit_on_change=false)
{
return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("mb_flag= 'M'")));
+ array('where'=>array("mb_flag= 'M'")), false, "stock_manufactured");
}
function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
function stock_component_items_list($name, $parent_stock_id, $selected_id=null,
$all_option=false, $submit_on_change=false, $editkey = false)
{
+ $parent = db_escape($parent_stock_id);
return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("stock_id != ".db_escape($parent_stock_id))), $editkey);
+ array('where'=>array("stock_id != $parent"), 'parent'=> $parent_stock_id), $editkey, "component");
}
+
function stock_component_items_list_cells($label, $name, $parent_stock_id,
$selected_id=null, $all_option=false, $submit_on_change=false, $editkey = false)
{
if ($label != null)
echo "<td>$label</td>\n";
+ $parent = db_escape($parent_stock_id);
echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("stock_id != ".db_escape($parent_stock_id)), 'cells'=>true),
- $editkey);
+ array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true, 'parent'=> $parent_stock_id), $editkey, "component");
}
//------------------------------------------------------------------------------------
$all_option=false, $submit_on_change=false)
{
return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("mb_flag!='D'")));
+ array('where'=>array("mb_flag!='D'")), false, "stock_costable");
}
function stock_costable_items_list_cells($label, $name, $selected_id=null,
if ($label != null)
echo "<td>$label</td>\n";
echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("mb_flag!='D'"), 'cells'=>true));
+ array('where'=>array("mb_flag!='D'"), 'cells'=>true), false, "stock_costable");
}
//------------------------------------------------------------------------------------
{
return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
array('where'=>array("NOT no_purchase"),
- 'show_inactive'=>$all), $editkey);
+ 'show_inactive'=>$all), $editkey, "stock_purchased");
}
//
// This helper is used in PO/GRN/PI entry and supports editable descriptions.
'async' => false,
'category' => 2,
'show_inactive' => $all
- ) );
+ ), "account" );
}
function _format_account($row)
echo "</td>\n";
}
-function cust_allocations_list_cells($label, $name, $selected=null)
+function cust_allocations_list_cells($label, $name, $selected=null, $submit_on_change=false)
{
if ($label != null)
$allocs = array(
ALL_TEXT=>_("All Types"),
'1'=> _("Sales Invoices"),
- '2'=> _("Overdue Invoices"),
+ '2'=> _("Unsettled transactions"),
'3' => _("Payments"),
'4' => _("Credit Notes"),
'5' => _("Delivery Notes")
);
- echo array_selector($name, $selected, $allocs);
+ echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
echo "</td>\n";
}
echo "</td>\n";
}
-function supp_transactions_list_cell($name, $selected=null)
+function supp_transactions_list_cell($name, $selected=null, $submit_on_change=false)
{
echo "<td>\n";
ALL_TEXT=>_("All Types"),
'6'=>_("GRNs"),
'1'=> _("Invoices"),
- '2'=> _("Overdue Invoices"),
+ '2'=> _("Unsettled transactions"),
'3' => _("Payments"),
'4' => _("Credit Notes"),
'5' => _("Overdue Credit Notes")
);
- echo array_selector($name, $selected, $allocs);
+ echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
echo "</td>\n";
}
{
global $payment_services;
- $services = array_combine(array_keys($payment_services), array_keys($payment_services));
+ $services = (object)array_combine(array_keys($payment_services), array_keys($payment_services));
return array_selector($name, null, $services, array(
'spec_option'=> _("No payment Link"),
projects / fa-stable.git / blobdiff