projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5594: Combo box to Customer Credit Note and Supplier Credit Note references. Fixed.
[fa-stable.git]
/
includes
/
ui
/
ui_controls.inc
diff --git
a/includes/ui/ui_controls.inc
b/includes/ui/ui_controls.inc
index 4b6d11cd8ef2891557f6e1663b814697d1cdd455..748889d6b8ba55b6ba62420e4561832041239b2a 100644
(file)
--- a/
includes/ui/ui_controls.inc
+++ b/
includes/ui/ui_controls.inc
@@
-22,7
+22,7
@@
function get_post($name, $dflt='')
$ret = array();
foreach($name as $key => $dflt)
if (!is_numeric($key)) {
$ret = array();
foreach($name as $key => $dflt)
if (!is_numeric($key)) {
- $ret[$key] = is_
float
($dflt) ? input_num($key, $dflt) : get_post($key, $dflt);
+ $ret[$key] = is_
numeric
($dflt) ? input_num($key, $dflt) : get_post($key, $dflt);
} else {
$ret[$dflt] = get_post($dflt, null);
}
} else {
$ret[$dflt] = get_post($dflt, null);
}
@@
-72,7
+72,7
@@
function end_form($breaks=0)
if ($form_nested-- > 0) return;
if ($form_nested-- > 0) return;
- $_SESSION['csrf_token'] =
hash('sha256', uniqid(mt_rand(), true)
);
+ $_SESSION['csrf_token'] =
random_id(
);
if ($breaks)
br($breaks);
hidden('_focus');
if ($breaks)
br($breaks);
hidden('_focus');
@@
-134,7
+134,6
@@
function table_section($number=1, $width=false)
echo "</table>\n";
output_hidden();
$width = ($width ? "width='$width'" : "");
echo "</table>\n";
output_hidden();
$width = ($width ? "width='$width'" : "");
- //echo "</td><td class='tableseparator' $width>\n"; // outer table
echo "</td><td style='border-left:1px solid #cccccc;' $width>\n"; // outer table
}
echo "<table class='tablestyle_inner'>\n";
echo "</td><td style='border-left:1px solid #cccccc;' $width>\n"; // outer table
}
echo "<table class='tablestyle_inner'>\n";
@@
-158,7
+157,7
@@
function vertical_space($params='')
echo "</td></tr><tr><td valign=center $params>";
}
echo "</td></tr><tr><td valign=center $params>";
}
-function meta_forward($forward_to, $params="", $timeout=0)
+function meta_forward($forward_to, $params="", $timeout=0
, $return=false
)
{
global $Ajax;
echo "<meta http-equiv='Refresh' content='".$timeout."; url=$forward_to?$params'>\n";
{
global $Ajax;
echo "<meta http-equiv='Refresh' content='".$timeout."; url=$forward_to?$params'>\n";
@@
-166,7
+165,7
@@
function meta_forward($forward_to, $params="", $timeout=0)
echo " " . _("If this does not happen") . " " . "<a href='$forward_to?$params'>" . _("click here") . "</a> " . _("to continue") . ".<br><br></center>\n";
if ($params !='') $params = '?'.$params;
$Ajax->redirect($forward_to.$params);
echo " " . _("If this does not happen") . " " . "<a href='$forward_to?$params'>" . _("click here") . "</a> " . _("to continue") . ".<br><br></center>\n";
if ($params !='') $params = '?'.$params;
$Ajax->redirect($forward_to.$params);
- exit;
+
if (!$return)
exit;
}
//-----------------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------------
@@
-256,7
+255,7
@@
function viewer_link($label, $url='', $class='', $id='', $icon=null)
$pars = access_string($label);
if (user_graphic_links() && $icon)
$pars[0] = set_icon($icon, $pars[0]);
$pars = access_string($label);
if (user_graphic_links() && $icon)
$pars[0] = set_icon($icon, $pars[0]);
-
-
$preview_str = "<a target='_blank' $class $id href='$path_to_root/$url' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
+
$preview_str = "<a target='_blank' $class $id href='$path_to_root/$url' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
}
else
$preview_str = $label;
}
else
$preview_str = $label;
@@
-504,13
+503,15
@@
function tab_visible($name, $tab)
*/
$popup_editors = array(
'customer' => array('/sales/manage/customers.php?debtor_no=',
*/
$popup_editors = array(
'customer' => array('/sales/manage/customers.php?debtor_no=',
- 113, _("Customers"), 900, 5
0
0),
+ 113, _("Customers"), 900, 5
5
0),
'branch' => array('/sales/manage/customer_branches.php?SelectedBranch=',
'branch' => array('/sales/manage/customer_branches.php?SelectedBranch=',
- 114, _("Branches"), 900,
70
0),
+ 114, _("Branches"), 900,
65
0),
'supplier' => array('/purchasing/manage/suppliers.php?supplier_id=',
'supplier' => array('/purchasing/manage/suppliers.php?supplier_id=',
- 113, _("Suppliers"),
900, 70
0),
+ 113, _("Suppliers"),
1150, 55
0),
'item' => array('/inventory/manage/items.php?stock_id=',
'item' => array('/inventory/manage/items.php?stock_id=',
- 115, _("Items"), 800, 600)
+ 115, _("Items"), 1000, 500),
+ 'fa_item' => array('/inventory/manage/items.php?FixedAsset=1&stock_id=',
+ 115, _("Items"), 1000, 500)
);
/*
Bind editors for various selectors.
);
/*
Bind editors for various selectors.
@@
-670,7
+671,7
@@
function page_processing($msg = false)
global $Ajax;
if ($msg === true)
global $Ajax;
if ($msg === true)
- $msg = _(
'Entered data has not been saved yet.\nDo you want to abandon changes?'
);
+ $msg = _(
"Entered data has not been saved yet.\nDo you want to abandon changes?"
);
$js = "_validate._processing=" . (
$msg ? '\''.strtr($msg, array("\n"=>'\\n')) . '\';' : 'null;');
$js = "_validate._processing=" . (
$msg ? '\''.strtr($msg, array("\n"=>'\\n')) . '\';' : 'null;');