X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=adf663288317479f0cee4a0238776d6114a370f5;hb=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8;hp=55881b1d424e6e4bdb8756ce5fe6247991863823;hpb=99d5647a5dd083073d39603792fd78c49bfb5ccb;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index 55881b1d..adf66328 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); } //-------------------------------------------------------------------------------------- @@ -201,6 +201,19 @@ function get_journal_trans_view_str($type, $trans_no, $label="", $icon=false, return viewer_link($label, $viewer, $class, $id, $icon); } +//-------------------------------------------------------------------------------------- + +function get_package_view_str($pkg, $label="", $icon=false, $class='', $id='') +{ + if ($label == "") + { + $label = _("Info"); +// $icon = ICON_GL; + } + return viewer_link($label, "includes/ui/view_package.php?id=$pkg", $class, $id, $icon); +} + + //-------------------------------------------------------------------------------------- function get_trans_view_str($type, $trans_no, $label="", $icon=false, @@ -355,18 +368,18 @@ function view_stock_status_cell($stock_id, $description=null) //-------------------------------------------------------------------------------------- -function display_debit_or_credit_cells($value) +function display_debit_or_credit_cells($value, $bold=false) { $value = round2($value, user_price_dec()); if ($value >= 0) { - amount_cell($value); + amount_cell($value, $bold); label_cell(""); } elseif ($value < 0) { label_cell(""); - amount_cell(abs($value)); + amount_cell(abs($value), $bold); } } @@ -374,11 +387,18 @@ function display_debit_or_credit_cells($value) function display_customer_trans_tax_details($tax_items, $columns) { - global $alternative_tax_include_on_docs; + global $alternative_tax_include_on_docs, $suppress_tax_rates; $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']; + else + $tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) "; if ($tax_item['included_in_price']) { if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1) @@ -386,17 +406,15 @@ function display_customer_trans_tax_details($tax_items, $columns) 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"); + label_row($tax_type_name, $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"); + label_row(_("Included") . " " . $tax_type_name + . ": $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"); + label_row($tax_type_name, $tax, "colspan=$columns align=right", "align=right"); } } @@ -406,10 +424,13 @@ 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'] . "%) " . - _("Amount") . ": $tax", "colspan=$columns align=right", "align=right"); + label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " + . ": $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"); @@ -424,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'] . "%) " . - _("Amount:") . " " . 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()); + } } } @@ -445,20 +468,20 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0) function display_footer_exit() { br(2); - end_page(false, false, true); + end_page(false, true); exit; } //-------------------------------------------------------------------------------------- -function display_allocations($alloc_result, $total) +function display_allocations($alloc_result, $total, $title, $show_summary=true) { global $systypes_array; if (!$alloc_result || db_num_rows($alloc_result) == 0) return; - display_heading2(_("Allocations")); + display_heading2($title); start_table(TABLESTYLE, "width=80%"); @@ -469,7 +492,6 @@ function display_allocations($alloc_result, $total) while ($alloc_row = db_fetch($alloc_result)) { - alt_table_row_color($k); label_cell($systypes_array[$alloc_row['type']]); @@ -477,9 +499,10 @@ function display_allocations($alloc_result, $total) label_cell(sql2date($alloc_row['tran_date'])); $alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec()); $alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec()); + if ($payments && ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT)) + $alloc_row['Total'] = -$alloc_row['Total']; amount_cell($alloc_row['Total']); - //amount_cell($alloc_row['Total'] - $alloc_row['PrevAllocs'] - $alloc_row['amt']); - amount_cell($alloc_row['Total'] - $alloc_row['amt']); + amount_cell($alloc_row['Total'] - $alloc_row['amt']); amount_cell($alloc_row['amt']); end_row(); @@ -489,12 +512,14 @@ function display_allocations($alloc_result, $total) label_cell(_("Total Allocated:"), "align=right colspan=5"); amount_cell($total_allocated); end_row(); - start_row(); - label_cell(_("Left to Allocate:"), "align=right colspan=5"); - $total = round2($total, user_price_dec()); - amount_cell($total - $total_allocated); - end_row(); - + if ($show_summary) + { + start_row(); + label_cell(_("Left to Allocate:"), "align=right colspan=5"); + $total = round2($total, user_price_dec()); + amount_cell($total - $total_allocated); + end_row(); + } end_table(1); } @@ -506,11 +531,28 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to { case PT_CUSTOMER : $alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type); - display_allocations($alloc_result, $total); + display_allocations($alloc_result, $total, _("Allocations")); return; case PT_SUPPLIER : $alloc_result = get_allocatable_to_supp_transactions($person_id, $type_no, $type); - display_allocations($alloc_result, $total); + display_allocations($alloc_result, $total, _("Allocations")); + return; + } +} + +//-------------------------------------------------------------------------------------- + +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, $type == ST_SALESORDER ? _("Pre-Payments") : _("Payments"), false); + return; + case PT_SUPPLIER : + $alloc_result = get_allocatable_from_supp_transactions($person_id, $type_no, $type); + display_allocations($alloc_result, $total, $type == ST_PURCHORDER ? _("Pre-Payments") : _("Payments"), false); return; } } @@ -546,9 +588,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); @@ -556,7 +598,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)) { @@ -617,7 +660,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) @@ -693,10 +736,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) { @@ -719,12 +762,11 @@ function _number_to_words($number) 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); - } + $price = hook_price_in_words($amount, $document); + if ($price) + return $price; + // Only usefor Remittance and Receipts as default if (!($document == ST_SUPPAYMENT || $document == ST_CUSTPAYMENT || $document == ST_CHEQUE)) return ""; @@ -733,16 +775,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) { @@ -785,31 +827,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; @@ -1275,7 +1292,6 @@ if (!function_exists('_vd')) { function _vd($mixed, $title = '', $exit = false) { - // Only the site admin is able to proceed here. $str = (!empty($title) ? ($title .':') : '') .'
';
     	$str .= print_r($mixed, true); //var_dump($mixed);
     	$str .= "
\n"; @@ -1285,43 +1301,48 @@ if (!function_exists('_vd')) } } -function display_backtrace($cond=true, $msg='') { +function _vl($mixed, $title = '', $exit = false) +{ + error_log((!empty($title) ? ($title .':') : '') . var_export($mixed, true)); + if ($exit) + exit; +} +function display_backtrace($cond=true, $msg='') { if ($cond) { if ($msg) $str = "
$msg
\n"; else $str = ''; - $str .= ''; - $trace = debug_backtrace(); - foreach($trace as $trn => $tr) { - if (!$trn) continue; - $str .= ''; - - $str .= ''; - } - - $str .= '
'; - $str .= $tr['file'].':'.$tr['line'].': '; - $str .= ''; - if (isset($tr['type'])) { - if($tr['type'] == '::') { - $str .= $tr['class'].'::'; - } else if($tr['type'] == '->') { - $str .= '('.$tr['class'].' Object)'.'->'; - } - } - 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']).')
'; - display_error($str); + $str .= get_backtrace(true); + display_error($str); } } -?> \ No newline at end of file +// +// FIXME: $payment_services array will be moved to bank_accounts in 2.4.x +// +if (!isset($payment_services)) +{ + $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; + + $link = @$payment_services[$name]; + + if (!$link) return null; + + $patterns = array(); + foreach ($options as $id => $option) + $patterns['<'.$id.'>'] = urlencode($options[$id]); + + return strtr($link, $patterns); +}