X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=includes%2Fui%2Fui_view.inc;h=5352cb91371cebd4ee9590ca625a2034614cb242;hb=a9d55e1c13cbd6a6305b9322ec8621a06516f9f3;hp=8fee0ae0bf3c9b88a1cf3ea1843c3553ba6ad3f8;hpb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 8fee0ae0..5352cb91 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -210,7 +210,7 @@ function get_package_view_str($pkg, $label="", $icon=false, $class='', $id='')
$label = _("Info");
// $icon = ICON_GL;
}
- return viewer_link($label, "includes/ui/view_package.php?id=$pkg", $class, $id, $icon);
+ return viewer_link($label, "admin/view/view_package.php?id=$pkg", $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);
}
//--------------------------------------------------------------------------------------
@@ -337,7 +337,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 +385,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 +541,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"));
@@ -625,7 +623,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 +633,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 +715,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 +723,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 +761,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.
|