X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=9a0d9cce20b952b078b3f131a3178cb63c66772b;hb=cc36638b65572da4867b7622723d6ed0135525b8;hp=d1262f1240a6122fe4dbb89f1fffec118f911f61;hpb=061f4eff6493a6cca071338156225401ae849d72;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index d1262f12..9a0d9cce 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -18,15 +18,15 @@ function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false, $class='', $id='') { $viewer = "purchasing/view/"; - if ($type == systypes::po()) + if ($type == ST_PURCHORDER) $viewer .= "view_po.php"; - elseif ($type == 20) + elseif ($type == ST_SUPPINVOICE) $viewer .= "view_supp_invoice.php"; - elseif ($type == 21) + elseif ($type == ST_SUPPCREDIT) $viewer .= "view_supp_credit.php"; - elseif ($type == 22) - $viewer = "view_supp_payment.php"; - elseif ($type == 25) + elseif ($type == ST_SUPPAYMENT) + $viewer .= "view_supp_payment.php"; + elseif ($type == ST_SUPPRECEIVE) $viewer .= "view_grn.php"; else return null; @@ -73,15 +73,15 @@ function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false, { $viewer = "sales/view/"; - if ($type == 10) + if ($type == ST_SALESINVOICE) $viewer .= "view_invoice.php"; - elseif ($type == 11) + elseif ($type == ST_CUSTCREDIT) $viewer .= "view_credit.php"; - elseif ($type == 12) + elseif ($type == ST_CUSTPAYMENT) $viewer .= "view_receipt.php"; - elseif ($type == 13) + elseif ($type == ST_CUSTDELIVERY) $viewer .= "view_dispatch.php"; - elseif ($type == 30) + elseif ($type == ST_SALESORDER || $type == ST_SALESQUOTE) $viewer .= "view_sales_order.php"; else return null; @@ -96,7 +96,7 @@ function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false, $lbl = $trans; if($preview_str!='') $preview_str .= ','; - $preview_str .= viewer_link($lbl, $viewer."?trans_no=$trans", + $preview_str .= viewer_link($lbl, $viewer."?trans_no=$trans&trans_type=$type", $class, $id, $icon); } @@ -111,14 +111,12 @@ function get_banking_trans_view_str($type, $trans_no, $label="", 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) - return $label; else return null; @@ -133,9 +131,9 @@ function get_inventory_trans_view_str($type, $trans_no, $label="", { $viewer = "inventory/view/"; - if ($type == systypes::inventory_adjustment()) + if ($type == ST_INVADJUST) $viewer .= "view_adjustment.php"; - elseif ($type == systypes::location_transfer()) + elseif ($type == ST_LOCTRANSFER) $viewer .= "view_transfer.php"; else return null; @@ -154,11 +152,11 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="", { $viewer = "manufacturing/view/"; - if ($type == 28) + if ($type == ST_MANUISSUE) $viewer .= "wo_issue_view.php"; - elseif ($type == 29) + elseif ($type == ST_MANURECEIVE) $viewer .= "wo_production_view.php"; - elseif ($type == systypes::work_order()) + elseif ($type == ST_WORKORDER) $viewer .= "work_order_view.php"; else return null; @@ -176,8 +174,24 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="", function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false, $class='', $id='') { - if ($type == 40) - $viewer = "dimensions/view_dimension.php?trans_no=$trans_no"; + if ($type == ST_DIMENSION) + $viewer = "dimensions/view/view_dimension.php?trans_no=$trans_no"; + else + return null; + + if ($label == "") + $label = $trans_no; + + 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 return null; @@ -216,6 +230,10 @@ function get_trans_view_str($type, $trans_no, $label="", $icon=false, 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; + return null; } @@ -239,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) @@ -253,7 +274,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); } } @@ -337,7 +358,8 @@ function view_stock_status_cell($stock_id, $description=null) function display_debit_or_credit_cells($value) { - if ($value > 0) + $value = round2($value, user_price_dec()); + if ($value >= 0) { amount_cell($value); label_cell(""); @@ -347,12 +369,6 @@ function display_debit_or_credit_cells($value) label_cell(""); amount_cell(abs($value)); } - else - { - //label_cell(""); - amount_cell(0); - label_cell(""); - } } //-------------------------------------------------------------------------------------- @@ -424,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; @@ -443,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()); @@ -475,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; @@ -508,7 +524,109 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') $cart->clear_items(); $qe = get_quick_entry($id); if ($descr != '') $qe['description'] .= ': '.$descr; - $qe_lines = get_quick_entry_lines($id); + $result = get_quick_entry_lines($id); + $totrate = 0; + while ($row = db_fetch($result)) + { + $qe_lines[] = $row; + + 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 + $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 + if ($first) + { + $taxbase = $base/($totrate+100); + $first = false; + } + + if (substr($qe_line['action'],0,1) != 'T') + $part = $taxbase; + else + $part = $base; + $item_tax = get_tax_type($qe_line['dest_id']); + if ($type == QE_SUPPINV && substr($qe_line['action'],0,1) != 'T') + { + $taxgroup = $cart->tax_group_id; + $rates = 0; + $res = get_tax_group_items($cart->tax_group_id); + 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; + $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']); + } + 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']); + } + } +/* while ($qe_line = db_fetch($qe_lines)) { switch (strtolower($qe_line['action'])) { @@ -538,18 +656,32 @@ 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 = get_taxes_for_item_tax($qe_line['dest_id']); + if ($type == QE_SUPPINV) + $qe_line['dest_id'] = $cart->tax_group_id; + $taxes = array(); + $res = get_tax_group_items($qe_line['dest_id']); + while ($row = db_fetch($res)) + $taxes[] = $row; $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']; + } + } + $taxbase = $base/($totrate+100); 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()); - + $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'], @@ -579,6 +711,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') $qe_line['dimension2_id'], $part, $qe['description']); } } +*/ } return $bank_amount; } @@ -586,16 +719,12 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='') function get_js_open_window($width, $height) { - $js = "\n\n"; + . "}\n"; return $js; } @@ -613,18 +742,25 @@ function set_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'); + $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() { - $js = "\n"; + . "}\n"; return $js; } @@ -877,6 +1012,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();