<?php
-
+/**********************************************************************
+ Copyright (C) FrontAccounting, LLC.
+ Released under the terms of the GNU General Public License, GPL,
+ as published by the Free Software Foundation, either version 3
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
include_once($path_to_root . "/includes/banking.inc");
include_once($path_to_root . "/includes/reserved.inc");
include_once($path_to_root . "/includes/types.inc");
'format' => null, // format functions for regular options
'disabled' => false,
'box_hint' => null, // box/selectors hints; null = std see below
- 'category' => false // category column name or false
+ 'category' => false, // category column name or false
+ 'show_inactive' => false // show inactive records.
);
// ------ merge options with defaults ----------
if($options != null)
}
}
if ($opts['order'] != false) {
- $sql .= ' ORDER BY '.$opts['order'];
+ if (!is_array($opts['order']))
+ $opts['order'] = array($opts['order']);
+ $sql .= ' ORDER BY '.implode(',',$opts['order']);
}
$sql .= $limit;
$sel = 'selected';
$found = $value;
}
+ // show selected option even if inactive
+ if (!$opts['show_inactive'] && @$contact_row['inactive'] && $sel==='') {
+ continue;
+ } else
+ $optclass = @$contact_row['inactive'] ? "class='inactive'" : '';
+
if ($first_id === false) {
$first_id = $value;
$first_opt = $descr;
$selector .= "<optgroup label='".$cat."'>\n";
$lastcat = $cat;
}
- $selector .= "<option $sel value='$value'>$descr</option>\n";
+ $selector .= "<option $sel $optclass value='$value'>$descr</option>\n";
}
db_free_result($result);
}
if ($spec_option !== false) { // if special option used - add it
$first_id = $spec_id;
$first_opt = $spec_option;
+// }
+// if($first_id !== false) {
$sel = $found===false ? 'selected' : '';
- $selector = "<option $sel value='$spec_id'>$spec_option</option>\n"
+ $optclass = @$contact_row['inactive'] ? "class='inactive'" : '';
+ $selector = "<option $sel value='$first_id'>$first_opt</option>\n"
. $selector;
}
$search_submit)."\n";
}
}
- default_focus($name);
+ default_focus(($search_box && $by_id) ? $search_box : $name);
$str = $selector;
if ($search_box && $opts['cells'])
echo ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector</td>";
'' : (" - " . $row[2]));
}
-function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
+function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
+ $all=false)
{
global $all_items;
- $sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ";
+ $sql = "SELECT supplier_id, supp_name, curr_code, inactive FROM ".TB_PREF."suppliers ";
$mode = get_company_pref('no_supplier_list');
'select_submit'=> $submit_on_change,
'async' => false,
'sel_hint' => $mode ? _('Press Space tab to filter by name fragment') :
- _('Select supplier')
+ _('Select supplier'),
+ 'show_inactive'=>$all
));
}
-function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function supplier_list_cells($label, $name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $all=false)
{
if ($label != null)
echo "<td>$label</td><td>\n";
- $str = supplier_list($name, $selected_id, $all_option, $submit_on_change);
+ $str = supplier_list($name, $selected_id, $all_option, $submit_on_change, $all);
echo "</td>\n";
return $str;
}
}
//----------------------------------------------------------------------------------------------
-function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
+function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, $show_inactive=false)
{
global $all_items;
- $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
+ $sql = "SELECT debtor_no, name, curr_code, inactive FROM ".TB_PREF."debtors_master ";
$mode = get_company_pref('no_customer_list');
'edit_submit' => true, // call editor on F4
'async' => false,
'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F4 - entry new customer') :
- _('Select customer')
+ _('Select customer'),
+ 'show_inactive' => $show_inactive
) );
}
-function customer_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function customer_list_cells($label, $name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $show_inactive=false)
{
if ($label != null)
echo "<td>$label</td>\n";
echo "<td nowrap>";
- $str = customer_list($name, $selected_id, $all_option, $submit_on_change);
+ $str = customer_list($name, $selected_id, $all_option, $submit_on_change,
+ $show_inactive);
echo "</td>\n";
return $str;
}
-function customer_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
+function customer_list_row($label, $name, $selected_id=null, $all_option = false,
+ $submit_on_change=false, $show_inactive=false)
{
echo "<tr><td>$label</td><td nowrap>";
- $str = customer_list($name, $selected_id, $all_option, $submit_on_change);
+ $str = customer_list($name, $selected_id, $all_option, $submit_on_change,
+ $show_inactive);
echo "</td>\n</tr>\n";
return $str;
}
{
global $all_items;
- $sql = "SELECT loc_code, location_name FROM ".TB_PREF."locations";
+ $sql = "SELECT loc_code, location_name, inactive FROM ".TB_PREF."locations";
return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name',
array(
function currencies_list($name, $selected_id=null, $submit_on_change=false)
{
- $sql = "SELECT curr_abrev, currency FROM ".TB_PREF."currencies";
+ $sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies";
// default to the company currency
//---------------------------------------------------------------------------------------------------
-function stock_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false, $opts=array())
+function stock_items_list($name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $opts=array())
{
global $all_items;
- $sql = "SELECT stock_id, s.description, c.description
+ $sql = "SELECT stock_id, s.description, c.description, s.inactive
FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
'search_submit' => get_company_pref('no_item_list')!=0,
'size'=>10,
'select_submit'=> $submit_on_change,
- 'category' => 2
+ 'category' => 2,
+ 'order' => array('c.description','stock_id')
), $opts) );
}
return (user_show_codes() ? ($row[0] . " - ") : "") . $row[1];
}
-function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $all=false)
{
if ($label != null)
echo "<td>$label</td>\n";
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('cells'=>true));
+ array('cells'=>true, 'show_inactive'=>$all));
return $str;
}
/*
{
global $all_items;
// all sales codes
- $sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit
+ $sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit,
+ i.inactive
FROM
".TB_PREF."item_codes i
LEFT JOIN
ON i.category_id=c.category_id";
if ($type == 'local') { // exclude foreign codes
- $sql .= " WHERE NOT i.is_foreign";
+ $sql .= " WHERE !i.is_foreign";
} elseif ($type == 'kits') { // sales kits
- $sql .= " WHERE NOT i.is_foreign
- AND NOT i.item_code=i.stock_id";
+ $sql .= " WHERE !i.is_foreign AND i.item_code!=i.stock_id";
}
-
+ $sql .= " AND !i.inactive";
$sql .= " GROUP BY i.item_code";
return combo_input($name, $selected_id, $sql, 'i.item_code', 'c.description',
'spec_option' => $all_option===true ? _("All Items") : $all_option,
'spec_id' => $all_items,
'search_box' => true,
- 'search' => array("i.item_code", "c.description"),
+ 'search' => array("i.item_code", "i.description"),
'search_submit' => get_company_pref('no_item_list')!=0,
'size'=>15,
'select_submit'=> $submit_on_change,
- 'order' => 'i.item_code',
- 'category' => 2
+ 'category' => 2,
+ 'order' => array('c.description','i.item_code')
), $opts) );
}
{
global $all_items;
- $sql = "SELECT stock_id, s.description, c.description
+ $sql = "SELECT stock_id, s.description, c.description, s.inactive
FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE
s.category_id=c.category_id";
//------------------------------------------------------------------------------------
function stock_purchasable_items_list($name, $selected_id=null,
- $all_option=false, $submit_on_change=false)
+ $all_option=false, $submit_on_change=false, $all=false)
{
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
array('where'=>array("mb_flag!= 'M'"),
- 'edit_submit' => true));
+ 'edit_submit' => true,
+ 'show_inactive'=>$all));
return $str;
}
function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
- $all_option=false, $submit_on_change=false)
+ $all_option=false, $submit_on_change=false, $all=false)
{
if ($label != null)
echo "<td>$label</td>\n";
function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=true)
{
- $types = array(
- 'M' => _("Manufactured"),
- 'B' => _("Purchased"),
- 'D' => _("Service")
- );
+ global $stock_types;
echo "<tr>";
if ($label != null)
echo "<td>$label</td>\n";
echo "<td>";
- array_selector($name, $selected_id, $types,
+ array_selector($name, $selected_id, $stock_types,
array(
'select_submit'=> true,
'disabled' => !$enabled) );
function shippers_list($name, $selected_id=null)
{
- $sql = "SELECT shipper_id, shipper_name FROM ".TB_PREF."shippers";
+ $sql = "SELECT shipper_id, shipper_name, inactive FROM ".TB_PREF."shippers";
combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', array());
}
function sales_persons_list($name, $selected_id=null)
{
- $sql = "SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman";
+ $sql = "SELECT salesman_code, salesman_name, inactive FROM ".TB_PREF."salesman";
combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', array());
}
function sales_areas_list($name, $selected_id=null)
{
- $sql = "SELECT area_code, description FROM ".TB_PREF."areas";
+ $sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
}
function sales_groups_list($name, $selected_id=null, $special_option=false)
{
- $sql = "SELECT id, description FROM ".TB_PREF."groups";
+ $sql = "SELECT id, description, inactive FROM ".TB_PREF."groups";
combo_input($name, $selected_id, $sql, 'id', 'description', array(
'spec_option' => $special_option===true ? ' ' : $special_option,
'order' => 'description', 'spec_id' => 0,
function payment_terms_list($name, $selected_id=null)
{
- $sql = "SELECT terms_indicator, terms FROM ".TB_PREF."payment_terms";
+ $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array());
}
function credit_status_list($name, $selected_id=null)
{
- $sql ="SELECT id, reason_description FROM ".TB_PREF."credit_status";
+ $sql ="SELECT id, reason_description, inactive FROM ".TB_PREF."credit_status";
combo_input($name, $selected_id, $sql, 'id', 'reason_description', array());
}
function sales_types_list($name, $selected_id=null, $submit_on_change=false, $special_option=false)
{
- $sql = "SELECT id, sales_type FROM ".TB_PREF."sales_types";
+ $sql = "SELECT id, sales_type, inactive FROM ".TB_PREF."sales_types";
return combo_input($name, $selected_id, $sql, 'id', 'sales_type',
array(
}
//-----------------------------------------------------------------------------------------------
-/*
-function bank_trans_types_list($name, $selected_id=null)
+function _format_date($row)
{
- $sql = "SELECT id, name FROM ".TB_PREF."bank_trans_types";
- combo_input($name, $selected_id, $sql, 'id', 'name', array());
+ return sql2date($row['reconciled']);
+}
+
+function bank_reconciliation_list($account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
+{
+ $sql = "SELECT reconciled, reconciled FROM ".TB_PREF."bank_trans
+ WHERE bank_act=".db_escape($account)." AND reconciled IS NOT NULL
+ GROUP BY reconciled";
+ combo_input($name, $selected_id, $sql, 'id', 'reconciled',
+ array(
+ 'spec_option' => $special_option,
+ 'format' => '_format_date',
+ 'spec_id' => '',
+ 'select_submit'=> $submit_on_change
+ ) );
}
-function bank_trans_types_list_cells($label, $name, $selected_id=null)
+function bank_reconciliation_list_cells($label,$account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
{
if ($label != null)
echo "<td>$label</td>\n";
echo "<td>";
- bank_trans_types_list($name, $selected_id);
+ bank_reconciliation_list($account, $name, $selected_id, $submit_on_change, $special_option);
echo "</td>\n";
}
-
-function bank_trans_types_list_row($label, $name, $selected_id=null)
+/*
+function bank_reconciliation_list_row($label, $account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
{
echo "<tr>\n";
- bank_trans_types_list_cells($label, $name, $selected_id);
+ bank_reconciliation_list_cells($label, $account, $name, $selected_id, $submit_on_change, $special_option);
echo "</tr>\n";
}
*/
{
global $all_items;
- $sql = "SELECT id, name FROM ".TB_PREF."workcentres";
+ $sql = "SELECT id, name, inactive FROM ".TB_PREF."workcentres";
return combo_input($name, $selected_id, $sql, 'id', 'name',
array(
function bank_accounts_list($name, $selected_id=null, $submit_on_change=false)
{
- $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
+ $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive
FROM ".TB_PREF."bank_accounts";
// , ".TB_PREF."chart_master
// WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
{
- $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
+ $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive
FROM ".TB_PREF."bank_accounts
WHERE ".TB_PREF."bank_accounts.account_type=3";
function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $submit_on_change=false)
{
- $sql = "SELECT id, pos_name FROM ".TB_PREF."sales_pos";
+ $sql = "SELECT id, pos_name, inactive FROM ".TB_PREF."sales_pos";
default_focus($name);
echo '<tr>';
//-----------------------------------------------------------------------------------------------
-function stock_categories_list($name, $selected_id=null)
+function stock_categories_list($name, $selected_id=null, $submit_on_change=false)
{
- $sql = "SELECT category_id, description FROM ".TB_PREF."stock_category";
+ $sql = "SELECT category_id, description, inactive FROM ".TB_PREF."stock_category";
combo_input($name, $selected_id, $sql, 'category_id', 'description',
- array('order'=>'category_id'));
+ array('order'=>'category_id',
+ 'select_submit'=> $submit_on_change,
+ 'async' => true
+ ));
}
-function stock_categories_list_cells($label, $name, $selected_id=null)
+function stock_categories_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
{
if ($label != null)
echo "<td>$label</td>\n";
echo "<td>";
- stock_categories_list($name, $selected_id);
+ stock_categories_list($name, $selected_id, $submit_on_change);
echo "</td>\n";
}
-function stock_categories_list_row($label, $name, $selected_id=null)
+function stock_categories_list_row($label, $name, $selected_id=null, $submit_on_change=false)
{
echo "<tr>\n";
- stock_categories_list_cells($label, $name, $selected_id);
+ stock_categories_list_cells($label, $name, $selected_id, $submit_on_change);
echo "</tr>\n";
}
//-----------------------------------------------------------------------------------------------
function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false,
- $show_group=true, $cells=false, $all_option=false, $submit_on_change=false)
+ $cells=false, $all_option=false, $submit_on_change=false, $all=false)
{
if ($skip_bank_accounts)
- $sql = "SELECT chart.account_code, chart.account_name, type.name
+ $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive
FROM (".TB_PREF."chart_master chart,".TB_PREF."chart_types type) "
."LEFT JOIN ".TB_PREF."bank_accounts acc "
."ON chart.account_code=acc.account_code
WHERE acc.account_code IS NULL
AND chart.account_type=type.id";
else
- $sql = "SELECT chart.account_code, chart.account_name, type.name
+ $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive
FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
WHERE chart.account_type=type.id";
'format' => '_format_account',
'spec_option' => $all_option===true ? _("Use Item Sales Accounts") : $all_option,
'spec_id' => '',
- 'order' => 'account_code',
+ 'order' => array('name','account_code'),
'search_box' => $cells,
'search_submit' => false,
'size' => 12,
'cells' => true,
'select_submit'=> $submit_on_change,
'async' => false,
- 'category' => ($show_group ? 2 : false)
+ 'category' => 2,
+ 'show_inactive' => $all
) );
}
return $row[0] . " " . $row[1];
}
-function gl_all_accounts_list_cells($label, $name, $selected_id=null, $skip_bank_accounts=false,
- $show_group=false, $cells=false, $all_option=false)
+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)
{
if ($label != null)
echo "<td>$label</td>\n";
echo "<td>";
- gl_all_accounts_list($name, $selected_id, $skip_bank_accounts, $show_group, $cells, $all_option);
+ gl_all_accounts_list($name, $selected_id,
+ $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all);
echo "</td>\n";
}
-function gl_all_accounts_list_row($label, $name, $selected_id=null, $skip_bank_accounts=false,
- $show_group=false, $cells=false, $all_option=false)
+function gl_all_accounts_list_row($label, $name, $selected_id=null,
+ $skip_bank_accounts=false, $cells=false, $all_option=false)
{
echo "<tr>\n";
- gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts,
- $show_group, $cells, $all_option);
+ gl_all_accounts_list_cells($label, $name, $selected_id,
+ $skip_bank_accounts, $cells, $all_option);
echo "</tr>\n";
}
return $str;
}
-//------------------------------------------------------------------------------------------------
-
-function quick_entries_list($name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false)
-{
- $where = false;
- $sql = "SELECT id, description FROM ".TB_PREF."quick_entries";
- if ($expense != -1)
- {
- $sql .= " WHERE deposit=$expense";
- $where = true;
- }
- if ($bank_only != -1)
- {
- if ($where)
- $sql .= " AND bank_only=$bank_only";
- else
- $sql .= " WHERE bank_only=$bank_only";
- }
- combo_input($name, $selected_id, $sql, 'id', 'description',
- array(
- 'spec_id' => '',
- 'order' => 'description',
- 'select_submit'=> $submit_on_change,
- 'async' => false
- ) );
-
-}
-
-function quick_entries_list_cells($label, $name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false)
-{
- echo "<td>$label</td><td>\n";
- quick_entries_list($name, $selected_id, $expense, $bank_only, $submit_on_change);
- echo "</td>";
-}
-
-function quick_entries_list_row($label, $name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false)
-{
- echo "<tr>\n";
- quick_entries_list_cells($label, $name, $selected_id, $expense, $bank_only, $submit_on_change);
- echo "</tr>\n";
-}
-
-
//------------------------------------------------------------------------------------------------
function wo_types_list($name, $selected_id=null)
));
}
+//------------------------------------------------------------------------------------------------
+
+function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_change=false)
+{
+ $where = false;
+ $sql = "SELECT id, description FROM ".TB_PREF."quick_entries";
+ if ($type != null)
+ $sql .= " WHERE type=$type";
+
+ combo_input($name, $selected_id, $sql, 'id', 'description',
+ array(
+ 'spec_id' => '',
+ 'order' => 'description',
+ 'select_submit'=> $submit_on_change,
+ 'async' => false
+ ) );
+
+}
+
+function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false)
+{
+ echo "<td>$label</td><td>\n";
+ quick_entries_list($name, $selected_id, $type, $submit_on_change);
+ echo "</td>";
+}
+
+function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false)
+{
+ echo "<tr>\n";
+ quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change);
+ echo "</tr>\n";
+}
+
+
+function quick_actions_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+ global $quick_actions;
+
+ echo "<tr><td>$label</td><td>";
+ array_selector($name, $selected_id, $quick_actions,
+ array(
+ 'select_submit'=> $submit_on_change
+ ) );
+ echo "</td></tr>\n";
+}
+
+function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+ global $quick_entry_types;
+
+ echo "<tr><td>$label</td><td>";
+ array_selector($name, $selected_id, $quick_entry_types,
+ array(
+ 'select_submit'=> $submit_on_change
+ ) );
+ echo "</td></tr>\n";
+}
+
+function record_status_list_row($label, $name) {
+ return yesno_list_row($label, $name, null, _('Inactive'), _('Active'));
+}
?>
\ No newline at end of file