X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=e2fc6a10cb91505a1cf5012bc2c91cb4303eaa41;hb=3a5c989060c96623b8f621ba89f8eb4405fb1588;hp=375498d0f2bc9a367d3bda4921dcbb64ee2f6050;hpb=fed6bc04a7b050a0b69136a332e92ee651812487;p=fa-stable.git
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 375498d0..e2fc6a10 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -5,16 +5,16 @@ 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 = " ";
+$_search_button = " ";
-$_select_button = " ";
+$_select_button = " ";
$all_items = reserved_words::get_all();
//----------------------------------------------------------------------------
-// Universal combo generator
+// Universal sql combo generator
// $sql must return selector values and selector texts in columns 0 & 1
// Options are merged with defaults.
@@ -30,7 +30,9 @@ $opts = array( // default options
'spec_option'=>false, // option text or false
'spec_id' => 0, // option id
// submit on select parameters
+ 'default' => '', // default value when $_POST is not set
'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,
@@ -46,11 +48,12 @@ $opts = array( // default options
'cells' => false, // combo displayed as 2 | cells
'search' => array(), // sql field names to search
'format' => null, // format functions for regular options
- 'disabled' => false, // FIX todo
+ 'disabled' => false,
'box_hint' => null // box/selectors hints; null = std see below
);
// ------ merge options with defaults ----------
- $opts = array_merge($opts, $options);
+ if($options != null)
+ $opts = array_merge($opts, $options);
if (!is_array($opts['where'])) $opts['where'] = array($opts['where']);
$search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box'];
@@ -60,28 +63,28 @@ $opts = array( // default options
$spec_option = $opts['spec_option'];
$by_id = ($opts['type'] == 0);
$class = $by_id ? 'combo':'combo2';
+ $disabled = $opts['disabled'] ? "disabled" : '';
if(!count($opts['search'])) {
$opts['search'] = array($by_id ? $valfield : $namefield);
}
- if ($opts['sel_hint'] === null)
+ if ($opts['sel_hint'] === null)
$opts['sel_hint'] = $by_id || $search_box==false ?
- '' : _('Press Space tab for search pattern entry');
+ '' : _('Press Space tab for search pattern entry');
if ($opts['box_hint'] === null)
- $opts['box_hint'] = $search_box ?
+ $opts['box_hint'] = $search_box && $search_submit != false ?
($by_id ? _('Enter code fragment to search or * for all')
: _('Enter description fragment to search or * for all')) :'';
if ($selected_id == null) {
- $selected_id = get_post($name, null);
+ $selected_id = get_post($name, $opts['default']);
}
$txt = get_post($search_box);
$rel = '';
$limit = '';
if (isset($_POST[$select_submit])) {
-
if ($by_id) $txt = $_POST[$name];
if (!$opts['async'])
@@ -95,16 +98,17 @@ $opts = array( // default options
$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 (!$opts['async'])
$Ajax->activate('_page_body');
else
$Ajax->activate($name);
}
if ($txt == '') {
- if ($spec_option === false)
- $limit = ' LIMIT 1';
+ if ($spec_option === false && $selected_id==null)
+ $limit = ' LIMIT 1';
else
- $opts['where'][] = $valfield . "='". get_post($name, $spec_id)."'";
+ $opts['where'][] = $valfield . "='". get_post($name, $spec_id)."'";
}
else
if ($txt != '*') {
@@ -129,14 +133,17 @@ $opts = array( // default options
$selector = $first_opt = '';
$first_id = false;
$found = false;
-//if($name=='SelectStockFromList') display_error($sql);
+//if($name=='contact_sel') display_error($sql);
if($result = db_query($sql)) {
while ($contact_row = db_fetch($result)) {
$value = $contact_row[0];
$descr = $opts['format']==null ? $contact_row[1] :
call_user_func($opts['format'], $contact_row);
$sel = '';
- if ($selected_id === $value) {
+ if (get_post($search_submit) && ($txt === $value)) {
+ $selected_id = $value;
+ }
+ if ((string)($selected_id) === $value) {
$sel = 'selected';
$found = $value;
}
@@ -148,6 +155,7 @@ $opts = array( // default options
}
db_free_result($result);
}
+
// Prepend special option.
if ($spec_option !== false) { // if special option used - add it
$first_id = $spec_id;
@@ -158,17 +166,17 @@ $opts = array( // default options
}
if ($found === false) {
- $_POST[$name] = $first_id;
+ $selected_id = $first_id;
}
+ $_POST[$name] = $selected_id;
- if ($by_id) {
- $txt = $_POST[$name];
- if ($search_box)
- $Ajax->addUpdate($name, $search_box, $txt);
+ if ($by_id && $search_box != false) {
+ $txt = $found;
+ $Ajax->addUpdate($name, $search_box, $txt ? $txt : '');
}
-
- $selector = "\n";
+ $aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
+ $selector = "\n";
$Ajax->addUpdate($name, "_{$name}_sel", $selector);
@@ -179,24 +187,24 @@ $opts = array( // default options
if ($select_submit != false) { // if submit on change is used - add select button
global $_select_button;
// button class selects form reload/ajax selector update
- $selector .= sprintf($_select_button, user_theme(),
- (in_ajax() ? 'display:none;':''),
+ $selector .= sprintf($_select_button, $disabled, user_theme(),
+ (fallback_mode() ? '' : 'display:none;'),
$select_submit)."\n";
}
// ------ make combo ----------
$edit_entry = '';
if ($search_box != false) {
- $edit_entry = "\n";
if ($search_submit != false) {
global $_search_button;
- $edit_entry .= sprintf($_search_button, user_theme(),
- (in_ajax() ? 'display:none;':''),
+ $edit_entry .= sprintf($_search_button, $disabled, user_theme(),
+ (fallback_mode() ? '' : 'display:none;'),
$search_submit)."\n";
}
}
@@ -210,7 +218,118 @@ $opts = array( // default options
return $str;
}
-function supplier_list($name, $selected_id, $spec_option=false, $submit_on_change=false)
+/*
+ Helper function.
+ Returns true if selector $name is subject to update.
+*/
+function list_updated($name)
+{
+ return isset($_POST['_'.$name.'_update']) || isset($_POST['_'.$name.'_button']);
+}
+//----------------------------------------------------------------------------------------------
+// Universal array combo generator
+// $items is array of options 'value' => 'description'
+// Options is reduced set of combo_selector options and is merged with defaults.
+
+function array_selector($name, $selected_id, $items, $options=null)
+{
+ global $Ajax;
+
+$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
+ // search box parameters
+ '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'];
+ $spec_id = $opts['spec_id'];
+ $spec_option = $opts['spec_option'];
+ $disabled = $opts['disabled'] ? "disabled" : '';
+
+ if ($selected_id == null) {
+ $selected_id = get_post($name, $opts['default']);
+ }
+
+ if (isset($_POST[$select_submit])) {
+ if (!$opts['async'])
+ $Ajax->activate('_page_body');
+ else
+ $Ajax->activate($name);
+ }
+
+ // ------ make selector ----------
+ $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";
+ }
+
+ // Prepend special option.
+ if ($spec_option !== false) { // if special option used - add it
+ $first_id = $spec_id;
+ $first_opt = $spec_option;
+ $sel = $found===false ? 'selected' : '';
+ $selector = "\n"
+ . $selector;
+ }
+
+ if ($found === false) {
+ $_POST[$name] = $first_id;
+ }
+
+ $aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
+ $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(),
+ (fallback_mode() ? '' : 'display:none;'),
+ $select_submit)."\n";
+ }
+ default_focus($name);
+ echo $selector;
+
+ return $selector;
+}
+//----------------------------------------------------------------------------------------------
+
+function _format_add_curr($row)
+{
+ static $company_currency;
+
+ if ($company_currency == null)
+ {
+ $company_currency = get_company_currency();
+ }
+ return $row[1] . ($row[2] == $company_currency ?
+ '' : (" - " . $row[2]));
+}
+
+function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
{
global $all_items;
@@ -222,6 +341,7 @@ function supplier_list($name, $selected_id, $spec_option=false, $submit_on_chang
array(
'format' => '_format_add_curr',
'search_box' => $mode!=0,
+ 'edit_submit' => true,
'type' => 1,
'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option,
'spec_id' => $all_items,
@@ -232,19 +352,7 @@ function supplier_list($name, $selected_id, $spec_option=false, $submit_on_chang
));
}
-function _format_add_curr($row)
-{
-static $company_currency;
-
-if ($company_currency == null)
-{
- $company_currency = get_company_currency();
-}
-return $row[1] . ($row[2] == $company_currency ?
- '' : (" - " . $row[2]));
-}
-
-function supplier_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
if ($label != null)
echo "$label | \n";
@@ -253,7 +361,7 @@ function supplier_list_cells($label, $name, $selected_id, $all_option=false, $su
return $str;
}
-function supplier_list_row($label, $name, $selected_id, $all_option = false, $submit_on_change=false)
+function supplier_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
{
echo " | | $label | ";
$str = supplier_list($name, $selected_id, $all_option, $submit_on_change );
@@ -262,7 +370,7 @@ return $str;
}
//----------------------------------------------------------------------------------------------
-function customer_list($name, $selected_id, $spec_option=false, $submit_on_change=false)
+function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
{
global $all_items;
@@ -279,13 +387,14 @@ return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
'spec_option' => $spec_option === true ? _("All Customers") : $spec_option,
'spec_id' => $all_items,
'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') :
+ 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F4 - entry new customer') :
_('Select customer')
) );
}
-function customer_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function customer_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
if ($label != null)
echo " | $label | \n";
@@ -295,17 +404,17 @@ function customer_list_cells($label, $name, $selected_id, $all_option=false, $su
return $str;
}
-function customer_list_row($label, $name, $selected_id, $all_option = false, $submit_on_change=false)
+function customer_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
{
-echo "
| $label | ";
-$str = customer_list($name, $selected_id, $all_option, $submit_on_change);
-echo " | \n
\n";
-return $str;
+ echo "| $label | ";
+ $str = customer_list($name, $selected_id, $all_option, $submit_on_change);
+ echo " | \n
\n";
+ return $str;
}
//------------------------------------------------------------------------------------------------
-function customer_branches_list($customer_id, $name, $selected_id,
+function customer_branches_list($customer_id, $name, $selected_id=null,
$spec_option = true, $enabled=true, $submit_on_change=false)
{
global $all_items;
@@ -321,12 +430,11 @@ return combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
'spec_id' => $all_items,
'select_submit'=> $submit_on_change,
'sel_hint' => _('Select customer branch')
-// 'async' => false
) );
}
//------------------------------------------------------------------------------------------------
-function customer_branches_list_cells($label,$customer_id, $name, $selected_id, $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)
{
if ($label != null)
echo "$label | \n";
@@ -336,7 +444,7 @@ function customer_branches_list_cells($label,$customer_id, $name, $selected_id,
return $ret;
}
-function customer_branches_list_row($label,$customer_id, $name, $selected_id, $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)
{
echo "";
$ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
@@ -346,7 +454,7 @@ function customer_branches_list_row($label,$customer_id, $name, $selected_id, $a
//------------------------------------------------------------------------------------------------
-function locations_list($name, $selected_id, $all_option=false, $submit_on_change=false)
+function locations_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
global $all_items;
@@ -356,12 +464,11 @@ 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,
- 'async' => false
+ 'select_submit'=> $submit_on_change
) );
}
-function locations_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function locations_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
if ($label != null)
echo "| $label | \n";
@@ -371,7 +478,7 @@ function locations_list_cells($label, $name, $selected_id, $all_option=false, $s
return $str;
}
-function locations_list_row($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
echo "
";
$str = locations_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
@@ -381,59 +488,51 @@ function locations_list_row($label, $name, $selected_id, $all_option=false, $sub
//-----------------------------------------------------------------------------------------------
-function currencies_list($name, $selected_id, $submit_on_change=false)
+function currencies_list($name, $selected_id=null, $submit_on_change=false)
{
$sql = "SELECT curr_abrev, currency FROM ".TB_PREF."currencies";
// default to the company currency
- if ($selected_id == "")
- {
- $selected_id = get_company_currency();
- $_POST[$name] = $selected_id;
- }
return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
array(
'select_submit'=> $submit_on_change,
- 'async' => false
+ 'default' => get_company_currency(),
+ 'async' => false
) );
}
-function currencies_list_cells($label, $name, $selected_id)
+function currencies_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
{
if ($label != null)
echo "| $label | \n";
echo "";
- $str = currencies_list($name, $selected_id);
+ $str = currencies_list($name, $selected_id, $submit_on_change);
echo " | \n";
return $str;
}
-function currencies_list_row($label, $name, $selected_id)
+function currencies_list_row($label, $name, $selected_id=null, $submit_on_change=false)
{
echo "
\n";
- $str = currencies_list_cells($label, $name, $selected_id);
+ $str = currencies_list_cells($label, $name, $selected_id, $submit_on_change);
echo "
\n";
return $str;
}
//---------------------------------------------------------------------------------------------------
-function fiscalyears_list($name, $selected_id, $submit_on_change=false)
+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
- if ($selected_id == "")
- {
- $selected_id = get_company_pref('f_year');
- $_POST[$name] = $selected_id;
- }
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
@@ -446,7 +545,7 @@ function _format_fiscalyears($row)
. " " . ($row[3] ? _('Closed') : _('Active')) . "\n";
}
-function fiscalyears_list_cells($label, $name, $selected_id)
+function fiscalyears_list_cells($label, $name, $selected_id=null)
{
if ($label != null)
echo "$label | \n";
@@ -456,7 +555,7 @@ function fiscalyears_list_cells($label, $name, $selected_id)
return $str;
}
-function fiscalyears_list_row($label, $name, $selected_id)
+function fiscalyears_list_row($label, $name, $selected_id=null)
{
echo "\n";
$str = fiscalyears_list_cells($label, $name, $selected_id);
@@ -465,7 +564,7 @@ function fiscalyears_list_row($label, $name, $selected_id)
}
//------------------------------------------------------------------------------------
-function dimensions_list($name, $selected_id, $no_option=false, $showname=' ',
+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";
@@ -479,37 +578,37 @@ $options = array(
);
if ($showclosed)
- $options['where'][] = "closed=0";
+ $options['where'][] = "closed=0";
if($showtype)
- $options['where'][] = "type_=$showtype";
+ $options['where'][] = "type_=$showtype";
return combo_input($name, $selected_id, $sql, 'id', 'ref', $options);
}
-function dimensions_list_cells($label, $name, $selected_id, $no_option=false, $showname=null,
- $showclosed=false, $showtype=0)
+function dimensions_list_cells($label, $name, $selected_id=null, $no_option=false, $showname=null,
+ $showclosed=false, $showtype=0, $submit_on_change=false)
{
if ($label != null)
echo "| $label | \n";
echo "";
- $str = dimensions_list($name, $selected_id, $no_option, $showname, false, $showclosed, $showtype);
+ $str = 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, $no_option=false, $showname=null,
- $showclosed=false, $showtype=0)
+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,
- $showclosed, $showtype);
+ $showclosed, $showtype, $submit_on_change);
echo "
\n";
return $str;
}
//---------------------------------------------------------------------------------------------------
-function stock_items_list($name, $selected_id, $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())
{
global $all_items;
@@ -536,16 +635,16 @@ function _format_stock_items($row)
. $row[2] . " - " . $row[1];
}
-function stock_items_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
if ($label != null)
echo "$label | \n";
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('cells'=>true));
+ array('cells'=>true));
return $str;
}
/*
-function stock_items_list_row($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+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);
@@ -553,9 +652,76 @@ function stock_items_list_row($label, $name, $selected_id, $all_option=false, $s
return $str;
}
*/
+//---------------------------------------------------------------------------------------------------
+//
+// Select item via foreign code.
+//
+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
+ FROM
+ ".TB_PREF."item_codes i
+ LEFT JOIN
+ ".TB_PREF."stock_category c
+ ON i.category_id=c.category_id";
+
+ if ($type == 'local') { // exclude foreign codes
+ $sql .= " WHERE NOT i.is_foreign";
+ } elseif ($type == 'kits') { // sales kits
+ $sql .= " WHERE NOT i.is_foreign
+ AND NOT i.item_code=i.stock_id";
+ }
+
+ $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","s.description"),
+ 'search_submit' => get_company_pref('no_item_list')!=0,
+ 'size'=>15,
+ 'select_submit'=> $submit_on_change,
+ 'order' => 'i.item_code'
+ ), $opts) );
+}
+
+function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+{
+ if ($label != null)
+ echo "| $label | \n";
+ $str = 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;
+}
+
+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 "";
+ $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+ 'local', array('cells'=>false));
+ echo " |
";
+ return $str;
+}
//------------------------------------------------------------------------------------
-function base_stock_items_list($where, $name, $selected_id,
+function base_stock_items_list($where, $name, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
global $all_items;
@@ -575,14 +741,14 @@ function base_stock_items_list($where, $name, $selected_id,
}
//------------------------------------------------------------------------------------
-function stock_bom_items_list($name, $selected_id, $all_option=false, $submit_on_change=false)
+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, $all_option=false, $submit_on_change=false)
+function stock_bom_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
{
if ($label != null)
echo "$label | \n";
@@ -592,7 +758,7 @@ function stock_bom_items_list_cells($label, $name, $selected_id, $all_option=fal
return $str;
}
-function stock_bom_items_list_row($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+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);
@@ -602,14 +768,14 @@ function stock_bom_items_list_row($label, $name, $selected_id, $all_option=false
*/
//------------------------------------------------------------------------------------
-function stock_manufactured_items_list($name, $selected_id,
+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);
}
-function stock_manufactured_items_list_cells($label, $name, $selected_id,
+function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
if ($label != null)
@@ -621,7 +787,7 @@ function stock_manufactured_items_list_cells($label, $name, $selected_id,
return $str;
}
-function stock_manufactured_items_list_row($label, $name, $selected_id,
+function stock_manufactured_items_list_row($label, $name, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
echo "
\n";
@@ -632,60 +798,70 @@ function stock_manufactured_items_list_row($label, $name, $selected_id,
}
//------------------------------------------------------------------------------------
-function stock_component_items_list($name, $parent_stock_id, $selected_id,
+function stock_component_items_list($name, $parent_stock_id, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
- return base_stock_items_list("stock_id != '$parent_stock_id'", $name, $selected_id,
- $all_option, $submit_on_change);
+ $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('where'=>array("stock_id != '$parent_stock_id'")));
+ return $str;
+}
+
+function stock_component_items_list_cells($label, $name, $parent_stock_id,
+ $selected_id=null, $all_option=false, $submit_on_change=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;
}
//------------------------------------------------------------------------------------
-function stock_costable_items_list($name, $selected_id,
+function stock_costable_items_list($name, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
- return base_stock_items_list("mb_flag!='D'", $name, $selected_id,
- $all_option, $submit_on_change);
+ $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+ array('where'=>array("mb_flag!='D'")));
+ return $str;
}
-//------------------------------------------------------------------------------------
-
-function stock_purchasable_items_list($name, $selected_id, $all_option=false,
- $submit_on_change=false, $opts=array())
+function stock_costable_items_list_cells($label, $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
- AND mb_flag !='M' ";
- return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
- array_merge( array(
- 'format' => '_format_stock_items',
- 'spec_option' => $all_option===true ? _("All Items") : $all_option,
- 'spec_id' => $all_items,
- 'search_box' => true,
- 'search' => array("stock_id", "c.description","s.description"),
- 'search_submit' => get_company_pref('no_item_list')!=0,
- 'size'=>10,
- 'select_submit'=> $submit_on_change
- ), $opts) );
+ 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;
+}
+//------------------------------------------------------------------------------------
+function stock_purchasable_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!= 'M'"),
+ 'edit_submit' => true));
+ return $str;
}
-function stock_purchasable_items_list_cells($label, $name, $selected_id,
+function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
$all_option=false, $submit_on_change=false)
{
if ($label != null)
echo "$label | \n";
- $ret = stock_purchasable_items_list($name, $selected_id, $all_option,
- $submit_on_change, array('cells'=>true) );
- return $ret;
+ $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,
+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,
+ $ret = stock_purchasable_items_list_cells($label, $name, $selected_id=null,
$all_option, $submit_on_change);
echo "
\n";
return $ret;
@@ -693,79 +869,61 @@ function stock_purchasable_items_list_row($label, $name, $selected_id,
//------------------------------------------------------------------------------------
-function stock_item_types_list_row($label, $name, $selected_id, $enabled=true)
+function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=true)
{
- default_focus($name);
+ $types = array(
+ 'M' => _("Manufactured"),
+ 'B' => _("Purchased"),
+ 'D' => _("Service")
+ );
+
echo "";
- if ($label != NULL)
+ if ($label != null)
echo "| $label | \n";
echo "";
- if ($enabled)
- $sel = " |
\n";
- return $sel;
}
-function stock_units_list_row($label, $name, $value, $enabled=true)
+function stock_units_list_row($label, $name, $value=null, $enabled=true)
{
- default_focus($name);
$result = get_all_item_units();
- echo "| $label | \n";
- if ($enabled)
- echo " |
\n";
}
//------------------------------------------------------------------------------------
-function tax_types_list($name, $selected_id, $none_option=false, $submit_on_change=false)
+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' => 0,
+ 'spec_id' => reserved_words::get_all_numeric(),
'select_submit'=> $submit_on_change,
'async' => false,
) );
}
-function tax_types_list_cells($label, $name, $selected_id, $none_option=false,
+function tax_types_list_cells($label, $name, $selected_id=null, $none_option=false,
$submit_on_change=false)
{
if ($label != null)
@@ -776,7 +934,7 @@ function tax_types_list_cells($label, $name, $selected_id, $none_option=false,
return $str;
}
-function tax_types_list_row($label, $name, $selected_id, $none_option=false,
+function tax_types_list_row($label, $name, $selected_id=null, $none_option=false,
$submit_on_change=false)
{
echo "\n";
@@ -787,7 +945,7 @@ function tax_types_list_row($label, $name, $selected_id, $none_option=false,
//------------------------------------------------------------------------------------
-function tax_groups_list($name, $selected_id,
+function tax_groups_list($name, $selected_id=null,
$none_option=false, $submit_on_change=false)
{
$sql = "SELECT id, name FROM ".TB_PREF."tax_groups";
@@ -796,39 +954,39 @@ function tax_groups_list($name, $selected_id,
array(
'order' => 'id',
'spec_option' => $none_option,
- 'spec_id' => 0,
+ 'spec_id' => reserved_words::get_all_numeric(),
'select_submit'=> $submit_on_change,
'async' => false,
) );
}
-function tax_groups_list_cells($label, $name, $selected_id, $submit_on_change=false)
+function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
{
if ($label != null)
echo "| $label | \n";
echo "";
- $str = tax_groups_list($name, $selected_id, false, $submit_on_change);
+ $str = tax_groups_list($name, $selected_id, $none_option, $submit_on_change);
echo " | \n";
return $str;
}
-function tax_groups_list_row($label, $name, $selected_id, $submit_on_change=false)
+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, false, $submit_on_change);
+ $str = tax_groups_list_cells($label, $name, $selected_id, $none_option, $submit_on_change);
echo "
\n";
return $str;
}
//------------------------------------------------------------------------------------
-function item_tax_types_list($name, $selected_id)
+function item_tax_types_list($name, $selected_id=null)
{
$sql ="SELECT id, name FROM ".TB_PREF."item_tax_types";
combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
}
-function item_tax_types_list_cells($label, $name, $selected_id)
+function item_tax_types_list_cells($label, $name, $selected_id=null)
{
if ($label != null)
echo "$label | \n";
@@ -837,7 +995,7 @@ function item_tax_types_list_cells($label, $name, $selected_id)
echo "\n";
}
-function item_tax_types_list_row($label, $name, $selected_id)
+function item_tax_types_list_row($label, $name, $selected_id=null)
{
echo "\n";
item_tax_types_list_cells($label, $name, $selected_id);
@@ -846,13 +1004,13 @@ function item_tax_types_list_row($label, $name, $selected_id)
//------------------------------------------------------------------------------------
-function shippers_list($name, $selected_id)
+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());
}
-function shippers_list_cells($label, $name, $selected_id)
+function shippers_list_cells($label, $name, $selected_id=null)
{
if ($label != null)
echo "| $label | \n";
@@ -861,7 +1019,7 @@ function shippers_list_cells($label, $name, $selected_id)
echo "\n";
}
-function shippers_list_row($label, $name, $selected_id)
+function shippers_list_row($label, $name, $selected_id=null)
{
echo "
\n";
shippers_list_cells($label, $name, $selected_id);
@@ -870,13 +1028,13 @@ function shippers_list_row($label, $name, $selected_id)
//-------------------------------------------------------------------------------------
-function sales_persons_list($name, $selected_id)
+function sales_persons_list($name, $selected_id=null)
{
$sql = "SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman";
combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', array());
}
-function sales_persons_list_cells($label, $name, $selected_id)
+function sales_persons_list_cells($label, $name, $selected_id=null)
{
if ($label != null)
echo "| $label | \n";
@@ -885,7 +1043,7 @@ function sales_persons_list_cells($label, $name, $selected_id)
echo "\n";
}
-function sales_persons_list_row($label, $name, $selected_id, $submit_on_change=false)
+function sales_persons_list_row($label, $name, $selected_id=null, $submit_on_change=false)
{
echo "
\n";
sales_persons_list_cells($label, $name, $selected_id, $submit_on_change=false);
@@ -894,13 +1052,13 @@ function sales_persons_list_row($label, $name, $selected_id, $submit_on_change=f
//------------------------------------------------------------------------------------
-function sales_areas_list($name, $selected_id)
+function sales_areas_list($name, $selected_id=null)
{
$sql = "SELECT area_code, description FROM ".TB_PREF."areas";
combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
}
-function sales_areas_list_cells($label, $name, $selected_id)
+function sales_areas_list_cells($label, $name, $selected_id=null)
{
if ($label != null)
echo "| $label | \n";
@@ -909,7 +1067,7 @@ function sales_areas_list_cells($label, $name, $selected_id)
echo "\n";
}
-function sales_areas_list_row($label, $name, $selected_id)
+function sales_areas_list_row($label, $name, $selected_id=null)
{
echo "
\n";
sales_areas_list_cells($label, $name, $selected_id);
@@ -918,13 +1076,75 @@ function sales_areas_list_row($label, $name, $selected_id)
//------------------------------------------------------------------------------------
-function workorders_list($name, $selected_id)
+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(
+ 'spec_option' => $special_option===true ? ' ' : $special_option,
+ 'order' => 'description', 'spec_id' => 0,
+ ));
+}
+
+function sales_groups_list_cells($label, $name, $selected_id=null, $special_option=false)
+{
+ if ($label != null)
+ echo "| $label | \n";
+ 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 "
\n";
+}
+
+//------------------------------------------------------------------------------------
+
+function _format_template_items($row)
+{
+ return ($row[0] . " - " . _("Amount") . " ".$row[1]);
+}
+
+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(
+ 'format' => '_format_template_items',
+ 'spec_option' => $special_option===true ? ' ' : $special_option,
+ 'order' => 'order_no', 'spec_id' => 0,
+ ));
+}
+
+function templates_list_cells($label, $name, $selected_id=null, $special_option=false)
+{
+ if ($label != null)
+ echo "$label | \n";
+ 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 "
\n";
+}
+
+//------------------------------------------------------------------------------------
+
+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());
}
-function workorders_list_cells($label, $name, $selected_id)
+function workorders_list_cells($label, $name, $selected_id=null)
{
if ($label != null)
echo "$label | \n";
@@ -933,7 +1153,7 @@ function workorders_list_cells($label, $name, $selected_id)
echo "\n";
}
-function workorders_list_row($label, $name, $selected_id)
+function workorders_list_row($label, $name, $selected_id=null)
{
echo "\n";
workorders_list_cells($label, $name, $selected_id);
@@ -942,13 +1162,13 @@ function workorders_list_row($label, $name, $selected_id)
//------------------------------------------------------------------------------------
-function payment_terms_list($name, $selected_id)
+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());
}
-function payment_terms_list_cells($label, $name, $selected_id)
+function payment_terms_list_cells($label, $name, $selected_id=null)
{
if ($label != null)
echo "| $label | \n";
@@ -957,7 +1177,7 @@ function payment_terms_list_cells($label, $name, $selected_id)
echo "\n";
}
-function payment_terms_list_row($label, $name, $selected_id)
+function payment_terms_list_row($label, $name, $selected_id=null)
{
echo "
\n";
payment_terms_list_cells($label, $name, $selected_id);
@@ -966,13 +1186,13 @@ function payment_terms_list_row($label, $name, $selected_id)
//------------------------------------------------------------------------------------
-function credit_status_list($name, $selected_id)
+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());
}
-function credit_status_list_cells($label, $name, $selected_id)
+function credit_status_list_cells($label, $name, $selected_id=null)
{
if ($label != null)
echo "| $label | \n";
@@ -981,7 +1201,7 @@ function credit_status_list_cells($label, $name, $selected_id)
echo "\n";
}
-function credit_status_list_row($label, $name, $selected_id)
+function credit_status_list_row($label, $name, $selected_id=null)
{
echo "
\n";
credit_status_list_cells($label, $name, $selected_id);
@@ -990,7 +1210,7 @@ function credit_status_list_row($label, $name, $selected_id)
//-----------------------------------------------------------------------------------------------
-function sales_types_list($name, $selected_id, $submit_on_change=false, $special_option=false)
+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";
@@ -1003,7 +1223,7 @@ function sales_types_list($name, $selected_id, $submit_on_change=false, $special
) );
}
-function sales_types_list_cells($label, $name, $selected_id, $submit_on_change=false, $special_option=false)
+function sales_types_list_cells($label, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
{
if ($label != null)
echo "| $label | \n";
@@ -1013,7 +1233,7 @@ function sales_types_list_cells($label, $name, $selected_id, $submit_on_change=f
return $str;
}
-function sales_types_list_row($label, $name, $selected_id, $submit_on_change=false, $special_option=false)
+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);
@@ -1023,13 +1243,13 @@ function sales_types_list_row($label, $name, $selected_id, $submit_on_change=fal
//-----------------------------------------------------------------------------------------------
-function movement_types_list($name, $selected_id)
+function movement_types_list($name, $selected_id=null)
{
$sql = "SELECT id, name FROM ".TB_PREF."movement_types";
combo_input($name, $selected_id, $sql, 'id', 'name', array());
}
-function movement_types_list_cells($label, $name, $selected_id)
+function movement_types_list_cells($label, $name, $selected_id=null)
{
if ($label != null)
echo "| $label | \n";
@@ -1038,7 +1258,7 @@ function movement_types_list_cells($label, $name, $selected_id)
echo "\n";
}
-function movement_types_list_row($label, $name, $selected_id)
+function movement_types_list_row($label, $name, $selected_id=null)
{
echo "
\n";
movement_types_list_cells($label, $name, $selected_id);
@@ -1046,14 +1266,14 @@ function movement_types_list_row($label, $name, $selected_id)
}
//-----------------------------------------------------------------------------------------------
-
-function bank_trans_types_list($name, $selected_id)
+/*
+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());
}
-function bank_trans_types_list_cells($label, $name, $selected_id)
+function bank_trans_types_list_cells($label, $name, $selected_id=null)
{
if ($label != null)
echo "| $label | \n";
@@ -1062,16 +1282,16 @@ function bank_trans_types_list_cells($label, $name, $selected_id)
echo "\n";
}
-function bank_trans_types_list_row($label, $name, $selected_id)
+function bank_trans_types_list_row($label, $name, $selected_id=null)
{
echo "
\n";
bank_trans_types_list_cells($label, $name, $selected_id);
echo "
\n";
}
-
+*/
//-----------------------------------------------------------------------------------------------
-function workcenter_list($name, $selected_id, $all_option=false)
+function workcenter_list($name, $selected_id=null, $all_option=false)
{
global $all_items;
@@ -1084,7 +1304,7 @@ function workcenter_list($name, $selected_id, $all_option=false)
) );
}
-function workcenter_list_cells($label, $name, $selected_id, $all_option=false)
+function workcenter_list_cells($label, $name, $selected_id=null, $all_option=false)
{
default_focus($name);
if ($label != null)
@@ -1094,7 +1314,7 @@ function workcenter_list_cells($label, $name, $selected_id, $all_option=false)
echo "\n";
}
-function workcenter_list_row($label, $name, $selected_id, $all_option=false)
+function workcenter_list_row($label, $name, $selected_id=null, $all_option=false)
{
echo "\n";
workcenter_list_cells($label, $name, $selected_id, $all_option);
@@ -1103,13 +1323,14 @@ function workcenter_list_row($label, $name, $selected_id, $all_option=false)
//-----------------------------------------------------------------------------------------------
-function bank_accounts_list($name, $selected_id, $submit_on_change=false)
+function bank_accounts_list($name, $selected_id=null, $submit_on_change=false)
{
- $sql = "SELECT ".TB_PREF."bank_accounts.account_code, bank_account_name, bank_curr_code
- FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master
- WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
+ $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
+ FROM ".TB_PREF."bank_accounts";
+// , ".TB_PREF."chart_master
+// WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
- return combo_input($name, $selected_id, $sql, 'account_code', 'bank_account_name',
+ return combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
array(
'format' => '_format_add_curr',
'select_submit'=> $submit_on_change,
@@ -1117,7 +1338,7 @@ function bank_accounts_list($name, $selected_id, $submit_on_change=false)
) );
}
-function bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change=false)
+function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
{
if ($label != null)
echo "| $label | \n";
@@ -1127,17 +1348,70 @@ function bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change
return $str;
}
-function bank_accounts_list_row($label, $name, $selected_id, $submit_on_change=false)
+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 "
\n";
return $str;
}
+//-----------------------------------------------------------------------------------------------
+
+function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+ $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
+ FROM ".TB_PREF."bank_accounts
+ WHERE ".TB_PREF."bank_accounts.account_type=3";
+
+ if ($label != null)
+ 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 " |
\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";
+
+ default_focus($name);
+ echo '';
+ if ($label != null)
+ 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 " |
\n";
+
+ return $str;
+}
+//-----------------------------------------------------------------------------------------------
+function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
+{
+ if ($label != null)
+ echo "$label | \n";
+ echo "";
+ $str = yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change);
+ echo " | \n";
+ return $str;
+}
//-----------------------------------------------------------------------------------------------
-function class_list($name, $selected_id, $submit_on_change=false)
+function class_list($name, $selected_id=null, $submit_on_change=false)
{
$sql = "SELECT cid, class_name FROM ".TB_PREF."chart_class";
@@ -1149,7 +1423,7 @@ function class_list($name, $selected_id, $submit_on_change=false)
}
-function class_list_cells($label, $name, $selected_id, $submit_on_change=false)
+function class_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
{
if ($label != null)
echo "$label | \n";
@@ -1159,7 +1433,7 @@ function class_list_cells($label, $name, $selected_id, $submit_on_change=false)
return $str;
}
-function class_list_row($label, $name, $selected_id, $submit_on_change=false)
+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);
@@ -1169,14 +1443,14 @@ function class_list_row($label, $name, $selected_id, $submit_on_change=false)
//-----------------------------------------------------------------------------------------------
-function stock_categories_list($name, $selected_id)
+function stock_categories_list($name, $selected_id=null)
{
$sql = "SELECT category_id, description FROM ".TB_PREF."stock_category";
combo_input($name, $selected_id, $sql, 'category_id', 'description',
array('order'=>'category_id'));
}
-function stock_categories_list_cells($label, $name, $selected_id)
+function stock_categories_list_cells($label, $name, $selected_id=null)
{
if ($label != null)
echo "| $label | \n";
@@ -1185,7 +1459,7 @@ function stock_categories_list_cells($label, $name, $selected_id)
echo "\n";
}
-function stock_categories_list_row($label, $name, $selected_id)
+function stock_categories_list_row($label, $name, $selected_id=null)
{
echo "
\n";
stock_categories_list_cells($label, $name, $selected_id);
@@ -1194,7 +1468,7 @@ function stock_categories_list_row($label, $name, $selected_id)
//-----------------------------------------------------------------------------------------------
-function gl_account_types_list($name, $selected_id, $all_option, $all_option_numeric)
+function gl_account_types_list($name, $selected_id=null, $all_option, $all_option_numeric)
{
global $all_items;
@@ -1208,7 +1482,7 @@ function gl_account_types_list($name, $selected_id, $all_option, $all_option_num
) );
}
-function gl_account_types_list_cells($label, $name, $selected_id, $all_option=false,
+function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false,
$all_option_numeric=false)
{
if ($label != null)
@@ -1218,7 +1492,7 @@ function gl_account_types_list_cells($label, $name, $selected_id, $all_option=fa
echo "\n";
}
-function gl_account_types_list_row($label, $name, $selected_id, $all_option=false,
+function gl_account_types_list_row($label, $name, $selected_id=null, $all_option=false,
$all_option_numeric=false)
{
echo "
\n";
@@ -1228,15 +1502,15 @@ function gl_account_types_list_row($label, $name, $selected_id, $all_option=fals
}
//-----------------------------------------------------------------------------------------------
-function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false,
- $show_group=false, $cells=false, $all_option=false)
+function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false,
+ $show_group=false, $cells=false, $all_option=false, $submit_on_change=false)
{
if ($skip_bank_accounts)
$sql = "SELECT chart.account_code, chart.account_name, type.name
FROM (".TB_PREF."chart_master chart,".TB_PREF."chart_types type) "
."LEFT JOIN ".TB_PREF."bank_accounts acc "
."ON chart.account_code=acc.account_code
- WHERE acc.account_code IS NULL
+ WHERE acc.account_code IS NULL
AND chart.account_type=type.id";
else
$sql = "SELECT chart.account_code, chart.account_name, type.name
@@ -1253,7 +1527,9 @@ function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false,
'search_submit' => false,
'size' => 12,
'max' => 10,
- 'cells' => true
+ 'cells' => true,
+ 'select_submit'=> $submit_on_change,
+ 'async' => false
) );
}
@@ -1268,7 +1544,7 @@ function _format_account2($row)
return $row[0] . " " . $row[2] . " " . $row[1];
}
-function gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts=false,
+function gl_all_accounts_list_cells($label, $name, $selected_id=null, $skip_bank_accounts=false,
$show_group=false, $cells=false, $all_option=false)
{
if ($label != null)
@@ -1278,7 +1554,7 @@ function gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_acco
echo "\n";
}
-function gl_all_accounts_list_row($label, $name, $selected_id, $skip_bank_accounts=false,
+function gl_all_accounts_list_row($label, $name, $selected_id=null, $skip_bank_accounts=false,
$show_group=false, $cells=false, $all_option=false)
{
echo "
\n";
@@ -1287,45 +1563,19 @@ function gl_all_accounts_list_row($label, $name, $selected_id, $skip_bank_accoun
echo "
\n";
}
-function yesno_list($name, $selected_id, $name_yes="", $name_no="", $submit_on_change=false)
+function yesno_list($name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
{
- default_focus($name);
- if ($submit_on_change == true)
- echo "