X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=111f2d7e6911beea3406188a63d34b388bf739ec;hb=508b54ee5cef13ac64f1532dfedfb7b242aa9077;hp=2765c6c4a106ad4904439645dbe296ecaf97050d;hpb=dd670202b6d8cf0661a9261906dd8309c6fcf3d9;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 2765c6c4..111f2d7e 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -14,46 +14,34 @@ include_once($path_to_root . "/includes/types.inc");
//--------------------------------------------------------------------------------------
-function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false,
+ $class='', $id='')
{
- global $path_to_root;
-
- $viewer = "";
- if ($type == systypes::po())
- $viewer = "view_po.php";
- elseif ($type == 20)
- $viewer = "view_supp_invoice.php";
- elseif ($type == 21)
- $viewer = "view_supp_credit.php";
- elseif ($type == 22)
- $viewer = "view_supp_payment.php";
- elseif ($type == 25)
- $viewer = "view_grn.php";
+ $viewer = "purchasing/view/";
+ if ($type == ST_PURCHORDER)
+ $viewer .= "view_po.php";
+ elseif ($type == ST_SUPPINVOICE)
+ $viewer .= "view_supp_invoice.php";
+ elseif ($type == ST_SUPPCREDIT)
+ $viewer .= "view_supp_credit.php";
+ elseif ($type == ST_SUPPAYMENT)
+ $viewer .= "view_supp_payment.php";
+ elseif ($type == ST_SUPPRECEIVE)
+ $viewer .= "view_grn.php";
else
return null;
+ $viewer .= "?trans_no=$trans_no";
if ($label == "")
$label = $trans_no;
- if ($viewer != "")
- {
- $pars = access_string($label);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str = "$pars[0]";
- }
- else
- $preview_str = $label;
-
- return $preview_str;
+ return viewer_link($label, $viewer, $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
-function get_gl_view_str($type, $trans_no, $label="", $force=false)
+function get_gl_view_str($type, $trans_no, $label="", $force=false, $class='', $id='')
{
- global $path_to_root;
-
if (!$force && !user_show_gl_info())
return "";
@@ -63,12 +51,10 @@ function get_gl_view_str($type, $trans_no, $label="", $force=false)
$label = _("GL");
$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;
+ return viewer_link($label,
+ "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no",
+ $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
@@ -82,21 +68,21 @@ function get_gl_view_str_cell($type, $trans_no, $label="")
//--------------------------------------------------------------------------------------
-function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false,
+ $class='', $id='')
{
- global $path_to_root;
-
- $viewer = "";
- if ($type == 10)
- $viewer = "view_invoice.php";
- elseif ($type == 11)
- $viewer = "view_credit.php";
- elseif ($type == 12)
- $viewer = "view_receipt.php";
- elseif ($type == 13)
- $viewer = "view_dispatch.php";
- elseif ($type == 30)
- $viewer = "view_sales_order.php";
+ $viewer = "sales/view/";
+
+ if ($type == ST_SALESINVOICE)
+ $viewer .= "view_invoice.php";
+ elseif ($type == ST_CUSTCREDIT)
+ $viewer .= "view_credit.php";
+ elseif ($type == ST_CUSTPAYMENT)
+ $viewer .= "view_receipt.php";
+ elseif ($type == ST_CUSTDELIVERY)
+ $viewer .= "view_dispatch.php";
+ elseif ($type == ST_SALESORDER || $type == ST_SALESQUOTE)
+ $viewer .= "view_sales_order.php";
else
return null;
@@ -110,173 +96,141 @@ function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false)
$lbl = $trans;
if($preview_str!='') $preview_str .= ',';
- if ($viewer != "")
- {
- $pars = access_string($lbl);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str .= "$pars[0]";
- }
- else
- $preview_str .= $lbl;
- }
+ $preview_str .= viewer_link($lbl, $viewer."?trans_no=$trans&trans_type=$type",
+ $class, $id, $icon);
- return $preview_str;
+ }
+ return $preview_str;
}
//--------------------------------------------------------------------------------------
-function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_banking_trans_view_str($type, $trans_no, $label="",
+ $icon=false, $class='', $id='')
{
- global $path_to_root;
-
- $viewer = "";
+ if ($label == "")
+ $label = $trans_no;
- if ($type == 4)
+ if ($type == ST_BANKTRANSFER)
$viewer = "bank_transfer_view.php";
- elseif ($type == 1)
+ elseif ($type == ST_BANKPAYMENT)
$viewer = "gl_payment_view.php";
- elseif ($type == 2)
+ elseif ($type == ST_BANKDEPOSIT)
$viewer = "gl_deposit_view.php";
- elseif ($type == 0)
- $viewer = "";
else
return null;
- if ($label == "")
- $label = $trans_no;
-
- if ($viewer != "")
- {
- $pars = access_string($label);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str = "$pars[0]";
- }
- else
- $preview_str = $label;
-
- return $preview_str;
+ return viewer_link($label, "gl/view/$viewer?trans_no=$trans_no",
+ $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
-function get_inventory_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_inventory_trans_view_str($type, $trans_no, $label="",
+ $icon=false, $class='', $id='')
{
- global $path_to_root;
+ $viewer = "inventory/view/";
- $viewer = "";
-
- if ($type == systypes::inventory_adjustment())
- $viewer = "view_adjustment.php";
- elseif ($type == systypes::location_transfer())
- $viewer = "view_transfer.php";
+ if ($type == ST_INVADJUST)
+ $viewer .= "view_adjustment.php";
+ elseif ($type == ST_LOCTRANSFER)
+ $viewer .= "view_transfer.php";
else
return null;
+ $viewer .= "?trans_no=$trans_no";
if ($label == "")
$label = $trans_no;
- if ($viewer != "")
- {
- $pars = access_string($label);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str = "$pars[0]";
- }
- else
- $preview_str = $label;
-
- return $preview_str;
+ return viewer_link($label, $viewer, $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
-function get_manufacturing_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_manufacturing_trans_view_str($type, $trans_no, $label="",
+ $icon=false, $class='', $id='')
{
- global $path_to_root;
-
- $viewer = "";
-
- if ($type == 28)
- $viewer = "wo_issue_view.php";
- elseif ($type == 29)
- $viewer = "wo_production_view.php";
- elseif ($type == systypes::work_order())
- $viewer = "work_order_view.php";
+ $viewer = "manufacturing/view/";
+
+ if ($type == ST_MANUISSUE)
+ $viewer .= "wo_issue_view.php";
+ elseif ($type == ST_MANURECEIVE)
+ $viewer .= "wo_production_view.php";
+ elseif ($type == ST_WORKORDER)
+ $viewer .= "work_order_view.php";
else
return null;
+ $viewer .= "?trans_no=$trans_no";
+
if ($label == "")
$label = $trans_no;
- if ($viewer != "")
- {
- $pars = access_string($label);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str = "$pars[0]";
- }
- else
- $preview_str = $label;
-
- return $preview_str;
+ return viewer_link($label, $viewer, $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
-function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false,
+ $class='', $id='')
{
- global $path_to_root;
-
- $viewer = "";
-
- if ($type == 40)
- $viewer = "view_dimension.php";
+ if ($type == ST_DIMENSION)
+ $viewer = "dimensions/view/view_dimension.php?trans_no=$trans_no";
else
return null;
if ($label == "")
$label = $trans_no;
- if ($viewer != "")
- {
- $pars = access_string($label);
- if (user_graphic_links() && $icon)
- $pars[0] = set_icon($icon, $pars[0]);
- $preview_str = "$pars[0]";
- }
+ return viewer_link($label, $viewer, $class, $id, $icon);
+}
+/*
+ Journal entry or cost update postings link
+*/
+function get_journal_trans_view_str($type, $trans_no, $label="", $icon=false,
+ $class='', $id='')
+{
+ if ($type == ST_JOURNAL || $type == ST_COSTUPDATE)
+ $viewer = "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no";
else
- $preview_str = $label;
+ return null;
- return $preview_str;
+ if ($label == "")
+ $label = $trans_no;
+
+ return viewer_link($label, $viewer, $class, $id, $icon);
}
//--------------------------------------------------------------------------------------
-function get_trans_view_str($type, $trans_no, $label="", $icon=false)
+function get_trans_view_str($type, $trans_no, $label="", $icon=false,
+ $class='', $id='')
{
- $view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
- $view_str = get_supplier_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_supplier_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
- $view_str = get_banking_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_banking_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
- $view_str = get_inventory_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_inventory_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
- $view_str = get_manufacturing_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_manufacturing_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
- $view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon);
+ $view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
+ if ($view_str != null)
+ return $view_str;
+
+ $view_str = get_journal_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
if ($view_str != null)
return $view_str;
@@ -303,9 +257,12 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=
if ($date_ == Today()) {
$rate = get_date_exchange_rate($currency, $date_);
if (!$rate) {
- $rate = get_ecb_rate($currency);
- if ($rate)
- add_exchange_rate($currency, $date_, $rate, $rate);
+ $row = get_currency($currency);
+ if ($row['auto_update']) {
+ $rate = retrieve_exrate($currency, $date_);
+ if ($rate)
+ add_exchange_rate($currency, $date_, $rate, $rate);
+ }
}
}
if (!$rate)
@@ -401,6 +358,7 @@ function view_stock_status_cell($stock_id, $description=null)
function display_debit_or_credit_cells($value)
{
+ $value = round2($value, user_price_dec());
if ($value >= 0)
{
amount_cell($value);
@@ -474,7 +432,7 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
function display_footer_exit()
{
br(2);
- end_page();
+ end_page(false, false, true);
exit;
}
@@ -482,7 +440,7 @@ function display_footer_exit()
function display_allocations($alloc_result, $total)
{
- global $table_style;
+ global $table_style, $systypes_array;
if (!$alloc_result || db_num_rows($alloc_result) == 0)
return;
@@ -501,7 +459,7 @@ function display_allocations($alloc_result, $total)
alt_table_row_color($k);
- label_cell(systypes::name($alloc_row['type']));
+ label_cell($systypes_array[$alloc_row['type']]);
label_cell(get_trans_view_str($alloc_row['type'],$alloc_row['trans_no']));
label_cell(sql2date($alloc_row['tran_date']));
$alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec());
@@ -533,11 +491,11 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
{
switch ($person_type)
{
- case payment_person_types::customer() :
+ case PT_CUSTOMER :
$alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type);
display_allocations($alloc_result, $total);
return;
- case payment_person_types::supplier() :
+ case PT_SUPPLIER :
$alloc_result = get_allocatable_to_supp_transactions($person_id, $type_no, $type);
display_allocations($alloc_result, $total);
return;
@@ -567,8 +525,22 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
$qe = get_quick_entry($id);
if ($descr != '') $qe['description'] .= ': '.$descr;
$result = get_quick_entry_lines($id);
+ $totrate = 0;
+ while ($row = db_fetch($result))
+ {
+ $qe_lines[] = $row;
- while ($qe_line = db_fetch($result))
+ switch (strtolower($row['action'])) {
+ 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')
+ $totrate += get_tax_type_default_rate($row['dest_id']);
+ }
+ }
+ $first = true;
+ $taxbase = 0;
+ foreach($qe_lines as $qe_line)
{
switch (strtolower($qe_line['action'])) {
case "=": // post current base amount to GL account
@@ -597,65 +569,51 @@ 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
- //$taxes = get_taxes_for_item_tax($qe_line['dest_id']);
- $taxes = array();
+ if ($first)
+ {
+ $taxbase = $base/($totrate+100);
+ $first = false;
+ }
+
+ if (substr($qe_line['action'],0,1) != 'T')
+ $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_items($cart->tax_group_id);
while ($row = db_fetch($res))
- $taxes[] = array('rate'=>$row['rate'], 'sales_gl_code'=>$row['sales_gl_code'],
- 'purchasing_gl_code'=>$row['purchasing_gl_code']);
+ $rates += $row['rate'];
+ if ($rates == 0)
+ continue 2;
}
- else
- {
- $res = get_all_tax_types_simple();
- $i = 1;
- while ($tt = db_fetch($res))
- {
- if ($qe_line['dest_id'] & $i)
- {
- $row2 = get_tax_type($tt['id']);
- $taxes[] = array('rate'=>$row2['rate'], 'sales_gl_code'=>$row2['sales_gl_code'],
- 'purchasing_gl_code'=>$row2['purchasing_gl_code']);
- }
- $i <<= 1;
- }
- }
- $tax_total = 0;
- $totrate = 0;
- // find total tax
- if (substr($qe_line['action'],0,1) != 'T') {
- foreach ($taxes as $index => $item_tax) {
- $totrate += $item_tax['rate'];
- }
+ $tax = round2($part * $item_tax['rate'], user_price_dec());
+ 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;
}
- $taxbase = $base/($totrate+100);
- foreach ($taxes as $index => $item_tax) {
- $tax = round2($taxbase * $item_tax['rate'], 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 ($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;
+ $base += $tax;
elseif (strpos($qe_line['action'], '-'))
- $base -= $tax_total;
+ $base -= $tax;
continue 2;
}
if ($type != QE_SUPPINV)
@@ -673,6 +631,86 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
return $bank_amount;
}
+//--------------------------------------------------------------------------------------
+//
+// Simple English version of number to words conversion.
+//
+function _number_to_words($number)
+{
+ $Bn = floor($number / 1000000000); /* Billions (giga) */
+ $number -= $Bn * 1000000000;
+ $Gn = floor($number / 1000000); /* Millions (mega) */
+ $number -= $Gn * 1000000;
+ $kn = floor($number / 1000); /* Thousands (kilo) */
+ $number -= $kn * 1000;
+ $Hn = floor($number / 100); /* Hundreds (hecto) */
+ $number -= $Hn * 100;
+ $Dn = floor($number / 10); /* Tens (deca) */
+ $n = $number % 10; /* Ones */
+
+ $res = "";
+
+ if ($Bn)
+ $res .= _number_to_words($Bn) . " Billion";
+ if ($Gn)
+ $res .= (empty($res) ? "" : " ") . _number_to_words($Gn) . " Million";
+ if ($kn)
+ $res .= (empty($res) ? "" : " ") . _number_to_words($kn) . " Thousand";
+ if ($Hn)
+ $res .= (empty($res) ? "" : " ") . _number_to_words($Hn) . " Hundred";
+
+ $ones = array("", "One", "Two", "Three", "Four", "Five", "Six",
+ "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen",
+ "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eightteen",
+ "Nineteen");
+ $tens = array("", "", "Twenty", "Thirty", "Fourty", "Fifty", "Sixty",
+ "Seventy", "Eigthy", "Ninety");
+
+ if ($Dn || $n)
+ {
+ if (!empty($res))
+ $res .= " and ";
+ if ($Dn < 2)
+ $res .= $ones[$Dn * 10 + $n];
+ else
+ {
+ $res .= $tens[$Dn];
+ if ($n)
+ $res .= "-" . $ones[$n];
+ }
+ }
+
+ if (empty($res))
+ $res = "zero";
+ return $res;
+}
+
+function price_in_words($amount, $document=0)
+{
+ global $Hooks;
+ // use local price_in_words() if the hook is defined
+ if (method_exists($Hooks, 'price_in_words'))
+ {
+ return $Hooks->price_in_words($amount, $document);
+ }
+ // Only usefor Remittance and Receipts as default
+ if (!($document == ST_SUPPAYMENT || $document == ST_CUSTPAYMENT || $document == ST_CHEQUE))
+ return "";
+ if ($amount < 0 || $amount > 999999999999)
+ return "";
+ $dec = user_price_dec();
+ if ($dec > 0)
+ {
+ $divisor = pow(10, $dec);
+ $frac = round2($amount - floor($amount), $dec) * $divisor;
+ $frac = sprintf("%0{$dec}d", $frac);
+ $and = _("and");
+ $frac = " $and $frac/$divisor";
+ }
+ else
+ $frac = "";
+ return _number_to_words(intval($amount)) . $frac;
+}
function get_js_open_window($width, $height)
{
@@ -696,11 +734,23 @@ function set_focus($name, $form_no=0) {
}
//
// Set default focus on first field $name if not set yet
-//
-function default_focus($name, $form_no=0) {
+// Returns unique name if $name=null
+//
+function default_focus($name=null, $form_no=0) {
+ static $next;
+ if ($name==null)
+ $name = uniqid('_el',true);
if (!isset($_POST['_focus'])) {
set_focus($name);
}
+ return $name;
+}
+/*
+ Reset focus to next control element (e.g. link).
+*/
+function reset_focus()
+{
+ unset($_POST['_focus']);
}
function get_js_png_fix()
@@ -739,7 +789,7 @@ function get_js_date_picker()
$how = user_date_format(); // 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
$sep = $dateseps[user_date_sep()]; // date separator
- $wstart = (($date_system == 1 || $date_system == 2) ? 6 : ($how == 0 ? 0 : 1)); // weekstart (sun = 0, mon = 1)
+ $wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 ? 0 : 1)); // weekstart (sun = 0, mon = 1)
$months = array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
$wdays = array(_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa"));
$wno = _("W"); // week no
@@ -957,6 +1007,8 @@ function CC() {
$js .= "
dateField.value = dateString;
setFocus(dateField.name);
+ if(dateField.getAttribute('aspect')=='cdate')
+ setElementProperty('color', (dateField.value==user.date ? 'black':'red'), dateField);
if (dateField.className=='searchbox')
dateField.onblur();
hide();
@@ -1034,7 +1086,7 @@ function CC() {
if (dayOfMonth == selectedDay && currentYear == selectedYear && currentMonth == selectedMonth) {
css_class = 'current';
";
- if ($date_system == 1 || $date_system == 2)
+ if ($date_system == 1 || $date_system == 2 || $date_system == 3)
$js .= "
} else if (dayOfWeek == 5) {
";