";
if ($label != null)
echo "$label | \n";
echo "";
- array_selector($name, $selected_id, $types,
+ array_selector($name, $selected_id, $stock_types,
array(
'select_submit'=> true,
'disabled' => !$enabled) );
@@ -939,7 +1044,7 @@ function item_tax_types_list_row($label, $name, $selected_id=null)
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());
}
@@ -963,7 +1068,7 @@ function shippers_list_row($label, $name, $selected_id=null)
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());
}
@@ -987,7 +1092,7 @@ function sales_persons_list_row($label, $name, $selected_id=null, $submit_on_cha
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());
}
@@ -1011,7 +1116,7 @@ function sales_areas_list_row($label, $name, $selected_id=null)
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,
@@ -1097,7 +1202,7 @@ function workorders_list_row($label, $name, $selected_id=null)
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());
}
@@ -1121,7 +1226,7 @@ function payment_terms_list_row($label, $name, $selected_id=null)
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());
}
@@ -1145,7 +1250,7 @@ function credit_status_list_row($label, $name, $selected_id=null)
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(
@@ -1199,26 +1304,38 @@ function movement_types_list_row($label, $name, $selected_id=null)
}
//-----------------------------------------------------------------------------------------------
-/*
-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_trans_types_list_cells($label, $name, $selected_id=null)
+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_reconciliation_list_cells($label,$account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
{
if ($label != null)
echo " | $label | \n";
echo "";
- bank_trans_types_list($name, $selected_id);
+ bank_reconciliation_list($account, $name, $selected_id, $submit_on_change, $special_option);
echo " | \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 "