X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=72d2dd9c261f422a0be830b88780a9c4150ca64e;hb=d23b97ed26bc0608c9ba1037b66058c709e83765;hp=932eaf7ec52bfb9da0ec2e1868263c0ac16718a7;hpb=8c7e9ee8fafeec2061c8a4ed5201d23a3e601b3b;p=fa-stable.git
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 932eaf7e..72d2dd9c 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -181,12 +181,13 @@ $opts = array( // default options
if (get_post($search_button) && ($txt == $value)) {
$selected_id[] = $value;
}
- if (in_array($value, $selected_id)) {
+
+ if (in_array((string)$value, $selected_id, true)) {
$sel = 'selected';
$found = $value;
$edit = $opts['editable'] && $contact_row['editable']
&& (@$_POST[$search_box] == $value)
- ? $descr : false;
+ ? $contact_row[1] : false; // get non-formatted description
if ($edit)
break; // selected field is editable - abandon list construction
}
@@ -228,7 +229,7 @@ $opts = array( // default options
$_POST[$name] = $multi ? $selected_id : $selected_id[0];
- $selector = "\n";
@@ -240,7 +241,7 @@ $opts = array( // default options
."\n";
set_focus($name.'_text'); // prevent lost focus
- } else if (isset($_POST['_'.$name.'_edit']))
+ } else if (get_post($search_submit ? $search_submit : "_{$name}_button"))
set_focus($name); // prevent lost focus
if (!$opts['editable'])
$txt = $found;
@@ -249,7 +250,7 @@ $opts = array( // default options
$Ajax->addUpdate($name, "_{$name}_sel", $selector);
- // span for select list/inut field update
+ // span for select list/input field update
$selector = "".$selector."\n";
// if selectable or editable list is used - add select button
@@ -343,22 +344,28 @@ $opts = array( // default options
//if($name=='SelectStockFromList') display_error($sql);
foreach($items as $value=>$descr) {
$sel = '';
- if (in_array((string)$value, $selected_id)) {
- $sel = 'selected';
+ if (in_array((string)$value, $selected_id, true)) {
+ $sel = "selected='selected'";
$found = $value;
}
if ($first_id === false) {
$first_id = $value;
- $first_opt = $descr;
+ $first_opt = "\n";
+ }
+ else {
+ $selector .= "\n";
}
- $selector .= "\n";
}
+ if ($first_id!==false) {
+ $sel = ($found===$first_id) || ($found===false && ($spec_option===false)) ? "selected='selected'" : '';
+ $selector = sprintf($first_opt, $sel).$selector;
+ }
// Prepend special option.
if ($spec_option !== false) { // if special option used - add it
$first_id = $spec_id;
$first_opt = $spec_option;
- $sel = $found===false ? 'selected' : '';
+ $sel = $found===false ? "selected='selected'" : '';
$selector = "\n"
. $selector;
}
@@ -367,7 +374,7 @@ $opts = array( // default options
$selected_id = array($first_id);
}
$_POST[$name] = $multi ? $selected_id : $selected_id[0];
- $selector = "\n";
@@ -441,7 +448,7 @@ function supplier_list_cells($label, $name, $selected_id=null, $all_option=false
function supplier_list_row($label, $name, $selected_id=null, $all_option = false,
$submit_on_change=false, $all=false, $editkey = false)
{
- echo "| $label | ";
+ echo " |
| $label | ";
echo supplier_list($name, $selected_id, $all_option, $submit_on_change,
$all, $editkey);
echo " |
\n";
@@ -491,7 +498,7 @@ function customer_list_cells($label, $name, $selected_id=null, $all_option=false
function customer_list_row($label, $name, $selected_id=null, $all_option = false,
$submit_on_change=false, $show_inactive=false, $editkey = false)
{
- echo "| $label | ";
+ echo " |
| $label | ";
echo customer_list($name, $selected_id, $all_option, $submit_on_change,
$show_inactive, $editkey);
echo " | \n
\n";
@@ -537,8 +544,8 @@ function customer_branches_list_cells($label,$customer_id, $name, $selected_id=n
function customer_branches_list_row($label, $customer_id, $name, $selected_id=null,
$all_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
{
- echo "";
- customer_branches_list_cells($label, $customer_id, $name, $selected_id,
+ echo "
| $label | ";
+ customer_branches_list_cells(null, $customer_id, $name, $selected_id,
$all_option, $enabled, $submit_on_change, $editkey);
echo "
";
}
@@ -570,8 +577,8 @@ function locations_list_cells($label, $name, $selected_id=null, $all_option=fals
function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
- echo "";
- locations_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
+ echo "
| $label | ";
+ locations_list_cells(null, $name, $selected_id, $all_option, $submit_on_change);
echo "
\n";
}
@@ -601,8 +608,8 @@ function currencies_list_cells($label, $name, $selected_id=null, $submit_on_chan
function currencies_list_row($label, $name, $selected_id=null, $submit_on_change=false)
{
- echo "\n";
- currencies_list_cells($label, $name, $selected_id, $submit_on_change);
+ echo "
| $label | ";
+ currencies_list_cells(null, $name, $selected_id, $submit_on_change);
echo "
\n";
}
@@ -642,8 +649,8 @@ function fiscalyears_list_cells($label, $name, $selected_id=null)
function fiscalyears_list_row($label, $name, $selected_id=null)
{
- echo "\n";
- fiscalyears_list_cells($label, $name, $selected_id);
+ echo "
| $label | ";
+ fiscalyears_list_cells(null, $name, $selected_id);
echo "
\n";
}
//------------------------------------------------------------------------------------
@@ -682,8 +689,8 @@ function dimensions_list_cells($label, $name, $selected_id=null, $no_option=fals
function dimensions_list_row($label, $name, $selected_id=null, $no_option=false, $showname=null,
$showclosed=false, $showtype=0, $submit_on_change=false)
{
- echo "\n";
- dimensions_list_cells($label, $name, $selected_id, $no_option, $showname,
+ echo "
| $label | ";
+ dimensions_list_cells(null, $name, $selected_id, $no_option, $showname,
$showclosed, $showtype, $submit_on_change);
echo "
\n";
}
@@ -695,7 +702,7 @@ function stock_items_list($name, $selected_id=null, $all_option=false,
{
global $all_items;
- $sql = "SELECT stock_id, s.description, c.description, s.inactive
+ $sql = "SELECT stock_id, s.description, c.description, s.inactive, s.editable
FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
if ($editkey)
@@ -802,7 +809,7 @@ function sales_local_items_list_row($label, $name, $selected_id=null, $all_optio
{
echo "";
if ($label != null)
- echo "| $label | \n";
+ echo "$label | \n";
echo "";
echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,
'local', array('cells'=>false, 'editable' => false));
@@ -830,8 +837,8 @@ function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
function stock_manufactured_items_list_row($label, $name, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
- echo " |
\n";
- stock_manufactured_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
+ echo "
| $label | ";
+ stock_manufactured_items_list_cells(null, $name, $selected_id, $all_option, $submit_on_change);
echo "
\n";
}
//------------------------------------------------------------------------------------
@@ -878,7 +885,9 @@ function stock_purchasable_items_list($name, $selected_id=null,
array('where'=>array("mb_flag!= 'M'"),
'show_inactive'=>$all), $editkey);
}
-
+//
+// This helper is used in PO/GRN/PI entry and supports editable descriptions.
+//
function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
$all_option=false, $submit_on_change=false, $editkey=false)
{
@@ -886,18 +895,19 @@ function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
echo "$label | \n";
echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
array('where'=>array("mb_flag!= 'M'"),
+ 'editable' => 30,
'cells'=>true), $editkey);
}
-
+/*
function stock_purchasable_items_list_row($label, $name, $selected_id=null,
$all_option=false, $submit_on_change=false, $editkey=false)
{
- echo "\n";
- stock_purchasable_items_list_cells($label, $name, $selected_id=null,
+ echo "
| $label | ";
+ stock_purchasable_items_list_cells(null, $name, $selected_id=null,
$all_option, $submit_on_change, $editkey);
echo "
\n";
}
-
+*/
//------------------------------------------------------------------------------------
function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=true)
@@ -906,7 +916,7 @@ function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=tr
echo "";
if ($label != null)
- echo "| $label | \n";
+ echo "$label | \n";
echo "";
echo array_selector($name, $selected_id, $stock_types,
@@ -921,7 +931,7 @@ function stock_units_list_row($label, $name, $value=null, $enabled=true)
$result = get_all_item_units();
echo " |
";
if ($label != null)
- echo "| $label | \n";
+ echo "$label | \n";
echo "";
while($unit = db_fetch($result))
@@ -960,8 +970,8 @@ function tax_types_list_cells($label, $name, $selected_id=null, $none_option=fal
function tax_types_list_row($label, $name, $selected_id=null, $none_option=false,
$submit_on_change=false)
{
- echo " |
\n";
- tax_types_list_cells($label, $name, $selected_id, $none_option, $submit_on_change);
+ echo "
| $label | ";
+ tax_types_list_cells(null, $name, $selected_id, $none_option, $submit_on_change);
echo "
\n";
}
@@ -993,8 +1003,8 @@ function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=fa
function tax_groups_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
{
- echo "\n";
- tax_groups_list_cells($label, $name, $selected_id, $none_option, $submit_on_change);
+ echo "
| $label | ";
+ tax_groups_list_cells(null, $name, $selected_id, $none_option, $submit_on_change);
echo "
\n";
}
@@ -1017,8 +1027,8 @@ function item_tax_types_list_cells($label, $name, $selected_id=null)
function item_tax_types_list_row($label, $name, $selected_id=null)
{
- echo "\n";
- item_tax_types_list_cells($label, $name, $selected_id);
+ echo "
| $label | ";
+ item_tax_types_list_cells(null, $name, $selected_id);
echo "
\n";
}
@@ -1042,8 +1052,8 @@ function shippers_list_cells($label, $name, $selected_id=null)
function shippers_list_row($label, $name, $selected_id=null)
{
- echo "\n";
- shippers_list_cells($label, $name, $selected_id);
+ echo "
| $label | ";
+ shippers_list_cells(null, $name, $selected_id);
echo "
\n";
}
@@ -1069,8 +1079,8 @@ function sales_persons_list_cells($label, $name, $selected_id=null, $spec_opt=fa
function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=false)
{
- echo "\n";
- sales_persons_list_cells($label, $name, $selected_id, $spec_opt);
+ echo "
| $label | ";
+ sales_persons_list_cells(null, $name, $selected_id, $spec_opt);
echo "
\n";
}
@@ -1093,8 +1103,8 @@ function sales_areas_list_cells($label, $name, $selected_id=null)
function sales_areas_list_row($label, $name, $selected_id=null)
{
- echo "\n";
- sales_areas_list_cells($label, $name, $selected_id);
+ echo "
| $label | ";
+ sales_areas_list_cells(null, $name, $selected_id);
echo "
\n";
}
@@ -1120,8 +1130,8 @@ function sales_groups_list_cells($label, $name, $selected_id=null, $special_opti
function sales_groups_list_row($label, $name, $selected_id=null, $special_option=false)
{
- echo "\n";
- sales_groups_list_cells($label, $name, $selected_id, $special_option);
+ echo "
| $label | ";
+ sales_groups_list_cells(null, $name, $selected_id, $special_option);
echo "
\n";
}
@@ -1155,8 +1165,8 @@ function templates_list_cells($label, $name, $selected_id=null, $special_option=
function templates_list_row($label, $name, $selected_id=null, $special_option=false)
{
- echo "\n";
- templates_list_cells($label, $name, $selected_id, $special_option);
+ echo "
| $label | ";
+ templates_list_cells(null, $name, $selected_id, $special_option);
echo "
\n";
}
@@ -1179,8 +1189,8 @@ function workorders_list_cells($label, $name, $selected_id=null)
function workorders_list_row($label, $name, $selected_id=null)
{
- echo "\n";
- workorders_list_cells($label, $name, $selected_id);
+ echo "
| $label | ";
+ workorders_list_cells(null, $name, $selected_id);
echo "
\n";
}
@@ -1203,8 +1213,8 @@ function payment_terms_list_cells($label, $name, $selected_id=null)
function payment_terms_list_row($label, $name, $selected_id=null)
{
- echo "\n";
- payment_terms_list_cells($label, $name, $selected_id);
+ echo "
| $label | ";
+ payment_terms_list_cells(null, $name, $selected_id);
echo "
\n";
}
@@ -1227,8 +1237,8 @@ function credit_status_list_cells($label, $name, $selected_id=null)
function credit_status_list_row($label, $name, $selected_id=null)
{
- echo "\n";
- credit_status_list_cells($label, $name, $selected_id);
+ echo "
| $label | ";
+ credit_status_list_cells(null, $name, $selected_id);
echo "
\n";
}
@@ -1258,8 +1268,8 @@ function sales_types_list_cells($label, $name, $selected_id=null, $submit_on_cha
function sales_types_list_row($label, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
{
- echo "\n";
- sales_types_list_cells($label, $name, $selected_id, $submit_on_change, $special_option);
+ echo "
| $label | ";
+ sales_types_list_cells(null, $name, $selected_id, $submit_on_change, $special_option);
echo "
\n";
}
@@ -1282,8 +1292,8 @@ function movement_types_list_cells($label, $name, $selected_id=null)
function movement_types_list_row($label, $name, $selected_id=null)
{
- echo "\n";
- movement_types_list_cells($label, $name, $selected_id);
+ echo "
| $label | ";
+ movement_types_list_cells(null, $name, $selected_id);
echo "
\n";
}
@@ -1350,8 +1360,8 @@ function workcenter_list_cells($label, $name, $selected_id=null, $all_option=fal
function workcenter_list_row($label, $name, $selected_id=null, $all_option=false)
{
- echo "\n";
- workcenter_list_cells($label, $name, $selected_id, $all_option);
+ echo "
| $label | ";
+ workcenter_list_cells(null, $name, $selected_id, $all_option);
echo "
\n";
}
@@ -1381,8 +1391,8 @@ function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_c
function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
{
- echo "\n";
- bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change);
+ echo "
| $label | ";
+ bank_accounts_list_cells(null, $name, $selected_id, $submit_on_change);
echo "
\n";
}
//-----------------------------------------------------------------------------------------------
@@ -1394,7 +1404,7 @@ function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
WHERE ".TB_PREF."bank_accounts.account_type=3";
if ($label != null)
- echo "| $label | \n";
+ echo "
| $label | \n";
echo "";
echo combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
array(
@@ -1413,7 +1423,7 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub
default_focus($name);
echo ' |
';
if ($label != null)
- echo "| $label | \n";
+ echo "$label | \n";
echo "";
echo combo_input($name, $selected_id, $sql, 'id', 'pos_name',
@@ -1428,13 +1438,36 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub
}
//-----------------------------------------------------------------------------------------------
+// Payment type selector for current user.
+//
+function sale_payment_list($name, $selected_id=null, $submit_on_change=true)
+{
+ $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
+ $paym = get_sales_point(user_pos());
+
+ if (!$paym['cash_sale'] || !$paym['credit_sale']) {
+ if ($paym['cash_sale']) // only cash
+ $sql .= " WHERE days_before_due=0 AND day_in_following_month=0";
+ else
+ $sql .= " WHERE days_before_due!=0 OR day_in_following_month!=0";
+ }
-function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
+ return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms',
+ array(
+ 'select_submit'=> $submit_on_change,
+ 'async' => true
+ ) );
+
+}
+
+function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=true)
{
if ($label != null)
- echo " | $label | \n";
+ echo "$label | \n";
echo "";
- echo yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change);
+
+ echo sale_payment_list($name, $selected_id, $submit_on_change);
+
echo " | \n";
}
//-----------------------------------------------------------------------------------------------
@@ -1462,8 +1495,8 @@ function class_list_cells($label, $name, $selected_id=null, $submit_on_change=fa
function class_list_row($label, $name, $selected_id=null, $submit_on_change=false)
{
- echo "
\n";
- class_list_cells($label, $name, $selected_id, $submit_on_change);
+ echo "
| $label | ";
+ class_list_cells(null, $name, $selected_id, $submit_on_change);
echo "
\n";
}
@@ -1491,14 +1524,14 @@ function stock_categories_list_cells($label, $name, $selected_id=null, $spec_opt
function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
{
- echo "\n";
- stock_categories_list_cells($label, $name, $selected_id, $spec_opt, $submit_on_change);
+ echo "
| $label | ";
+ stock_categories_list_cells(null, $name, $selected_id, $spec_opt, $submit_on_change);
echo "
\n";
}
//-----------------------------------------------------------------------------------------------
-function gl_account_types_list($name, $selected_id=null, $all_option=false, $all_option_numeric=true)
+function gl_account_types_list($name, $selected_id=null, $all_option=false, $all=true)
{
global $all_items;
@@ -1506,28 +1539,26 @@ function gl_account_types_list($name, $selected_id=null, $all_option=false, $all
return combo_input($name, $selected_id, $sql, 'id', 'name',
array(
- 'order' => 'id',
+ 'order' => array('class_id', 'id', 'parent'),
'spec_option' =>$all_option,
- 'spec_id' => $all_option_numeric ? 0 : $all_items
+ 'spec_id' => $all_items
) );
}
-function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false,
- $all_option_numeric=false)
+function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false, $all=false)
{
if ($label != null)
echo "$label | \n";
echo "";
- echo gl_account_types_list($name, $selected_id, $all_option, $all_option_numeric);
+ echo gl_account_types_list($name, $selected_id, $all_option, $all);
echo " | \n";
}
-function gl_account_types_list_row($label, $name, $selected_id=null, $all_option=false,
- $all_option_numeric=false)
+function gl_account_types_list_row($label, $name, $selected_id=null, $all_option=false, $all=false)
{
- echo "\n";
- gl_account_types_list_cells($label, $name, $selected_id, $all_option,
- $all_option_numeric);
+ echo "
| $label | ";
+ gl_account_types_list_cells(null, $name, $selected_id, $all_option,
+ $all);
echo "
\n";
}
@@ -1552,7 +1583,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
'format' => '_format_account',
'spec_option' => $all_option===true ? _("Use Item Sales Accounts") : $all_option,
'spec_id' => '',
- 'order' => array('type.id','account_code'),
+ 'order' => array('type.class_id','type.id','account_code'),
'search_box' => $cells,
'search_submit' => false,
'size' => 12,
@@ -1586,8 +1617,8 @@ function gl_all_accounts_list_cells($label, $name, $selected_id=null,
function gl_all_accounts_list_row($label, $name, $selected_id=null,
$skip_bank_accounts=false, $cells=false, $all_option=false)
{
- echo "\n";
- gl_all_accounts_list_cells($label, $name, $selected_id,
+ echo "
| $label | ";
+ gl_all_accounts_list_cells(null, $name, $selected_id,
$skip_bank_accounts, $cells, $all_option);
echo "
\n";
}
@@ -1615,37 +1646,38 @@ function yesno_list_cells($label, $name, $selected_id=null, $name_yes="", $name_
function yesno_list_row($label, $name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
{
- echo "\n";
- yesno_list_cells($label, $name, $selected_id, $name_yes, $name_no, $submit_on_change);
+ echo "
| $label | ";
+ yesno_list_cells(null, $name, $selected_id, $name_yes, $name_no, $submit_on_change);
echo "
\n";
}
//------------------------------------------------------------------------------------------------
-function languages_list($name, $selected_id=null)
+function languages_list($name, $selected_id=null, $all_option=false)
{
global $installed_languages;
$items = array();
+ if ($all_option)
+ $items[''] = $all_option;
foreach ($installed_languages as $lang)
$items[$lang['code']] = $lang['name'];
-
return array_selector($name, $selected_id, $items);
}
-function languages_list_cells($label, $name, $selected_id=null)
+function languages_list_cells($label, $name, $selected_id=null, $all_option=false)
{
if ($label != null)
echo "$label | \n";
echo "";
- echo languages_list($name, $selected_id);
+ echo languages_list($name, $selected_id, $all_option);
echo " | \n";
}
-function languages_list_row($label, $name, $selected_id=null)
+function languages_list_row($label, $name, $selected_id=null, $all_option=false)
{
- echo "\n";
- languages_list_cells($label, $name, $selected_id);
+ echo "
| $label | ";
+ languages_list_cells(null, $name, $selected_id, $all_option);
echo "
\n";
}
@@ -1669,8 +1701,8 @@ function bank_account_types_list_cells($label, $name, $selected_id=null)
function bank_account_types_list_row($label, $name, $selected_id=null)
{
- echo "\n";
- bank_account_types_list_cells($label, $name, $selected_id);
+ echo "
| $label | ";
+ bank_account_types_list_cells(null, $name, $selected_id);
echo "
\n";
}
@@ -1700,8 +1732,8 @@ function payment_person_types_list_cells($label, $name, $selected_id=null, $rela
function payment_person_types_list_row($label, $name, $selected_id=null, $related=null)
{
- echo "\n";
- payment_person_types_list_cells($label, $name, $selected_id, $related);
+ echo "
| $label | ";
+ payment_person_types_list_cells(null, $name, $selected_id, $related);
echo "
\n";
}
@@ -1717,7 +1749,7 @@ function wo_types_list($name, $selected_id=null)
function wo_types_list_row($label, $name, $selected_id=null)
{
- echo "| $label | \n";
+ echo " |
| $label | \n";
echo wo_types_list($name, $selected_id);
echo " |
\n";
}
@@ -1728,7 +1760,7 @@ function dateformats_list_row($label, $name, $value=null)
{
global $dateformats;
- echo "| $label | \n";
+ echo " |
| $label | \n";
echo array_selector( $name, $value, $dateformats );
echo " |
\n";
}
@@ -1737,7 +1769,7 @@ function dateseps_list_row($label, $name, $value=null)
{
global $dateseps;
- echo "| $label | \n";
+ echo " |
| $label | \n";
echo array_selector( $name, $value, $dateseps );
echo " |
\n";
}
@@ -1746,7 +1778,7 @@ function thoseps_list_row($label, $name, $value=null)
{
global $thoseps;
- echo "| $label | \n";
+ echo " |
| $label | \n";
echo array_selector( $name, $value, $thoseps );
echo " |
\n";
}
@@ -1755,7 +1787,7 @@ function decseps_list_row($label, $name, $value=null)
{
global $decseps;
- echo "| $label | \n";
+ echo " |
| $label | \n";
echo array_selector( $name, $value, $decseps );
echo " |
\n";
}
@@ -1776,7 +1808,7 @@ function themes_list_row($label, $name, $value=null)
}
ksort($themes);
- echo "| $label | \n";
+ echo " |
| $label | \n";
echo array_selector( $name, $value, $themes );
echo " |
\n";
}
@@ -1789,7 +1821,7 @@ function pagesizes_list_row($label, $name, $value=null)
foreach ($pagesizes as $pz)
$items[$pz] = $pz;
- echo "| $label | \n";
+ echo " |
| $label | \n";
echo array_selector( $name, $value, $items );
echo " |
\n";
}
@@ -1819,8 +1851,8 @@ function systypes_list_cells($label, $name, $value=null, $submit_on_change=false
function systypes_list_row($label, $name, $value=null, $submit_on_change=false)
{
- echo "\n";
- systypes_list_cells($label, $name, $value, false, $submit_on_change);
+ echo "
| $label | ";
+ systypes_list_cells(null, $name, $value, false, $submit_on_change);
echo "
\n";
}
@@ -1899,8 +1931,8 @@ function policy_list_cells($label, $name, $selected=null)
function policy_list_row($label, $name, $selected=null)
{
- echo "\n";
- policy_list_cells($label, $name, $selected);
+ echo "
| $label | ";
+ policy_list_cells(null, $name, $selected);
echo "
\n";
}
@@ -1918,8 +1950,8 @@ function credit_type_list_cells($label, $name, $selected=null, $submit_on_change
function credit_type_list_row($label, $name, $selected=null, $submit_on_change=false)
{
- echo "\n";
- credit_type_list_cells($label, $name, $selected, $submit_on_change);
+ echo "
| $label | ";
+ credit_type_list_cells(null, $name, $selected, $submit_on_change);
echo "
\n";
}
@@ -1945,8 +1977,8 @@ function number_list_cells($label, $name, $selected, $from, $to, $no_option=fals
function number_list_row($label, $name, $selected, $from, $to, $no_option=false)
{
- echo "\n";
- echo number_list_cells($label, $name, $selected, $from, $to, $no_option);
+ echo "
| $label | ";
+ echo number_list_cells(null, $name, $selected, $from, $to, $no_option);
echo "
\n";
}
@@ -1963,7 +1995,7 @@ function print_profiles_list_row($label, $name, $selected_id=null, $spec_opt=fal
echo "";
if ($label != null)
- echo "| $label | \n";
+ echo "$label | \n";
echo "";
echo array_selector($name, $selected_id, $profiles,
@@ -2015,15 +2047,17 @@ 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)
{
- echo " | $label | \n";
+ if ($label != null)
+ echo " | $label | \n";
+ echo "";
echo quick_entries_list($name, $selected_id, $type, $submit_on_change);
echo " | ";
}
function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false)
{
- echo "
\n";
- quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change);
+ echo "
| $label | ";
+ quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change);
echo "
\n";
}
@@ -2032,7 +2066,7 @@ function quick_actions_list_row($label, $name, $selected_id=null, $submit_on_cha
{
global $quick_actions;
- echo "| $label | ";
+ echo " |
| $label | ";
echo array_selector($name, $selected_id, $quick_actions,
array(
'select_submit'=> $submit_on_change
@@ -2044,7 +2078,7 @@ function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on
{
global $quick_entry_types;
- echo " |
| $label | ";
+ echo " |
| $label | ";
echo array_selector($name, $selected_id, $quick_entry_types,
array(
'select_submit'=> $submit_on_change
@@ -2060,7 +2094,7 @@ function class_types_list_row($label, $name, $selected_id=null, $submit_on_chang
{
global $class_types;
- echo " |
| $label | ";
+ echo " |
| $label | ";
echo array_selector($name, $selected_id, $class_types,
array(
'select_submit'=> $submit_on_change
@@ -2099,8 +2133,8 @@ function security_roles_list_cells($label, $name, $selected_id=null, $new_item=f
function security_roles_list_row($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false,
$show_inactive = false)
{
- echo " |
";
- security_roles_list_cells($label, $name, $selected_id, $new_item, $submit_on_change, $show_inactive);
+ echo "
| $label | ";
+ security_roles_list_cells(null, $name, $selected_id, $new_item, $submit_on_change, $show_inactive);
echo "
\n";
}
@@ -2119,7 +2153,7 @@ function tab_list_row($label, $name, $selected_id=null, $all = false)
}
}
echo "\n";
- echo "| $label | \n";
+ echo " | $label | \n";
echo array_selector($name, $selected_id, $tabs);
echo " |
\n";
}
@@ -2161,8 +2195,8 @@ function tag_list_cells($label, $name, $height, $type, $mult=false, $all=false,
function tag_list_row($label, $name, $height, $type, $mult=false, $all=false, $spec_opt = false)
{
- echo "\n";
- tag_list_cells($label, $name, $height, $type, $mult, $all, $spec_opt);
+ echo "
| $label | ";
+ tag_list_cells(null, $name, $height, $type, $mult, $all, $spec_opt);
echo "
\n";
}