projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trying to access array offset on value of type bool. Fixed.
[fa-stable.git]
/
includes
/
ui
/
ui_lists.inc
diff --git
a/includes/ui/ui_lists.inc
b/includes/ui/ui_lists.inc
index 5b6387f644dc4fe37eabdf5f10903ee99f1ed90e..1d804985bff59a491343a73c0965bb81050f7169 100644
(file)
--- a/
includes/ui/ui_lists.inc
+++ b/
includes/ui/ui_lists.inc
@@
-150,7
+150,7
@@
$opts = array( // default options
foreach($opts['search'] as $i=> $s)
$opts['search'][$i] = $s . " LIKE "
.db_escape(($class=='combo3' ? '' : '%').$txt.'%');
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']
) . ')';
}
}
}
}
}
}
@@
-158,7
+158,7
@@
$opts = array( // default options
// sql completion
if (count($opts['where'])) {
$where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND ';
// 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);
$group_pos = strpos($sql, 'GROUP BY');
if ($group_pos) {
$group = substr($sql, $group_pos);
@@
-345,7
+345,7
@@
$opts = array( // default options
$img_title = _("Search suppliers");
break;
case "account":
$img_title = _("Search suppliers");
break;
case "account":
- case "account2"
;
+ 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");
$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");
@@
-365,7
+365,7
@@
$opts = array( // default options
$selector .= ' '.$opts['editlink'];
if ($search_box && $opts['cells'])
$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;
else
$str = $edit_entry.$selector.$img;
return $str;
@@
-944,7
+944,7
@@
function sales_items_list_cells($label, $name, $selected_id=null, $all_option=fa
if ($label != null)
echo "<td>$label</td>\n";
echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,
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)
}
function sales_kits_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
@@
-1152,11
+1152,12
@@
function stock_depreciable_fa_list_cells($label, $name, $selected_id=null,
( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
$year = get_current_fiscalyear();
( 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
// 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'";
$where_opts[] = "material_cost > 0";
$where_opts[] = "mb_flag='F'";
@@
-2309,7
+2310,7
@@
function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_cha
}
}
-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";
{
if ($label != null)
echo "<td>$label</td>\n";
@@
-2318,7
+2319,7
@@
function quick_entries_list_cells($label, $name, $selected_id=null, $type, $subm
echo "</td>";
}
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);
{
echo "<tr><td class='label'>$label</td>";
quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change);
@@
-2690,7
+2691,7
@@
function accounts_type_list_row($label, $name, $selected_id=null)
function users_list_cells($label, $name, $selected_id=null, $submit_on_change=false, $spec_opt=true)
{
$where = false;
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";
if ($label != null)
echo "<td>$label</td>\n";