foreach($opts['search'] as $i=> $s)
$opts['search'][$i] = $s . " LIKE "
.db_escape(($class=='combo3' ? '' : '%').$txt.'%');
- $opts['where'][] = '('. implode($opts['search'], ' OR ') . ')';
+ $opts['where'][] = '('. implode(' OR ', $opts['search']) . ')';
}
}
}
// sql completion
if (count($opts['where'])) {
$where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND ';
- $where .= '('. implode($opts['where'], ' AND ') . ')';
+ $where .= '('. implode(' AND ', $opts['where']) . ')';
$group_pos = strpos($sql, 'GROUP BY');
if ($group_pos) {
$group = substr($sql, $group_pos);
$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;
}
default_focus(($search_box && $by_id) ? $search_box : $name);
- if ($SysPrefs->use_popup_search)
+ $img = "";
+ if ($SysPrefs->use_popup_search && (!isset($opts['fixed_asset']) || !$opts['fixed_asset']))
{
- $img = "";
- $img_title = "";
- $link = "";
+ $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 "assets":
- $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=assets&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 ($type != NULL) {
+ 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":
+ case "account2":
+ $skip = strtolower($type) == "account" ? false : true;
+ $link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&skip=".$skip."&client_id=" . $id;
+ $img_title = _("Search GL accounts");
+ break;
+ }
+ }
}
if ($link !=="") {
if ($opts['editlink'])
$selector .= ' '.$opts['editlink'];
- if ($SysPrefs->use_popup_search)
- {
- if ($search_box && $opts['cells'])
- $str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector$img</td>";
- else
- $str = $edit_entry.$selector.$img;
- }
+ if ($search_box && $opts['cells'])
+ $str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td nowrap>$selector$img</td>";
else
- {
- if ($search_box && $opts['cells'])
- $str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector</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');
$submit_on_change=false, $all=false, $editkey = false)
{
if ($label != null)
- echo "<td>$label</td><td>\n";
- echo supplier_list($name, $selected_id, $all_option, $submit_on_change,
+ echo "<td>$label</td>\n";
+ echo "<td>";
+ echo supplier_list($name, $selected_id, $all_option, $submit_on_change,
$all, $editkey);
- echo "</td>\n";
+ echo "</td>\n";
}
function supplier_list_row($label, $name, $selected_id=null, $all_option = false,
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');
//-----------------------------------------------------------------------------------------------
-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
) );
}
if ($editkey)
set_editor('item', $name, $editkey);
- if (isset($opts['fixed_asset']) && $opts['fixed_asset'])
- $type = 'assets';
$ret = combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
array_merge(
array(
'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,
if ($label != null)
echo "<td>$label</td>\n";
echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,
- '', array('cells'=>true));
+ '', array('cells'=>true, 'max'=>50)); // maximum is set to 50 and not default 255.
}
function sales_kits_list($name, $selected_id=null, $all_option=false, $submit_on_change=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 != $parent"), 'cells'=>true, 'parent'=> $parent_stock_id), $editkey, "component");
+ array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true, 'parent'=> $parent_stock_id), $editkey, "component");
}
//------------------------------------------------------------------------------------
( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
$year = get_current_fiscalyear();
- $y = date('Y', strtotime($year['end']));
+ $begin = date2sql(add_months(sql2date($year['begin']), -1));
+ $end = date2sql(add_months(sql2date($year['end']), -1));
// check if current fiscal year
- $where_opts[] = "depreciation_date < '".$y."-12-01'";
- $where_opts[] = "depreciation_date >= '".($y-1)."-12-01'";
+ $where_opts[] = "depreciation_date <= '".$end."'";
+ $where_opts[] = "depreciation_date >= '".$begin."'";
$where_opts[] = "material_cost > 0";
$where_opts[] = "mb_flag='F'";
function tax_groups_list($name, $selected_id=null,
$none_option=false, $submit_on_change=false)
{
- $sql = "SELECT id, name FROM ".TB_PREF."tax_groups";
+ $sql = "SELECT id, name, inactive FROM ".TB_PREF."tax_groups";
return combo_input($name, $selected_id, $sql, 'id', 'name',
array(
//------------------------------------------------------------------------------------
-function item_tax_types_list($name, $selected_id=null)
+function item_tax_types_list($name, $selected_id=null, $show_inactive = false)
{
$sql ="SELECT id, name FROM ".TB_PREF."item_tax_types";
+ if (!$show_inactive)
+ $sql .= " WHERE !inactive";
+
return combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
}
-function item_tax_types_list_cells($label, $name, $selected_id=null)
+function item_tax_types_list_cells($label, $name, $selected_id=null, $show_inactive = false)
{
if ($label != null)
echo "<td>$label</td>\n";
echo "<td>";
- echo item_tax_types_list($name, $selected_id);
+ echo item_tax_types_list($name, $selected_id, $show_inactive);
echo "</td>\n";
}
-function item_tax_types_list_row($label, $name, $selected_id=null)
+function item_tax_types_list_row($label, $name, $selected_id=null, $show_inactive = false)
{
echo "<tr><td class='label'>$label</td>";
- item_tax_types_list_cells(null, $name, $selected_id);
+ item_tax_types_list_cells(null, $name, $selected_id, $show_inactive);
echo "</tr>\n";
}
//------------------------------------------------------------------------------------
-function sales_areas_list($name, $selected_id=null)
+function sales_areas_list($name, $selected_id=null, $special_option=false)
{
$sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
- return combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
+ return combo_input($name, $selected_id, $sql, 'area_code', 'description',
+ array('spec_option' => $special_option===true ? ' ' : $special_option,
+ 'order' => 'description', 'spec_id' => 0));
}
-function sales_areas_list_cells($label, $name, $selected_id=null)
+function sales_areas_list_cells($label, $name, $selected_id=null, $special_option=false)
{
if ($label != null)
echo "<td>$label</td>\n";
echo "<td>";
- echo sales_areas_list($name, $selected_id);
+ echo sales_areas_list($name, $selected_id, $special_option);
echo "</td>\n";
}
-function sales_areas_list_row($label, $name, $selected_id=null)
+function sales_areas_list_row($label, $name, $selected_id=null, $special_option=false)
{
echo "<tr><td class='label'>$label</td>";
- sales_areas_list_cells(null, $name, $selected_id);
+ sales_areas_list_cells(null, $name, $selected_id, $special_option);
echo "</tr>\n";
}
function sales_groups_list($name, $selected_id=null, $special_option=false)
{
- $sql = "SELECT id, description, inactive FROM ".TB_PREF."groups";
+ $sql = "SELECT id, description, inactive FROM `".TB_PREF."groups`";
return combo_input($name, $selected_id, $sql, 'id', 'description', array(
'spec_option' => $special_option===true ? ' ' : $special_option,
'order' => 'description', 'spec_id' => 0,
//-----------------------------------------------------------------------------------------------
function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false,
- $cells=false, $all_option=false, $submit_on_change=false, $all=false)
+ $cells=false, $all_option=false, $submit_on_change=false, $all=false, $type_id=false)
{
if ($skip_bank_accounts)
$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
WHERE chart.account_type=type.id";
-
+ if ($type_id ) $sql .= " AND chart.account_type=".db_escape($type_id);
+ $account = ($skip_bank_accounts ? "account2" : "account");
return combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name',
array(
'format' => '_format_account',
'async' => false,
'category' => 2,
'show_inactive' => $all
- ), "account" );
+ ), $account );
}
function _format_account($row)
function gl_all_accounts_list_cells($label, $name, $selected_id=null,
$skip_bank_accounts=false, $cells=false, $all_option=false,
- $submit_on_change=false, $all=false)
+ $submit_on_change=false, $all=false, $type_id=false)
{
if ($label != null)
echo "<td>$label</td>\n";
echo "<td>";
echo gl_all_accounts_list($name, $selected_id,
- $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all);
+ $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id);
echo "</td>\n";
}
function gl_all_accounts_list_row($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, $type_id=false)
{
echo "<tr><td class='label'>$label</td>";
gl_all_accounts_list_cells(null, $name, $selected_id,
- $skip_bank_accounts, $cells, $all_option);
+ $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id);
echo "</tr>\n";
}
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";
}
}
-function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false)
+function quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change=false)
{
if ($label != null)
echo "<td>$label</td>\n";
echo "</td>";
}
-function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false)
+function quick_entries_list_row($label, $name, $selected_id, $type, $submit_on_change=false)
{
echo "<tr><td class='label'>$label</td>";
quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change);
{
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"),
FROM "
.TB_PREF."debtors_master d,"
.TB_PREF."cust_branch c
- WHERE d.debtor_no=c.debtor_no AND c.receivables_account=".db_escape($account);
+ WHERE d.debtor_no=c.debtor_no AND NOT d.inactive AND c.receivables_account=".db_escape($account);
else
$sql = "SELECT supplier_id as id, supp_ref as name
FROM "
.TB_PREF."suppliers s
- WHERE s.payable_account=".db_escape($account);
+ WHERE NOT s.inactive AND s.payable_account=".db_escape($account);
$mode = get_company_pref('no_customer_list');
function users_list_cells($label, $name, $selected_id=null, $submit_on_change=false, $spec_opt=true)
{
$where = false;
- $sql = " SELECT user_id, real_name FROM ".TB_PREF."users";
+ $sql = " SELECT user_id, IF(real_name = '', user_id, real_name) FROM ".TB_PREF."users";
if ($label != null)
echo "<td>$label</td>\n";
projects / fa-stable.git / blobdiff