X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=616a0ffa9364ee687855e31712240a75813ca413;hb=5d3fcb9c57e586c20651594edf91a2dccb08df00;hp=7b472fcdf182208f8a94e4ba2dc88e6a80a4383d;hpb=065a66792cca6a32e5ee332686bc65a9254f7712;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index 7b472fcd..616a0ffa 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -391,6 +391,9 @@ function display_customer_trans_tax_details($tax_items, $columns) $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']; @@ -421,6 +424,9 @@ 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'] . "%) " @@ -439,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'] . "%) " - . " " . 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()); + } } } @@ -466,14 +474,14 @@ function display_footer_exit() //-------------------------------------------------------------------------------------- -function display_allocations($alloc_result, $total) +function display_allocations($alloc_result, $total, $payments=false) { global $systypes_array; if (!$alloc_result || db_num_rows($alloc_result) == 0) return; - display_heading2(_("Allocations")); + display_heading2(($payments ? _("Payments") : _("Allocations"))); start_table(TABLESTYLE, "width=80%"); @@ -492,9 +500,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(); @@ -530,6 +539,23 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to } } +//-------------------------------------------------------------------------------------- + +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, true); + return; + case PT_SUPPLIER : + $alloc_result = get_allocatable_from_supp_transactions($person_id, $type_no, $type); + display_allocations($alloc_result, $total, true); + return; + } +} + //-------------------------------------------------------------------------------------- // // Expands selected quick entry $id into GL posings and adds to cart. @@ -633,7 +659,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) @@ -709,10 +735,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) { @@ -748,9 +774,9 @@ 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"; } @@ -800,31 +826,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; @@ -832,11 +833,11 @@ function get_js_date_picker() if (!file_exists($fpath) || $go_debug) { - global $dateseps, $date_system; + global $dateseps, $date_system, $tmonths; $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 || $date_system == 3) ? 6 : ($how == 0 ? 0 : 1)); // weekstart (sun = 0, mon = 1) + $wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 || $how == 3 ? 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 @@ -919,6 +920,7 @@ function CC() { var selectedDay = 0; var months = ['$months[0]','$months[1]','$months[2]','$months[3]','$months[4]','$months[5]','$months[6]','$months[7]','$months[8]','$months[9]','$months[10]','$months[11]']; var wdays = ['$wdays[0]', '$wdays[1]', '$wdays[2]', '$wdays[3]', '$wdays[4]', '$wdays[5]', '$wdays[6]']; + var tmonths = ['$tmonths[0]','$tmonths[1]','$tmonths[2]','$tmonths[3]','$tmonths[4]','$tmonths[5]','$tmonths[6]','$tmonths[7]','$tmonths[8]','$tmonths[9]','$tmonths[10]','$tmonths[11]','$tmonths[12]']; var dateField = null; function getProperty(p_property){ var p_elm = calendarId; @@ -1021,7 +1023,7 @@ function CC() { this.getWeek = getWeek; function getWeek(year, month, day) { "; - if ($how == 0) + if ($how == 0 || $how == 3) $js .= " day++;"; $js .= " var date = new Date(year,month-1,day); @@ -1035,19 +1037,26 @@ function CC() { } this.setDate = setDate; function setDate(year, month, day) { - if (dateField) { + if (dateField){ +"; + if ($how < 3) + $js .= " if (month < 10) {month = '0' + month;} if (day < 10) {day = '0' + day;} "; - if ($how == 0) + else + $js .= " + month = tmonths[month]; +"; + if ($how == 0 || $how == 3) $js .= " var dateString = month+'$sep'+day+'$sep'+year; "; - else if ($how == 1) + else if ($how == 1 || $how == 4) $js .= " var dateString = day+'$sep'+month+'$sep'+year; "; - else + else if ($how == 2 || $how == 5) $js .= " var dateString = year+'$sep'+month+'$sep'+day; "; @@ -1183,11 +1192,29 @@ function CC() { selectedMonth = parseInt(dateParts[1],10); selectedYear = parseInt(dateParts[2],10); "; - else + else if ($how == 2) $js .= " selectedYear = parseInt(dateParts[0],10); selectedMonth = parseInt(dateParts[1],10); selectedDay = parseInt(dateParts[2],10); +"; + else if ($how == 3) + $js .= " + selectedDay = parseInt(dateParts[1],10); + selectedMonth = parseInt(tmonths.indexOf(dateParts[0]),10); + selectedYear = parseInt(dateParts[2],10); +"; + else if ($how == 4) + $js .= " + selectedDay = parseInt(dateParts[0],10); + selectedMonth = parseInt(tmonths.indexOf(dateParts[1]),10); + selectedYear = parseInt(dateParts[2],10); +"; + else + $js .= " + selectedYear = parseInt(dateParts[0],10); + selectedMonth = parseInt(tmonths.indexOf(dateParts[1]),10); + selectedDay = parseInt(dateParts[2],10); "; $js .= " } catch(e) {} @@ -1317,37 +1344,32 @@ function display_backtrace($cond=true, $msg='') { } } -function get_backtrace($html = false) +// +// FIXME: $payment_services array will be moved to bank_accounts in 2.4.x +// +if (!isset($payment_services)) { - $str = ''; - if ($html) $str .= ''; - $trace = debug_backtrace(); - - foreach($trace as $trn => $tr) { - if (!$trn) continue; - if ($html) $str .= ''; - } + $link = @$payment_services[$name]; - if ($html) $str .= '
'; - $str .= $tr['file'].':'.$tr['line'].': '; - if ($html) $str .= ''; - if (isset($tr['type'])) { - if($tr['type'] == '::') { - $str .= $tr['class'].'::'; - } else if($tr['type'] == '->') { - $str .= '('.$tr['class'].' Object)'.'->'; - } - } + $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; - 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']).')
'; - return $str; + if (!$link) return null; + + $patterns = array(); + foreach ($options as $id => $option) + $patterns['<'.$id.'>'] = urlencode($options[$id]); + + return strtr($link, $patterns); } + ?> \ No newline at end of file