X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=7465381cae6e3307f4137955325c26fdd5b70672;hb=d32bf132413c22c5a19966160fcd574346f63b24;hp=9c8cb2d6f22d48a6605063fd152e925cb967dd19;hpb=01d7a75fb7fbaac6379ddb9ec8abfa01e87249a7;p=fa-stable.git
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 9c8cb2d6..8e4da29d 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1,17 +1,23 @@
.
+***********************************************************************/
include_once($path_to_root . "/includes/banking.inc");
-include_once($path_to_root . "/includes/reserved.inc");
include_once($path_to_root . "/includes/types.inc");
include_once($path_to_root . "/includes/current_user.inc");
-$_search_button = " ";
-
-$_select_button = " ";
+define('SEARCH_BUTTON', " ");
-$all_items = reserved_words::get_all();
+define('SELECT_BUTTON', " ");
//----------------------------------------------------------------------------
// Universal sql combo generator
@@ -19,9 +25,9 @@ $all_items = reserved_words::get_all();
// Options are merged with defaults.
function combo_input($name, $selected_id, $sql, $valfield, $namefield,
- $options=null)
+ $options=null, $type=null)
{
-global $Ajax;
+global $Ajax, $path_to_root, $SysPrefs ;
$opts = array( // default options
'where'=> array(), // additional constraints
@@ -31,26 +37,31 @@ $opts = array( // default options
'spec_id' => 0, // option id
// submit on select parameters
'default' => '', // default value when $_POST is not set
+ 'multi' => false, // multiple select
'select_submit' => false, //submit on select: true/false
- 'edit_submit' => false, // call editor on F4
'async' => true, // select update via ajax (true) vs _page_body reload
// search box parameters
'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
'max' => 50,
+ 'height' => false, // number of lines in select box
'cells' => false, // combo displayed as 2
| cells
'search' => array(), // sql field names to search
'format' => null, // format functions for regular options
'disabled' => false,
'box_hint' => null, // box/selectors hints; null = std see below
- 'category' => false // category column name or false
+ 'category' => false, // category column name or false
+ 'show_inactive' => false, // show inactive records.
+ 'editable' => false, // false, or length of editable entry field
+ 'editlink' => false // link to entity entry/edit page (optional)
);
// ------ merge options with defaults ----------
if($options != null)
@@ -58,14 +69,28 @@ $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_submit = $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_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';
- $disabled = $opts['disabled'] ? "disabled" : '';
+ 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'];
+
if(!count($opts['search'])) {
$opts['search'] = array($by_id ? $valfield : $namefield);
}
@@ -79,13 +104,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((string)$selected_id); // code is generalized for multiple selection support
+
$txt = get_post($search_box);
$rel = '';
$limit = '';
-
- if (isset($_POST[$select_submit])) {
+ if (isset($_POST['_'.$name.'_update'])) { // select list or search box change
if ($by_id) $txt = $_POST[$name];
if (!$opts['async'])
@@ -93,33 +120,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 = ''; // 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==null)
- $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 ';
@@ -133,7 +168,9 @@ $opts = array( // default options
}
}
if ($opts['order'] != false) {
- $sql .= ' ORDER BY '.$opts['order'];
+ if (!is_array($opts['order']))
+ $opts['order'] = array($opts['order']);
+ $sql .= ' ORDER BY '.implode(',',$opts['order']);
}
$sql .= $limit;
@@ -142,31 +179,50 @@ $opts = array( // default options
$first_id = false;
$found = false;
$lastcat = null;
-//if($name=='stock_id') display_error($sql);
+ $edit = false;
+ $pname = false;
+ if (($type === "customer" || $type === "supplier") && !empty($SysPrefs->prefs['shortname_name_in_list']))
+ $pname = true;
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);
+ call_user_func($opts['format'], $contact_row, $pname);
$sel = '';
- if (get_post($search_submit) && ($txt === $value)) {
- $selected_id = $value;
+ if (get_post($search_button) && ($txt == $value)) {
+ $selected_id[] = $value;
}
- if ((string)($selected_id) === $value) {
+
+ 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==='') {
+ continue;
+ } else
+ $optclass = @$contact_row['inactive'] ? "class='inactive'" : '';
+
if ($first_id === false) {
$first_id = $value;
$first_opt = $descr;
}
$cat = $contact_row[$opts['category']];
if ($opts['category'] !== false && $cat != $lastcat){
+ if ($lastcat!==null)
+ $selector .= "";
$selector .= "";
db_free_result($result);
}
@@ -175,38 +231,54 @@ $opts = array( // default options
$first_id = $spec_id;
$first_opt = $spec_option;
$sel = $found===false ? 'selected' : '';
- $selector = "\n"
+ $optclass = @$contact_row['inactive'] ? "class='inactive'" : '';
+ $selector = "\n"
. $selector;
}
- if ($found === false) {
- $selected_id = $first_id;
+ if ($found===false) {
+ $selected_id = array($first_id);
}
- $_POST[$name] = $selected_id;
+
+ $_POST[$name] = $multi ? $selected_id : $selected_id[0];
- if ($by_id && $search_box != false) {
- $txt = $found;
+ if ($SysPrefs->use_popup_search)
+ $selector = "\n";
+ else
+ $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 : '');
}
- $aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
- $selector = "\n";
$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
- global $_select_button;
+ // if selectable or editable list is used - add select button
+ if ($select_submit != false || $search_button) {
// button class selects form reload/ajax selector update
- $selector .= sprintf($_select_button, $disabled, user_theme(),
+ $selector .= sprintf(SELECT_BUTTON, $disabled, user_theme(),
(fallback_mode() ? '' : 'display:none;'),
- $select_submit)."\n";
+ '_'.$name.'_update')."\n";
}
// ------ make combo ----------
-
$edit_entry = '';
if ($search_box != false) {
$edit_entry = "\n";
- if ($search_submit != false) {
- global $_search_button;
- $edit_entry .= sprintf($_search_button, $disabled, user_theme(),
+ if ($search_submit != false || $opts['editable']) {
+ $edit_entry .= sprintf(SEARCH_BUTTON, $disabled, user_theme(),
(fallback_mode() ? '' : 'display:none;'),
- $search_submit)."\n";
+ $search_submit ? $search_submit : "_{$name}_button")."\n";
}
}
- default_focus($name);
- $str = $selector;
+ default_focus(($search_box && $by_id) ? $search_box : $name);
+
+ $img = "";
+ if ($SysPrefs->use_popup_search && (!isset($opts['fixed_asset']) || !$opts['fixed_asset']))
+ {
+ $img_title = "";
+ $link = "";
+ $id = $name;
+ if ($SysPrefs->use_popup_windows) {
+ switch (strtolower($type)) {
+ case "stock":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=all&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "stock_manufactured":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=manufactured&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "stock_purchased":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=purchasable&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "stock_sales":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=sales&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "stock_costable":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=costable&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "component":
+ $parent = $opts['parent'];
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=component&parent=".$parent."&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "kits":
+ $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=kits&client_id=" . $id;
+ $img_title = _("Search items");
+ break;
+ case "customer":
+ $link = $path_to_root . "/sales/inquiry/customers_list.php?popup=1&client_id=" . $id;
+ $img_title = _("Search customers");
+ break;
+ case "branch":
+ $link = $path_to_root . "/sales/inquiry/customer_branches_list.php?popup=1&client_id=" . $id . "#customer_id";
+ $img_title = _("Search branches");
+ break;
+ case "supplier":
+ $link = $path_to_root . "/purchasing/inquiry/suppliers_list.php?popup=1&client_id=" . $id;
+ $img_title = _("Search suppliers");
+ break;
+ case "account":
+ case "account2":
+ $skip = strtolower($type) == "account" ? false : true;
+ $link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&skip=".$skip."&client_id=" . $id;
+ $img_title = _("Search GL accounts");
+ break;
+ }
+ }
+
+ if ($link !=="") {
+ $theme = user_theme();
+ $img = '';
+ }
+ }
+
+ if ($opts['editlink'])
+ $selector .= ' '.$opts['editlink'];
+
if ($search_box && $opts['cells'])
- echo ($edit_entry!='' ? "$edit_entry | " : '')."$selector | ";
+ $str = ($edit_entry!='' ? "$edit_entry | " : '')."$selector$img | ";
else
- echo $edit_entry.$selector;
-
+ $str = $edit_entry.$selector.$img;
return $str;
}
@@ -253,26 +392,30 @@ $opts = array( // default options
'spec_option'=>false, // option text or false
'spec_id' => 0, // option id
'select_submit' => false, //submit on select: true/false
- 'edit_submit' => false, // call editor on F4
'async' => true, // select update via ajax (true) vs _page_body reload
'default' => '', // default value when $_POST is not set
+ 'multi'=>false, // multiple select
// search box parameters
+ 'height' => false, // number of lines in select box
'sel_hint' => null,
'disabled' => false
);
// ------ merge options with defaults ----------
if($options != null)
$opts = array_merge($opts, $options);
- $select_submit = $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit'];
+ $select_submit = $opts['select_submit'];
$spec_id = $opts['spec_id'];
$spec_option = $opts['spec_option'];
$disabled = $opts['disabled'] ? "disabled" : '';
+ $multi = $opts['multi'];
if ($selected_id == null) {
$selected_id = get_post($name, $opts['default']);
}
+ if(!is_array($selected_id))
+ $selected_id = array((string)$selected_id); // code is generalized for multiple selection support
- if (isset($_POST[$select_submit])) {
+ if (isset($_POST[ '_'.$name.'_update'])) {
if (!$opts['async'])
$Ajax->activate('_page_body');
else
@@ -283,20 +426,22 @@ $opts = array( // default options
$selector = $first_opt = '';
$first_id = false;
$found = false;
-//if($name=='SelectStockFromList') display_error($sql);
- foreach($items as $value=>$descr) {
- $sel = '';
- if ($selected_id == $value) {
- $sel = 'selected';
- $found = $value;
- }
- if ($first_id === false) {
- $first_id = $value;
- $first_opt = $descr;
- }
- $selector .= "\n";
+ foreach($items as $value=>$descr) {
+ $sel = '';
+ if (in_array((string)$value, $selected_id, true)) {
+ $sel = 'selected';
+ $found = $value;
+ }
+ if ($first_id === false) {
+ $first_id = $value;
+ $first_opt = $descr;
}
+ $selector .= "\n";
+ }
+ if ($first_id!==false) {
+ $sel = ($found===$first_id) || ($found===false && ($spec_option===false)) ? "selected='selected'" : '';
+ }
// Prepend special option.
if ($spec_option !== false) { // if special option used - add it
$first_id = $spec_id;
@@ -306,32 +451,39 @@ $opts = array( // default options
. $selector;
}
- if ($found === false) {
- $_POST[$name] = $first_id;
+ if ($found===false) {
+ $selected_id = array($first_id);
}
+ $_POST[$name] = $multi ? $selected_id : $selected_id[0];
- $aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
- $selector = "\n";
+ $selector = "\n";
$Ajax->addUpdate($name, "_{$name}_sel", $selector);
$selector = "".$selector."\n";
if ($select_submit != false) { // if submit on change is used - add select button
- global $_select_button;
- $selector .= sprintf($_select_button, $disabled, user_theme(),
+ $selector .= sprintf(SELECT_BUTTON, $disabled, user_theme(),
(fallback_mode() ? '' : 'display:none;'),
- $select_submit)."\n";
+ '_'.$name.'_update')."\n";
}
default_focus($name);
- echo $selector;
return $selector;
}
//----------------------------------------------------------------------------------------------
+function array_selector_row($label, $name, $selected_id, $items, $options=null)
+{
+ echo "$label | \n";
+ echo array_selector($name, $selected_id, $items, $options);
+ echo " |
\n";
+}
-function _format_add_curr($row)
+//----------------------------------------------------------------------------------------------
+function _format_add_curr($row, $pname=false)
{
static $company_currency;
@@ -339,181 +491,233 @@ function _format_add_curr($row)
{
$company_currency = get_company_currency();
}
- return $row[1] . ($row[2] == $company_currency ?
- '' : (" - " . $row[2]));
+ if (!$pname)
+ {
+ return $row[1] . ($row[2] == $company_currency ? '' : (" - " . $row[2]));
+ }
+ else
+ {
+ return $row[1] . " - " . $row[2] . ($row[3] == $company_currency ? '' : (" - " . $row[3]));
+ }
}
-function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
+function add_edit_combo($type)
{
- global $all_items;
+ global $path_to_root, $popup_editors, $SysPrefs;
+
+ if (!isset($SysPrefs->use_icon_for_editkey) || $SysPrefs->use_icon_for_editkey==0)
+ return "";
+ // Derive theme path
+ $theme_path = $path_to_root . '/themes/' . user_theme();
+
+ $key = $popup_editors[$type][1];
+ $onclick = "onclick=\"javascript:callEditor($key); return false;\"";
+ $img = "";
+ return "$img";
+}
- $sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ";
+function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
+ $all=false, $editkey = false)
+{
+ global $SysPrefs;
+ if (!empty($SysPrefs->prefs['shortname_name_in_list']))
+ $sql = "SELECT supplier_id, supp_ref, supp_name, curr_code, inactive FROM ".TB_PREF."suppliers ";
+ else
+ $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers ";
$mode = get_company_pref('no_supplier_list');
- return combo_input($name, $selected_id, $sql, 'supplier_id', 'supp_name',
+ if ($editkey)
+ set_editor('supplier', $name, $editkey);
+
+ $ret = combo_input($name, $selected_id, $sql, 'supplier_id', 'supp_name',
array(
'format' => '_format_add_curr',
+ 'order' => array('supp_ref'),
'search_box' => $mode!=0,
- 'edit_submit' => true,
'type' => 1,
+ 'search' => array("supp_ref","supp_name","gst_no"),
'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option,
- 'spec_id' => $all_items,
+ 'spec_id' => ALL_TEXT,
'select_submit'=> $submit_on_change,
'async' => false,
'sel_hint' => $mode ? _('Press Space tab to filter by name fragment') :
- _('Select supplier')
- ));
+ _('Select supplier'),
+ 'show_inactive'=>$all,
+ 'editlink' => $editkey ? add_edit_combo('supplier') : false
+ ), "supplier");
+ return $ret;
}
-function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function supplier_list_cells($label, $name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $all=false, $editkey = false)
{
if ($label != null)
- echo "$label | \n";
- $str = supplier_list($name, $selected_id, $all_option, $submit_on_change);
- echo " | \n";
- return $str;
+ echo "$label | \n";
+ echo "";
+ echo supplier_list($name, $selected_id, $all_option, $submit_on_change,
+ $all, $editkey);
+ echo " | \n";
}
-function supplier_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
+function supplier_list_row($label, $name, $selected_id=null, $all_option = false,
+ $submit_on_change=false, $all=false, $editkey = false)
{
-echo "$label | ";
- $str = supplier_list($name, $selected_id, $all_option, $submit_on_change );
-echo " |
\n";
-return $str;
+ echo "$label | ";
+ echo supplier_list($name, $selected_id, $all_option, $submit_on_change,
+ $all, $editkey);
+ echo " |
\n";
}
//----------------------------------------------------------------------------------------------
-function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
+function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
+ $show_inactive=false, $editkey = false)
{
- global $all_items;
-
- $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
+ global $SysPrefs;
+ if (!empty($SysPrefs->prefs['shortname_name_in_list']))
+ $sql = "SELECT debtor_no, debtor_ref, name, curr_code, inactive FROM ".TB_PREF."debtors_master ";
+ else
+ $sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master ";
$mode = get_company_pref('no_customer_list');
-return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
+ if ($editkey)
+ set_editor('customer', $name, $editkey);
+
+ $ret = combo_input($name, $selected_id, $sql, 'debtor_no', 'debtor_ref',
array(
'format' => '_format_add_curr',
+ 'order' => array('debtor_ref'),
'search_box' => $mode!=0,
'type' => 1,
'size' => 20,
+ 'search' => array("debtor_ref","name","tax_id"),
'spec_option' => $spec_option === true ? _("All Customers") : $spec_option,
- 'spec_id' => $all_items,
+ 'spec_id' => ALL_TEXT,
'select_submit'=> $submit_on_change,
- 'edit_submit' => true, // call editor on F4
'async' => false,
- 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F4 - entry new customer') :
- _('Select customer')
- ) );
+ 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F2 - entry new customer') :
+ _('Select customer'),
+ 'show_inactive' => $show_inactive,
+ 'editlink' => $editkey ? add_edit_combo('customer') : false
+ ), "customer" );
+ return $ret;
}
-function customer_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function customer_list_cells($label, $name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $show_inactive=false, $editkey = false)
{
if ($label != null)
echo "$label | \n";
echo "";
- $str = customer_list($name, $selected_id, $all_option, $submit_on_change);
+ echo customer_list($name, $selected_id, $all_option, $submit_on_change,
+ $show_inactive, $editkey);
echo " | \n";
- return $str;
}
-function customer_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
+function customer_list_row($label, $name, $selected_id=null, $all_option = false,
+ $submit_on_change=false, $show_inactive=false, $editkey = false)
{
- echo "$label | ";
- $str = customer_list($name, $selected_id, $all_option, $submit_on_change);
+
+ echo " |
$label | ";
+ echo customer_list($name, $selected_id, $all_option, $submit_on_change,
+ $show_inactive, $editkey);
echo " | \n
\n";
- return $str;
}
//------------------------------------------------------------------------------------------------
function customer_branches_list($customer_id, $name, $selected_id=null,
- $spec_option = true, $enabled=true, $submit_on_change=false)
+ $spec_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
{
- global $all_items;
- $sql = "SELECT branch_code, br_name FROM ".TB_PREF."cust_branch
- WHERE debtor_no='" . $customer_id . "' ";
+ $sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch
+ WHERE debtor_no=" . db_escape($customer_id)." ";
+
+ if ($editkey)
+ set_editor('branch', $name, $editkey);
- $where = $enabled ? array("disable_trans = 0") : array();
-return combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
+ $where = $enabled ? array("inactive = 0") : array();
+ $ret = combo_input($name, $selected_id, $sql, 'branch_code', 'branch_ref',
array(
'where' => $where,
+ 'order' => array('branch_ref'),
'spec_option' => $spec_option === true ? _('All branches') : $spec_option,
- 'spec_id' => $all_items,
+ 'spec_id' => ALL_TEXT,
'select_submit'=> $submit_on_change,
- 'sel_hint' => _('Select customer branch')
- ) );
+ 'sel_hint' => _('Select customer branch'),
+ 'editlink' => $editkey ? add_edit_combo('branch') : false
+ ), "branch" );
+ return $ret;
}
//------------------------------------------------------------------------------------------------
-function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false)
+function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null,
+ $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
{
if ($label != null)
echo "$label | \n";
echo "";
- $ret = customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+ echo customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled,
+ $submit_on_change, $editkey);
echo " | \n";
- return $ret;
}
-function customer_branches_list_row($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false)
+function customer_branches_list_row($label, $customer_id, $name, $selected_id=null,
+ $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
{
- echo "";
- $ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+ echo "
$label | ";
+ customer_branches_list_cells(null, $customer_id, $name, $selected_id,
+ $all_option, $enabled, $submit_on_change, $editkey);
echo "
";
- return $ret;
}
//------------------------------------------------------------------------------------------------
-function locations_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function locations_list($name, $selected_id=null, $all_option=false, $submit_on_change=false, $fixed_asset=false)
{
- global $all_items;
- $sql = "SELECT loc_code, location_name FROM ".TB_PREF."locations";
+ $sql = "SELECT loc_code, location_name, inactive FROM ".TB_PREF."locations WHERE fixed_asset=".(int)$fixed_asset;
-return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name',
- array(
- 'spec_option' => $all_option === true ? _("All Locations") : $all_option,
- 'spec_id' => $all_items,
- 'select_submit'=> $submit_on_change
- ) );
+ return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name',
+ array(
+ 'spec_option' => $all_option === true ? _("All Locations") : $all_option,
+ 'spec_id' => ALL_TEXT,
+ 'select_submit'=> $submit_on_change
+ ) );
}
-function locations_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function locations_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $fixed_asset=false)
{
if ($label != null)
echo "$label | \n";
echo "";
- $str = locations_list($name, $selected_id, $all_option, $submit_on_change);
+ echo locations_list($name, $selected_id, $all_option, $submit_on_change, $fixed_asset);
echo " | \n";
- return $str;
}
-function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $fixed_asset=false)
{
- echo "";
- $str = 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, $fixed_asset);
echo "
\n";
- return $str;
}
//-----------------------------------------------------------------------------------------------
-function currencies_list($name, $selected_id=null, $submit_on_change=false)
+function currencies_list($name, $selected_id=null, $submit_on_change=false, $exclude_home_curr=false)
{
- $sql = "SELECT curr_abrev, currency FROM ".TB_PREF."currencies";
+ $sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies";
+ if ($exclude_home_curr)
+ $sql .= " WHERE curr_abrev!='".get_company_currency()."'";
-// default to the company currency
-
-return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
- array(
- 'select_submit'=> $submit_on_change,
- 'default' => get_company_currency(),
- 'async' => false
- ) );
+ // default to the company currency
+ return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
+ array(
+ 'select_submit'=> $submit_on_change,
+ 'default' => get_company_currency(),
+ 'async' => false
+ ) );
}
function currencies_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
@@ -521,17 +725,15 @@ function currencies_list_cells($label, $name, $selected_id=null, $submit_on_chan
if ($label != null)
echo "$label | \n";
echo "";
- $str = currencies_list($name, $selected_id, $submit_on_change);
+ echo currencies_list($name, $selected_id, $submit_on_change);
echo " | \n";
- return $str;
}
function currencies_list_row($label, $name, $selected_id=null, $submit_on_change=false)
{
- echo "\n";
- $str = currencies_list_cells($label, $name, $selected_id, $submit_on_change);
+ echo "
$label | ";
+ currencies_list_cells(null, $name, $selected_id, $submit_on_change);
echo "
\n";
- return $str;
}
//---------------------------------------------------------------------------------------------------
@@ -541,22 +743,22 @@ function fiscalyears_list($name, $selected_id=null, $submit_on_change=false)
$sql = "SELECT * FROM ".TB_PREF."fiscal_year";
-// default to the company current fiscal year
+ // default to the company current fiscal year
-return combo_input($name, $selected_id, $sql, 'id', '',
- array(
- 'order' => 'begin',
- 'default' => get_company_pref('f_year'),
- 'format' => '_format_fiscalyears',
- 'select_submit'=> $submit_on_change,
- 'async' => false
- ) );
+ return combo_input($name, $selected_id, $sql, 'id', '',
+ array(
+ 'order' => 'begin',
+ 'default' => get_company_pref('f_year'),
+ 'format' => '_format_fiscalyears',
+ 'select_submit'=> $submit_on_change,
+ 'async' => false
+ ) );
}
function _format_fiscalyears($row)
{
return sql2date($row[1]) . " - " . sql2date($row[2])
- . " " . ($row[3] ? _('Closed') : _('Active')) . "\n";
+ . " " . ($row[3] ? _('Closed') : _('Active'));
}
function fiscalyears_list_cells($label, $name, $selected_id=null)
@@ -564,37 +766,35 @@ function fiscalyears_list_cells($label, $name, $selected_id=null)
if ($label != null)
echo "$label | \n";
echo "";
- $str = fiscalyears_list($name, $selected_id);
+ echo fiscalyears_list($name, $selected_id);
echo " | \n";
- return $str;
}
function fiscalyears_list_row($label, $name, $selected_id=null)
{
- echo "\n";
- $str = fiscalyears_list_cells($label, $name, $selected_id);
+ echo "
$label | ";
+ fiscalyears_list_cells(null, $name, $selected_id);
echo "
\n";
- return $str;
}
//------------------------------------------------------------------------------------
function dimensions_list($name, $selected_id=null, $no_option=false, $showname=' ',
$submit_on_change=false, $showclosed=false, $showtype=1)
{
-$sql = "SELECT id, CONCAT(reference,' ',name) as ref FROM ".TB_PREF."dimensions";
+ $sql = "SELECT id, CONCAT(reference,' ',name) as ref FROM ".TB_PREF."dimensions";
-$options = array(
- 'order' => 'reference',
- 'spec_option'=>$no_option ? $showname : false,
- 'spec_id' => 0,
- 'select_submit'=> $submit_on_change,
- 'async' => false,
+ $options = array(
+ 'order' => 'reference',
+ 'spec_option'=>$no_option ? $showname : false,
+ 'spec_id' => 0,
+ 'select_submit'=> $submit_on_change,
+ 'async' => false,
);
- if ($showclosed)
+ if (!$showclosed)
$options['where'][] = "closed=0";
if($showtype)
- $options['where'][] = "type_=$showtype";
+ $options['where'][] = "type_=".db_escape($showtype);
return combo_input($name, $selected_id, $sql, 'id', 'ref', $options);
}
@@ -605,43 +805,53 @@ function dimensions_list_cells($label, $name, $selected_id=null, $no_option=fals
if ($label != null)
echo "$label | \n";
echo "";
- $str = dimensions_list($name, $selected_id, $no_option, $showname, $submit_on_change, $showclosed, $showtype);
+ echo dimensions_list($name, $selected_id, $no_option, $showname, $submit_on_change, $showclosed, $showtype);
echo " | \n";
- return $str;
}
function dimensions_list_row($label, $name, $selected_id=null, $no_option=false, $showname=null,
$showclosed=false, $showtype=0, $submit_on_change=false)
{
- echo "\n";
- $str = 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";
- return $str;
}
//---------------------------------------------------------------------------------------------------
-function stock_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false, $opts=array())
+function stock_items_list($name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $opts=array(), $editkey = false, $type = "stock")
{
- global $all_items;
-
- $sql = "SELECT stock_id, s.description, c.description
+ $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";
- 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,
- 'category' => 2
- ), $opts) );
+ if (isset($opts['fixed_asset']) && $opts['fixed_asset'])
+ $sql .= " AND mb_flag='F'";
+ else
+ $sql .= " AND mb_flag!='F'";
+
+ if ($editkey)
+ set_editor('item', $name, $editkey);
+
+ $ret = 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_TEXT,
+ 'search_box' => true,
+ 'search' => array("stock_id", "c.description","s.description"),
+ 'search_submit' => get_company_pref('no_item_list')!=0 && (!isset($opts['fixed_asset']) || !$opts['fixed_asset']),
+ 'size'=>10,
+ 'select_submit'=> $submit_on_change,
+ 'category' => 2,
+ 'order' => array('c.description','stock_id'),
+ 'editlink' => $editkey ? add_edit_combo('item') : false,
+ 'editable' => false,
+ 'max' => 255
+ ), $opts), $type );
+ return $ret;
}
function _format_stock_items($row)
@@ -649,21 +859,35 @@ function _format_stock_items($row)
return (user_show_codes() ? ($row[0] . " - ") : "") . $row[1];
}
-function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $all=false, $editkey = false, $opts= array())
{
+ if (isset($opts['fixed_asset']) && $opts['fixed_asset'])
+ $editor_item = 'fa_item';
+ else
+ $editor_item = 'item';
+
+// if ($editkey) ??
+// set_editor($editor_item, $name, $editkey);
+
if ($label != null)
echo "$label | \n";
- $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('cells'=>true));
- return $str;
+
+// ??
+// $opts = array_merge($options, array('cells'=>true, 'show_inactive'=>$all, 'new_icon' => $editkey ? 'item' : false));
+//
+// echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, $opts);
+
+ echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array_merge(array('cells'=>true, 'show_inactive'=>$all), $opts), $editkey);
+
}
/*
function stock_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
echo "\n";
- $str = stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
+ stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
echo "
\n";
- return $str;
}
*/
//---------------------------------------------------------------------------------------------------
@@ -673,121 +897,79 @@ function stock_items_list_row($label, $name, $selected_id=null, $all_option=fals
function sales_items_list($name, $selected_id=null, $all_option=false,
$submit_on_change=false, $type='', $opts=array())
{
- global $all_items;
// all sales codes
- $sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit
+ $sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit,
+ i.inactive, if(count(*)>1, '0', s.editable) as editable
FROM
+ ".TB_PREF."stock_master s,
".TB_PREF."item_codes i
LEFT JOIN
".TB_PREF."stock_category c
- ON i.category_id=c.category_id";
+ ON i.category_id=c.category_id
+ WHERE i.stock_id=s.stock_id
+ AND mb_flag != 'F'";
+
if ($type == 'local') { // exclude foreign codes
- $sql .= " WHERE NOT i.is_foreign";
+ $sql .= " AND !i.is_foreign";
} elseif ($type == 'kits') { // sales kits
- $sql .= " WHERE NOT i.is_foreign
- AND NOT i.item_code=i.stock_id";
+ $sql .= " AND !i.is_foreign AND i.item_code!=i.stock_id";
}
-
+ $sql .= " AND !i.inactive AND !s.inactive AND !s.no_sale";
$sql .= " GROUP BY i.item_code";
return combo_input($name, $selected_id, $sql, 'i.item_code', 'c.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("i.item_code", "c.description"),
- 'search_submit' => get_company_pref('no_item_list')!=0,
- 'size'=>15,
- 'select_submit'=> $submit_on_change,
- 'order' => 'i.item_code',
- 'category' => 2
- ), $opts) );
+ array_merge(
+ array(
+ 'format' => '_format_stock_items',
+ 'spec_option' => $all_option===true ? _("All Items") : $all_option,
+ 'spec_id' => ALL_TEXT,
+ 'search_box' => true,
+ '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'),
+ 'editable' => 30,
+ 'max' => 255
+ ), $opts), $type == 'kits' ? $type : "stock_sales" );
}
-function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $editkey=false)
{
+ if ($editkey)
+ set_editor('item', $name, $editkey);
+
if ($label != null)
echo "$label | \n";
- $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+ echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,
'', array('cells'=>true));
- return $str;
}
function sales_kits_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
- $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change,
- 'kits', array('cells'=>false));
- return $str;
+ return sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+ '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 "";
- $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change,
- 'local', array('cells'=>false));
+ echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+ 'local', array('cells'=>false, 'editable' => false));
echo " |
";
- return $str;
-}
-//------------------------------------------------------------------------------------
-
-function base_stock_items_list($where, $name, $selected_id=null,
- $all_option=false, $submit_on_change=false)
-{
- 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";
-
- return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
- array(
- 'format' => '_format_stock_items',
- 'spec_option' => $all_option==true ? _("All Items") : $all_option,
- 'spec_id' => $all_items,
- 'select_submit'=> $submit_on_change,
- 'where' => $where,
- 'category' => 2 ) );
-}
-//------------------------------------------------------------------------------------
-
-function stock_bom_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
-{
-
- return base_stock_items_list("(s.mb_flag='M' OR s.mb_flag='K')",
- $name, $selected_id, $all_option, $submit_on_change);
-}
-/*
-function stock_bom_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
-{
- if ($label != null)
- echo "$label | \n";
- echo "";
- $str = stock_bom_items_list($name, $selected_id, $all_option, $submit_on_change);
- echo " | \n";
- return $str;
-}
-
-function stock_bom_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
-{
- echo "\n";
- $str = stock_bom_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
- echo "
\n";
- return $str;
}
-*/
//------------------------------------------------------------------------------------
function stock_manufactured_items_list($name, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
- return base_stock_items_list("s.mb_flag='M'",
- $name, $selected_id, $all_option, $submit_on_change);
+ return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('where'=>array("mb_flag= 'M'")), false, "stock_manufactured");
}
function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
@@ -796,48 +978,44 @@ function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
if ($label != null)
echo "$label | \n";
echo "";
- $str = stock_manufactured_items_list($name, $selected_id, $all_option,
- $submit_on_change);
+ echo stock_manufactured_items_list($name, $selected_id, $all_option, $submit_on_change);
echo " | \n";
- return $str;
}
function stock_manufactured_items_list_row($label, $name, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
- echo "\n";
- $str = 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";
- return $str;
}
//------------------------------------------------------------------------------------
function stock_component_items_list($name, $parent_stock_id, $selected_id=null,
- $all_option=false, $submit_on_change=false)
+ $all_option=false, $submit_on_change=false, $editkey = false)
{
- $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("stock_id != '$parent_stock_id'")));
- return $str;
+ $parent = db_escape($parent_stock_id);
+ return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('where'=>array("stock_id != $parent"), 'parent'=> $parent_stock_id), $editkey, "component");
}
+
function stock_component_items_list_cells($label, $name, $parent_stock_id,
- $selected_id=null, $all_option=false, $submit_on_change=false)
+ $selected_id=null, $all_option=false, $submit_on_change=false, $editkey = false)
{
if ($label != null)
echo "$label | \n";
- $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true));
- return $str;
+ $parent = db_escape($parent_stock_id);
+ echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true, 'parent'=> $parent_stock_id), $editkey, "component");
}
//------------------------------------------------------------------------------------
function stock_costable_items_list($name, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
- $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("mb_flag!='D'")));
- return $str;
+ return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('where'=>array("mb_flag!='D'")), false, "stock_costable");
}
function stock_costable_items_list_cells($label, $name, $selected_id=null,
@@ -845,59 +1023,44 @@ function stock_costable_items_list_cells($label, $name, $selected_id=null,
{
if ($label != null)
echo "$label | \n";
- $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("mb_flag!='D'"), 'cells'=>true));
- return $str;
+ echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('where'=>array("mb_flag!='D'"), 'cells'=>true), false, "stock_costable");
}
//------------------------------------------------------------------------------------
function stock_purchasable_items_list($name, $selected_id=null,
- $all_option=false, $submit_on_change=false)
+ $all_option=false, $submit_on_change=false, $all=false, $editkey=false)
{
- $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("mb_flag!= 'M'"),
- 'edit_submit' => true));
- return $str;
+ return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('where'=>array("NOT no_purchase"),
+ 'show_inactive'=>$all), $editkey, "stock_purchased");
}
-
+//
+// 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)
+ $all_option=false, $submit_on_change=false, $editkey=false)
{
if ($label != null)
echo "$label | \n";
- $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('where'=>array("mb_flag!= 'M'"),
- 'edit_submit' => true,
- 'cells'=>true));
- return $str;
-}
-
-function stock_purchasable_items_list_row($label, $name, $selected_id=null,
- $all_option=false, $submit_on_change=false)
-{
- echo "\n";
- $ret = stock_purchasable_items_list_cells($label, $name, $selected_id=null,
- $all_option, $submit_on_change);
- echo "
\n";
- return $ret;
+ echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('where'=>array("NOT no_purchase"),
+ 'editable' => 30,
+ 'cells'=>true), $editkey);
}
//------------------------------------------------------------------------------------
function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=true)
{
- $types = array(
- 'M' => _("Manufactured"),
- 'B' => _("Purchased"),
- 'D' => _("Service")
- );
+ global $stock_types;
echo "";
if ($label != null)
- echo "$label | \n";
+ echo "$label | \n";
echo "";
- array_selector($name, $selected_id, $types,
+ echo array_selector($name, $selected_id, $stock_types,
array(
'select_submit'=> true,
'disabled' => !$enabled) );
@@ -909,33 +1072,115 @@ 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))
$units[$unit['abbr']] = $unit['name'];
- array_selector($name, $value, $units,
- array(
- 'select_submit'=> true,
- 'disabled' => !$enabled) );
+ echo array_selector($name, $value, $units, array( 'disabled' => !$enabled) );
echo " |
\n";
}
//------------------------------------------------------------------------------------
+function stock_purchasable_fa_list_cells($label, $name, $selected_id=null, $all_option=false,
+ $submit_on_change=false, $all=false, $editkey = false, $exclude_items = array())
+{
+ // Check if a fixed asset has been bought.
+ $where_opts[] = "stock_id NOT IN
+ ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
+
+ // exclude items currently on the order.
+ foreach($exclude_items as $item) {
+ $where_opts[] = "stock_id != ".db_escape($item->stock_id);
+ }
+ $where_opts[] = "mb_flag='F'";
+
+ echo stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change, $all, $editkey,
+ array('fixed_asset' => true, 'where' => $where_opts));
+}
+
+function stock_disposable_fa_list($name, $selected_id=null,
+ $all_option=false, $submit_on_change=false)
+{
+ // Check if a fixed asset has been bought....
+ $where_opts[] = "stock_id IN
+ ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
+ // ...but has not been disposed or sold already.
+ $where_opts[] = "stock_id NOT IN
+ ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
+
+ $where_opts[] = "mb_flag='F'";
+
+ echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('fixed_asset' => true, 'where' => $where_opts));
+}
+
+function stock_disposable_fa_list_cells($label, $name, $selected_id=null,
+ $all_option=false, $submit_on_change=false, $exclude_items = array())
+{
+ // Check if a fixed asset has been bought....
+ $where_opts[] = "stock_id IN
+ ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
+ // ...but has not been disposed or sold already.
+ $where_opts[] = "stock_id NOT IN
+ ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
+
+ $where_opts[] = "mb_flag='F'";
+
+ foreach($exclude_items as $item) {
+ $where_opts[] = "stock_id != ".db_escape($item->stock_id);
+ }
+
+ if ($label != null)
+ echo "$label | \n";
+ echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('fixed_asset' => true, 'cells'=>true, 'where' => $where_opts));
+}
+
+function stock_depreciable_fa_list_cells($label, $name, $selected_id=null,
+ $all_option=false, $submit_on_change=false)
+{
+
+ // Check if a fixed asset has been bought....
+ $where_opts[] = "stock_id IN
+ ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
+ // ...but has not been disposed or sold already.
+ $where_opts[] = "stock_id NOT IN
+ ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
+
+ $year = get_current_fiscalyear();
+ $begin = date2sql(add_months(sql2date($year['begin']), -1));
+ $end = date2sql(add_months(sql2date($year['end']), -1));
+
+ // check if current fiscal year
+ $where_opts[] = "depreciation_date <= '".$end."'";
+ $where_opts[] = "depreciation_date >= '".$begin."'";
+
+ $where_opts[] = "material_cost > 0";
+ $where_opts[] = "mb_flag='F'";
+
+ if ($label != null)
+ echo "$label | \n";
+ echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('fixed_asset' => true, 'where' => $where_opts, 'cells'=>true));
+}
+
+//------------------------------------------------------------------------------------
+
function tax_types_list($name, $selected_id=null, $none_option=false, $submit_on_change=false)
{
$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' => reserved_words::get_all_numeric(),
- 'select_submit'=> $submit_on_change,
- 'async' => false,
- ) );
+ array(
+ 'spec_option' => $none_option,
+ 'spec_id' => ALL_NUMERIC,
+ 'select_submit'=> $submit_on_change,
+ 'async' => false,
+ ) );
}
function tax_types_list_cells($label, $name, $selected_id=null, $none_option=false,
@@ -944,18 +1189,16 @@ function tax_types_list_cells($label, $name, $selected_id=null, $none_option=fal
if ($label != null)
echo "$label | \n";
echo "";
- $str = tax_types_list($name, $selected_id, $none_option, $submit_on_change);
+ echo tax_types_list($name, $selected_id, $none_option, $submit_on_change);
echo " | \n";
- return $str;
}
function tax_types_list_row($label, $name, $selected_id=null, $none_option=false,
$submit_on_change=false)
{
- echo "\n";
- $str = 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";
- return $str;
}
//------------------------------------------------------------------------------------
@@ -963,16 +1206,16 @@ function tax_types_list_row($label, $name, $selected_id=null, $none_option=false
function tax_groups_list($name, $selected_id=null,
$none_option=false, $submit_on_change=false)
{
- $sql = "SELECT id, name FROM ".TB_PREF."tax_groups";
+ $sql = "SELECT id, name, inactive FROM ".TB_PREF."tax_groups";
return combo_input($name, $selected_id, $sql, 'id', 'name',
- array(
- 'order' => 'id',
- 'spec_option' => $none_option,
- 'spec_id' => reserved_words::get_all_numeric(),
- 'select_submit'=> $submit_on_change,
- 'async' => false,
- ) );
+ array(
+ 'order' => 'id',
+ 'spec_option' => $none_option,
+ 'spec_id' => ALL_NUMERIC,
+ 'select_submit'=> $submit_on_change,
+ 'async' => false,
+ ) );
}
function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
@@ -980,40 +1223,41 @@ function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=fa
if ($label != null)
echo "$label | \n";
echo "";
- $str = tax_groups_list($name, $selected_id, $none_option, $submit_on_change);
+ echo tax_groups_list($name, $selected_id, $none_option, $submit_on_change);
echo " | \n";
- return $str;
}
function tax_groups_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
{
- echo "\n";
- $str = 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";
- return $str;
}
//------------------------------------------------------------------------------------
-function item_tax_types_list($name, $selected_id=null)
+function item_tax_types_list($name, $selected_id=null, $show_inactive = false)
{
$sql ="SELECT id, name FROM ".TB_PREF."item_tax_types";
- combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
+ if (!$show_inactive)
+ $sql .= " WHERE !inactive";
+
+ return combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
}
-function item_tax_types_list_cells($label, $name, $selected_id=null)
+function item_tax_types_list_cells($label, $name, $selected_id=null, $show_inactive = false)
{
if ($label != null)
echo "$label | \n";
echo "";
- item_tax_types_list($name, $selected_id);
+ echo item_tax_types_list($name, $selected_id, $show_inactive);
echo " | \n";
}
-function item_tax_types_list_row($label, $name, $selected_id=null)
+function item_tax_types_list_row($label, $name, $selected_id=null, $show_inactive = false)
{
- echo "\n";
- item_tax_types_list_cells($label, $name, $selected_id);
+ echo "
$label | ";
+ item_tax_types_list_cells(null, $name, $selected_id, $show_inactive);
echo "
\n";
}
@@ -1021,8 +1265,9 @@ function item_tax_types_list_row($label, $name, $selected_id=null)
function shippers_list($name, $selected_id=null)
{
- $sql = "SELECT shipper_id, shipper_name FROM ".TB_PREF."shippers";
- combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', array());
+ $sql = "SELECT shipper_id, shipper_name, inactive FROM ".TB_PREF."shippers";
+ return combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name',
+ array('order'=>array('shipper_name')));
}
function shippers_list_cells($label, $name, $selected_id=null)
@@ -1030,62 +1275,67 @@ function shippers_list_cells($label, $name, $selected_id=null)
if ($label != null)
echo "$label | \n";
echo "";
- shippers_list($name, $selected_id);
+ echo shippers_list($name, $selected_id);
echo " | \n";
}
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";
}
//-------------------------------------------------------------------------------------
-function sales_persons_list($name, $selected_id=null)
+function sales_persons_list($name, $selected_id=null, $spec_opt=false)
{
- $sql = "SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman";
- combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', array());
+ $sql = "SELECT salesman_code, salesman_name, inactive FROM ".TB_PREF."salesman";
+ return combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name',
+ array('order'=>array('salesman_name'),
+ 'spec_option' => $spec_opt,
+ 'spec_id' => ALL_NUMERIC));
}
-function sales_persons_list_cells($label, $name, $selected_id=null)
+function sales_persons_list_cells($label, $name, $selected_id=null, $spec_opt=false)
{
if ($label != null)
echo "$label | \n";
echo "\n";
- sales_persons_list($name, $selected_id);
+ echo sales_persons_list($name, $selected_id, $spec_opt);
echo " | \n";
}
-function sales_persons_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=false)
{
- echo "\n";
- sales_persons_list_cells($label, $name, $selected_id, $submit_on_change=false);
+ echo "
$label | ";
+ sales_persons_list_cells(null, $name, $selected_id, $spec_opt);
echo "
\n";
}
//------------------------------------------------------------------------------------
-function sales_areas_list($name, $selected_id=null)
+function sales_areas_list($name, $selected_id=null, $special_option=false)
{
- $sql = "SELECT area_code, description FROM ".TB_PREF."areas";
- combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
+ $sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
+ return combo_input($name, $selected_id, $sql, 'area_code', 'description',
+ array('spec_option' => $special_option===true ? ' ' : $special_option,
+ 'order' => 'description', 'spec_id' => 0));
}
-function sales_areas_list_cells($label, $name, $selected_id=null)
+function sales_areas_list_cells($label, $name, $selected_id=null, $special_option=false)
{
if ($label != null)
echo "$label | \n";
echo "";
- sales_areas_list($name, $selected_id);
+ echo sales_areas_list($name, $selected_id, $special_option);
echo " | \n";
}
-function sales_areas_list_row($label, $name, $selected_id=null)
+function sales_areas_list_row($label, $name, $selected_id=null, $special_option=false)
{
- echo "\n";
- sales_areas_list_cells($label, $name, $selected_id);
+ echo "
$label | ";
+ sales_areas_list_cells(null, $name, $selected_id, $special_option);
echo "
\n";
}
@@ -1093,8 +1343,8 @@ function sales_areas_list_row($label, $name, $selected_id=null)
function sales_groups_list($name, $selected_id=null, $special_option=false)
{
- $sql = "SELECT id, description FROM ".TB_PREF."groups";
- combo_input($name, $selected_id, $sql, 'id', 'description', array(
+ $sql = "SELECT id, description, inactive FROM ".TB_PREF."groups";
+ return combo_input($name, $selected_id, $sql, 'id', 'description', array(
'spec_option' => $special_option===true ? ' ' : $special_option,
'order' => 'description', 'spec_id' => 0,
));
@@ -1105,14 +1355,14 @@ function sales_groups_list_cells($label, $name, $selected_id=null, $special_opti
if ($label != null)
echo "$label | \n";
echo "";
- sales_groups_list($name, $selected_id, $special_option);
+ echo sales_groups_list($name, $selected_id, $special_option);
echo " | \n";
}
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";
}
@@ -1128,7 +1378,7 @@ function templates_list($name, $selected_id=null, $special_option=false)
$sql = "SELECT sorder.order_no, Sum(line.unit_price*line.quantity*(1-line.discount_percent)) AS OrderValue
FROM ".TB_PREF."sales_orders as sorder, ".TB_PREF."sales_order_details as line
WHERE sorder.order_no = line.order_no AND sorder.type = 1 GROUP BY line.order_no";
- combo_input($name, $selected_id, $sql, 'order_no', 'OrderValue', array(
+ return combo_input($name, $selected_id, $sql, 'order_no', 'OrderValue', array(
'format' => '_format_template_items',
'spec_option' => $special_option===true ? ' ' : $special_option,
'order' => 'order_no', 'spec_id' => 0,
@@ -1140,14 +1390,14 @@ function templates_list_cells($label, $name, $selected_id=null, $special_option=
if ($label != null)
echo "$label | \n";
echo "";
- templates_list($name, $selected_id, $special_option);
+ echo templates_list($name, $selected_id, $special_option);
echo " | \n";
}
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";
}
@@ -1156,7 +1406,7 @@ function templates_list_row($label, $name, $selected_id=null, $special_option=fa
function workorders_list($name, $selected_id=null)
{
$sql = "SELECT id, wo_ref FROM ".TB_PREF."workorders WHERE closed=0";
- combo_input($name, $selected_id, $sql, 'id', 'wo_ref', array());
+ return combo_input($name, $selected_id, $sql, 'id', 'wo_ref', array());
}
function workorders_list_cells($label, $name, $selected_id=null)
@@ -1164,14 +1414,14 @@ function workorders_list_cells($label, $name, $selected_id=null)
if ($label != null)
echo "$label | \n";
echo "";
- workorders_list($name, $selected_id);
+ echo workorders_list($name, $selected_id);
echo " | \n";
}
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";
}
@@ -1179,8 +1429,8 @@ function workorders_list_row($label, $name, $selected_id=null)
function payment_terms_list($name, $selected_id=null)
{
- $sql = "SELECT terms_indicator, terms FROM ".TB_PREF."payment_terms";
- combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array());
+ $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
+ return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array());
}
function payment_terms_list_cells($label, $name, $selected_id=null)
@@ -1188,14 +1438,14 @@ function payment_terms_list_cells($label, $name, $selected_id=null)
if ($label != null)
echo "$label | \n";
echo "";
- payment_terms_list($name, $selected_id);
+ echo payment_terms_list($name, $selected_id);
echo " | \n";
}
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";
}
@@ -1203,8 +1453,8 @@ function payment_terms_list_row($label, $name, $selected_id=null)
function credit_status_list($name, $selected_id=null)
{
- $sql ="SELECT id, reason_description FROM ".TB_PREF."credit_status";
- combo_input($name, $selected_id, $sql, 'id', 'reason_description', array());
+ $sql ="SELECT id, reason_description, inactive FROM ".TB_PREF."credit_status";
+ return combo_input($name, $selected_id, $sql, 'id', 'reason_description', array());
}
function credit_status_list_cells($label, $name, $selected_id=null)
@@ -1212,14 +1462,14 @@ function credit_status_list_cells($label, $name, $selected_id=null)
if ($label != null)
echo "$label | \n";
echo "";
- credit_status_list($name, $selected_id);
+ echo credit_status_list($name, $selected_id);
echo " | \n";
}
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";
}
@@ -1227,14 +1477,13 @@ function credit_status_list_row($label, $name, $selected_id=null)
function sales_types_list($name, $selected_id=null, $submit_on_change=false, $special_option=false)
{
- $sql = "SELECT id, sales_type FROM ".TB_PREF."sales_types";
+ $sql = "SELECT id, sales_type, inactive FROM ".TB_PREF."sales_types";
return combo_input($name, $selected_id, $sql, 'id', 'sales_type',
array(
'spec_option' => $special_option===true ? _("All Sales Types") : $special_option,
'spec_id' => 0,
'select_submit'=> $submit_on_change,
- // 'async' => false,
) );
}
@@ -1243,64 +1492,51 @@ function sales_types_list_cells($label, $name, $selected_id=null, $submit_on_cha
if ($label != null)
echo "$label | \n";
echo "";
- $str = sales_types_list($name, $selected_id, $submit_on_change, $special_option);
+ echo sales_types_list($name, $selected_id, $submit_on_change, $special_option);
echo " | \n";
- return $str;
}
function sales_types_list_row($label, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
{
- echo "\n";
- $str = 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";
- return $str;
}
//-----------------------------------------------------------------------------------------------
-function movement_types_list($name, $selected_id=null)
+function _format_date($row)
{
- $sql = "SELECT id, name FROM ".TB_PREF."movement_types";
- combo_input($name, $selected_id, $sql, 'id', 'name', array());
+ return sql2date($row['reconciled']);
}
-function movement_types_list_cells($label, $name, $selected_id=null)
+function bank_reconciliation_list($account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
{
- if ($label != null)
- echo "$label | \n";
- echo "";
- movement_types_list($name, $selected_id);
- echo " | \n";
-}
-
-function movement_types_list_row($label, $name, $selected_id=null)
-{
- echo "\n";
- movement_types_list_cells($label, $name, $selected_id);
- echo "
\n";
-}
-
-//-----------------------------------------------------------------------------------------------
-/*
-function bank_trans_types_list($name, $selected_id=null)
-{
- $sql = "SELECT id, name FROM ".TB_PREF."bank_trans_types";
- combo_input($name, $selected_id, $sql, 'id', 'name', array());
+ $sql = "SELECT reconciled, reconciled FROM ".TB_PREF."bank_trans
+ WHERE bank_act=".db_escape($account)." AND reconciled IS NOT NULL
+ GROUP BY reconciled";
+ return combo_input($name, $selected_id, $sql, 'id', 'reconciled',
+ array(
+ 'spec_option' => $special_option,
+ 'format' => '_format_date',
+ 'spec_id' => '',
+ 'select_submit'=> $submit_on_change
+ ) );
}
-function bank_trans_types_list_cells($label, $name, $selected_id=null)
+function bank_reconciliation_list_cells($label,$account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
{
if ($label != null)
echo "$label | \n";
echo "";
- bank_trans_types_list($name, $selected_id);
+ echo bank_reconciliation_list($account, $name, $selected_id, $submit_on_change, $special_option);
echo " | \n";
}
-
-function bank_trans_types_list_row($label, $name, $selected_id=null)
+/*
+function bank_reconciliation_list_row($label, $account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
{
echo "\n";
- bank_trans_types_list_cells($label, $name, $selected_id);
+ bank_reconciliation_list_cells($label, $account, $name, $selected_id, $submit_on_change, $special_option);
echo "
\n";
}
*/
@@ -1308,15 +1544,14 @@ function bank_trans_types_list_row($label, $name, $selected_id=null)
function workcenter_list($name, $selected_id=null, $all_option=false)
{
- global $all_items;
- $sql = "SELECT id, name FROM ".TB_PREF."workcentres";
+ $sql = "SELECT id, name, inactive FROM ".TB_PREF."workcentres";
return combo_input($name, $selected_id, $sql, 'id', 'name',
- array(
- 'spec_option' =>$all_option===true ? _("All Suppliers") : $all_option,
- 'spec_id' => $all_items,
- ) );
+ array(
+ 'spec_option' =>$all_option===true ? _("All Suppliers") : $all_option,
+ 'spec_id' => ALL_TEXT,
+ ) );
}
function workcenter_list_cells($label, $name, $selected_id=null, $all_option=false)
@@ -1325,32 +1560,32 @@ function workcenter_list_cells($label, $name, $selected_id=null, $all_option=fal
if ($label != null)
echo "$label | \n";
echo "";
- workcenter_list($name, $selected_id, $all_option);
+ echo workcenter_list($name, $selected_id, $all_option);
echo " | \n";
}
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";
}
//-----------------------------------------------------------------------------------------------
-function bank_accounts_list($name, $selected_id=null, $submit_on_change=false)
+function bank_accounts_list($name, $selected_id=null, $submit_on_change=false, $spec_option=false)
{
- $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
+ $sql = "SELECT id, bank_account_name, bank_curr_code, inactive
FROM ".TB_PREF."bank_accounts";
-// , ".TB_PREF."chart_master
-// WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
return combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
- array(
- 'format' => '_format_add_curr',
- 'select_submit'=> $submit_on_change,
- 'async' => false
- ) );
+ array(
+ 'format' => '_format_add_curr',
+ 'select_submit'=> $submit_on_change,
+ 'spec_option' => $spec_option,
+ 'spec_id' => '',
+ 'async' => false
+ ) );
}
function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
@@ -1358,71 +1593,92 @@ function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_c
if ($label != null)
echo "$label | \n";
echo "";
- $str = bank_accounts_list($name, $selected_id, $submit_on_change);
+ echo bank_accounts_list($name, $selected_id, $submit_on_change);
echo " | \n";
- return $str;
}
function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
{
- echo "\n";
- $str = 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";
- return $str;
}
//-----------------------------------------------------------------------------------------------
-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)
{
- $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
+
+ $sql = "SELECT id, bank_account_name, bank_curr_code, inactive
FROM ".TB_PREF."bank_accounts
- WHERE ".TB_PREF."bank_accounts.account_type=3";
+ WHERE account_type=".BT_CASH;
if ($label != null)
- echo "$label | \n";
+ echo "
$label | \n";
echo "";
- $str = combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
- array(
- 'format' => '_format_add_curr',
- 'select_submit'=> $submit_on_change,
- 'async' => true
- ) );
+ echo combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
+ array(
+ 'spec_option' => $all_option,
+ 'spec_id' => ALL_TEXT,
+ 'format' => '_format_add_curr',
+ 'select_submit'=> $submit_on_change,
+ 'async' => true
+ ) );
echo " |
\n";
- return $str;
}
//-----------------------------------------------------------------------------------------------
function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $submit_on_change=false)
{
- $sql = "SELECT id, pos_name FROM ".TB_PREF."sales_pos";
+ $sql = "SELECT id, pos_name, inactive FROM ".TB_PREF."sales_pos";
default_focus($name);
echo '';
if ($label != null)
- echo "$label | \n";
+ echo "$label | \n";
echo "";
- $str = combo_input($name, $selected_id, $sql, 'id', 'pos_name',
- array(
- 'select_submit'=> $submit_on_change,
- 'async' => true,
- 'spec_option' =>$spec_option,
- 'spec_id' => -1,
- ) );
+ echo combo_input($name, $selected_id, $sql, 'id', 'pos_name',
+ array(
+ 'select_submit'=> $submit_on_change,
+ 'async' => true,
+ 'spec_option' =>$spec_option,
+ 'spec_id' => -1,
+ 'order'=> array('pos_name')
+ ) );
echo " |
\n";
- return $str;
}
//-----------------------------------------------------------------------------------------------
+// Payment type selector for current user.
+//
+function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true, $prepayments=true)
+{
+ $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
-function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
+ if ($category == PM_CASH) // only cash
+ $sql .= " WHERE days_before_due=0 AND day_in_following_month=0";
+ elseif ($category == PM_CREDIT) // only delayed payments
+ $sql .= " WHERE days_before_due".($prepayments ? '!=': '>')."0 OR day_in_following_month!=0";
+ elseif (!$prepayments)
+ $sql .= " WHERE days_before_due>=0";
+
+ 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, $prepayments=true)
{
if ($label != null)
- echo "$label | \n";
+ echo "$label | \n";
echo "";
- $str = yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change);
+
+ echo sale_payment_list($name, $category, $selected_id, $submit_on_change, $prepayments);
+
echo " | \n";
- return $str;
}
//-----------------------------------------------------------------------------------------------
@@ -1431,10 +1687,10 @@ function class_list($name, $selected_id=null, $submit_on_change=false)
$sql = "SELECT cid, class_name FROM ".TB_PREF."chart_class";
return combo_input($name, $selected_id, $sql, 'cid', 'class_name',
- array(
- 'select_submit'=> $submit_on_change,
- 'async' => false
- ) );
+ array(
+ 'select_submit'=> $submit_on_change,
+ 'async' => false
+ ) );
}
@@ -1443,142 +1699,183 @@ function class_list_cells($label, $name, $selected_id=null, $submit_on_change=fa
if ($label != null)
echo "$label | \n";
echo "";
- $str = class_list($name, $selected_id, $submit_on_change);
+ echo class_list($name, $selected_id, $submit_on_change);
echo " | \n";
- return $str;
}
function class_list_row($label, $name, $selected_id=null, $submit_on_change=false)
{
- echo "\n";
- $str = class_list_cells($label, $name, $selected_id, $submit_on_change);
+ echo "
$label | ";
+ class_list_cells(null, $name, $selected_id, $submit_on_change);
echo "
\n";
- return $str;
}
//-----------------------------------------------------------------------------------------------
-
-function stock_categories_list($name, $selected_id=null)
+function stock_categories_list($name, $selected_id=null, $spec_opt=false, $submit_on_change=false, $fixed_asset=false)
{
- $sql = "SELECT category_id, description FROM ".TB_PREF."stock_category";
- combo_input($name, $selected_id, $sql, 'category_id', 'description',
- array('order'=>'category_id'));
+ $where_opts = array();
+ if ($fixed_asset)
+ $where_opts[0] = "dflt_mb_flag='F'";
+ else
+ $where_opts[0] = "dflt_mb_flag!='F'";
+
+ $sql = "SELECT category_id, description, inactive FROM ".TB_PREF."stock_category";
+ return combo_input($name, $selected_id, $sql, 'category_id', 'description',
+ array('order'=>'category_id',
+ 'spec_option' => $spec_opt,
+ 'spec_id' => -1,
+ 'select_submit'=> $submit_on_change,
+ 'async' => true,
+ 'where' => $where_opts,
+ ));
}
-function stock_categories_list_cells($label, $name, $selected_id=null)
+function stock_categories_list_cells($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false, $fixed_asset=false)
{
if ($label != null)
echo "$label | \n";
echo "";
- stock_categories_list($name, $selected_id);
+ echo stock_categories_list($name, $selected_id, $spec_opt, $submit_on_change, $fixed_asset);
echo " | \n";
}
-function stock_categories_list_row($label, $name, $selected_id=null)
+function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false, $fixed_asset=false)
{
- echo "\n";
- stock_categories_list_cells($label, $name, $selected_id);
+ echo "
$label | ";
+ stock_categories_list_cells(null, $name, $selected_id, $spec_opt, $submit_on_change, $fixed_asset);
echo "
\n";
}
+//-----------------------------------------------------------------------------------------------
+function fixed_asset_classes_list($name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
+{
+ $sql = "SELECT c.fa_class_id, CONCAT(c.fa_class_id,' - ',c.description) `desc`, CONCAT(p.fa_class_id,' - ',p.description) `class`, c.inactive FROM "
+ .TB_PREF."stock_fa_class c LEFT JOIN ".TB_PREF."stock_fa_class p ON c.parent_id=p.fa_class_id";
+
+ return combo_input($name, $selected_id, $sql, 'c.fa_class_id', 'desc',
+ array('order'=>'c.fa_class_id',
+ 'spec_option' => $spec_opt,
+ 'spec_id' => '-1',
+ 'select_submit'=> $submit_on_change,
+ 'async' => true,
+ 'search_box' => true,
+ 'search' => array("c.fa_class_id"),
+ 'search_submit' => false,
+ 'spec_id' => '',
+ 'size' => 3,
+ 'max' => 3,
+ 'category' => 'class',
+ ));
+}
+
+function fixed_asset_classes_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
+{
+ echo "$label | ";
+ echo "";
+ echo fixed_asset_classes_list($name, $selected_id, $spec_opt, $submit_on_change);
+ echo " |
\n";
+}
+
//-----------------------------------------------------------------------------------------------
-function gl_account_types_list($name, $selected_id=null, $all_option, $all_option_numeric)
+function gl_account_types_list($name, $selected_id=null, $all_option=false, $all=true)
{
- 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
- ) );
+ return combo_input($name, $selected_id, $sql, 'id', 'name',
+ array(
+ 'format' => '_format_account',
+ 'order' => array('class_id', 'id', 'parent'),
+ 'spec_option' =>$all_option,
+ 'spec_id' => ALL_TEXT
+ ) );
}
-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 "";
- 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";
}
//-----------------------------------------------------------------------------------------------
function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false,
- $show_group=true, $cells=false, $all_option=false, $submit_on_change=false)
+ $cells=false, $all_option=false, $submit_on_change=false, $all=false, $type_id=false)
{
if ($skip_bank_accounts)
- $sql = "SELECT chart.account_code, chart.account_name, type.name
+ $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
FROM (".TB_PREF."chart_master chart,".TB_PREF."chart_types type) "
."LEFT JOIN ".TB_PREF."bank_accounts acc "
."ON chart.account_code=acc.account_code
WHERE acc.account_code IS NULL
AND chart.account_type=type.id";
else
- $sql = "SELECT chart.account_code, chart.account_name, type.name
+ $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
WHERE chart.account_type=type.id";
-
- combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name',
- array(
- 'format' => '_format_account',
- 'spec_option' => $all_option===true ? _("Use Item Sales Accounts") : $all_option,
- 'spec_id' => '',
- 'order' => 'account_code',
- 'search_box' => $cells,
+ if ($type_id ) $sql .= " AND chart.account_type=".db_escape($type_id);
+ $account = ($skip_bank_accounts ? "account2" : "account");
+ return combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name',
+ array(
+ 'format' => '_format_account',
+ 'spec_option' => $all_option===true ? _("Use Item Sales Accounts") : $all_option,
+ 'spec_id' => '',
+ 'type' => 2,
+ 'order' => array('type.class_id','type.id','account_code'),
+ 'search_box' => $cells,
'search_submit' => false,
'size' => 12,
'max' => 10,
'cells' => true,
- 'select_submit'=> $submit_on_change,
- 'async' => false,
- 'category' => ($show_group ? 2 : false)
- ) );
-
+ 'select_submit'=> $submit_on_change,
+ 'async' => false,
+ 'category' => 2,
+ 'show_inactive' => $all
+ ), $account );
}
function _format_account($row)
{
- return $row[0] . " " . $row[1];
+ return $row[0] . " " . $row[1];
}
-function gl_all_accounts_list_cells($label, $name, $selected_id=null, $skip_bank_accounts=false,
- $show_group=false, $cells=false, $all_option=false)
+function gl_all_accounts_list_cells($label, $name, $selected_id=null,
+ $skip_bank_accounts=false, $cells=false, $all_option=false,
+ $submit_on_change=false, $all=false, $type_id=false)
{
if ($label != null)
echo "$label | \n";
echo "";
- gl_all_accounts_list($name, $selected_id, $skip_bank_accounts, $show_group, $cells, $all_option);
+ echo gl_all_accounts_list($name, $selected_id,
+ $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id);
echo " | \n";
}
-function gl_all_accounts_list_row($label, $name, $selected_id=null, $skip_bank_accounts=false,
- $show_group=false, $cells=false, $all_option=false)
+function gl_all_accounts_list_row($label, $name, $selected_id=null,
+ $skip_bank_accounts=false, $cells=false, $all_option=false, $type_id=false)
{
- echo "\n";
- gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts,
- $show_group, $cells, $all_option);
+ echo "
$label | ";
+ gl_all_accounts_list_cells(null, $name, $selected_id,
+ $skip_bank_accounts, $cells, $all_option, $type_id);
echo "
\n";
}
function yesno_list($name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
{
$items = array();
- $items['1'] = strlen($name_yes) ? $name_yes : _("Yes");
$items['0'] = strlen($name_no) ? $name_no : _("No");
+ $items['1'] = strlen($name_yes) ? $name_yes : _("Yes");
return array_selector($name, $selected_id, $items,
array(
@@ -1591,45 +1888,44 @@ function yesno_list_cells($label, $name, $selected_id=null, $name_yes="", $name_
if ($label != null)
echo "$label | \n";
echo "";
- $str = yesno_list($name, $selected_id, $name_yes, $name_no, $submit_on_change);
+ echo yesno_list($name, $selected_id, $name_yes, $name_no, $submit_on_change);
echo " | \n";
- return $str;
}
function yesno_list_row($label, $name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
{
- echo "\n";
- $str = 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";
- return $str;
}
//------------------------------------------------------------------------------------------------
-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 );
+ 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 "";
- 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";
}
@@ -1637,15 +1933,9 @@ function languages_list_row($label, $name, $selected_id=null)
function bank_account_types_list($name, $selected_id=null)
{
- $types = bank_account_types::get_all();
+ global $bank_account_types;
- $items = array();
- foreach ($types as $type)
- {
- $items[$type['id']] = $type['name'];
- }
-
- return array_selector($name, $selected_id, $items );
+ return array_selector($name, $selected_id, $bank_account_types);
}
function bank_account_types_list_cells($label, $name, $selected_id=null)
@@ -1653,31 +1943,28 @@ function bank_account_types_list_cells($label, $name, $selected_id=null)
if ($label != null)
echo "$label | \n";
echo "";
- bank_account_types_list($name, $selected_id);
+ echo bank_account_types_list($name, $selected_id);
echo " | \n";
}
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";
}
//------------------------------------------------------------------------------------------------
function payment_person_types_list($name, $selected_id=null, $submit_on_change=false)
{
- $types = payment_person_types::get_all();
+ global $payment_person_types;
$items = array();
- foreach ($types as $type)
+ foreach ($payment_person_types as $key=>$type)
{
- if (payment_person_types::has_items($type['id']))
- {
- $items[$type['id']] = $type['name'];
- }
- }
-
+ if ($key != PT_WORKORDER)
+ $items[$key] = $type;
+ }
return array_selector($name, $selected_id, $items,
array( 'select_submit'=> $submit_on_change ) );
}
@@ -1687,119 +1974,69 @@ function payment_person_types_list_cells($label, $name, $selected_id=null, $rela
if ($label != null)
echo "$label | \n";
echo "";
- $str = payment_person_types_list($name, $selected_id, $related);
+ echo payment_person_types_list($name, $selected_id, $related);
echo " | \n";
- return $str;
}
function payment_person_types_list_row($label, $name, $selected_id=null, $related=null)
{
- echo "\n";
- $str = payment_person_types_list_cells($label, $name, $selected_id, $related);
- echo "
\n";
- return $str;
-}
-
-//------------------------------------------------------------------------------------------------
-
-function quick_entries_list($name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false)
-{
- $where = false;
- $sql = "SELECT id, description FROM ".TB_PREF."quick_entries";
- if ($expense != -1)
- {
- $sql .= " WHERE deposit=$expense";
- $where = true;
- }
- if ($bank_only != -1)
- {
- if ($where)
- $sql .= " AND bank_only=$bank_only";
- else
- $sql .= " WHERE bank_only=$bank_only";
- }
- combo_input($name, $selected_id, $sql, 'id', 'description',
- array(
- 'spec_id' => '',
- 'order' => 'description',
- 'select_submit'=> $submit_on_change,
- 'async' => false
- ) );
-
-}
-
-function quick_entries_list_cells($label, $name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false)
-{
- echo "$label | \n";
- quick_entries_list($name, $selected_id, $expense, $bank_only, $submit_on_change);
- echo " | ";
-}
-
-function quick_entries_list_row($label, $name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false)
-{
- echo "\n";
- quick_entries_list_cells($label, $name, $selected_id, $expense, $bank_only, $submit_on_change);
+ echo "
$label | ";
+ payment_person_types_list_cells(null, $name, $selected_id, $related);
echo "
\n";
}
-
//------------------------------------------------------------------------------------------------
function wo_types_list($name, $selected_id=null)
{
- $types = wo_types::get_all();
-
- $items = array();
- foreach ($types as $type)
- $items[$type['id']] = $type['name'];
+ global $wo_types_array;
- return array_selector($name, $selected_id, $items,
+ return array_selector($name, $selected_id, $wo_types_array,
array( 'select_submit'=> true, 'async' => true ) );
}
function wo_types_list_row($label, $name, $selected_id=null)
{
- echo "$label | \n";
- $str = wo_types_list($name, $selected_id);
+ echo " |
$label | \n";
+ echo wo_types_list($name, $selected_id);
echo " |
\n";
- return $str;
}
//------------------------------------------------------------------------------------------------
function dateformats_list_row($label, $name, $value=null)
{
- global $dateformats;
+ global $SysPrefs;
- echo "$label | \n";
- array_selector( $name, $value, $dateformats );
+ echo " |
$label | \n";
+ echo array_selector( $name, $value, $SysPrefs->dateformats );
echo " |
\n";
}
function dateseps_list_row($label, $name, $value=null)
{
- global $dateseps;
+ global $SysPrefs;
- echo "$label | \n";
- array_selector( $name, $value, $dateseps );
+ echo " |
$label | \n";
+ echo array_selector( $name, $value, $SysPrefs->dateseps );
echo " |
\n";
}
function thoseps_list_row($label, $name, $value=null)
{
- global $thoseps;
+ global $SysPrefs;
- echo "$label | \n";
- array_selector( $name, $value, $thoseps );
+ echo " |
$label | \n";
+ echo array_selector( $name, $value, $SysPrefs->thoseps );
echo " |
\n";
}
function decseps_list_row($label, $name, $value=null)
{
- global $decseps;
+ global $SysPrefs;
- echo "$label | \n";
- array_selector( $name, $value, $decseps );
+ echo " |
$label | \n";
+ echo array_selector( $name, $value, $SysPrefs->decseps );
echo " |
\n";
}
@@ -1819,34 +2056,57 @@ function themes_list_row($label, $name, $value=null)
}
ksort($themes);
- echo "$label | \n";
- array_selector( $name, $value, $themes );
+ echo " |
$label | \n";
+ echo array_selector( $name, $value, $themes );
echo " |
\n";
}
function pagesizes_list_row($label, $name, $value=null)
{
- global $pagesizes;
+ global $SysPrefs;
$items = array();
- foreach ($pagesizes as $pz)
+ foreach ($SysPrefs->pagesizes as $pz)
$items[$pz] = $pz;
- echo "$label | \n";
- array_selector( $name, $value, $items );
+ echo " |
$label | \n";
+ echo array_selector( $name, $value, $items );
echo " |
\n";
}
-function security_headings_list_row($label, $name, $value=null)
+function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=false, $exclude=array())
{
- global $security_headings;
+ global $systypes_array;
- echo "$label | \n";
- array_selector( $name, $value, $security_headings );
- echo " |
\n";
+ // 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,
+ 'select_submit'=> $submit_on_change,
+ 'async' => false,
+ )
+ );
}
-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, $exclude);
+ echo " | \n";
+}
+
+function systypes_list_row($label, $name, $value=null, $submit_on_change=false, $exclude=array())
+{
+ echo "$label | ";
+ systypes_list_cells(null, $name, $value, $submit_on_change, $exclude);
+ echo "
\n";
+}
+
+function journal_types_list_cells($label, $name, $value=null, $submit_on_change=false)
{
global $systypes_array;
@@ -1854,64 +2114,73 @@ function systypes_list_cells($label, $name, $value=null, $submit_on_change=false
echo "$label | \n";
echo "";
- $items = array();
- foreach ($systypes_array as $key=>$type)
- $items[$key] = $type['name'];
+ $items = $systypes_array;
+
+ // exclude quotes, orders and dimensions
+ foreach (array(ST_PURCHORDER, ST_SALESORDER, ST_DIMENSION, ST_SALESQUOTE, ST_LOCTRANSFER) as $excl)
+ unset($items[$excl]);
- $str = array_selector($name, $value, $items,
+ echo array_selector($name, $value, $items,
array(
+ 'spec_option'=> _("All"),
+ 'spec_id' => -1,
'select_submit'=> $submit_on_change,
'async' => false
)
);
echo " | \n";
- return $str;
}
-function systypes_list_row($label, $name, $value=null, $submit_on_change=false)
+function cust_allocations_list_cells($label, $name, $selected=null, $submit_on_change=false)
{
- echo "\n";
- $str = systypes_list_cells($label, $name, $value, $submit_on_change);
- echo "
\n";
- return $str;
-}
-
-function cust_allocations_list_cells($label, $name, $selected=null)
-{
- global $all_items;
if ($label != null)
label_cell($label);
echo "\n";
$allocs = array(
- $all_items=>_("All Types"),
+ ALL_TEXT=>_("All Types"),
'1'=> _("Sales Invoices"),
- '2'=> _("Overdue Invoices"),
+ '2'=> _("Unsettled transactions"),
'3' => _("Payments"),
'4' => _("Credit Notes"),
'5' => _("Delivery Notes")
);
- $str = array_selector($name, $selected, $allocs);
+ echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
echo " | \n";
- return $str;
}
function supp_allocations_list_cell($name, $selected=null)
{
- global $all_items;
echo "\n";
$allocs = array(
- $all_items=>_("All Types"),
+ ALL_TEXT=>_("All Types"),
'1'=> _("Invoices"),
'2'=> _("Overdue Invoices"),
'3' => _("Payments"),
'4' => _("Credit Notes"),
'5' => _("Overdue Credit Notes")
);
- $str = array_selector($name, $selected, $allocs);
+ echo array_selector($name, $selected, $allocs);
+ echo " | \n";
+}
+
+function supp_transactions_list_cell($name, $selected=null, $submit_on_change=false)
+{
+
+ echo "\n";
+ $allocs = array(
+ ALL_TEXT=>_("All Types"),
+ '6'=>_("GRNs"),
+ '1'=> _("Invoices"),
+ '2'=> _("Unsettled transactions"),
+ '3' => _("Payments"),
+ '4' => _("Credit Notes"),
+ '5' => _("Overdue Credit Notes")
+ );
+
+ echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
echo " | \n";
- return $str;
}
function policy_list_cells($label, $name, $selected=null)
@@ -1919,17 +2188,16 @@ function policy_list_cells($label, $name, $selected=null)
if ($label != null)
label_cell($label);
echo "\n";
- $str = array_selector($name, $selected,
+ echo array_selector($name, $selected,
array( '' => _("Automatically put balance on back order"),
'CAN' => _("Cancel any quantites not delivered")) );
echo " | \n";
- return $str;
}
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";
}
@@ -1938,20 +2206,18 @@ function credit_type_list_cells($label, $name, $selected=null, $submit_on_change
if ($label != null)
label_cell($label);
echo "\n";
- $str = array_selector($name, $selected,
- array( 'Return' => _("Items Returned to Inventory Location"),
- 'WriteOff' => _("Items Written Off")),
- array( 'select_submit'=> $submit_on_change ) );
+ echo array_selector($name, $selected,
+ array( 'Return' => _("Items Returned to Inventory Location"),
+ 'WriteOff' => _("Items Written Off")),
+ array( 'select_submit'=> $submit_on_change ) );
echo " | \n";
- return $str;
}
function credit_type_list_row($label, $name, $selected=null, $submit_on_change=false)
{
- echo "\n";
- $str = credit_type_list_cells($label, $name, $selected, $submit_on_change);
+ echo "
$label | ";
+ credit_type_list_cells(null, $name, $selected, $submit_on_change);
echo "
\n";
- return $str;
}
function number_list($name, $selected, $from, $to, $no_option=false)
@@ -1961,8 +2227,8 @@ function number_list($name, $selected, $from, $to, $no_option=false)
$items[$i] = "$i";
return array_selector($name, $selected, $items,
- array( 'spec_option' => $no_option,
- 'spec_id' => reserved_words::get_all_numeric()) );
+ array( 'spec_option' => $no_option,
+ 'spec_id' => ALL_NUMERIC) );
}
function number_list_cells($label, $name, $selected, $from, $to, $no_option=false)
@@ -1970,14 +2236,14 @@ function number_list_cells($label, $name, $selected, $from, $to, $no_option=fals
if ($label != null)
label_cell($label);
echo "\n";
- number_list($name, $selected, $from, $to, $no_option);
+ echo number_list($name, $selected, $from, $to, $no_option);
echo " | \n";
}
function number_list_row($label, $name, $selected, $from, $to, $no_option=false)
{
- echo "\n";
- 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";
}
@@ -1994,10 +2260,10 @@ function print_profiles_list_row($label, $name, $selected_id=null, $spec_opt=fal
echo "";
if ($label != null)
- echo "$label | \n";
+ echo "$label | \n";
echo "";
- array_selector($name, $selected_id, $profiles,
+ echo array_selector($name, $selected_id, $profiles,
array( 'select_submit'=> $submit_on_change,
'spec_option'=>$spec_opt,
'spec_id' => ''
@@ -2018,12 +2284,441 @@ function printers_list($name, $selected_id=null, $spec_opt=false, $submit_on_cha
$printers[$myrow['id']] = $myrow['name'].' - '.$myrow['description'];
}
}
- array_selector($name, $selected_id, $printers,
+ return array_selector($name, $selected_id, $printers,
array( 'select_submit'=> $submit_on_change,
'spec_option'=>$spec_opt,
'spec_id' => ''
));
}
+//------------------------------------------------------------------------------------------------
+
+function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_change=false)
+{
+ $where = false;
+ $sql = "SELECT id, description FROM ".TB_PREF."quick_entries";
+ if ($type != null)
+ $sql .= " WHERE type=$type";
-?>
\ No newline at end of file
+ return combo_input($name, $selected_id, $sql, 'id', 'description',
+ array(
+ 'spec_id' => '',
+ 'order' => 'description',
+ 'select_submit'=> $submit_on_change,
+ 'async' => false
+ ) );
+
+}
+
+function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false)
+{
+ 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 "
$label | ";
+ quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change);
+ echo "
\n";
+}
+
+
+function quick_actions_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+ global $quick_actions;
+
+ echo "$label | ";
+ echo array_selector($name, $selected_id, $quick_actions,
+ array(
+ 'select_submit'=> $submit_on_change
+ ) );
+ echo " |
\n";
+}
+
+function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+ global $quick_entry_types;
+
+ echo "$label | ";
+ echo array_selector($name, $selected_id, $quick_entry_types,
+ array(
+ 'select_submit'=> $submit_on_change
+ ) );
+ echo " |
\n";
+}
+
+function record_status_list_row($label, $name) {
+ return yesno_list_row($label, $name, null, _('Inactive'), _('Active'));
+}
+
+function class_types_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+ global $class_types;
+
+ echo "$label | ";
+ echo array_selector($name, $selected_id, $class_types,
+ array(
+ 'select_submit'=> $submit_on_change
+ ) );
+ echo " |
\n";
+}
+
+//------------------------------------------------------------------------------------------------
+
+function security_roles_list($name, $selected_id=null, $new_item=false, $submit_on_change=false,
+ $show_inactive = false)
+{
+
+ $sql = "SELECT id, role, inactive FROM ".TB_PREF."security_roles";
+
+ return combo_input($name, $selected_id, $sql, 'id', 'description',
+ array(
+ 'spec_option'=>$new_item ? _("New role") : false,
+ 'spec_id' => '',
+ 'select_submit'=> $submit_on_change,
+ 'show_inactive' => $show_inactive
+ ) );
+}
+
+function security_roles_list_cells($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false,
+ $show_inactive = false)
+{
+ if ($label != null)
+ echo "$label | \n";
+ echo "";
+ echo security_roles_list($name, $selected_id, $new_item, $submit_on_change, $show_inactive);
+ echo " | \n";
+}
+
+function security_roles_list_row($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false,
+ $show_inactive = false)
+{
+ echo "$label | ";
+ security_roles_list_cells(null, $name, $selected_id, $new_item, $submit_on_change, $show_inactive);
+ echo "
\n";
+}
+
+function tab_list_row($label, $name, $selected_id=null)
+{
+ global $installed_extensions;
+
+ $tabs = array();
+ foreach ($_SESSION['App']->applications as $app) {
+ $tabs[$app->id] = access_string($app->name, true);
+ }
+ echo "\n";
+ echo "$label | \n";
+ echo array_selector($name, $selected_id, $tabs);
+ echo " |
\n";
+}
+
+//-----------------------------------------------------------------------------------------------
+
+function tag_list($name, $height, $type, $multi=false, $all=false, $spec_opt = false)
+{
+ // Get tags
+ global $path_to_root;
+ include_once($path_to_root . "/admin/db/tags_db.inc");
+ $results = get_tags($type, $all);
+
+ while ($tag = db_fetch($results))
+ $tags[$tag['id']] = $tag['name'];
+
+ if (!isset($tags)) {
+ $tags[''] = $all ? _("No tags defined.") : _("No active tags defined.");
+ $spec_opt = false;
+ }
+ return array_selector($name, null, $tags,
+ array(
+ 'multi' => $multi,
+ 'height' => $height,
+ 'spec_option'=> $spec_opt,
+ 'spec_id' => -1,
+ ) );
+}
+
+function tag_list_cells($label, $name, $height, $type, $mult=false, $all=false, $spec_opt = false)
+{
+ if ($label != null)
+ echo "$label | \n";
+ echo "\n";
+ echo tag_list($name, $height, $type, $mult, $all, $spec_opt);
+ echo " | \n";
+
+}
+
+function tag_list_row($label, $name, $height, $type, $mult=false, $all=false, $spec_opt = false)
+{
+ echo "$label | ";
+ tag_list_cells(null, $name, $height, $type, $mult, $all, $spec_opt);
+ echo "
\n";
+}
+
+//---------------------------------------------------------------------------------------------
+// List of sets of active extensions
+//
+function extset_list($name, $value=null, $submit_on_change=false)
+{
+ global $db_connections;
+
+ $items = array();
+ foreach ($db_connections as $comp)
+ $items[] = sprintf(_("Activated for '%s'"), $comp['name']);
+ return array_selector( $name, $value, $items,
+ array(
+ '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 payment_services($name)
+{
+ global $payment_services;
+
+ $services = (object)array_combine(array_keys($payment_services), array_keys($payment_services));
+
+ return array_selector($name, null, $services, array(
+ 'spec_option'=> _("No payment Link"),
+ 'spec_id' => '',
+ ));
+}
+
+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 refline_list($name, $type, $value=null, $spec_option=false)
+{
+ $sql = "SELECT id, prefix, inactive FROM ".TB_PREF."reflines";
+
+ $where = array();
+
+ if (isset($type))
+ $where = array('`trans_type`='.db_escape($type));
+
+ return combo_input($name, $value, $sql, 'id', 'prefix',
+ array(
+ 'order'=>array('prefix'),
+ 'spec_option' => $spec_option,
+ 'spec_id' => '',
+ 'type' => 2,
+ 'where' => $where,
+ 'select_submit' => true,
+ )
+ );
+}
+
+function refline_list_row($label, $name, $type, $selected_id=null, $spec_option=false)
+{
+ echo "";
+ if ($label != null)
+ echo "$label | \n";
+ echo "";
+
+ echo refline_list($name, $type, $selected_id, $spec_option);
+ echo " |
\n";
+}
+
+
+//----------------------------------------------------------------------------------------------
+
+function subledger_list($name, $account, $selected_id=null)
+{
+
+ $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 NOT d.inactive AND c.receivables_account=".db_escape($account);
+ else
+ $sql = "SELECT supplier_id as id, supp_ref as name
+ FROM "
+ .TB_PREF."suppliers s
+ WHERE NOT s.inactive AND 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";
+}
+
+function accounts_type_list_row($label, $name, $selected_id=null)
+{
+ echo "";
+ if ($label != null)
+ echo "$label | \n";
+ echo "";
+ $sel = array(_("Numeric"), _("Alpha Numeric"), _("ALPHA NUMERIC"));
+ echo array_selector($name, $selected_id, $sel);
+ echo " |
\n";
+}
+
+function users_list_cells($label, $name, $selected_id=null, $submit_on_change=false, $spec_opt=true)
+{
+ $where = false;
+ $sql = " SELECT user_id, IF(real_name = ' ', user_id, real_name) FROM ".TB_PREF."users";
+
+ if ($label != null)
+ echo "$label | \n";
+ echo "";
+
+ echo combo_input($name, $selected_id, $sql, 'user_id', 'real_name',
+ array(
+ 'spec_option' => $spec_opt===true ?_("All users") : $spec_opt,
+ 'spec_id' => '',
+ 'order' => 'real_name',
+ 'select_submit'=> $submit_on_change,
+ 'async' => false
+ ) );
+ echo " | ";
+
+}
+
+function collations_list_row($label, $name, $selected_id=null)
+{
+ global $supported_collations;
+
+ echo "";
+ if ($label != null)
+ echo "$label | \n";
+ echo "";
+
+ echo array_selector($name, $selected_id, $supported_collations,
+ array('select_submit'=> false) );
+ echo " |
\n";
+}