X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=2b0905c08e4db3bcfe493cb9bb5b2899ac8ef63d;hb=e1face140a007355cdeea1725c02d10cb34c80dd;hp=b5c98534603071b2ee663969f9129f1deb7765d4;hpb=a578378e067a6af5bbdcdb5881632c29494a8aa1;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index b5c98534..2b0905c0 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1,6 +1,6 @@
\n";
+ $pars[0] = set_icon($icon, $pars[0]);
$preview_str = "$pars[0]";
}
else
@@ -65,7 +65,7 @@ function get_gl_view_str($type, $trans_no, $label="", $force=false)
}
$pars = access_string($label);
if (user_graphic_links() && $icon)
- $pars[0] = "
\n";
+ $pars[0] = set_icon($icon, $pars[0]);
$gl_view = "$pars[0]";
return $gl_view;
@@ -114,7 +114,7 @@ function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false)
{
$pars = access_string($lbl);
if (user_graphic_links() && $icon)
- $pars[0] = "
\n";
+ $pars[0] = set_icon($icon, $pars[0]);
$preview_str .= "$pars[0]";
}
else
@@ -150,7 +150,7 @@ function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false)
{
$pars = access_string($label);
if (user_graphic_links() && $icon)
- $pars[0] = "
\n";
+ $pars[0] = set_icon($icon, $pars[0]);
$preview_str = "$pars[0]";
}
else
@@ -181,7 +181,7 @@ function get_inventory_trans_view_str($type, $trans_no, $label="", $icon=false)
{
$pars = access_string($label);
if (user_graphic_links() && $icon)
- $pars[0] = "
\n";
+ $pars[0] = set_icon($icon, $pars[0]);
$preview_str = "$pars[0]";
}
else
@@ -214,7 +214,7 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="", $icon=fal
{
$pars = access_string($label);
if (user_graphic_links() && $icon)
- $pars[0] = "
\n";
+ $pars[0] = set_icon($icon, $pars[0]);
$preview_str = "$pars[0]";
}
else
@@ -243,7 +243,7 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false)
{
$pars = access_string($label);
if (user_graphic_links() && $icon)
- $pars[0] = "
\n";
+ $pars[0] = set_icon($icon, $pars[0]);
$preview_str = "$pars[0]";
}
else
@@ -288,7 +288,7 @@ function get_trans_view_str($type, $trans_no, $label="", $icon=false)
// 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_)
+function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=false)
{
global $Ajax;
@@ -309,15 +309,16 @@ function exchange_rate_display($from_currency, $to_currency, $date_)
}
}
if (!$rate)
- $rate = get_exchange_rate_from_to($to_currency, $from_currency, $date_);
-
- if ($from_currency == $comp_currency)
- $rate = 1 / $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());
- label_row(_("Exchange Rate:"),"1 " . $from_currency
- . " = " . $rate . " " . $to_currency );
- $Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
+ 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);
}
}
@@ -546,6 +547,84 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
}
}
+//--------------------------------------------------------------------------------------
+function display_quick_entries(&$cart, $id, $totamount, $payment=true, $supp_trans=false)
+{
+ if (!isset($id) || $id == null || $id == "")
+ {
+ display_error( _("No Quick Entries are defined."));
+ set_focus('totamount');
+ }
+ else
+ {
+ $rate = 0;
+ if (!$payment)
+ $totamount = -$totamount;
+ if (!$supp_trans)
+ $cart->clear_items();
+ $qe = get_quick_entry($id);
+ $qe_lines = get_quick_entry_lines($id);
+ while ($qe_line = db_fetch($qe_lines))
+ {
+ if ($qe_line['tax_acc'])
+ {
+ $account = get_gl_account($qe_line['account']);
+ $tax_group = $account['tax_code'];
+ $items = get_tax_group_items($tax_group);
+ while ($item = db_fetch($items))
+ $rate += $item['rate'];
+ if ($rate != 0)
+ $totamount = $totamount * 100 / ($rate + 100);
+ //$cart->clear_items();
+ if (!$supp_trans)
+ $cart->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'],
+ $totamount, $qe['description']);
+ else
+ {
+ $acc_name = get_gl_account_name($qe_line['account']);
+ $cart->add_gl_codes_to_trans($qe_line['account'], $acc_name, $qe_line['dimension_id'],
+ $qe_line['dimension2_id'], $totamount, $qe['description']);
+ }
+ $items = get_tax_group_items($tax_group);
+ while ($item = db_fetch($items))
+ {
+ if ($item['rate'] != 0)
+ {
+ $amount = $totamount * $item['rate'] / 100;
+ $code = (($amount < 0 || $payment || $supp_trans) ? $item['purchasing_gl_code'] :
+ $item['sales_gl_code']);
+ if (!$supp_trans)
+ $cart->add_gl_item($code, 0, 0, $amount, $qe['description']);
+ else
+ {
+ $acc_name = get_gl_account_name($code);
+ $cart->add_gl_codes_to_trans($code, $acc_name, 0, 0, $amount, $qe['description']);
+ }
+ }
+ }
+ }
+ else
+ {
+ if ($qe_line['pct'])
+ $amount = $totamount * $qe_line['amount'] / 100;
+ else
+ $amount = $qe_line['amount'];
+ if (!$supp_trans)
+ $cart->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'],
+ $amount, $qe['description']);
+ else
+ {
+ $acc_name = get_gl_account_name($qe_line['account']);
+ $cart->add_gl_codes_to_trans($qe_line['account'], $acc_name, $qe_line['dimension_id'],
+ $qe_line['dimension2_id'], $amount, $qe['description']);
+ }
+ }
+ }
+ //line_start_focus();
+ }
+}
+
+
function get_js_open_window($width, $height)
{
$js = "\n