projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup comments. Small bugfixes. Final run
[fa-stable.git]
/
includes
/
ui
/
ui_view.inc
diff --git
a/includes/ui/ui_view.inc
b/includes/ui/ui_view.inc
index 12883aa048ce9f237c0ceec71b9deff1a7fa3332..5352cb91371cebd4ee9590ca625a2034614cb242 100644
(file)
--- a/
includes/ui/ui_view.inc
+++ b/
includes/ui/ui_view.inc
@@
-262,7
+262,7
@@
function check_ui_refresh($name=null)
$name = $bt[1]['function'];
$old = @$_SESSION['ui_context'][$name];
$new = $_SESSION['ui_context'][$name] = $bt[1]['args'];
$name = $bt[1]['function'];
$old = @$_SESSION['ui_context'][$name];
$new = $_SESSION['ui_context'][$name] = $bt[1]['args'];
- return ($new != $old)
|| ($_SERVER['REQUEST_METHOD'] == 'GET')
;
+ return ($new != $old);
}
//--------------------------------------------------------------------------------------
}
//--------------------------------------------------------------------------------------
@@
-385,10
+385,8
@@
function view_stock_status($stock_id, $description=null, $echo=true)
{
global $path_to_root;
if ($description)
{
global $path_to_root;
if ($description)
- //hyperlink_params_separate($path_to_root . "/inventory/inquiry/stock_status.php", (user_show_codes()?$stock_id . " - ":"") . $description, "stock_id=$stock_id");
$preview_str = "<a target='_blank' href='$path_to_root/inventory/inquiry/stock_status.php?stock_id=$stock_id&popup=1' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >". (user_show_codes()?$stock_id . " - ":"") . $description."</a>";
else
$preview_str = "<a target='_blank' href='$path_to_root/inventory/inquiry/stock_status.php?stock_id=$stock_id&popup=1' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >". (user_show_codes()?$stock_id . " - ":"") . $description."</a>";
else
- //hyperlink_params_separate($path_to_root . "/inventory/inquiry/stock_status.php", $stock_id, "stock_id=$stock_id");
$preview_str = "<a target='_blank' href='$path_to_root/inventory/inquiry/stock_status.php?stock_id=$stock_id&popup=1' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$stock_id</a>";
if($echo)
echo $preview_str;
$preview_str = "<a target='_blank' href='$path_to_root/inventory/inquiry/stock_status.php?stock_id=$stock_id&popup=1' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$stock_id</a>";
if($echo)
echo $preview_str;
@@
-718,7
+716,7
@@
function quickentry_calculate($base, $id, $taxgroup=null, $date=null)
case "t+": // ditto & increase base amount
case "t-": // ditto & reduce base amount
if (substr($row['action'], 0, 1) != 'T')
case "t+": // ditto & increase base amount
case "t-": // ditto & reduce base amount
if (substr($row['action'], 0, 1) != 'T')
- $totrate += get_tax_type_
default_
rate($row['dest_id']);
+ $totrate += get_tax_type_rate($row['dest_id']);
}
}
$first = true;
}
}
$first = true;