X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=9a9eb0932ed8988373c844462bed9c19c9a641d7;hb=d859c6081f650d22eba97b13a298b681148d0d6d;hp=e2e5066ac0f4ee1ec6952b1aef6584b3565c4285;hpb=f4b29dbecba8d6c5ada8d2272bb3c285fe6e21e0;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index e2e5066a..9a9eb093 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -250,45 +250,81 @@ function get_trans_view_str($type, $trans_no, $label="", $icon=false, return null; } +/* + Helper for ui drawing functions. + Checks whether any of input function parameters has changed or page is called with GET method (first page display). + $name - context +*/ +function check_ui_refresh($name=null) +{ + $bt = debug_backtrace(); + if (!$name) + $name = $bt[1]['function']; + $old = @$_SESSION['ui_context'][$name]; + $new = $_SESSION['ui_context'][$name] = $bt[1]['args']; + return ($new != $old) || ($_SERVER['REQUEST_METHOD'] == 'GET'); +} + //-------------------------------------------------------------------------------------- // Displays currency exchange rate for given date. // When there is no exrate for today, // gets it form ECB and stores in local database. // -function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=false) +function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit=false) { - global $Ajax; + global $Ajax, $xr_provider_authoritative; + + $readonly = false; if ($from_currency != $to_currency) { - $comp_currency = get_company_currency(); - if ($from_currency == $comp_currency) - $currency = $to_currency; - else - $currency = $from_currency; - $rate = 0; - if ($date_ == Today()) { - $rate = get_date_exchange_rate($currency, $date_); - if (!$rate) { + $rate = get_post('_ex_rate'); + if (check_ui_refresh() || !$rate) { // readonly or ui context changed + $comp_currency = get_company_currency(); + if ($from_currency == $comp_currency) + $currency = $to_currency; + else + $currency = $from_currency; + + $rate = get_date_exchange_rate($currency, $date_); // try local + + if ($rate) + $readonly = true; // if we have already local exrate keep it unchanged + + if (!$rate) { // retry from remote service $row = get_currency($currency); - if ($row['auto_update']) { - $rate = retrieve_exrate($currency, $date_); - if ($rate) - add_exchange_rate($currency, $date_, $rate, $rate); + + if ($row['auto_update']) // autoupdate means use remote service & store exrate on first transaction. + { + $rate = retrieve_exrate($currency, $date_); + if (!$rate) + display_warning(sprintf(_("Cannot retrieve exchange rate for currency %s. Please adjust approximate rate if needed."), $currency)); + elseif ($xr_provider_authoritative) { + // if the remote exrate is considered authoritative we can store the rate here, + // otherwise exrate will be stored during transaction write + $readonly = true; + add_new_exchange_rate($currency, $date_, $rate); + } } } + if (!$rate) { // get and edit latest available + $rate = get_exchange_rate_from_home_currency($currency, $date_); + } + if ($from_currency != $comp_currency) + $rate = 1 / ($rate / get_exchange_rate_from_home_currency($to_currency, $date_)); + $Ajax->activate('_ex_rate_span'); } - if (!$rate) - $rate = get_exchange_rate_from_home_currency($currency, $date_); - if ($from_currency != $comp_currency) - $rate = 1 / ($rate / get_exchange_rate_from_home_currency($to_currency, $date_)); $rate = number_format2($rate, user_exrate_dec()); - 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" ); - $Ajax->addUpdate('_ex_rate','_ex_rate', $rate); + + if ($force_edit || !$readonly) + $ctrl = ""; + else + $ctrl = "$rate"; + + label_row(_("Exchange Rate:"), $span = "$ctrl $from_currency = 1 $to_currency" ); + + $Ajax->addUpdate('_ex_rate_span', '_ex_rate_span', $span); } } @@ -322,7 +358,7 @@ function comments_display_row($type, $id) echo ""; while ($comment = db_fetch($comments)) { - echo $comment["memo_"] . "
"; + echo nl2br($comment["memo_"]) . "
"; } echo ""; } @@ -439,49 +475,72 @@ function display_supp_trans_tax_details($tax_items, $columns) //-------------------------------------------------------------------------------------- -function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0) +function display_edit_tax_items($taxes, $columns, $tax_included, $rightspan=0, $editable=false) { $total = 0; foreach ($taxes as $taxitem) - { - 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()); - } - } - } - - return $total; + { + $amount = isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value']; + if ($taxitem['Value'] != 0){ + if ($editable) { + if (!isset($_POST['mantax['.$taxitem['tax_type_id'].']'])) + $_POST['mantax['.$taxitem['tax_type_id'].']'] = price_format($amount); + start_row(); + if ($tax_included) { + $colspan = $columns-1; + label_cell(_("Included") . " " . $taxitem['tax_type_name'].":", + "colspan={$colspan} align='right'"); + amount_cells(null, 'mantax['.$taxitem['tax_type_id'].']', + null, "colspan=$columns align=right", '', user_price_dec()); + } else { + label_cell($taxitem['tax_type_name'], "colspan=$columns align='right'"); + amount_cells(null, 'mantax['.$taxitem['tax_type_id'].']', + null, "colspan=$columns align=right", null, user_price_dec()); + $total += round2($amount, user_price_dec()); + } + if ($rightspan) + label_cell('', "colspan ='$rightspan'"); + end_row(); + } else { + $value = number_format2($taxitem['Value'],user_price_dec()); + if ($tax_included) + { + label_row(_("Included") . " " . $taxitem['tax_type_name'] + . " " . $value , "", "colspan=$columns align=right", "align=right", $rightspan); + } + else + { + label_row($taxitem['tax_type_name'], + $value, "colspan=$columns align=right", "align=right", $rightspan); + $total += round2($taxitem['Value'], user_price_dec()); + } + } + } + } + return $total; } //-------------------------------------------------------------------------------------- -function display_footer_exit() +function display_footer_exit($space=2) { - br(2); + if ($space) + br($space); end_page(false, false, true); 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%"); @@ -500,9 +559,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(); @@ -538,6 +598,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. @@ -717,10 +794,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) { @@ -756,9 +833,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"; } @@ -815,18 +892,18 @@ 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 $back = _("Back"); if ($date_system == 1) list($cyear, $cmon, $cday) = gregorian_to_jalali(date("Y"), date("n"), date("j")); - else if ($date_system == 2) + elseif ($date_system == 2) list($cyear, $cmon, $cday) = gregorian_to_islamic(date("Y"), date("n"), date("j")); @@ -902,6 +979,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; @@ -946,7 +1024,7 @@ function CC() { $js .= " return [31,31,31,31,31,31,30,30,30,30,30,(((((((year - ((year > 0) ? 474 : 473)) % 2820) + 474) + 38) * 682) % 2816) < 682 ? 30 : 29)][month-1]; "; - else if ($date_system == 2) + elseif ($date_system == 2) $js .= " return [30,29,30,29,30,29,30,29,30,29,30,(((((11 * year) + 14) % 30) < 11) ? 30 : 29)][month-1]; "; @@ -979,7 +1057,7 @@ function CC() { Math.floor(((epyear * 682) - 110) / 2816) + (epyear - 1) * 365 + Math.floor(epbase / 2820) * 1029983 + (1948320.5 - 1); "; - else if ($date_system == 2) + elseif ($date_system == 2) $js .= " var t; t = Math.floor((11 * year + 3) / 30) + 354 * year + 30 * month - @@ -1004,7 +1082,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); @@ -1018,19 +1096,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) + elseif ($how == 1 || $how == 4) $js .= " var dateString = day+'$sep'+month+'$sep'+year; "; - else + elseif ($how == 2 || $how == 5) $js .= " var dateString = year+'$sep'+month+'$sep'+day; "; @@ -1160,17 +1245,35 @@ function CC() { selectedDay = parseInt(dateParts[1],10); selectedYear = parseInt(dateParts[2],10); "; - else if ($how == 1) + elseif ($how == 1) $js .= " selectedDay = parseInt(dateParts[0],10); selectedMonth = parseInt(dateParts[1],10); selectedYear = parseInt(dateParts[2],10); "; - else + elseif ($how == 2) $js .= " selectedYear = parseInt(dateParts[0],10); selectedMonth = parseInt(dateParts[1],10); selectedDay = parseInt(dateParts[2],10); +"; + elseif ($how == 3) + $js .= " + selectedDay = parseInt(dateParts[1],10); + selectedMonth = parseInt(tmonths.indexOf(dateParts[0]),10); + selectedYear = parseInt(dateParts[2],10); +"; + elseif ($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) {} @@ -1300,4 +1403,32 @@ function display_backtrace($cond=true, $msg='') { } } +// +// 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); +} + ?> \ No newline at end of file