";
- else if ($extra != "")
- echo "";
- else
- echo "";
+ return base_stock_items_list("stock_id != '$parent_stock_id'", $name, $selected_id,
+ $all_option, $submit_on_change);
+}
+//------------------------------------------------------------------------------------
- if ($all_option == true)
- {
- if ($selected_id == $all_items)
- {
- echo ""._("All Items")." \n";
- }
- else
- {
- echo ""._("All Items")." \n";
- }
- if ($selected_id == "")
- {
- $selected_id = $all_items;
- }
- }
+function stock_costable_items_list($name, $selected_id,
+ $all_option=false, $submit_on_change=false)
+{
+ return base_stock_items_list("mb_flag!='D'", $name, $selected_id,
+ $all_option, $submit_on_change);
+}
- while ($row = db_fetch_row($result))
- {
- if ($selected_id == $row[0])
- {
- echo "";
- }
- else
- {
- echo " ";
- }
- echo (user_show_codes()?$row[0] . " - ":"") . $row[2] . " - " . $row[1] . " \n";
+//------------------------------------------------------------------------------------
- if ($selected_id == "")
- {
- $selected_id = $row[0];
- $_POST[$name] = $selected_id;
- }
- }
+function stock_purchasable_items_list($name, $selected_id, $all_option=false,
+ $submit_on_change=false, $opts=array())
+{
+ global $all_items;
+ $sql = "SELECT stock_id, s.description, c.description
+ FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c
+ WHERE s.category_id=c.category_id
+ AND mb_flag !='M' ";
+ return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
+ array_merge( array(
+ 'format' => '_format_stock_items',
+ 'spec_option' => $all_option===true ? _("All Items") : $all_option,
+ 'spec_id' => $all_items,
+ 'search_box' => true,
+ 'search' => array("stock_id", "c.description","s.description"),
+ 'search_submit' => get_company_pref('no_item_list')!=0,
+ 'size'=>10,
+ 'select_submit'=> $submit_on_change
+ ), $opts) );
- echo " ";
- db_free_result($result);
}
-function stock_purchasable_items_list_cells($label, $name, &$selected_id, $all_option=false, $submit_on_change=false, $extra = "")
+function stock_purchasable_items_list_cells($label, $name, $selected_id,
+ $all_option=false, $submit_on_change=false)
{
if ($label != null)
echo "$label \n";
- echo "";
- stock_purchasable_items_list($name, $selected_id, $all_option, $submit_on_change, $extra);
- echo " \n";
+ $ret = stock_purchasable_items_list($name, $selected_id, $all_option,
+ $submit_on_change, array('cells'=>true) );
+ return $ret;
}
-function stock_purchasable_items_list_row($label, $name, &$selected_id, $all_option=false, $submit_on_change=false)
+function stock_purchasable_items_list_row($label, $name, $selected_id,
+ $all_option=false, $submit_on_change=false)
{
echo "\n";
- stock_purchasable_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
+ $ret = stock_purchasable_items_list_cells($label, $name, $selected_id,
+ $all_option, $submit_on_change);
echo " \n";
-}
-
-//------------------------------------------------------------------------------------
-
-function stock_costable_items_list($name, &$selected_id,
- $all_option=false, $submit_on_change=false)
-{
- $sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
- FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
- AND mb_flag !='D'";
-
- base_stock_items_list($sql, $name, $selected_id,
- $all_option, _("All Items"), $submit_on_change);
+ return $ret;
}
//------------------------------------------------------------------------------------
function stock_item_types_list_row($label, $name, $selected_id, $enabled=true)
{
+ default_focus($name);
echo "";
if ($label != NULL)
echo "$label \n";
echo "";
if ($enabled)
- echo "\n";
+ $sel = "\n";
+
else
- echo "\n";
+ $sel = "\n";
if ($selected_id == null)
$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
if ($selected_id == "")
$_POST[$name] = $selected_id = "B";
- echo "" . _("Manufactured"). " \n";
- echo "" . _("Purchased"). " \n";
- echo "" . _("Service"). " \n";
- echo " \n";
+ $sel .= "" . _("Manufactured"). " \n";
+ $sel .= "" . _("Purchased"). " \n";
+ $sel .= "" . _("Service"). " \n";
+ $sel .= " ";
+ echo $sel;
+ echo "\n";
+ return $sel;
}
function stock_units_list_row($label, $name, $value, $enabled=true)
{
- global $stock_units;
-
+ default_focus($name);
+ $result = get_all_item_units();
echo "$label \n";
if ($enabled)
echo "";
@@ -1059,17 +730,21 @@ function stock_units_list_row($label, $name, $value, $enabled=true)
if ($value == null)
$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- foreach ($stock_units as $unit)
+
+ while($unit = db_fetch($result))
{
if ($value == "")
- $_POST[$name] = $value = $unit;
- if ($value==$unit)
{
- echo "$unit \n";
+ $_POST[$name] = $unit['abbr'];
+ }
+ $descr = $unit['name'];
+ if ($value==$unit['abbr'])
+ {
+ echo "$descr \n";
}
else
{
- echo "$unit \n";
+ echo "$descr \n";
}
}
echo " \n";
@@ -1077,38 +752,54 @@ function stock_units_list_row($label, $name, $value, $enabled=true)
//------------------------------------------------------------------------------------
-function tax_types_list($name, $selected_id,
- $none_option=false, $none_option_name=null, $submit_on_change=false)
+function tax_types_list($name, $selected_id, $none_option=false, $submit_on_change=false)
{
- simple_codeandname_list("SELECT id, name FROM ".TB_PREF."tax_types",
- $name, $selected_id, $none_option, $none_option_name, true, $submit_on_change);
+ $sql = "SELECT id, CONCAT(name, ' (',rate,'%)') as name FROM ".TB_PREF."tax_types";
+
+ return combo_input($name, $selected_id, $sql, 'id', 'name',
+ array(
+ 'spec_option' => $none_option,
+ 'spec_id' => 0,
+ 'select_submit'=> $submit_on_change,
+ 'async' => false,
+ ) );
}
function tax_types_list_cells($label, $name, $selected_id, $none_option=false,
- $none_option_name=null, $submit_on_change=false)
+ $submit_on_change=false)
{
if ($label != null)
echo "$label \n";
echo "";
- tax_types_list($name, $selected_id, $none_option, $none_option_name, $submit_on_change);
+ $str = tax_types_list($name, $selected_id, $none_option, $submit_on_change);
echo " \n";
+ return $str;
}
function tax_types_list_row($label, $name, $selected_id, $none_option=false,
- $none_option_name=null, $submit_on_change=false)
+ $submit_on_change=false)
{
echo "\n";
- tax_types_list_cells($label, $name, $selected_id, $none_option, $none_option_name, $submit_on_change);
+ $str = tax_types_list_cells($label, $name, $selected_id, $none_option, $submit_on_change);
echo " \n";
+ return $str;
}
//------------------------------------------------------------------------------------
function tax_groups_list($name, $selected_id,
- $none_option=false, $none_option_name=null, $submit_on_change=false)
+ $none_option=false, $submit_on_change=false)
{
- simple_codeandname_list("SELECT id, name FROM ".TB_PREF."tax_groups ORDER BY id",
- $name, $selected_id, $none_option, $none_option_name, true, $submit_on_change);
+ $sql = "SELECT id, name FROM ".TB_PREF."tax_groups";
+
+ return combo_input($name, $selected_id, $sql, 'id', 'name',
+ array(
+ 'order' => 'id',
+ 'spec_option' => $none_option,
+ 'spec_id' => 0,
+ 'select_submit'=> $submit_on_change,
+ 'async' => false,
+ ) );
}
function tax_groups_list_cells($label, $name, $selected_id, $submit_on_change=false)
@@ -1116,23 +807,25 @@ function tax_groups_list_cells($label, $name, $selected_id, $submit_on_change=fa
if ($label != null)
echo "$label \n";
echo "";
- tax_groups_list($name, $selected_id, false, null, $submit_on_change);
+ $str = tax_groups_list($name, $selected_id, false, $submit_on_change);
echo " \n";
+ return $str;
}
function tax_groups_list_row($label, $name, $selected_id, $submit_on_change=false)
{
echo "\n";
- tax_groups_list_cells($label, $name, $selected_id, false, null, $submit_on_change);
+ $str = tax_groups_list_cells($label, $name, $selected_id, false, $submit_on_change);
echo " \n";
+ return $str;
}
//------------------------------------------------------------------------------------
function item_tax_types_list($name, $selected_id)
{
- simple_codeandname_list("SELECT id, name FROM ".TB_PREF."item_tax_types ORDER BY id",
- $name, $selected_id);
+ $sql ="SELECT id, name FROM ".TB_PREF."item_tax_types";
+ combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
}
function item_tax_types_list_cells($label, $name, $selected_id)
@@ -1155,8 +848,8 @@ function item_tax_types_list_row($label, $name, $selected_id)
function shippers_list($name, $selected_id)
{
- simple_codeandname_list("SELECT shipper_id, shipper_name FROM ".TB_PREF."shippers",
- $name, $selected_id);
+ $sql = "SELECT shipper_id, shipper_name FROM ".TB_PREF."shippers";
+ combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', array());
}
function shippers_list_cells($label, $name, $selected_id)
@@ -1179,8 +872,8 @@ function shippers_list_row($label, $name, $selected_id)
function sales_persons_list($name, $selected_id)
{
- simple_codeandname_list("SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman",
- $name, $selected_id);
+ $sql = "SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman";
+ combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', array());
}
function sales_persons_list_cells($label, $name, $selected_id)
@@ -1192,10 +885,10 @@ function sales_persons_list_cells($label, $name, $selected_id)
echo "\n";
}
-function sales_persons_list_row($label, $name, $selected_id)
+function sales_persons_list_row($label, $name, $selected_id, $submit_on_change=false)
{
echo "\n";
- sales_persons_list_cells($label, $name, $selected_id);
+ sales_persons_list_cells($label, $name, $selected_id, $submit_on_change=false);
echo " \n";
}
@@ -1203,8 +896,8 @@ function sales_persons_list_row($label, $name, $selected_id)
function sales_areas_list($name, $selected_id)
{
- simple_codeandname_list("SELECT area_code, description FROM ".TB_PREF."areas",
- $name, $selected_id);
+ $sql = "SELECT area_code, description FROM ".TB_PREF."areas";
+ combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
}
function sales_areas_list_cells($label, $name, $selected_id)
@@ -1227,8 +920,8 @@ function sales_areas_list_row($label, $name, $selected_id)
function workorders_list($name, $selected_id)
{
- simple_codeandname_list("SELECT id, wo_ref FROM ".TB_PREF."workorders WHERE closed=0",
- $name, $selected_id);
+ $sql = "SELECT id, wo_ref FROM ".TB_PREF."workorders WHERE closed=0";
+ combo_input($name, $selected_id, $sql, 'id', 'wo_ref', array());
}
function workorders_list_cells($label, $name, $selected_id)
@@ -1251,8 +944,8 @@ function workorders_list_row($label, $name, $selected_id)
function payment_terms_list($name, $selected_id)
{
- simple_codeandname_list("SELECT terms_indicator, terms FROM ".TB_PREF."payment_terms",
- $name, $selected_id);
+ $sql = "SELECT terms_indicator, terms FROM ".TB_PREF."payment_terms";
+ combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array());
}
function payment_terms_list_cells($label, $name, $selected_id)
@@ -1275,8 +968,8 @@ function payment_terms_list_row($label, $name, $selected_id)
function credit_status_list($name, $selected_id)
{
- simple_codeandname_list("SELECT id, reason_description FROM ".TB_PREF."credit_status",
- $name, $selected_id);
+ $sql ="SELECT id, reason_description FROM ".TB_PREF."credit_status";
+ combo_input($name, $selected_id, $sql, 'id', 'reason_description', array());
}
function credit_status_list_cells($label, $name, $selected_id)
@@ -1297,34 +990,43 @@ function credit_status_list_row($label, $name, $selected_id)
//-----------------------------------------------------------------------------------------------
-function sales_types_list($name, $selected_id)
+function sales_types_list($name, $selected_id, $submit_on_change=false, $special_option=false)
{
- simple_codeandname_list("SELECT id, sales_type FROM ".TB_PREF."sales_types",
- $name, $selected_id);
+ $sql = "SELECT id, sales_type FROM ".TB_PREF."sales_types";
+
+ return combo_input($name, $selected_id, $sql, 'id', 'sales_type',
+ array(
+ 'spec_option' => $special_option===true ? _("All Sales Types") : $special_option,
+ 'spec_id' => 0,
+ 'select_submit'=> $submit_on_change,
+ // 'async' => false,
+ ) );
}
-function sales_types_list_cells($label, $name, $selected_id)
+function sales_types_list_cells($label, $name, $selected_id, $submit_on_change=false, $special_option=false)
{
if ($label != null)
echo "$label \n";
echo "";
- sales_types_list($name, $selected_id);
+ $str = sales_types_list($name, $selected_id, $submit_on_change, $special_option);
echo " \n";
+ return $str;
}
-function sales_types_list_row($label, $name, $selected_id)
+function sales_types_list_row($label, $name, $selected_id, $submit_on_change=false, $special_option=false)
{
echo "\n";
- sales_types_list_cells($label, $name, $selected_id);
+ $str = sales_types_list_cells($label, $name, $selected_id, $submit_on_change, $special_option);
echo " \n";
+ return $str;
}
//-----------------------------------------------------------------------------------------------
function movement_types_list($name, $selected_id)
{
- simple_codeandname_list("SELECT id, name FROM ".TB_PREF."movement_types",
- $name, $selected_id);
+ $sql = "SELECT id, name FROM ".TB_PREF."movement_types";
+ combo_input($name, $selected_id, $sql, 'id', 'name', array());
}
function movement_types_list_cells($label, $name, $selected_id)
@@ -1347,8 +1049,8 @@ function movement_types_list_row($label, $name, $selected_id)
function bank_trans_types_list($name, $selected_id)
{
- simple_codeandname_list("SELECT id, name FROM ".TB_PREF."bank_trans_types",
- $name, $selected_id);
+ $sql = "SELECT id, name FROM ".TB_PREF."bank_trans_types";
+ combo_input($name, $selected_id, $sql, 'id', 'name', array());
}
function bank_trans_types_list_cells($label, $name, $selected_id)
@@ -1372,44 +1074,19 @@ function bank_trans_types_list_row($label, $name, $selected_id)
function workcenter_list($name, $selected_id, $all_option=false)
{
global $all_items;
- echo "";
$sql = "SELECT id, name FROM ".TB_PREF."workcentres";
- $result = db_query($sql);
-
- if ($selected_id == null)
- $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- if ($all_option == true)
- {
- if ($selected_id == $all_items)
- {
- echo "" . _("All Work Centres") . " \n";
- }
- else
- {
- echo "" . _("All Work Centres") . " \n";
- }
- }
-
- while ($row = db_fetch_row($result))
- {
- if ($selected_id == $row[0])
- {
- echo "";
- }
- else
- {
- echo " ";
- }
- echo $row[1] . " \n";
- }
- echo " ";
- db_free_result($result);
+ return combo_input($name, $selected_id, $sql, 'id', 'name',
+ array(
+ 'spec_option' =>$all_option===true ? _("All Suppliers") : $all_option,
+ 'spec_id' => $all_items,
+ ) );
}
function workcenter_list_cells($label, $name, $selected_id, $all_option=false)
{
+ default_focus($name);
if ($label != null)
echo "$label \n";
echo "";
@@ -1428,43 +1105,16 @@ function workcenter_list_row($label, $name, $selected_id, $all_option=false)
function bank_accounts_list($name, $selected_id, $submit_on_change=false)
{
- if ($submit_on_change==true)
- echo "";
- else
- echo "";
-
- $company_currency = get_company_currency();
-
$sql = "SELECT ".TB_PREF."bank_accounts.account_code, bank_account_name, bank_curr_code
FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master
WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
- $result = db_query($sql);
-
- if ($selected_id == null)
- $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- while ($row = db_fetch_row($result))
- {
- if ($selected_id == $row[0])
- {
- echo "";
- }
- else
- {
- echo " ";
- }
- echo $row[1];
- if ($company_currency != $row[2])
- echo " - " . $row[2];
- echo " \n";
- if ($selected_id == "")
- {
- $selected_id = $row[0];
- $_POST[$name] = $selected_id;
- }
- }
- echo " ";
- db_free_result($result);
+ return combo_input($name, $selected_id, $sql, 'account_code', 'bank_account_name',
+ array(
+ 'format' => '_format_add_curr',
+ 'select_submit'=> $submit_on_change,
+ 'async' => false
+ ) );
}
function bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change=false)
@@ -1472,51 +1122,31 @@ function bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change
if ($label != null)
echo "$label \n";
echo "";
- bank_accounts_list($name, $selected_id, $submit_on_change);
+ $str = bank_accounts_list($name, $selected_id, $submit_on_change);
echo " \n";
+ return $str;
}
function bank_accounts_list_row($label, $name, $selected_id, $submit_on_change=false)
{
echo "\n";
- bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change);
+ $str = bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change);
echo " \n";
+ return $str;
}
//-----------------------------------------------------------------------------------------------
function class_list($name, $selected_id, $submit_on_change=false)
{
- if ($submit_on_change==true)
- echo "";
- else
- echo "";
-
$sql = "SELECT cid, class_name FROM ".TB_PREF."chart_class";
- $result = db_query($sql);
- if ($selected_id == null)
- $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- while ($row = db_fetch_row($result))
- {
- if ($selected_id == $row[0])
- {
- echo "";
- }
- else
- {
- echo " ";
- }
- echo $row[1] . " \n";
- if ($selected_id == "")
- {
- $selected_id = $row[0];
- $_POST[$name] = $selected_id;
- }
- }
+ return combo_input($name, $selected_id, $sql, 'cid', 'class_name',
+ array(
+ 'select_submit'=> $submit_on_change,
+ 'async' => false
+ ) );
- echo " ";
- db_free_result($result);
}
function class_list_cells($label, $name, $selected_id, $submit_on_change=false)
@@ -1524,23 +1154,26 @@ function class_list_cells($label, $name, $selected_id, $submit_on_change=false)
if ($label != null)
echo "$label \n";
echo "";
- class_list($name, $selected_id, $submit_on_change);
+ $str = class_list($name, $selected_id, $submit_on_change);
echo " \n";
+ return $str;
}
function class_list_row($label, $name, $selected_id, $submit_on_change=false)
{
echo "\n";
- class_list_cells($label, $name, $selected_id, $submit_on_change);
+ $str = class_list_cells($label, $name, $selected_id, $submit_on_change);
echo " \n";
+ return $str;
}
//-----------------------------------------------------------------------------------------------
function stock_categories_list($name, $selected_id)
{
- simple_codeandname_list("SELECT category_id, description FROM ".TB_PREF."stock_category
- ORDER BY category_id", $name, $selected_id);
+ $sql = "SELECT category_id, description FROM ".TB_PREF."stock_category";
+ combo_input($name, $selected_id, $sql, 'category_id', 'description',
+ array('order'=>'category_id'));
}
function stock_categories_list_cells($label, $name, $selected_id)
@@ -1561,108 +1194,104 @@ function stock_categories_list_row($label, $name, $selected_id)
//-----------------------------------------------------------------------------------------------
-function gl_account_types_list($name, $selected_id, $all_option, $all_option_name,
- $all_option_numeric)
+function gl_account_types_list($name, $selected_id, $all_option, $all_option_numeric)
{
- simple_codeandname_list("SELECT id, name FROM ".TB_PREF."chart_types ORDER BY id",
- $name, $selected_id, $all_option, $all_option_name, $all_option_numeric);
+ global $all_items;
+
+ $sql = "SELECT id, name FROM ".TB_PREF."chart_types";
+
+ combo_input($name, $selected_id, $sql, 'id', 'name',
+ array(
+ 'order' => 'id',
+ 'spec_option' =>$all_option,
+ 'spec_id' => $all_option_numeric ? 0 : $all_items
+ ) );
}
-function gl_account_types_list_cells($label, $name, $selected_id, $all_option=false, $all_option_name=null,
+function gl_account_types_list_cells($label, $name, $selected_id, $all_option=false,
$all_option_numeric=false)
{
if ($label != null)
echo "$label \n";
echo "";
- gl_account_types_list($name, $selected_id, $all_option, $all_option_name, $all_option_numeric);
+ gl_account_types_list($name, $selected_id, $all_option, $all_option_numeric);
echo " \n";
}
-function gl_account_types_list_row($label, $name, $selected_id, $all_option=false, $all_option_name=null,
+function gl_account_types_list_row($label, $name, $selected_id, $all_option=false,
$all_option_numeric=false)
{
echo "\n";
gl_account_types_list_cells($label, $name, $selected_id, $all_option,
- $all_option_name, $all_option_numeric);
+ $all_option_numeric);
echo " \n";
}
//-----------------------------------------------------------------------------------------------
-
function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false,
- $show_group=false, $onchange="")
+ $show_group=false, $cells=false, $all_option=false)
{
- echo "";
-
if ($skip_bank_accounts)
- $sql = "SELECT ".TB_PREF."chart_master.account_code, ".TB_PREF."chart_master.account_name, ".TB_PREF."chart_types.name
- FROM (".TB_PREF."chart_master,".TB_PREF."chart_types) LEFT JOIN ".TB_PREF."bank_accounts ON ".TB_PREF."chart_master.account_code=".TB_PREF."bank_accounts.account_code
- WHERE ".TB_PREF."bank_accounts.account_code IS NULL
- AND ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id
- ORDER BY account_code;";
+ $sql = "SELECT chart.account_code, chart.account_name, type.name
+ 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 account_code, account_name,".TB_PREF."chart_types.name
- FROM ".TB_PREF."chart_master, ".TB_PREF."chart_types
- WHERE ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id
- ORDER BY account_code";
+ $sql = "SELECT chart.account_code, chart.account_name, type.name
+ FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
+ WHERE chart.account_type=type.id";
- if ($selected_id == null)
- $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- $result = db_query($sql, "query chart master");
+ combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name',
+ array(
+ 'format' => '_format_account' . ($show_group ? '2' : ''),
+ 'spec_option' => $all_option===true ? _("Use Item Sales Accounts") : $all_option,
+ 'spec_id' => '',
+ 'order' => 'account_code',
+ 'search_box' => $cells,
+ 'search_submit' => false,
+ 'size' => 12,
+ 'max' => 10,
+ 'cells' => true
+ ) );
- while ($row = db_fetch_row($result))
- {
- if ($selected_id == $row[0])
- {
- echo "";
- }
- else
- {
- echo " ";
- }
- //echo str_pad($row[0],6,'0', STR_PAD_LEFT) . " " . $row[2] . " " . $row[1];
- if ($show_group)
- echo $row[0] . " " . $row[2] . " " . $row[1] . " \n";
- else
- echo $row[0] . " " . $row[1] . "\n";
+}
- if ($selected_id == "")
- {
- $selected_id = $row[0];
- $_POST[$name] = $selected_id;
- }
- }
+function _format_account($row)
+{
+ return $row[0] . " " . $row[1];
+}
- echo " ";
- db_free_result($result);
+function _format_account2($row)
+{
+ return $row[0] . " " . $row[2] . " " . $row[1];
}
function gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts=false,
- $show_group=false, $onchange="")
+ $show_group=false, $cells=false, $all_option=false)
{
if ($label != null)
echo "$label \n";
echo "";
- gl_all_accounts_list($name, $selected_id, $skip_bank_accounts, $show_group, $onchange);
+ gl_all_accounts_list($name, $selected_id, $skip_bank_accounts, $show_group, $cells, $all_option);
echo " \n";
}
function gl_all_accounts_list_row($label, $name, $selected_id, $skip_bank_accounts=false,
- $show_group=false, $onchange="")
+ $show_group=false, $cells=false, $all_option=false)
{
echo "\n";
gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts,
- $show_group, $onchange);
+ $show_group, $cells, $all_option);
echo " \n";
}
function yesno_list($name, $selected_id, $name_yes="", $name_no="", $submit_on_change=false)
{
+ default_focus($name);
if ($submit_on_change == true)
- echo "";
+ echo ""; // FIX ajax
else
echo "";
@@ -1677,10 +1306,10 @@ function yesno_list($name, $selected_id, $name_yes="", $name_no="", $submit_on_c
if ($selected_id == null)
$selected_id = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
- if ($selected_id == 0)
- echo "";
- else
- echo " ";
+ if ($selected_id == 0)
+ echo " ";
+ else
+ echo " ";
if (!isset($name_yes))
echo _("Yes") . " \n";
else
@@ -1688,7 +1317,7 @@ function yesno_list($name, $selected_id, $name_yes="", $name_no="", $submit_on_c
if ($selected_id == 0)
echo "";
else
- echo " ";
+ echo " ";
if (!isset($name_no))
echo _("No") . " \n";
else
@@ -1701,30 +1330,33 @@ function yesno_list_cells($label, $name, $selected_id, $name_yes="", $name_no=""
if ($label != null)
echo "$label \n";
echo "";
- yesno_list($name, $selected_id, $name_yes, $name_no, $submit_on_change);
+ $str = yesno_list($name, $selected_id, $name_yes, $name_no, $submit_on_change);
echo " \n";
+ return $str;
}
function yesno_list_row($label, $name, $selected_id, $name_yes="", $name_no="", $submit_on_change=false)
{
echo "\n";
- yesno_list_cells($label, $name, $selected_id, $name_yes, $name_no, $submit_on_change);
+ $str = yesno_list_cells($label, $name, $selected_id, $name_yes, $name_no, $submit_on_change);
echo " \n";
+ return $str;
}
//------------------------------------------------------------------------------------------------
-function languages_list($name, &$selected_id)
+function languages_list($name, $selected_id)
{
- global $installed_languages;
+ global $installed_languages;
+ default_focus($name);
echo "";
if ($selected_id == null)
$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
foreach ($installed_languages as $lang)
{
- echo "" . $lang['name'] . " \n";
@@ -1749,21 +1381,22 @@ function languages_list_row($label, $name, $selected_id)
//------------------------------------------------------------------------------------------------
-function bank_account_types_list($name, &$selected_id)
+function bank_account_types_list($name, $selected_id)
{
- $bank_account_types = bank_account_types::get_all();
+ $bank_account_types = bank_account_types::get_all();
- echo "";
+ default_focus($name);
+ echo "";
if ($selected_id == null)
$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- foreach ($bank_account_types as $type)
- {
- echo "" . $type['name'] . " \n";
- }
+ foreach ($bank_account_types as $type)
+ {
+ echo "" . $type['name'] . " \n";
+ }
}
function bank_account_types_list_cells($label, $name, $selected_id)
@@ -1786,27 +1419,28 @@ function bank_account_types_list_row($label, $name, $selected_id)
function payment_person_types_list($name, $selected_id, $related=null)
{
- $types = payment_person_types::get_all();
+ $types = payment_person_types::get_all();
- echo "";
+ default_focus($name);
+ echo "";
if ($selected_id == null)
$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- foreach ($types as $type)
- {
+ foreach ($types as $type)
+ {
if (payment_person_types::has_items($type['id']))
{
if ($selected_id == "")
$_POST[$name] = $selected_id = $type['id'];
- echo "" . $type['name'] . " \n";
+ echo "" . $type['name'] . " \n";
}
- }
+ }
}
function payment_person_types_list_cells($label, $name, $selected_id, $related=null)
@@ -1814,50 +1448,55 @@ function payment_person_types_list_cells($label, $name, $selected_id, $related=n
if ($label != null)
echo "$label \n";
echo "";
- payment_person_types_list($name, $selected_id, $related);
+ $str = payment_person_types_list($name, $selected_id, $related);
echo " \n";
+ return $str;
}
function payment_person_types_list_row($label, $name, $selected_id, $related=null)
{
echo "\n";
- payment_person_types_list_cells($label, $name, $selected_id, $related);
+ $str = payment_person_types_list_cells($label, $name, $selected_id, $related);
echo " \n";
+ return $str;
}
//------------------------------------------------------------------------------------------------
-function wo_types_list($name, &$selected_id)
+function wo_types_list($name, $selected_id)
{
- $types = wo_types::get_all();
+ $types = wo_types::get_all();
- echo "";
+ default_focus($name); // FIX ajax
+ echo "";
if ($selected_id == null)
$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- foreach ($types as $type)
- {
- echo "" . $type['name'] . " \n";
- }
+ foreach ($types as $type)
+ {
+ echo "" . $type['name'] . " \n";
+ }
echo " ";
}
-function wo_types_list_row($label, $name, &$selected_id)
+function wo_types_list_row($label, $name, $selected_id)
{
echo "$label \n";
- wo_types_list($name, $selected_id);
+ $str = wo_types_list($name, $selected_id);
echo " \n";
+ return $str;
}
//------------------------------------------------------------------------------------------------
function dateformats_list_row($label, $name, $value)
{
- global $dateformats;
+ global $dateformats;
+ default_focus($name);
echo "$label \n";
echo "";
@@ -1882,8 +1521,9 @@ function dateformats_list_row($label, $name, $value)
function dateseps_list_row($label, $name, $value)
{
- global $dateseps;
+ global $dateseps;
+ default_focus($name);
echo "$label \n";
echo "";
@@ -1908,8 +1548,9 @@ function dateseps_list_row($label, $name, $value)
function thoseps_list_row($label, $name, $value)
{
- global $thoseps;
+ global $thoseps;
+ default_focus($name);
echo "$label \n";
echo "";
@@ -1934,8 +1575,9 @@ function thoseps_list_row($label, $name, $value)
function decseps_list_row($label, $name, $value)
{
- global $decseps;
+ global $decseps;
+ default_focus($name);
echo "$label \n";
echo "";
@@ -1960,8 +1602,20 @@ function decseps_list_row($label, $name, $value)
function themes_list_row($label, $name, $value)
{
- global $themes;
+ global $path_to_root;
+ default_focus($name);
+ $path = $path_to_root.'/themes/';
+ $themes = array();
+ $themedir = opendir($path);
+ while(false !== ($fname = readdir($themedir)))
+ {
+ if($fname!='.' && $fname!='..' && $fname!='CVS' && is_dir($path.$fname))
+ {
+ $themes[] = $fname;
+ }
+ }
+ sort($themes);
echo "$label \n";
echo "";
@@ -1984,8 +1638,9 @@ function themes_list_row($label, $name, $value)
function pagesizes_list_row($label, $name, $value)
{
- global $pagesizes;
+ global $pagesizes;
+ default_focus($name);
echo "$label \n";
echo "";
@@ -2008,8 +1663,9 @@ function pagesizes_list_row($label, $name, $value)
function security_headings_list_row($label, $name, $value)
{
- global $security_headings;
+ global $security_headings;
+ default_focus($name);
echo "$label \n";
echo "";
@@ -2034,19 +1690,20 @@ function security_headings_list_row($label, $name, $value)
function systypes_list_cells($label, $name, $value, $submit_on_change=false)
{
- global $systypes_array;
+ global $systypes_array;
+ default_focus($name);
if ($label != null)
echo "$label \n";
- echo "";
- else
- echo ">";
+ echo ""; // FIX ajax
+ else
+ echo ">";
if ($value == null)
$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
- foreach ($systypes_array as $key=>$type)
- {
+ foreach ($systypes_array as $key=>$type)
+ {
if ($value==$key)
{
@@ -2056,20 +1713,22 @@ function systypes_list_cells($label, $name, $value, $submit_on_change=false)
{
echo "".$type['name']." \n";
}
- }
- echo " \n";
+ }
+ echo " \n";
}
function systypes_list_row($label, $name, $value, $submit_on_change=false)
{
echo "\n";
- systypes_list_cells($label, $name, $value, $submit_on_change);
+ $str = systypes_list_cells($label, $name, $value, $submit_on_change);
echo " \n";
+ return $str;
}
function cust_allocations_list_cells($label, $name, $selected)
{
global $all_items;
+ default_focus($name);
if ($label != null)
label_cell($label);
if ($selected == null)
@@ -2080,12 +1739,15 @@ function cust_allocations_list_cells($label, $name, $selected)
echo "" . _("Overdue Invoices"). " \n";
echo "" . _("Payments"). " \n";
echo "" . _("Credit Notes"). " \n";
+ echo "" . _("Delivery Notes"). " \n";
echo " \n";
}
function supp_allocations_list_cells($name, $selected)
{
global $all_items;
+
+ default_focus($name);
if ($selected == null)
$selected = (!isset($_POST[$name]) ? "" : $_POST[$name]);
echo "";
@@ -2100,6 +1762,7 @@ function supp_allocations_list_cells($name, $selected)
function policy_list_cells($label, $name, $selected)
{
+ default_focus($name);
if ($selected == null)
{
$selected = (!isset($_POST[$name]) ? "" : $_POST[$name]);
@@ -2123,6 +1786,7 @@ function policy_list_row($label, $name, $selected)
function credit_type_list_cells($label, $name, $selected, $submit_on_change=false)
{
+ default_focus($name);
if ($selected == null)
{
$selected = (!isset($_POST[$name]) ? "Return" : $_POST[$name]);
@@ -2131,11 +1795,11 @@ function credit_type_list_cells($label, $name, $selected, $submit_on_change=fals
}
if ($label != null)
label_cell($label);
- echo "";
- else
- echo ">";
+ echo "";
+ else
+ echo ">";
echo "" . _("Items Returned to Inventory Location"). " \n";
echo "" . _("Items Written Off"). " \n";
echo " \n";
@@ -2144,50 +1808,60 @@ function credit_type_list_cells($label, $name, $selected, $submit_on_change=fals
function credit_type_list_row($label, $name, $selected, $submit_on_change=false)
{
echo "\n";
- credit_type_list_cells($label, $name, $selected, $submit_on_change);
+ $str = credit_type_list_cells($label, $name, $selected, $submit_on_change);
echo " \n";
+ return $str;
}
-function number_list($name, $selected, $from, $to, $firstlabel="")
+function number_list($name, $selected, $from, $to, $no_option=false)
{
+ default_focus($name);
if ($selected == null)
{
- $selected = (!isset($_POST[$name]) ? $from : $_POST[$name]);
- if ($selected == $from)
- $_POST[$name] = $selected;
+ $selected = (!isset($_POST[$name]) ? reserved_words::get_all_numeric() : $_POST[$name]);
}
echo "";
+ if ($no_option !== false)
+ {
+ $reserved_word = reserved_words::get_all_numeric();
+
+ if ($selected == $reserved_word)
+ {
+ echo "$no_option \n";
+ }
+ else
+ {
+ echo "$no_option \n";
+ }
+ }
+
for ($i = $from; $i <= $to; $i++)
- {
- if ($i == 0 && $firstlabel != "")
- $label = $firstlabel;
- else
- $label = $i;
+ {
if ($selected == $i)
{
- echo "$label \n";
+ echo "$i \n";
}
else
{
- echo "$label \n";
+ echo "$i \n";
}
- }
+ }
echo " \n";
}
-function number_list_cells($label, $name, $selected, $from, $to)
+function number_list_cells($label, $name, $selected, $from, $to, $no_option=false)
{
if ($label != null)
label_cell($label);
echo "\n";
- number_list($name, $selected, $from, $to);
+ number_list($name, $selected, $from, $to, $no_option);
echo " \n";
}
-function number_list_row($label, $name, $selected, $from, $to)
+function number_list_row($label, $name, $selected, $from, $to, $no_option=false)
{
echo "\n";
- number_list_cells($label, $name, $selected, $from, $to);
+ number_list_cells($label, $name, $selected, $from, $to, $no_option);
echo " \n";
}
?>
\ No newline at end of file