X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Ffiscalyears_db.inc;h=958338ef9ef0a97a81bb1fdfb96223077d0e14ab;hb=8c1a0401f6ad9191f18e5caf68126dce94002736;hp=ec00e0677db1ae283ca0d66362db1eb6dfefbab0;hpb=50606312fee0bb0dbe984e2c08af53b7dab229bd;p=fa-stable.git diff --git a/admin/db/fiscalyears_db.inc b/admin/db/fiscalyears_db.inc index ec00e067..958338ef 100644 --- a/admin/db/fiscalyears_db.inc +++ b/admin/db/fiscalyears_db.inc @@ -9,6 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ +require_once($path_to_root. "/includes/ui/items_cart.inc"); // fiscal year routines function add_fiscalyear($from_date, $to_date, $closed) @@ -48,8 +49,6 @@ function get_fiscalyear($id) function get_current_fiscalyear() { - global $path_to_root; - include_once($path_to_root . "/admin/db/company_db.inc"); $year = get_company_pref('f_year'); $sql = "SELECT * FROM ".TB_PREF."fiscal_year WHERE id=".db_escape($year); @@ -81,6 +80,18 @@ function is_date_in_fiscalyears($date, $closed=true) return db_fetch($result) !== false; } +function get_fiscalyear_begin_for_date($date) +{ + $date = date2sql($date); + $sql = "SELECT begin FROM ".TB_PREF."fiscal_year WHERE '$date' >= begin AND '$date' <= end"; + $result = db_query($sql, "could not get begin date of the fiscal year"); + $row = db_fetch_row($result); + if ($row != false) + return sql2date($row[0]); + else + return begin_fiscalyear(); +} + function check_begin_end_date($date1, $date2) { $sql = "SELECT MAX(end), MIN(begin) FROM ".TB_PREF."fiscal_year"; @@ -118,6 +129,8 @@ function check_years_before($date, $closed=false) //--------------------------------------------------------------------------------------------- function close_year($year) { + global $Refs; + $co = get_company_prefs(); if (get_gl_account($co['retained_earnings_act']) == false || get_gl_account($co['profit_loss_year_act']) == false) { @@ -147,15 +160,15 @@ function close_year($year) if ($balance != 0.0) { - $trans_type = ST_JOURNAL; - $trans_id = get_next_trans_no($trans_type); - - add_gl_trans($trans_type, $trans_id, $to, $co['retained_earnings_act'], - 0, 0, _("Closing Year"), -$balance); - add_gl_trans($trans_type, $trans_id, $to, $co['profit_loss_year_act'], - 0, 0, _("Closing Year"), $balance); - - } + $cart = new items_cart(ST_JOURNAL); + $cart->reference = $Refs->get_next(ST_JOURNAL, null, sql2date($to)); + $cart->tran_date = $cart->doc_date = $cart->event_date = $to; + + $cart->add_gl_item($co['retained_earnings_act'], 0, 0, -$balance, _("Closing Year"), '', 0); + $cart->add_gl_item($co['profit_loss_year_act'], 0, 0, $balance, _("Closing Year"), '', 0); + $cart->memo_ = _("Closing Year"); + write_journal_entries($cart); + } close_transactions($to); commit_transaction(); @@ -166,6 +179,10 @@ function open_year($year) { $myrow = get_fiscalyear($year); $from = sql2date($myrow['begin']); + + begin_transaction(); + close_transactions(add_days($from, -1)); + commit_transaction(); } //--------------------------------------------------------------------------------------------- @@ -174,11 +191,16 @@ function delete_attachments_and_comments($type_no, $trans_no) $sql = "SELECT * FROM ".TB_PREF."attachments WHERE type_no = $type_no AND trans_no = $trans_no"; $result = db_query($sql, "Could not retrieve attachments"); + $delflag = false; while ($row = db_fetch($result)) { + $delflag = true; $dir = company_path(). "/attachments"; if (file_exists($dir."/".$row['unique_name'])) unlink($dir."/".$row['unique_name']); + } + if ($delflag) + { $sql = "DELETE FROM ".TB_PREF."attachments WHERE type_no = $type_no AND trans_no = $trans_no"; db_query($sql, "Could not delete attachment"); } @@ -193,7 +215,7 @@ function delete_this_fiscalyear($selected_id) { global $db_connections; - db_backup($db_connections[$_SESSION["wa_current_user"]->company], 'Security backup before Fiscal Year Removal'); + db_backup($db_connections[user_company()], 'Security backup before Fiscal Year Removal'); begin_transaction(); $ref = _("Open Balance"); $myrow = get_fiscalyear($selected_id); @@ -279,19 +301,19 @@ function delete_this_fiscalyear($selected_id) delete_attachments_and_comments($row['type'], $row['trans_no']); } $sql = "SELECT id FROM ".TB_PREF."workorders WHERE released_date <= '$to' AND closed=1"; - $result = db_query($sql, "Could not retrieve supp trans"); + $result = db_query($sql, "Could not retrieve workorders"); while ($row = db_fetch($result)) { $sql = "SELECT issue_no FROM ".TB_PREF."wo_issues WHERE workorder_id = {$row['id']}"; $res = db_query($sql, "Could not retrieve wo issues"); - while ($row2 = db_fetch_row($res)) - { - $sql = "DELETE FROM ".TB_PREF."wo_issue_items WHERE issue_id = {$row2[0]}"; - db_query($sql, "Could not delete wo issue items"); - } - delete_attachments_and_comments(ST_MANUISSUE, $row['id']); - $sql = "DELETE FROM ".TB_PREF."wo_issues WHERE workorder_id = {$row['id']}"; - db_query($sql, "Could not delete wo issues"); + while ($row2 = db_fetch_row($res)) + { + $sql = "DELETE FROM ".TB_PREF."wo_issue_items WHERE issue_id = {$row2[0]}"; + db_query($sql, "Could not delete wo issue items"); + $sql = "DELETE FROM ".TB_PREF."wo_issues WHERE workorder_id = {$row2[0]}"; + db_query($sql, "Could not delete wo issues"); + delete_attachments_and_comments(ST_MANUISSUE, $row2[0]); + } $sql = "DELETE FROM ".TB_PREF."wo_manufacture WHERE workorder_id = {$row['id']}"; db_query($sql, "Could not delete wo manufacture"); $sql = "DELETE FROM ".TB_PREF."wo_requirements WHERE workorder_id = {$row['id']}"; @@ -302,7 +324,7 @@ function delete_this_fiscalyear($selected_id) } $sql = "SELECT loc_code, stock_id, SUM(qty) AS qty, SUM(qty*standard_cost) AS std_cost FROM ".TB_PREF."stock_moves WHERE tran_date <= '$to' GROUP by loc_code, stock_id"; - $result = db_query($sql, "Could not retrieve supp trans"); + $result = db_query($sql, "Could not retrieve stock moves"); while ($row = db_fetch($result)) { $sql = "DELETE FROM ".TB_PREF."stock_moves WHERE tran_date <= '$to' AND loc_code = '{$row['loc_code']}' AND stock_id = '{$row['stock_id']}'"; @@ -320,14 +342,15 @@ function delete_this_fiscalyear($selected_id) $sql = "DELETE FROM ".TB_PREF."exchange_rates WHERE date_ <= '$to'"; db_query($sql, "Could not delete exchange rates"); $sql = "DELETE FROM ".TB_PREF."budget_trans WHERE tran_date <= '$to'"; - db_query($sql, "Could not delete exchange rates"); - + db_query($sql, "Could not delete budget trans"); $sql = "SELECT account, SUM(amount) AS amount, person_type_id, person_id FROM " .TB_PREF."gl_trans WHERE tran_date <= '$to' GROUP by account, person_type_id, person_id"; $result = db_query($sql, "Could not retrieve gl trans"); $trans_no = get_next_trans_no(ST_JOURNAL); $last_account=''; + $new = false; + $total = 0.0; while ($row = db_fetch($result)) { if ($last_account != $row['account']) // deletes all subledgers postings, so do it once for account @@ -342,9 +365,22 @@ function delete_this_fiscalyear($selected_id) (".ST_JOURNAL.", $trans_no, '$to', '{$row['account']}', '$ref', {$row['amount']}, " .db_escape($row['person_type_id'], true).", ".db_escape($row['person_id'], true).")"; db_query($sql, "Could not insert gl trans"); + if ($row['amount'] > 0.0) + $total += $row['amount']; + $new = true; } } - + if ($new) + { + global $Refs; + $trans_type = ST_JOURNAL; + $date_ = sql2date($to); + $reference = $Refs->get_next($trans_type, null, $date_); + $Refs->save($trans_type, $trans_no, $reference); + add_journal($trans_type, $trans_no, $total, $date_, get_company_currency(), $reference); + $Refs->save($trans_type, $trans_no, $reference); + add_audit_trail($trans_type, $trans_no, $date_); + } $sql = "SELECT bank_act, SUM(amount) AS amount FROM ".TB_PREF."bank_trans WHERE trans_date <= '$to' GROUP BY bank_act"; $result = db_query($sql, "Could not retrieve bank trans"); while ($row = db_fetch($result)) @@ -391,4 +427,3 @@ function delete_this_fiscalyear($selected_id) } -?> \ No newline at end of file