X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_view.inc;h=55881b1d424e6e4bdb8756ce5fe6247991863823;hb=99d5647a5dd083073d39603792fd78c49bfb5ccb;hp=8e2591c3a9328ae619354dfa38a25e2e2e361369;hpb=9478a0cdeaf9201d2f3947e11e58d90354050025;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index 8e2591c3..55881b1d 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -283,13 +283,12 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate= function is_voided_display($type, $id, $label) { - global $table_style; $void_entry = get_voided_entry($type, $id); if ($void_entry == null) return false; - start_table("width=50% $table_style"); + start_table(TABLESTYLE, "width=50%"); echo "$label
"; echo "" . _("Date Voided:") . " " . sql2date($void_entry["date_"]) . "
"; if (strlen($void_entry["memo_"]) > 0) @@ -375,12 +374,26 @@ function display_debit_or_credit_cells($value) function display_customer_trans_tax_details($tax_items, $columns) { + global $alternative_tax_include_on_docs; + $first = true; while ($tax_item = db_fetch($tax_items)) { $tax = number_format2($tax_item['amount'],user_price_dec()); if ($tax_item['included_in_price']) - label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " . - _("Amount") . ": $tax", "", "colspan=$columns align=right", "align=right"); + { + if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1) + { + if ($first) + label_row(_("Total Tax Excluded"), number_format2($tax_item['net_amount'], user_price_dec()), + "colspan=$columns align=right", "align=right"); + label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)", + $tax, "colspan=$columns align=right", "align=right"); + $first = false; + } + else + label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " . + _("Amount") . ": $tax", "", "colspan=$columns align=right", "align=right"); + } else label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)", $tax, "colspan=$columns align=right", "align=right"); @@ -440,14 +453,14 @@ function display_footer_exit() function display_allocations($alloc_result, $total) { - global $table_style, $systypes_array; + global $systypes_array; if (!$alloc_result || db_num_rows($alloc_result) == 0) return; display_heading2(_("Allocations")); - start_table("$table_style width=80%"); + start_table(TABLESTYLE, "width=80%"); $th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"), _("Left to Allocate"), _("This Allocation")); @@ -597,9 +610,10 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') if (substr($qe_line['action'],0,1) != 'T') $part = $taxbase; else - $part = $base; + $part = $base/100; $item_tax = get_tax_type($qe_line['dest_id']); - if ($type == QE_SUPPINV && substr($qe_line['action'],0,1) != 'T') + //if ($type == QE_SUPPINV && substr($qe_line['action'],0,1) != 'T') + if ($type == QE_SUPPINV) { $taxgroup = $cart->tax_group_id; $rates = 0; @@ -649,6 +663,86 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') return $bank_amount; } +//-------------------------------------------------------------------------------------- +// +// Simple English version of number to words conversion. +// +function _number_to_words($number) +{ + $Bn = floor($number / 1000000000); /* Billions (giga) */ + $number -= $Bn * 1000000000; + $Gn = floor($number / 1000000); /* Millions (mega) */ + $number -= $Gn * 1000000; + $kn = floor($number / 1000); /* Thousands (kilo) */ + $number -= $kn * 1000; + $Hn = floor($number / 100); /* Hundreds (hecto) */ + $number -= $Hn * 100; + $Dn = floor($number / 10); /* Tens (deca) */ + $n = $number % 10; /* Ones */ + + $res = ""; + + if ($Bn) + $res .= _number_to_words($Bn) . " Billion"; + if ($Gn) + $res .= (empty($res) ? "" : " ") . _number_to_words($Gn) . " Million"; + if ($kn) + $res .= (empty($res) ? "" : " ") . _number_to_words($kn) . " Thousand"; + if ($Hn) + $res .= (empty($res) ? "" : " ") . _number_to_words($Hn) . " Hundred"; + + $ones = array("", "One", "Two", "Three", "Four", "Five", "Six", + "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen", + "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eightteen", + "Nineteen"); + $tens = array("", "", "Twenty", "Thirty", "Fourty", "Fifty", "Sixty", + "Seventy", "Eigthy", "Ninety"); + + if ($Dn || $n) + { + if (!empty($res)) + $res .= " and "; + if ($Dn < 2) + $res .= $ones[$Dn * 10 + $n]; + else + { + $res .= $tens[$Dn]; + if ($n) + $res .= "-" . $ones[$n]; + } + } + + if (empty($res)) + $res = "zero"; + return $res; +} + +function price_in_words($amount, $document=0) +{ + global $Hooks; + // use local price_in_words() if the hook is defined + if (method_exists($Hooks, 'price_in_words')) + { + return $Hooks->price_in_words($amount, $document); + } + // Only usefor Remittance and Receipts as default + if (!($document == ST_SUPPAYMENT || $document == ST_CUSTPAYMENT || $document == ST_CHEQUE)) + return ""; + if ($amount < 0 || $amount > 999999999999) + return ""; + $dec = user_price_dec(); + if ($dec > 0) + { + $divisor = pow(10, $dec); + $frac = round2($amount - floor($amount), $dec) * $divisor; + $frac = sprintf("%0{$dec}d", $frac); + $and = _("and"); + $frac = " $and $frac/$divisor"; + } + else + $frac = ""; + return _number_to_words(intval($amount)) . $frac; +} function get_js_open_window($width, $height) { @@ -718,8 +812,8 @@ function get_js_png_fix() function get_js_date_picker() { - global $comp_path, $go_debug; - $fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js'; + global $go_debug; + $fpath = company_path().'/js_cache/'.'date_picker.js'; if (!file_exists($fpath) || $go_debug) { @@ -1185,7 +1279,7 @@ if (!function_exists('_vd')) $str = (!empty($title) ? ($title .':') : '') .'
';
     	$str .= print_r($mixed, true); //var_dump($mixed);
     	$str .= "
\n"; - display_error('
'.$str.'
'); + display_notification('
'.$str.'
'); if ($exit) exit; }