X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=df4a2bddbb98fe668cf63f1fe6fa19fc3995dbcf;hb=93a920d7c98e55be77d2ea84e6c457f681b7a4e4;hp=1e43fdf9738e9b1b4b6ee937a851a5df0c64d618;hpb=10dced7e75209f8158e4e1fa250bfbf91cfaa182;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 1e43fdf9..df4a2bdd 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -317,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);
}
}
@@ -401,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("");
@@ -411,12 +411,6 @@ function display_debit_or_credit_cells($value)
label_cell("");
amount_cell(abs($value));
}
- else
- {
- //label_cell("");
- amount_cell(0);
- label_cell("");
- }
}
//--------------------------------------------------------------------------------------
@@ -614,6 +608,11 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
$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'],