projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed Advanced Manufacturing payments to be more flexible and simpler. Removed...
[fa-stable.git]
/
includes
/
ui
/
ui_lists.inc
diff --git
a/includes/ui/ui_lists.inc
b/includes/ui/ui_lists.inc
index afa50ee72b623308e82315b40586ee70c51c2395..a1b65af1bc4472cd0f1c15fc0f40ce5277347726 100644
(file)
--- a/
includes/ui/ui_lists.inc
+++ b/
includes/ui/ui_lists.inc
@@
-297,7
+297,7
@@
$opts = array( // default options
//if($name=='SelectStockFromList') display_error($sql);
foreach($items as $value=>$descr) {
$sel = '';
//if($name=='SelectStockFromList') display_error($sql);
foreach($items as $value=>$descr) {
$sel = '';
- if (
$selected_id ==
$value) {
+ if (
(string)$selected_id === (string)
$value) {
$sel = 'selected';
$found = $value;
}
$sel = 'selected';
$found = $value;
}
@@
-318,8
+318,9
@@
$opts = array( // default options
}
if ($found === false) {
}
if ($found === false) {
- $
_POST[$name]
= $first_id;
+ $
selected_id
= $first_id;
}
}
+ $_POST[$name] = $selected_id;
$aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
$selector = "<select $disabled name='$name' class='combo' title='"
$aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
$selector = "<select $disabled name='$name' class='combo' title='"
@@
-602,7
+603,7
@@
$options = array(
'async' => false,
);
'async' => false,
);
- if ($showclosed)
+ if (
!
$showclosed)
$options['where'][] = "closed=0";
if($showtype)
$options['where'][] = "type_=$showtype";
$options['where'][] = "closed=0";
if($showtype)
$options['where'][] = "type_=$showtype";
@@
-770,7
+771,7
@@
function base_stock_items_list($where, $name, $selected_id=null,
function stock_bom_items_list($name, $selected_id=null, $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')
",
+ return base_stock_items_list("
s.mb_flag='M'
",
$name, $selected_id, $all_option, $submit_on_change);
}
/*
$name, $selected_id, $all_option, $submit_on_change);
}
/*
@@
-1601,8
+1602,8
@@
function gl_all_accounts_list_row($label, $name, $selected_id=null,
function yesno_list($name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
{
$items = array();
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['0'] = strlen($name_no) ? $name_no : _("No");
+ $items['1'] = strlen($name_yes) ? $name_yes : _("Yes");
return array_selector($name, $selected_id, $items,
array(
return array_selector($name, $selected_id, $items,
array(
@@
-1698,7
+1699,8
@@
function payment_person_types_list($name, $selected_id=null, $submit_on_change=f
{
if (payment_person_types::has_items($type['id']))
{
{
if (payment_person_types::has_items($type['id']))
{
- $items[$type['id']] = $type['name'];
+ if ($type['id'] != payment_person_types::WorkOrder())
+ $items[$type['id']] = $type['name'];
}
}
}
}