X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=c00bd7c3e973d9b34b6aed54bbbb5281d411599f;hb=1da05f0618fbce09abde1c28f5908842b210c15e;hp=daa161be6ae3180436c9afe5791a210aed572179;hpb=dd6cb45ea1904bd494d199dad893afc52a656ae4;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index daa161be..c00bd7c3 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -51,7 +51,7 @@ 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" + $url = ($type == ST_WORKORDER) ? "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, $url, $class, $id, $icon); @@ -262,7 +262,7 @@ function check_ui_refresh($name=null) $name = $bt[1]['function']; $old = @$_SESSION['ui_context'][$name]; $new = $_SESSION['ui_context'][$name] = $bt[1]['args']; - return ($new != $old) || ($_SERVER['REQUEST_METHOD'] == 'GET'); + return ($new != $old); } //-------------------------------------------------------------------------------------- @@ -278,9 +278,15 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit if ($from_currency != $to_currency) { - $rate = get_post('_ex_rate'); + $rate = input_num('_ex_rate'); if (check_ui_refresh() || !$rate) { // readonly or ui context changed $comp_currency = get_company_currency(); + + if (!isset($from_currency)) + $from_currency = $comp_currency; + if (!isset($to_currency)) + $to_currency = $comp_currency; + if ($from_currency == $comp_currency) $currency = $to_currency; else @@ -337,7 +343,7 @@ function is_voided_display($type, $id, $label) if ($void_entry == null) return false; - start_table(TABLESTYLE, "width=50%"); + start_table(TABLESTYLE, "width='50%'"); echo "$label
"; echo "" . _("Date Voided:") . " " . sql2date($void_entry["date_"]) . "
"; if (strlen($void_entry["memo_"]) > 0) @@ -385,10 +391,8 @@ function view_stock_status($stock_id, $description=null, $echo=true) { global $path_to_root; if ($description) - //hyperlink_params_separate($path_to_root . "/inventory/inquiry/stock_status.php", (user_show_codes()?$stock_id . " - ":"") . $description, "stock_id=$stock_id"); $preview_str = "". (user_show_codes()?$stock_id . " - ":"") . $description.""; else - //hyperlink_params_separate($path_to_root . "/inventory/inquiry/stock_status.php", $stock_id, "stock_id=$stock_id"); $preview_str = "$stock_id"; if($echo) echo $preview_str; @@ -543,7 +547,7 @@ function display_allocations($alloc_result, $total, $title, $show_summary=true) display_heading2($title); - start_table(TABLESTYLE, "width=80%"); + start_table(TABLESTYLE, "width='80%'"); $th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"), _("Left to Allocate"), _("This Allocation")); @@ -562,7 +566,7 @@ function display_allocations($alloc_result, $total, $title, $show_summary=true) if ($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['amt']); + amount_cell($alloc_row['Total'] - $alloc_row['alloc']); amount_cell($alloc_row['amt']); end_row(); @@ -625,7 +629,7 @@ function display_allocations_to($person_type, $person_id, $type, $type_no, $tota function display_quick_entries(&$cart, $id, $base, $type, $descr='') { $bank_amount = 0; - + if (!isset($id) || $id == null || $id == "") { display_error( _("No Quick Entries are defined.")); @@ -635,31 +639,79 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') { if ($type == QE_DEPOSIT) $base = -$base; - if ($type != QE_SUPPINV) // only one quick entry on journal/bank transaction + if ($type != QE_SUPPINV && $type != QE_JOURNAL) // only one quick entry on journal/bank transaction $cart->clear_items(); + + // as for now tax_group is passed only in QE_SUPPINV + $qe_lines = quickentry_calculate($base, $id, @$cart->tax_group_id, $cart->tran_date); + + if ($qe_lines === 0) + { + display_error( _("No Quick Entry lines are defined.")); + set_focus('totamount'); + return 0; + } elseif ($qe_lines === -1) + { + display_error(_("Cannot post to GL account used by more than one tax type.")); + return 0; + } + foreach($qe_lines as $qe_line) + { + if ($descr != '') $qe_line['descr'] .= ': '.$descr; + if ($type != QE_SUPPINV) + $cart->add_gl_item($qe_line['code'], $qe_line['dim1'], + $qe_line['dim2'], $qe_line['amount'], $qe_line['descr']); + else + { + $acc_name = get_gl_account_name($qe_line['code']); + $cart->add_gl_codes_to_trans($qe_line['code'], + $acc_name, $qe_line['dim1'], + $qe_line['dim2'], $qe_line['amount'], $qe_line['descr']); + } + } + } + return $bank_amount; +} + +//-------------------------------------------------------------------------------------- + +function quickentry_calculate($base, $id, $taxgroup=null, $date=null) +{ + $gl_entries = array(); $qe = get_quick_entry($id); - if ($qe['bal_type'] == 1) + $type = $qe['type']; + $total = $base; + // quick entry made on account balance is special case. + if ($qe['bal_type'] == 1) // if this is quick entry based on balance - calculate it { - if ($qe['base_amount'] == 1.0) // monthly - $begin = begin_month($cart->tran_date); + // Note, that this is ugly hack overriding standard field usage + // just to make the feature available between major FA releases! + $gl_code = $qe['base_desc']; + $monthly = $qe['base_amount'] == 1.0; + + if (!isset($date)) + $date = Today(); + + if ($monthly) // marked as monthly + $begin = begin_month($date); else { - if (is_account_balancesheet($qe['base_desc'])) // total + if (is_account_balancesheet($gl_code)) // total $begin = ""; else $begin = begin_fiscalyear(); // from fiscalyear begin } - $base = get_gl_trans_from_to($begin, $cart->tran_date, $qe['base_desc']); + $base = get_gl_trans_from_to($begin, $date, $gl_code); } - 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'); return 0; } + + // first calculate total rate in case more than one tax is used $totrate = 0; while ($row = db_fetch($result)) { @@ -669,7 +721,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($row['action'],0,1) != 'T') + if (substr($row['action'], 0, 1) != 'T') $totrate += get_tax_type_rate($row['dest_id']); } } @@ -677,6 +729,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') $taxbase = 0; foreach($qe_lines as $qe_line) { + $gl_code = $qe_line['dest_id']; switch (strtolower($qe_line['action'])) { case "=": // post current base amount to GL account $part = $base; @@ -714,58 +767,45 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') $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_rates($cart->tax_group_id); + $res = get_tax_group_rates($taxgroup); 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; + 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']); + return -1; // more than one taxtype used with this GL account } + + $part = $tax; if (strpos($qe_line['action'], '+')) $base += $tax; elseif (strpos($qe_line['action'], '-')) $base -= $tax; - 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']); + } + $gl_entries[] = array( + 'code' => $gl_code, + 'name' => get_gl_account_name($gl_code), + 'dim1' => $qe_line['dimension_id'], + 'dim2' => $qe_line['dimension2_id'], + 'amount' => $part, + 'descr' => $qe_line['memo'] + ); } - } - } - return $bank_amount; + return $gl_entries; } + //-------------------------------------------------------------------------------------- // // Simple English version of number to words conversion. @@ -798,7 +838,7 @@ function _number_to_words($number) "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen"); - $tens = array("", "", "Twenty", "Thirty", "Fourty", "Fifty", "Sixty", + $tens = array("", "", "Twenty", "Thirty", "Forty", "Fifty", "Sixty", "Seventy", "Eighty", "Ninety"); if ($Dn || $n) @@ -854,6 +894,73 @@ function get_js_open_window($width, $height) . " var top = (screen.height - $height) / 2;\n" . " return window.open(url, title, 'width=$width,height=$height,left='+left+',top='+top+',screenX='+left+',screenY='+top+',status=no,scrollbars=yes');\n" . "}\n"; + $js .= get_js_lookup_window(); + return $js; +} + +function get_js_lookup_window() { + $js = "function lookupWindow(url, title) { + var u = url.split('#'); + if (u.length == 2) { + var element = document.getElementById(u[1]); + var options = element.options; + url = u[0] + '&' + u[1] + '=' + options[element.selectedIndex].value; + } + openWindow(url, title); + }"; + return $js; +} + +function get_js_select_combo_item() { + $js = "function selectComboItem(doc, client_id, value){ + var element = doc.getElementById(client_id); + if (typeof(element) != 'undefined' && element != null && element.tagName === 'SELECT' ){ + var options = element.options; + for (var i = 0, optionsLength = options.length; i < optionsLength; i++) { + if (options[i].value == value) { + element.selectedIndex = i; + element.onchange(); + } + } + } else { + var stock_element = doc.getElementsByName('stock_id'); + if( stock_element.length > 0) { + stock_element[0].value = value; + var stock_id = doc.getElementById('_stock_id_edit'); + stock_id.value=value; + stock_id.onblur(); + } + } + window.close(); + }"; + return $js; +} +/* for space search option */ +function get_js_set_combo_item() { + $js = "function setComboItem(doc, client_id, value, text){ + var element = doc.getElementById(client_id); + var search = doc.getElementById('_'+client_id+'_edit'); + if(typeof(element) != 'undefined' && element != null && element.tagName === 'SELECT') { + var options = element.options; + options.length = 0; + var option = doc.createElement('option'); + option.value = value; + option.text = text; + element.add(option, 0); + element.selectedIndex = 0; + search.value = ''; + element.onchange(); + } else { + var stock_element = doc.getElementsByName('stock_id'); + if( stock_element.length > 0) { + stock_element[0].value = value; + var stock_id = doc.getElementById('_stock_id_edit'); + stock_id.value=value; + stock_id.onblur(); + } + } + window.close(); + }"; return $js; } @@ -1356,6 +1463,14 @@ function changeCCYear(change) { function changeCCMonth(change) { cC.changeMonth(change); } +window.addEventListener('click', function(e) { + if (document.getElementById('CC').contains(e.target)){} else { + if (cC.visible()) { + cC.hide(); + } + } +}); + document.write(\"\"); document.write(\"
\");"; @@ -1390,7 +1505,7 @@ if (!function_exists('_vd')) function _vl($mixed, $title = '', $exit = false) { - error_log((!empty($title) ? ($title .':') : '') . var_export($mixed, true)); + error_log((!empty($title) ? ($title .':') : '') . print_r($mixed, true)); if ($exit) exit; } @@ -1413,6 +1528,7 @@ if (!isset($payment_services)) { $payment_services = array( 'PayPal' => "https://www.paypal.com/xclick?business=&item_name=&amount=¤cy_code=", + 'XUMM XRP' => "https://xumm.app/detect/request:{{account}}?amount=" ); } /* @@ -1431,6 +1547,41 @@ function payment_link($name, $options) foreach ($options as $id => $option) $patterns['<'.$id.'>'] = urlencode($options[$id]); + if (substr($name, 0, 4) == 'XUMM') + { + // Get the account number for 'XRPL Account' from 'bank_accounts' table + $sql = "SELECT bank_account_number FROM ".TB_PREF."bank_accounts WHERE bank_name = '$name'"; + $result = db_query($sql, "could not retrieve $name bank account number"); + $row = db_fetch($result); + if ($row == false) { + display_error(sprintf(_("Could not retrieve %s bank account number"), $name)); + return false; + } + $account = $row['bank_account_number']; + + // Replace the {{account}} placeholder in the XUMM URL with the extracted account value + $link = str_replace('{{account}}', urlencode($account), $link); + + // Extract XRP exchange rate + $curr_code = substr($name, -3); + $date = date('Y-m-d'); // Get the current date in 'YYYY-MM-DD' format + $sql = "SELECT rate_buy FROM ".TB_PREF."exchange_rates WHERE curr_code = '$curr_code' AND date_ = '$date'"; + $result = db_query($sql, "could not retrieve exchange rate for $curr_code - $date"); + $row = db_fetch($result); + if ($row == false) { + display_error(sprintf(_("Could not retrieve exchange rate for %s - %s"), $curr_code, $date)); + return false; + } + $exchange_rate = $row['rate_buy']; + if ($exchange_rate == 0) $exchange_rate = 1; + + // Divide the amount by the exchange rate + $options['amount'] /= $exchange_rate; + + // Replace the placeholder in the XUMM URL with the modified amount value + $link = str_replace('', urlencode($options['amount']), $link); + } + return strtr($link, $patterns); } @@ -1463,7 +1614,25 @@ function trans_editor_link($type, $trans_no) // 35=> Cost Update, ); - return !isset($editor_url[$type]) ? '' : + return !isset($editor_url[$type]) ? '--' : (is_closed_trans($type, $trans_no) ? set_icon(ICON_CLOSED, _('Closed')) : pager_link(_("Edit"), sprintf($editor_url[$type], $trans_no, $type), ICON_EDIT)); } + +function company_logo_on_view() +{ + // Display View Header + global $SysPrefs; + + $logo = company_path() . "/images/" . $SysPrefs->prefs['coy_logo']; + $nl = 1; + if (!empty($SysPrefs->prefs['company_logo_report']) && $SysPrefs->prefs['coy_logo'] != '' && file_exists($logo)) + { + $size = getimagesize($logo); + $height = $size[0] > 150 ? $size[1] * 150 / $size[0] : 30; + $text = ""; + } + else + $text = $SysPrefs->prefs['coy_name']; + display_note($text, 0, $nl, "style='font-size:16px;font-weight:600'"); +} \ No newline at end of file