X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=55881b1d424e6e4bdb8756ce5fe6247991863823;hb=99d5647a5dd083073d39603792fd78c49bfb5ccb;hp=78b54a0a9bcaab348697c421a9436d3bdbfcdba6;hpb=95303d7b5280820af76ddbd8908b120813f1e763;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index 78b54a0a..55881b1d 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -18,15 +18,15 @@ function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false, $class='', $id='') { $viewer = "purchasing/view/"; - if ($type == systypes::po()) + if ($type == ST_PURCHORDER) $viewer .= "view_po.php"; - elseif ($type == 20) + elseif ($type == ST_SUPPINVOICE) $viewer .= "view_supp_invoice.php"; - elseif ($type == 21) + elseif ($type == ST_SUPPCREDIT) $viewer .= "view_supp_credit.php"; - elseif ($type == 22) + elseif ($type == ST_SUPPAYMENT) $viewer .= "view_supp_payment.php"; - elseif ($type == 25) + elseif ($type == ST_SUPPRECEIVE) $viewer .= "view_grn.php"; else return null; @@ -73,15 +73,15 @@ function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false, { $viewer = "sales/view/"; - if ($type == 10) + if ($type == ST_SALESINVOICE) $viewer .= "view_invoice.php"; - elseif ($type == 11) + elseif ($type == ST_CUSTCREDIT) $viewer .= "view_credit.php"; - elseif ($type == 12) + elseif ($type == ST_CUSTPAYMENT) $viewer .= "view_receipt.php"; - elseif ($type == 13) + elseif ($type == ST_CUSTDELIVERY) $viewer .= "view_dispatch.php"; - elseif ($type == 30) + elseif ($type == ST_SALESORDER || $type == ST_SALESQUOTE) $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); } @@ -111,11 +111,11 @@ function get_banking_trans_view_str($type, $trans_no, $label="", if ($label == "") $label = $trans_no; - if ($type == 4) + if ($type == ST_BANKTRANSFER) $viewer = "bank_transfer_view.php"; - elseif ($type == 1) + elseif ($type == ST_BANKPAYMENT) $viewer = "gl_payment_view.php"; - elseif ($type == 2) + elseif ($type == ST_BANKDEPOSIT) $viewer = "gl_deposit_view.php"; else return null; @@ -131,9 +131,9 @@ function get_inventory_trans_view_str($type, $trans_no, $label="", { $viewer = "inventory/view/"; - if ($type == systypes::inventory_adjustment()) + if ($type == ST_INVADJUST) $viewer .= "view_adjustment.php"; - elseif ($type == systypes::location_transfer()) + elseif ($type == ST_LOCTRANSFER) $viewer .= "view_transfer.php"; else return null; @@ -152,11 +152,11 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="", { $viewer = "manufacturing/view/"; - if ($type == 28) + if ($type == ST_MANUISSUE) $viewer .= "wo_issue_view.php"; - elseif ($type == 29) + elseif ($type == ST_MANURECEIVE) $viewer .= "wo_production_view.php"; - elseif ($type == systypes::work_order()) + elseif ($type == ST_WORKORDER) $viewer .= "work_order_view.php"; else return null; @@ -174,7 +174,7 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="", function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false, $class='', $id='') { - if ($type == 40) + if ($type == ST_DIMENSION) $viewer = "dimensions/view/view_dimension.php?trans_no=$trans_no"; else return null; @@ -190,7 +190,7 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false, function get_journal_trans_view_str($type, $trans_no, $label="", $icon=false, $class='', $id='') { - if ($type == 0 || $type == 35) + if ($type == ST_JOURNAL || $type == ST_COSTUPDATE) $viewer = "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no"; else return null; @@ -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"); @@ -432,7 +445,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; } @@ -440,14 +453,14 @@ function display_footer_exit() function display_allocations($alloc_result, $total) { - global $table_style; + 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")); @@ -459,7 +472,7 @@ function display_allocations($alloc_result, $total) alt_table_row_color($k); - label_cell(systypes::name($alloc_row['type'])); + label_cell($systypes_array[$alloc_row['type']]); label_cell(get_trans_view_str($alloc_row['type'],$alloc_row['trans_no'])); label_cell(sql2date($alloc_row['tran_date'])); $alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec()); @@ -491,11 +504,11 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to { switch ($person_type) { - case payment_person_types::customer() : + case PT_CUSTOMER : $alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type); display_allocations($alloc_result, $total); return; - case payment_person_types::supplier() : + case PT_SUPPLIER : $alloc_result = get_allocatable_to_supp_transactions($person_id, $type_no, $type); display_allocations($alloc_result, $total); return; @@ -523,8 +536,27 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') if ($type != QE_SUPPINV) // only one quick entry on journal/bank transaction $cart->clear_items(); $qe = get_quick_entry($id); + if ($qe['bal_type'] == 1) + { + if ($qe['base_amount'] == 1.0) // monthly + $begin = begin_month($cart->tran_date); + else + { + if (is_account_balancesheet($qe['base_desc'])) // total + $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); + if (db_num_rows($result) == 0) + { + display_error( _("No Quick Entry lines are defined.")); + set_focus('totamount'); + } $totrate = 0; while ($row = db_fetch($result)) { @@ -534,7 +566,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']); } } @@ -578,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; @@ -626,96 +659,90 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') $qe_line['dimension2_id'], $part, $qe['description']); } } -/* - while ($qe_line = db_fetch($qe_lines)) - { - switch (strtolower($qe_line['action'])) { - case "=": // post current base amount to GL account - $part = $base; - break; - case "a": // post amount to GL account and reduce base - $part = $qe_line['amount']; - break; - case "a+": // post amount to GL account and increase base - $part = $qe_line['amount']; $base += $part; - break; - case "a-": // post amount to GL account and reduce base - $part = $qe_line['amount']; $base -= $part; - break; - case "%": // store acc*amount% to GL account - $part = round2($base * $qe_line['amount'] / 100, user_price_dec()); - break; - case "%+": // ditto & increase base amount - $part = round2($base * $qe_line['amount'] / 100, user_price_dec()); - $base += $part; - break; - case "%-": // ditto & reduce base amount - $part = round2($base * $qe_line['amount'] / 100, user_price_dec()); - $base -= $part; - break; - case "t": // post taxes calculated on base amount - case "t+": // ditto & increase base amount - case "t-": // ditto & reduce base amount - //$taxes = get_taxes_for_item_tax($qe_line['dest_id']); - if ($type == QE_SUPPINV) - $qe_line['dest_id'] = $cart->tax_group_id; - $taxes = array(); - $res = get_tax_group_items($qe_line['dest_id']); - while ($row = db_fetch($res)) - $taxes[] = $row; - $tax_total = 0; - $totrate = 0; - // find total tax - if (substr($qe_line['action'],0,1) != 'T') { - foreach ($taxes as $index => $item_tax) { - $totrate += $item_tax['rate']; - } - } - $taxbase = $base/($totrate+100); - foreach ($taxes as $index => $item_tax) { - $tax = round2($taxbase * $item_tax['rate'], user_price_dec()); - $gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0)) - ? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code']; - $tax_total += $tax; - if ($tax==0) continue; - if (!is_tax_gl_unique($gl_code)) { - display_error(_("Cannot post to GL account used by more than one tax type.")); - break 3; - } - if ($type != QE_SUPPINV) - $cart->add_gl_item($gl_code, - $qe_line['dimension_id'], $qe_line['dimension2_id'], - $tax, $qe['description']); - else - { - $acc_name = get_gl_account_name($gl_code); - $cart->add_gl_codes_to_trans($gl_code, - $acc_name, $qe_line['dimension_id'], - $qe_line['dimension2_id'], $tax, $qe['description']); - } - } - if (strpos($qe_line['action'], '+')) - $base += $tax_total; - elseif (strpos($qe_line['action'], '-')) - $base -= $tax_total; - continue 2; - } - if ($type != QE_SUPPINV) - $cart->add_gl_item($qe_line['dest_id'], $qe_line['dimension_id'], - $qe_line['dimension2_id'], $part, $qe['description']); - else - { - $acc_name = get_gl_account_name($qe_line['dest_id']); - $cart->add_gl_codes_to_trans($qe_line['dest_id'], - $acc_name, $qe_line['dimension_id'], - $qe_line['dimension2_id'], $part, $qe['description']); - } - } -*/ } 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) { @@ -785,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) { @@ -794,7 +821,7 @@ function get_js_date_picker() $how = user_date_format(); // 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw $sep = $dateseps[user_date_sep()]; // date separator - $wstart = (($date_system == 1 || $date_system == 2) ? 6 : ($how == 0 ? 0 : 1)); // weekstart (sun = 0, mon = 1) + $wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 ? 0 : 1)); // weekstart (sun = 0, mon = 1) $months = array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December")); $wdays = array(_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")); $wno = _("W"); // week no @@ -1091,7 +1118,7 @@ function CC() { if (dayOfMonth == selectedDay && currentYear == selectedYear && currentMonth == selectedMonth) { css_class = 'current'; "; - if ($date_system == 1 || $date_system == 2) + if ($date_system == 1 || $date_system == 2 || $date_system == 3) $js .= " } else if (dayOfWeek == 5) { "; @@ -1252,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; }