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);
$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 ($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 !=="") {
$selector .= ' '.$opts['editlink'];
if ($search_box && $opts['cells'])
- $str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector$img</td>";
+ $str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td nowrap>$selector$img</td>";
else
$str = $edit_entry.$selector.$img;
return $str;
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)
( 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 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,
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_row($label, $name, $selected_id=null,
- $skip_bank_accounts=false, $cells=false, $all_option=false, $type_id=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, $type_id);
+ $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id);
echo "</tr>\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);
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