X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=24939a1a0326c0f5e529ef0d5958ece20fcd974b;hb=50606312fee0bb0dbe984e2c08af53b7dab229bd;hp=b9ef39d587e3a9f02d7e2c68766b2da376f19318;hpb=628583995e3be96a346a9c078a41cf5ee0eab238;p=fa-stable.git
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index b9ef39d5..24939a1a 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -46,9 +46,10 @@ $opts = array( // default options
'sel_hint' => null,
'search_box' => false, // name or true/false
'type' => 0, // type of extended selector:
- // 0 - with (optional) visible search box, search by id
+ // 0 - with (optional) visible search box, search by fragment inside id
// 1 - with hidden search box, search by option text
- // 2 - TODO reverse: box with hidden selector available via enter; this
+ // 2 - with (optional) visible search box, search by fragment at the start of id
+ // 3 - TODO reverse: box with hidden selector available via enter; this
// would be convenient for optional ad hoc adding of new item
'search_submit' => true, //search submit button: true/false
'size' => 8, // size and max of box tag
@@ -60,7 +61,8 @@ $opts = array( // default options
'disabled' => false,
'box_hint' => null, // box/selectors hints; null = std see below
'category' => false, // category column name or false
- 'show_inactive' => false // show inactive records.
+ 'show_inactive' => false, // show inactive records.
+ 'editable' => false // false, or length of editable entry field
);
// ------ merge options with defaults ----------
if($options != null)
@@ -68,12 +70,25 @@ $opts = array( // default options
if (!is_array($opts['where'])) $opts['where'] = array($opts['where']);
$search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box'];
+ // select content filtered by search field:
$search_submit = $opts['search_submit']===true ? '_'.$name.'_button' : $opts['search_submit'];
+ // select set by select content field
+ $search_button = $opts['editable'] ? '_'.$name.'_button' : ($search_box ? $search_submit : false);
+
$select_submit = $opts['select_submit'];
$spec_id = $opts['spec_id'];
$spec_option = $opts['spec_option'];
- $by_id = ($opts['type'] == 0);
- $class = $by_id ? 'combo':'combo2';
+ if ($opts['type'] == 0) {
+ $by_id = true;
+ $class = 'combo';
+ } elseif($opts['type'] == 1) {
+ $by_id = false;
+ $class = 'combo2';
+ } else {
+ $by_id = true;
+ $class = 'combo3';
+ }
+
$disabled = $opts['disabled'] ? "disabled" : '';
$multi = $opts['multi'];
@@ -90,16 +105,15 @@ $opts = array( // default options
: _('Enter description fragment to search or * for all')) :'';
if ($selected_id == null) {
- $selected_id = get_post($name, $opts['default']);
+ $selected_id = get_post($name, (string)$opts['default']);
}
if(!is_array($selected_id))
- $selected_id = array($selected_id); // code is generalized for multiple selection support
+ $selected_id = array((string)$selected_id); // code is generalized for multiple selection support
$txt = get_post($search_box);
$rel = '';
$limit = '';
-
- if (isset($_POST['_'.$name.'_update'])) {
+ if (isset($_POST['_'.$name.'_update'])) { // select list or search box change
if ($by_id) $txt = $_POST[$name];
if (!$opts['async'])
@@ -107,33 +121,41 @@ $opts = array( // default options
else
$Ajax->activate($name);
}
- if ($search_box) {
- // search related sql modifications
-
- $rel = "rel='$search_box'"; // set relation to list
- if ($opts['search_submit']) {
- if (isset($_POST[$search_submit])) {
- $selected_id = array(); // ignore selected_id while search
+ if (isset($_POST[$search_button])) {
if (!$opts['async'])
$Ajax->activate('_page_body');
else
$Ajax->activate($name);
}
- if ($txt == '') {
- if ($spec_option === false && $selected_id == array())
- $limit = ' LIMIT 1';
- else
- $opts['where'][] = $valfield . "='". get_post($name, $spec_id)."'";
- }
- else
- if ($txt != '*') {
+ if ($search_box) {
+ // search related sql modifications
- foreach($opts['search'] as $i=> $s)
- $opts['search'][$i] = $s . " LIKE '%{$txt}%'";
- $opts['where'][] = '('. implode($opts['search'], ' OR ') . ')';
+ $rel = "rel='$search_box'"; // set relation to list
+ if ($opts['search_submit']) {
+ if (isset($_POST[$search_button])) {
+ $selected_id = array(); // ignore selected_id while search
+ if (!$opts['async'])
+ $Ajax->activate('_page_body');
+ else
+ $Ajax->activate($name);
+ }
+ if ($txt == '') {
+ if ($spec_option === false && $selected_id == array())
+ $limit = ' LIMIT 1';
+ else
+ $opts['where'][] = $valfield . "=". db_escape(get_post($name, $spec_id));
+ }
+ else
+ if ($txt != '*') {
+
+ foreach($opts['search'] as $i=> $s)
+ $opts['search'][$i] = $s . " LIKE "
+ .db_escape(($class=='combo3' ? '' : '%').$txt.'%');
+ $opts['where'][] = '('. implode($opts['search'], ' OR ') . ')';
+ }
}
}
- }
+
// sql completion
if (count($opts['where'])) {
$where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND ';
@@ -158,19 +180,27 @@ $opts = array( // default options
$first_id = false;
$found = false;
$lastcat = null;
-//if($name=='stock_id') display_error($sql);
+ $edit = false;
+//if($name=='stock_id') display_notification('
'.print_r($_POST, true).'
');
+//if($name=='curr_default') display_notification($opts['search_submit']);
if($result = db_query($sql)) {
while ($contact_row = db_fetch($result)) {
$value = $contact_row[0];
$descr = $opts['format']==null ? $contact_row[1] :
call_user_func($opts['format'], $contact_row);
$sel = '';
- if (get_post($search_submit) && ($txt === $value)) {
+ 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)
+ ? $contact_row[1] : false; // get non-formatted description
+ if ($edit)
+ break; // selected field is editable - abandon list construction
}
// show selected option even if inactive
if (!$opts['show_inactive'] && @$contact_row['inactive'] && $sel==='') {
@@ -207,24 +237,35 @@ $opts = array( // default options
if ($found===false) {
$selected_id = array($first_id);
}
+
$_POST[$name] = $multi ? $selected_id : $selected_id[0];
- if ($by_id && $search_box != false) {
- $txt = $found;
- $Ajax->addUpdate($name, $search_box, $txt ? $txt : '');
- }
- $selector = "\n";
+ if ($by_id && ($search_box != false || $opts['editable']) ) {
+ // on first display show selector list
+ if (isset($_POST[$search_box]) && $opts['editable'] && $edit) {
+ $selector = ""
+ ."\n";
+ set_focus($name.'_text'); // prevent lost focus
+ } else if (get_post($search_submit ? $search_submit : "_{$name}_button"))
+ set_focus($name); // prevent lost focus
+ if (!$opts['editable'])
+ $txt = $found;
+ $Ajax->addUpdate($name, $search_box, $txt ? $txt : '');
+ }
+
$Ajax->addUpdate($name, "_{$name}_sel", $selector);
- // because of bug which M$ cannot fix since IE 5.0
- // we must embed whole selector in span tags to enable proper ajax update
+ // span for select list/input field update
$selector = "".$selector."\n";
- if ($select_submit != false) { // if submit on change is used - add select button
+ // if selectable or editable list is used - add select button
+ if ($select_submit != false || $search_button) {
global $_select_button;
// button class selects form reload/ajax selector update
$selector .= sprintf($_select_button, $disabled, user_theme(),
@@ -232,7 +273,6 @@ $opts = array( // default options
'_'.$name.'_update')."\n";
}
// ------ make combo ----------
-
$edit_entry = '';
if ($search_box != false) {
$edit_entry = "\n";
- if ($search_submit != false) {
+ if ($search_submit != false || $opts['editable']) {
global $_search_button;
$edit_entry .= sprintf($_search_button, $disabled, user_theme(),
(fallback_mode() ? '' : 'display:none;'),
- $search_submit)."\n";
+ $search_submit ? $search_submit : "_{$name}_button")."\n";
}
}
default_focus(($search_box && $by_id) ? $search_box : $name);
@@ -299,7 +339,7 @@ $opts = array( // default options
$selected_id = get_post($name, $opts['default']);
}
if(!is_array($selected_id))
- $selected_id = array($selected_id); // code is generalized for multiple selection support
+ $selected_id = array((string)$selected_id); // code is generalized for multiple selection support
if (isset($_POST[ '_'.$name.'_update'])) {
if (!$opts['async'])
@@ -315,7 +355,7 @@ $opts = array( // default options
//if($name=='SelectStockFromList') display_error($sql);
foreach($items as $value=>$descr) {
$sel = '';
- if (in_array((string)$value, $selected_id)) {
+ if (in_array((string)$value, $selected_id, true)) {
$sel = 'selected';
$found = $value;
}
@@ -326,6 +366,10 @@ $opts = array( // default options
$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;
@@ -339,7 +383,8 @@ $opts = array( // default options
$selected_id = array($first_id);
}
$_POST[$name] = $multi ? $selected_id : $selected_id[0];
- $selector = "\n";
@@ -413,7 +458,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";
@@ -463,7 +508,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";
@@ -477,7 +522,7 @@ function customer_branches_list($customer_id, $name, $selected_id=null,
global $all_items;
$sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch
- WHERE debtor_no='" . $customer_id . "' ";
+ WHERE debtor_no=" . db_escape($customer_id)." ";
if ($editkey)
set_editor('branch', $name, $editkey);
@@ -509,8 +554,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 "
";
}
@@ -542,8 +587,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";
}
@@ -554,7 +599,6 @@ function currencies_list($name, $selected_id=null, $submit_on_change=false)
$sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies";
// default to the company currency
-
return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
array(
'select_submit'=> $submit_on_change,
@@ -574,8 +618,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";
}
@@ -615,8 +659,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";
}
//------------------------------------------------------------------------------------
@@ -655,8 +699,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";
}
@@ -668,7 +712,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)
@@ -721,7 +765,7 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
global $all_items;
// all sales codes
$sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit,
- i.inactive
+ i.inactive, if(count(*)>1, '0', s.editable) as editable
FROM
".TB_PREF."stock_master s,
".TB_PREF."item_codes i
@@ -746,12 +790,14 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
'spec_option' => $all_option===true ? _("All Items") : $all_option,
'spec_id' => $all_items,
'search_box' => true,
- 'search' => array("i.item_code", "i.description"),
+ 'search' => array("i.item_code", "c.description", "i.description"),
'search_submit' => get_company_pref('no_item_list')!=0,
'size'=>15,
'select_submit'=> $submit_on_change,
'category' => 2,
- 'order' => array('c.description','i.item_code')
+ 'order' => array('c.description','i.item_code'),
+ 'editable' => 30,
+ 'max' => 255
), $opts) );
}
@@ -766,17 +812,17 @@ function sales_items_list_cells($label, $name, $selected_id=null, $all_option=fa
function sales_kits_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
return sales_items_list($name, $selected_id, $all_option, $submit_on_change,
- 'kits', array('cells'=>false));
+ 'kits', array('cells'=>false, 'editable' => false));
}
function sales_local_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
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));
+ 'local', array('cells'=>false, 'editable' => false));
echo " |
";
}
//------------------------------------------------------------------------------------
@@ -801,8 +847,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";
}
//------------------------------------------------------------------------------------
@@ -849,7 +895,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)
{
@@ -857,18 +905,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)
@@ -877,7 +926,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,
@@ -892,7 +941,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))
@@ -931,8 +980,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";
}
@@ -964,8 +1013,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";
}
@@ -988,8 +1037,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";
}
@@ -1013,8 +1062,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";
}
@@ -1040,8 +1089,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";
}
@@ -1064,8 +1113,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";
}
@@ -1091,8 +1140,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";
}
@@ -1126,8 +1175,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";
}
@@ -1150,8 +1199,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";
}
@@ -1174,8 +1223,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";
}
@@ -1198,8 +1247,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";
}
@@ -1229,8 +1278,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";
}
@@ -1253,8 +1302,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";
}
@@ -1321,8 +1370,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";
}
@@ -1352,23 +1401,27 @@ 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";
}
//-----------------------------------------------------------------------------------------------
-function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false, $all_option=false)
{
+ global $all_items;
+
$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";
+ WHERE ".TB_PREF."bank_accounts.account_type=".BT_CASH;
if ($label != null)
- echo "$label | \n";
+ echo "
$label | \n";
echo "";
echo combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
array(
+ 'spec_option' => $all_option,
+ 'spec_id' => $all_items,
'format' => '_format_add_curr',
'select_submit'=> $submit_on_change,
'async' => true
@@ -1384,7 +1437,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',
@@ -1399,13 +1452,33 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub
}
//-----------------------------------------------------------------------------------------------
+// Payment type selector for current user.
+//
+function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true)
+{
+ $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
+
+ if ($category == PM_CASH) // only cash
+ $sql .= " WHERE days_before_due=0 AND day_in_following_month=0";
+ if ($category == PM_CREDIT) // only delayed payments
+ $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, $category, $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, $category, $selected_id, $submit_on_change);
+
echo " | \n";
}
//-----------------------------------------------------------------------------------------------
@@ -1433,8 +1506,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";
}
@@ -1462,14 +1535,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;
@@ -1477,28 +1550,27 @@ 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',
+ 'format' => '_format_account',
+ '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";
}
@@ -1523,7 +1595,8 @@ 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'),
+ 'type' => 2,
+ 'order' => array('type.class_id','type.id','account_code'),
'search_box' => $cells,
'search_submit' => false,
'size' => 12,
@@ -1557,8 +1630,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";
}
@@ -1586,37 +1659,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";
}
@@ -1640,8 +1714,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";
}
@@ -1671,8 +1745,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";
}
@@ -1688,7 +1762,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";
}
@@ -1699,7 +1773,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";
}
@@ -1708,7 +1782,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";
}
@@ -1717,7 +1791,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";
}
@@ -1726,7 +1800,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";
}
@@ -1747,7 +1821,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";
}
@@ -1760,16 +1834,18 @@ 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";
}
-function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=false)
+function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=false, $exclude=array())
{
global $systypes_array;
- return array_selector($name, $value, $systypes_array,
+ // emove non-voidable transactions if needed
+ $systypes = array_diff_key($systypes_array, array_flip($exclude));
+ return array_selector($name, $value, $systypes,
array(
'spec_option'=> $spec_opt,
'spec_id' => ALL_NUMERIC,
@@ -1779,19 +1855,19 @@ function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=fa
);
}
-function systypes_list_cells($label, $name, $value=null, $submit_on_change=false)
+function systypes_list_cells($label, $name, $value=null, $submit_on_change=false, $exclude=array())
{
if ($label != null)
echo "$label | \n";
echo "";
- echo systypes_list($name, $value, false, $submit_on_change);
+ echo systypes_list($name, $value, false, $submit_on_change, $exclude);
echo " | \n";
}
-function systypes_list_row($label, $name, $value=null, $submit_on_change=false)
+function systypes_list_row($label, $name, $value=null, $submit_on_change=false, $exclude=array())
{
- echo "\n";
- systypes_list_cells($label, $name, $value, false, $submit_on_change);
+ echo "
$label | ";
+ systypes_list_cells(null, $name, $value, $submit_on_change, $exclude);
echo "
\n";
}
@@ -1857,6 +1933,25 @@ function supp_allocations_list_cell($name, $selected=null)
echo "\n";
}
+function supp_transactions_list_cell($name, $selected=null)
+{
+ global $all_items;
+
+ echo "\n";
+ $allocs = array(
+ $all_items=>_("All Types"),
+ '6'=>_("GRNs"),
+ '1'=> _("Invoices"),
+ '2'=> _("Overdue Invoices"),
+ '3' => _("Payments"),
+ '4' => _("Credit Notes"),
+ '5' => _("Overdue Credit Notes")
+ );
+
+ echo array_selector($name, $selected, $allocs);
+ echo " | \n";
+}
+
function policy_list_cells($label, $name, $selected=null)
{
if ($label != null)
@@ -1870,8 +1965,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";
}
@@ -1889,8 +1984,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";
}
@@ -1916,8 +2011,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";
}
@@ -1934,7 +2029,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,
@@ -1986,15 +2081,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";
}
@@ -2003,7 +2100,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
@@ -2015,7 +2112,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
@@ -2031,7 +2128,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
@@ -2070,8 +2167,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";
}
@@ -2090,7 +2187,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";
}
@@ -2132,8 +2229,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";
}
@@ -2149,11 +2246,167 @@ function extset_list($name, $value=null, $submit_on_change=false)
$items[] = sprintf(_("Activated for '%s'"), $comp['name']);
return array_selector( $name, $value, $items,
array(
- 'spec_option'=> _("Installed on system"),
+ 'spec_option'=> _("Available and/or installed"),
'spec_id' => -1,
'select_submit'=> $submit_on_change,
'async' => true
));
}
+function crm_category_types_list($name, $selected_id=null, $filter=array(), $submit_on_change=true)
+{
+
+ $sql = "SELECT id, name, type, inactive FROM ".TB_PREF."crm_categories";
+
+ $multi = false;
+ $groups = false;
+ $where = array();
+ if (@$filter['class']) {
+ $where[] = 'type='.db_escape($filter['class']);
+ } else
+ $groups = 'type';
+ if (@$filter['subclass']) $where[] = 'action='.db_escape($filter['subclass']);
+ if (@$filter['entity']) $where[] = 'entity_id='.db_escape($filter['entity']);
+ if (@$filter['multi']) { // contact category selector for person
+ $multi = true;
+ }
+
+ return combo_input($name, $selected_id, $sql, 'id', 'name',
+ array(
+ 'multi' => $multi,
+ 'height' => $multi ? 5:1,
+ 'category' => $groups,
+ 'select_submit'=> $submit_on_change,
+ 'async' => true,
+ 'where' => $where
+ ));
+}
+
+function crm_category_types_list_row($label, $name, $selected_id=null, $filter=array(), $submit_on_change=true)
+{
+ echo "$label | ";
+ echo crm_category_types_list($name, $selected_id, $filter, $submit_on_change);
+ echo " |
\n";
+}
+
+function payment_type_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+ global $pterm_types;
+
+ echo "$label | ";
+ echo array_selector($name, $selected_id, $pterm_types,
+ array(
+ 'select_submit'=> $submit_on_change
+ ) );
+ echo " |
\n";
+}
+
+function coa_list_row($label, $name, $value=null)
+{
+ global $path_to_root, $installed_extensions;
+
+ $path = $path_to_root.'/sql/';
+ $coas = array();
+ $sqldir = opendir($path);
+ while (false !== ($fname = readdir($sqldir)))
+ {
+ if (is_file($path.$fname) && substr($fname,-4)=='.sql' && @($fname[2] == '_'))
+ {
+ $ext = array_search_value($fname, $installed_extensions, 'sql');
+ if ($ext!=null) {
+ $descr = $ext['name'];
+ } elseif ($fname == 'en_US-new.sql') { // two standard COAs
+ $descr = _("Standard new company American COA (4 digit)");
+ } elseif ($fname == 'en_US-demo.sql') {
+ $descr = _("Standard American COA (4 digit) with demo data");
+ } else
+ $descr = $fname;
+
+ $coas[$fname] = $descr;
+ }
+ }
+ ksort($coas);
+
+ echo "$label | \n";
+ echo array_selector( $name, $value, $coas );
+ echo " |
\n";
+}
+
+function tax_algorithm_list($name, $value=null, $submit_on_change = false)
+{
+ global $tax_algorithms;
+
+ return array_selector($name, $value, $tax_algorithms,
+ array(
+ 'select_submit'=> $submit_on_change,
+ 'async' => true,
+ )
+ );
+}
+
+function tax_algorithm_list_cells($label, $name, $value=null, $submit_on_change=false)
+{
+ if ($label != null)
+ echo "$label | \n";
+ echo "";
+ echo tax_algorithm_list($name, $value, $submit_on_change);
+ echo " | \n";
+}
+
+function tax_algorithm_list_row($label, $name, $value=null, $submit_on_change=false)
+{
+ echo "$label | ";
+ tax_algorithm_list_cells(null, $name, $value, $submit_on_change);
+ echo "
\n";
+}
+//----------------------------------------------------------------------------------------------
+
+function subledger_list($name, $account, $selected_id=null)
+{
+ global $all_items;
+
+ $type = is_subledger_account($account);
+ if (!$type)
+ return '';
+
+ if($type > 0)
+ $sql = "SELECT DISTINCT d.debtor_no as id, debtor_ref as name
+ FROM "
+ .TB_PREF."debtors_master d,"
+ .TB_PREF."cust_branch c
+ WHERE d.debtor_no=c.debtor_no AND c.receivables_account=".db_escape($account);
+ else
+ $sql = "SELECT supplier_id as id, supp_ref as name
+ FROM "
+ .TB_PREF."suppliers s
+ WHERE s.payable_account=".db_escape($account);
+
+ $mode = get_company_pref('no_customer_list');
+
+ return combo_input($name, $selected_id, $sql, 'id', 'name',
+ array(
+ 'type' => 1,
+ 'size' => 20,
+ 'async' => false,
+ ) );
+}
+
+function subledger_list_cells($label, $name, $account, $selected_id=null)
+{
+ if ($label != null)
+ echo "$label | \n";
+ echo "";
+ echo subledger_list($name, $account, $selected_id);
+ echo " | \n";
+}
+
+function subledger_list_row($label, $name, $selected_id=null, $all_option = false,
+ $submit_on_change=false, $show_inactive=false, $editkey = false)
+{
+ echo "$label | ";
+ echo subledger_list($name, $account, $selected_id);
+ echo " | \n
\n";
+}
+
+
?>
\ No newline at end of file