X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=938f0a33768292029ec17229134f21c74b218268;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=c0e9e8c9a02646b3787c8eafc0906ea383baa576;hpb=6fcf6f5b5891c5fbbe12c01ee80c289f9bf46d97;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index c0e9e8c9..938f0a33 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -50,11 +50,11 @@ function get_gl_view_str($type, $trans_no, $label="", $force=false, $class='', $ { $label = _("GL"); $icon = ICON_GL; - } + } + $url = ($type == ST_WORKORDER && !work_order_is_closed($trans_no)) ? "manufacturing/view/wo_costs_view.php?trans_no=$trans_no" + : "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no"; - return viewer_link($label, - "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no", - $class, $id, $icon); + return viewer_link($label, $url, $class, $id, $icon); } //-------------------------------------------------------------------------------------- @@ -391,6 +391,9 @@ function display_customer_trans_tax_details($tax_items, $columns) $first = true; while ($tax_item = db_fetch($tax_items)) { + if (!$tax_item['amount']) + continue; + $tax = number_format2($tax_item['amount'],user_price_dec()); if (isset($suppress_tax_rates) && $suppress_tax_rates == 1) $tax_type_name = $tax_item['tax_type_name']; @@ -421,6 +424,9 @@ function display_supp_trans_tax_details($tax_items, $columns) { while ($tax_item = db_fetch($tax_items)) { + if (!$tax_item['amount']) + continue; + $tax = number_format2(abs($tax_item['amount']),user_price_dec()); if ($tax_item['included_in_price']) label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " @@ -439,16 +445,18 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0) foreach ($taxes as $taxitem) { - if ($tax_included) - { - label_row(_("Included") . " " . $taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%) " - . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan); - } - else - { - label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)", - number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan); - $total += round2($taxitem['Value'], user_price_dec()); + if ($taxitem['Value'] != 0) { + if ($tax_included) + { + label_row(_("Included") . " " . $taxitem['tax_type_name'] + . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan); + } + else + { + label_row($taxitem['tax_type_name'], + number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan); + $total += round2($taxitem['Value'], user_price_dec()); + } } } @@ -466,14 +474,14 @@ function display_footer_exit() //-------------------------------------------------------------------------------------- -function display_allocations($alloc_result, $total) +function display_allocations($alloc_result, $total, $payments=false) { global $systypes_array; if (!$alloc_result || db_num_rows($alloc_result) == 0) return; - display_heading2(_("Allocations")); + display_heading2(($payments ? _("Payments") : _("Allocations"))); start_table(TABLESTYLE, "width=80%"); @@ -530,6 +538,23 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to } } +//-------------------------------------------------------------------------------------- + +function display_allocations_to($person_type, $person_id, $type, $type_no, $total) +{ + switch ($person_type) + { + case PT_CUSTOMER : + $alloc_result = get_allocatable_from_cust_transactions($person_id, $type_no, $type); + display_allocations($alloc_result, $total, true); + return; + case PT_SUPPLIER : + $alloc_result = get_allocatable_from_supp_transactions($person_id, $type_no, $type); + display_allocations($alloc_result, $total, true); + return; + } +} + //-------------------------------------------------------------------------------------- // // Expands selected quick entry $id into GL posings and adds to cart. @@ -561,9 +586,9 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') $begin = ""; else $begin = begin_fiscalyear(); // from fiscalyear begin - } + } $base = get_gl_trans_from_to($begin, $cart->tran_date, $qe['base_desc']); - + } if ($descr != '') $qe['description'] .= ': '.$descr; $result = get_quick_entry_lines($id); @@ -571,7 +596,8 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') { display_error( _("No Quick Entry lines are defined.")); set_focus('totamount'); - } + return 0; + } $totrate = 0; while ($row = db_fetch($result)) { @@ -632,7 +658,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') { $taxgroup = $cart->tax_group_id; $rates = 0; - $res = get_tax_group_items($cart->tax_group_id); + $res = get_tax_group_rates($cart->tax_group_id); while ($row = db_fetch($res)) $rates += $row['rate']; if ($rates == 0) @@ -708,10 +734,10 @@ function _number_to_words($number) $ones = array("", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen", - "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eightteen", + "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen"); $tens = array("", "", "Twenty", "Thirty", "Fourty", "Fifty", "Sixty", - "Seventy", "Eigthy", "Ninety"); + "Seventy", "Eighty", "Ninety"); if ($Dn || $n) { @@ -747,16 +773,16 @@ function price_in_words($amount, $document=0) $dec = user_price_dec(); if ($dec > 0) { - $divisor = pow(10, $dec); - $frac = round2($amount - floor($amount), $dec) * $divisor; - $frac = sprintf("%0{$dec}d", $frac); + $divisor = pow(10, $dec); + $frac = round2($amount - floor($amount), $dec) * $divisor; + $frac = sprintf("%0{$dec}d", round2($frac, 0)); $and = _("and"); $frac = " $and $frac/$divisor"; } else $frac = ""; return _number_to_words(intval($amount)) . $frac; -} +} function get_js_open_window($width, $height) { @@ -799,31 +825,6 @@ function reset_focus() unset($_POST['_focus']); } -function get_js_png_fix() -{ - $js = "function fixPNG(myImage)\n" - . "{\n" - . " var arVersion = navigator.appVersion.split(\"MSIE\")\n" - . " var version = parseFloat(arVersion[1])\n" - . " if ((version >= 5.5) && (version < 7) && (document.body.filters))\n" - . " {\n" - . " var imgID = (myImage.id) ? \"id='\" + myImage.id + \"' \" : \"\"\n" - . " var imgClass = (myImage.className) ? \"class='\" + myImage.className + \"' \" : \"\"\n" - . " var imgTitle = (myImage.title) ?\n" - . " \"title='\" + myImage.title + \"' \" : \"title='\" + myImage.alt + \"' \"\n" - . " var imgStyle = \"display:inline-block;\" + myImage.style.cssText\n" - . " var strNewHTML = \"\"\n" - . " myImage.outerHTML = strNewHTML\n" - . " }\n" - . "}\n"; - return $js; -} - function get_js_date_picker() { global $go_debug; @@ -1316,37 +1317,30 @@ function display_backtrace($cond=true, $msg='') { } } -function get_backtrace($html = false) +// +// FIXME: $payment_services array will be moved to bank_accounts in 2.4.x +// +if (!isset($payment_services)) { - $str = ''; - if ($html) $str .= ''; - $trace = debug_backtrace(); - - foreach($trace as $trn => $tr) { - if (!$trn) continue; - if ($html) $str .= ''; - } + $link = @$payment_services[$name]; + + if (!$link) return null; + + $patterns = array(); + foreach ($options as $id => $option) + $patterns['<'.$id.'>'] = urlencode($options[$id]); - if ($html) $str .= '
'; - $str .= $tr['file'].':'.$tr['line'].': '; - if ($html) $str .= ''; - if (isset($tr['type'])) { - if($tr['type'] == '::') { - $str .= $tr['class'].'::'; - } else if($tr['type'] == '->') { - $str .= '('.$tr['class'].' Object)'.'->'; - } - } + $payment_services = array( + 'PayPal' => "https://www.paypal.com/xclick/business=&item_name=&amount=¤cy_code=", + ); +} +/* +* Payment link generation. Options provided during invoice generation: +* company_email, comment, amount, currency +*/ +function payment_link($name, $options) +{ + global $payment_services; - foreach($tr['args'] as $n=>$a) { - if (is_object($tr['args'][$n])) - $tr['args'][$n] = "(".get_class($tr['args'][$n])." Object)"; - if (is_array($tr['args'][$n])) - $tr['args'][$n] = "(Array[".count($tr['args'][$n])."])"; - else - $tr['args'][$n] = "'".$tr['args'][$n]."'"; - } - $str .= $tr['function'].'('. implode(',',$tr['args']).')
'; - return $str; + return strtr($link, $patterns); } -?> \ No newline at end of file