X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=19e94b3e188dff830cdc5f0d7c18d54748580d8c;hb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;hp=f95182abe46bfa9514d1ce73b1018e72bc5e9707;hpb=a1e0df1ef259550f26bc150cf912fd518c7344e3;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index f95182ab..19e94b3e 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) - $viewer = "view_supp_payment.php"; - elseif ($type == 25) + elseif ($type == ST_SUPPAYMENT) + $viewer .= "view_supp_payment.php"; + 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; @@ -274,7 +274,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate= if ($edit_rate) text_row(_("Exchange Rate:"), '_ex_rate', $rate, 8, 8, null, "", " $from_currency = 1 $to_currency"); else - label_row(_("Exchange Rate:"),"$rate $from_currency = 1 $to_currency" ); + label_row(_("Exchange Rate:"),"$rate $from_currency = 1 $to_currency" ); $Ajax->addUpdate('_ex_rate','_ex_rate', $rate); } } @@ -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) @@ -358,7 +357,8 @@ function view_stock_status_cell($stock_id, $description=null) function display_debit_or_credit_cells($value) { - if ($value > 0) + $value = round2($value, user_price_dec()); + if ($value >= 0) { amount_cell($value); label_cell(""); @@ -368,12 +368,6 @@ function display_debit_or_credit_cells($value) label_cell(""); amount_cell(abs($value)); } - else - { - //label_cell(""); - amount_cell(0); - label_cell(""); - } } //-------------------------------------------------------------------------------------- @@ -437,7 +431,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; } @@ -445,14 +439,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")); @@ -464,7 +458,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()); @@ -496,11 +490,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; @@ -528,9 +522,43 @@ 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; - $qe_lines = get_quick_entry_lines($id); - while ($qe_line = db_fetch($qe_lines)) + $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)) + { + $qe_lines[] = $row; + + switch (strtolower($row['action'])) { + case "t": // post taxes calculated on base amount + case "t+": // ditto & increase base amount + case "t-": // ditto & reduce base amount + if (substr($row['action'],0,1) != 'T') + $totrate += get_tax_type_default_rate($row['dest_id']); + } + } + $first = true; + $taxbase = 0; + foreach($qe_lines as $qe_line) { switch (strtolower($qe_line['action'])) { case "=": // post current base amount to GL account @@ -559,34 +587,51 @@ 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 - $taxes = get_taxes_for_item_tax($qe_line['dest_id']); - $tax_total = 0; - foreach ($taxes as $index => $item_tax) { - if(substr($qe_line['action'],0,1) != 'T') - $tax = round2($base * $item_tax['rate'] - / ($item_tax['rate'] + 100), user_price_dec()); - else - $tax = round2($base * $item_tax['rate'] / 100, 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 ($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 ($first) + { + $taxbase = $base/($totrate+100); + $first = false; + } + + if (substr($qe_line['action'],0,1) != 'T') + $part = $taxbase; + else + $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) + { + $taxgroup = $cart->tax_group_id; + $rates = 0; + $res = get_tax_group_items($cart->tax_group_id); + while ($row = db_fetch($res)) + $rates += $row['rate']; + if ($rates == 0) + continue 2; + } + $tax = round2($part * $item_tax['rate'], user_price_dec()); + if ($tax==0) continue 2; + $gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0)) + ? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code']; + if (!is_tax_gl_unique($gl_code)) { + display_error(_("Cannot post to GL account used by more than one tax type.")); + break 2; + } + 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; + $base += $tax; elseif (strpos($qe_line['action'], '-')) - $base -= $tax_total; + $base -= $tax; continue 2; } if ($type != QE_SUPPINV) @@ -604,6 +649,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) { @@ -638,6 +763,13 @@ function default_focus($name=null, $form_no=0) { } return $name; } +/* + Reset focus to next control element (e.g. link). +*/ +function reset_focus() +{ + unset($_POST['_focus']); +} function get_js_png_fix() { @@ -666,8 +798,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) { @@ -675,7 +807,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 @@ -972,7 +1104,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) { "; @@ -1133,7 +1265,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; }