X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=df4a2bddbb98fe668cf63f1fe6fa19fc3995dbcf;hb=93a920d7c98e55be77d2ea84e6c457f681b7a4e4;hp=d30db81b95249d24db56c692929a248af4553862;hpb=4f85173dcfa0e39b8c1c022c563c90d2e9bc4cc4;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index d30db81b..df4a2bdd 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1,13 +1,22 @@
.
+***********************************************************************/
include_once($path_to_root . "/admin/db/voiding_db.inc");
include_once($path_to_root . "/includes/types.inc");
//--------------------------------------------------------------------------------------
-function get_supplier_trans_view_str($type, $trans_no, $label="")
+function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false)
{
- global $path_to_root, $use_popup_windows;
+ global $path_to_root;
$viewer = "";
if ($type == systypes::po())
@@ -28,10 +37,10 @@ function get_supplier_trans_view_str($type, $trans_no, $label="")
if ($viewer != "")
{
- if ($use_popup_windows)
- $preview_str = "$label";
- else
- $preview_str = "$label";
+ $pars = access_string($label);
+ if (user_graphic_links() && $icon)
+ $pars[0] = set_icon($icon, $pars[0]);
+ $preview_str = "$pars[0]";
}
else
$preview_str = $label;
@@ -43,17 +52,21 @@ function get_supplier_trans_view_str($type, $trans_no, $label="")
function get_gl_view_str($type, $trans_no, $label="", $force=false)
{
- global $path_to_root, $use_popup_windows;
+ global $path_to_root;
if (!$force && !user_show_gl_info())
return "";
+ $icon = false;
if ($label == "")
+ {
$label = _("GL");
- if ($use_popup_windows)
- $gl_view = "$label";
- else
- $gl_view = "$label";
+ $icon = ICON_GL;
+ }
+ $pars = access_string($label);
+ if (user_graphic_links() && $icon)
+ $pars[0] = set_icon($icon, $pars[0]);
+ $gl_view = "$pars[0]";
return $gl_view;
}
@@ -69,9 +82,9 @@ function get_gl_view_str_cell($type, $trans_no, $label="")
//--------------------------------------------------------------------------------------
-function get_customer_trans_view_str($type, $trans_no, $label="")
+function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false)
{
- global $path_to_root, $use_popup_windows;
+ global $path_to_root;
$viewer = "";
if ($type == 10)
@@ -91,18 +104,18 @@ function get_customer_trans_view_str($type, $trans_no, $label="")
$lbl = $label;
$preview_str = '';
+
foreach($trans_no as $trans) {
if ($label == "")
$lbl = $trans;
-
if($preview_str!='') $preview_str .= ',';
if ($viewer != "")
{
- if ($use_popup_windows)
- $preview_str .= "$lbl";
- else
- $preview_str .= "$lbl";
+ $pars = access_string($lbl);
+ if (user_graphic_links() && $icon)
+ $pars[0] = set_icon($icon, $pars[0]);
+ $preview_str .= "$pars[0]";
}
else
$preview_str .= $lbl;
@@ -113,9 +126,9 @@ function get_customer_trans_view_str($type, $trans_no, $label="")
//--------------------------------------------------------------------------------------
-function get_banking_trans_view_str($type, $trans_no, $label="")
+function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false)
{
- global $path_to_root, $use_popup_windows;
+ global $path_to_root;
$viewer = "";
@@ -135,10 +148,10 @@ function get_banking_trans_view_str($type, $trans_no, $label="")
if ($viewer != "")
{
- if ($use_popup_windows)
- $preview_str = "$label";
- else
- $preview_str = "$label";
+ $pars = access_string($label);
+ if (user_graphic_links() && $icon)
+ $pars[0] = set_icon($icon, $pars[0]);
+ $preview_str = "$pars[0]";
}
else
$preview_str = $label;
@@ -148,9 +161,9 @@ function get_banking_trans_view_str($type, $trans_no, $label="")
//--------------------------------------------------------------------------------------
-function get_inventory_trans_view_str($type, $trans_no, $label="")
+function get_inventory_trans_view_str($type, $trans_no, $label="", $icon=false)
{
- global $path_to_root, $use_popup_windows;
+ global $path_to_root;
$viewer = "";
@@ -166,10 +179,10 @@ function get_inventory_trans_view_str($type, $trans_no, $label="")
if ($viewer != "")
{
- if ($use_popup_windows)
- $preview_str = "$label";
- else
- $preview_str = "$label";
+ $pars = access_string($label);
+ if (user_graphic_links() && $icon)
+ $pars[0] = set_icon($icon, $pars[0]);
+ $preview_str = "$pars[0]";
}
else
$preview_str = $label;
@@ -179,9 +192,9 @@ function get_inventory_trans_view_str($type, $trans_no, $label="")
//--------------------------------------------------------------------------------------
-function get_manufacturing_trans_view_str($type, $trans_no, $label="")
+function get_manufacturing_trans_view_str($type, $trans_no, $label="", $icon=false)
{
- global $path_to_root, $use_popup_windows;
+ global $path_to_root;
$viewer = "";
@@ -199,10 +212,10 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="")
if ($viewer != "")
{
- if ($use_popup_windows)
- $preview_str = "$label";
- else
- $preview_str = "$label";
+ $pars = access_string($label);
+ if (user_graphic_links() && $icon)
+ $pars[0] = set_icon($icon, $pars[0]);
+ $preview_str = "$pars[0]";
}
else
$preview_str = $label;
@@ -212,9 +225,9 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="")
//--------------------------------------------------------------------------------------
-function get_dimensions_trans_view_str($type, $trans_no, $label="")
+function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false)
{
- global $path_to_root, $use_popup_windows;
+ global $path_to_root;
$viewer = "";
@@ -228,10 +241,10 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="")
if ($viewer != "")
{
- if ($use_popup_windows)
- $preview_str = "$label";
- else
- $preview_str = "$label";
+ $pars = access_string($label);
+ if (user_graphic_links() && $icon)
+ $pars[0] = set_icon($icon, $pars[0]);
+ $preview_str = "$pars[0]";
}
else
$preview_str = $label;
@@ -241,29 +254,29 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="")
//--------------------------------------------------------------------------------------
-function get_trans_view_str($type, $trans_no, $label="")
+function get_trans_view_str($type, $trans_no, $label="", $icon=false)
{
- $view_str = get_customer_trans_view_str($type, $trans_no, $label);
+ $view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon);
if ($view_str != null)
return $view_str;
- $view_str = get_supplier_trans_view_str($type, $trans_no, $label);
+ $view_str = get_supplier_trans_view_str($type, $trans_no, $label, $icon);
if ($view_str != null)
return $view_str;
- $view_str = get_banking_trans_view_str($type, $trans_no, $label);
+ $view_str = get_banking_trans_view_str($type, $trans_no, $label, $icon);
if ($view_str != null)
return $view_str;
- $view_str = get_inventory_trans_view_str($type, $trans_no, $label);
+ $view_str = get_inventory_trans_view_str($type, $trans_no, $label, $icon);
if ($view_str != null)
return $view_str;
- $view_str = get_manufacturing_trans_view_str($type, $trans_no, $label);
+ $view_str = get_manufacturing_trans_view_str($type, $trans_no, $label, $icon);
if ($view_str != null)
return $view_str;
- $view_str = get_dimensions_trans_view_str($type, $trans_no, $label);
+ $view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon);
if ($view_str != null)
return $view_str;
@@ -304,7 +317,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_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" );
+ label_row(_("Exchange Rate:"),"$rate $from_currency = 1 $to_currency" );
$Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
}
}
@@ -363,7 +376,7 @@ function get_comments_string($type, $type_no)
//--------------------------------------------------------------------------------------
-function view_stock_status($stock_id, $description=null)
+function view_stock_status($stock_id, $description=null, $echo=true)
{
global $path_to_root;
if ($description)
@@ -372,7 +385,9 @@ function view_stock_status($stock_id, $description=null)
else
//hyperlink_params_separate($path_to_root . "/inventory/inquiry/stock_status.php", $stock_id, "stock_id=$stock_id");
$preview_str = "$stock_id";
- echo $preview_str;
+ if($echo)
+ echo $preview_str;
+ return $preview_str;
}
function view_stock_status_cell($stock_id, $description=null)
@@ -386,7 +401,7 @@ function view_stock_status_cell($stock_id, $description=null)
function display_debit_or_credit_cells($value)
{
- if ($value > 0)
+ if ($value >= 0)
{
amount_cell($value);
label_cell("");
@@ -396,12 +411,6 @@ function display_debit_or_credit_cells($value)
label_cell("");
amount_cell(abs($value));
}
- else
- {
- //label_cell("");
- amount_cell(0);
- label_cell("");
- }
}
//--------------------------------------------------------------------------------------
@@ -429,7 +438,7 @@ function display_supp_trans_tax_details($tax_items, $columns)
$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'] . "%) " .
- _("Amount:") . ": $tax", "colspan=$columns align=right", "align=right");
+ _("Amount") . ": $tax", "colspan=$columns align=right", "align=right");
else
label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)",
$tax, "colspan=$columns align=right", "align=right");
@@ -453,7 +462,7 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
{
label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)",
number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan);
- $total += $taxitem['Value'];
+ $total += round2($taxitem['Value'], user_price_dec());
}
}
@@ -535,18 +544,117 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
}
}
+//--------------------------------------------------------------------------------------
+//
+// Expands selected quick entry $id into GL posings and adds to cart.
+// returns calculated amount posted to bank GL account.
+//
+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."));
+ set_focus('totamount');
+ }
+ else
+ {
+ if ($type == QE_DEPOSIT)
+ $base = -$base;
+ if ($type != QE_SUPPINV) // only one quick entry on journal/bank transaction
+ $cart->clear_items();
+ $qe = get_quick_entry($id);
+ if ($descr != '') $qe['description'] .= ': '.$descr;
+ $qe_lines = get_quick_entry_lines($id);
+ while ($qe_line = db_fetch($qe_lines))
+ {
+ switch (strtolower($qe_line['action'])) {
+ case "=": // post current base amount to GL account
+ $part = $base;
+ break;
+ case "a": // post amount to GL account and reduce base
+ $part = $qe_line['amount'];
+ break;
+ case "a+": // post amount to GL account and increase base
+ $part = $qe_line['amount']; $base += $part;
+ break;
+ case "a-": // post amount to GL account and reduce base
+ $part = $qe_line['amount']; $base -= $part;
+ break;
+ case "%": // store acc*amount% to GL account
+ $part = round2($base * $qe_line['amount'] / 100, user_price_dec());
+ break;
+ case "%+": // ditto & increase base amount
+ $part = round2($base * $qe_line['amount'] / 100, user_price_dec());
+ $base += $part;
+ break;
+ case "%-": // ditto & reduce base amount
+ $part = round2($base * $qe_line['amount'] / 100, user_price_dec());
+ $base -= $part;
+ break;
+ case "t": // post taxes calculated on base amount
+ case "t+": // ditto & increase base amount
+ case "t-": // ditto & reduce base amount
+ $taxes = get_taxes_for_item_tax($qe_line['dest_id']);
+ $tax_total = 0;
+ foreach ($taxes as $index => $item_tax) {
+ if(substr($qe_line['action'],0,1) != 'T')
+ $tax = round2($base * $item_tax['rate']
+ / ($item_tax['rate'] + 100), user_price_dec());
+ else
+ $tax = round2($base * $item_tax['rate'] / 100, user_price_dec());
+
+ $gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0))
+ ? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
+ $tax_total += $tax;
+ if ($tax==0) continue;
+ if (!is_tax_gl_unique($gl_code)) {
+ display_error(_("Cannot post to GL account used by more than one tax type."));
+ break 3;
+ }
+ 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']);
+ }
+ }
+ if (strpos($qe_line['action'], '+'))
+ $base += $tax_total;
+ elseif (strpos($qe_line['action'], '-'))
+ $base -= $tax_total;
+ 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']);
+ }
+ }
+ }
+ return $bank_amount;
+}
+
+
function get_js_open_window($width, $height)
{
- $js = "\n\n";
+ . "}\n";
return $js;
}
@@ -570,8 +678,7 @@ function default_focus($name, $form_no=0) {
function get_js_png_fix()
{
- $js = "\n";
+ . "}\n";
return $js;
}
@@ -600,30 +706,6 @@ function get_js_date_picker()
global $comp_path, $go_debug;
$fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js';
- $js = "
-";
- add_js_source($js);
-
if (!file_exists($fpath) || $go_debug) {
global $dateseps, $date_system;
@@ -1083,12 +1165,52 @@ if (!function_exists('_vd'))
function _vd($mixed, $title = '', $exit = false)
{
// Only the site admin is able to proceed here.
- echo (!empty($title) ? ($title .':') : '') .'
';
- var_dump($mixed);
- echo "
\n";
+ $str = (!empty($title) ? ($title .':') : '') .'';
+ $str .= print_r($mixed, true); //var_dump($mixed);
+ $str .= "
\n";
+ display_error('');
if ($exit)
exit;
}
}
+function display_backtrace($cond=true, $msg='') {
+
+ if ($cond) {
+ if ($msg)
+ $str = "$msg\n";
+ else
+ $str = '';
+ $str .= '';
+ $trace = debug_backtrace();
+ foreach($trace as $trn => $tr) {
+ if (!$trn) continue;
+ $str .= '';
+ $str .= $tr['file'].':'.$tr['line'].': ';
+ $str .= ' | ';
+ if (isset($tr['type'])) {
+ if($tr['type'] == '::') {
+ $str .= $tr['class'].'::';
+ } else if($tr['type'] == '->') {
+ $str .= '('.$tr['class'].' Object)'.'->';
+ }
+ }
+ 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']).') | ';
+
+ $str .= '
';
+ }
+
+ $str .= '
';
+ display_error($str);
+ }
+}
+
?>
\ No newline at end of file