X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=513052dd2f93cf495446bf0630ee5f28bb6af33d;hb=394479072885eec15203a1213511cd016d416f6b;hp=b65339ef8fc09cabceae106b4fa119550ddedbd3;hpb=9738f7d64641df18b688f0d03a3b62c93f40e0c7;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index b65339ef..513052dd 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -281,6 +281,12 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit
$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
@@ -560,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();
@@ -832,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)
@@ -908,13 +914,23 @@ function get_js_lookup_window() {
function get_js_select_combo_item() {
$js = "function selectComboItem(doc, client_id, value){
var element = doc.getElementById(client_id);
- var options = element.options;
- for (var i = 0, optionsLength = options.length; i < optionsLength; i++) {
- if (options[i].value == value) {
- element.selectedIndex = i;
- element.onchange();
+ 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;
@@ -923,14 +939,26 @@ function get_js_select_combo_item() {
function get_js_set_combo_item() {
$js = "function setComboItem(doc, client_id, value, text){
var element = doc.getElementById(client_id);
- 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;
- element.onchange();
+ 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;
@@ -1435,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(\"\");";
@@ -1469,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;
}
@@ -1542,48 +1578,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));
}
-// This script updates the browser history when
-// any of the passed variables change.
-// This way, if the user changes these variables,
-// then uses the back button to return, it returns to the page
-// as the user modified it.
-function get_js_history(...$vars)
+function company_logo_on_view()
{
- $js = '
- function changeVar() {
- var stateObj = { foo: "bar" };
- var state = "";
-';
-
- $first = true;
- foreach ( $vars as $var ) {
- $js .= '
- var element = document.getElementsByName("' . $var. '");
- if (element[0])';
- if ($first) {
- $first = false;
- $js .= '
- state += "' . basename($_SERVER['SCRIPT_NAME']) . "?";
- } else
- $js .= '
- state += "&';
- $js .= $var .'="' . ' + element[0].value;';
- }
-
- $js .= '
- history.replaceState(stateObj, "page 2", state);
- }';
- return $js;
-}
+ // Display View Header
+ global $SysPrefs;
-function set_posts(...$vars)
-{
- foreach ( $vars as $var )
- if (isset($_GET[$var]))
- $_POST[$var] = $_GET[$var];
-}
+ $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