X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=bedf484a9c9112144ff7da880852e119b82473bb;hb=0da4935c1fb5b588bfd7ead31f05069c9566eb8d;hp=78b54a0a9bcaab348697c421a9436d3bdbfcdba6;hpb=95303d7b5280820af76ddbd8908b120813f1e763;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index 78b54a0a..bedf484a 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -81,7 +81,7 @@ function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false, $viewer .= "view_receipt.php"; elseif ($type == 13) $viewer .= "view_dispatch.php"; - elseif ($type == 30) + elseif ($type == 30 || $type == 32) $viewer .= "view_sales_order.php"; else return null; @@ -96,7 +96,7 @@ function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false, $lbl = $trans; if($preview_str!='') $preview_str .= ','; - $preview_str .= viewer_link($lbl, $viewer."?trans_no=$trans", + $preview_str .= viewer_link($lbl, $viewer."?trans_no=$trans&trans_type=$type", $class, $id, $icon); } @@ -534,7 +534,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') case "t": // post taxes calculated on base amount case "t+": // ditto & increase base amount case "t-": // ditto & reduce base amount - if (substr($qe_line['action'],0,1) != 'T') + if (substr($row['action'],0,1) != 'T') $totrate += get_tax_type_default_rate($row['dest_id']); } }