X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=fe54a261bc2637c68c444ad678d816636701c343;hb=d23b97ed26bc0608c9ba1037b66058c709e83765;hp=9b51ce3f64c972da290168dd5afa9024b2c5f150;hpb=deed05a36c33ecad4dd8528b84c13490bbc042de;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 9b51ce3f..fe54a261 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -432,7 +432,7 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
function display_footer_exit()
{
br(2);
- end_page();
+ end_page(false, false, true);
exit;
}
@@ -597,9 +597,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 +650,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 +799,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 +1266,7 @@ if (!function_exists('_vd'))
$str = (!empty($title) ? ($title .':') : '') .'
';
$str .= print_r($mixed, true); //var_dump($mixed);
$str .= "
\n";
- display_error('');
+ display_notification('');
if ($exit)
exit;
}