Minor bug in deleting fiscal years. Apmuthu.

[fa-stable.git] / admin / db / fiscalyears_db.inc

diff --git a/admin/db/fiscalyears_db.inc b/admin/db/fiscalyears_db.inc
index 9051e47547faa3e49f84f1e0754b59dbb39605f7..893233c4120e825240bb44e30d1566a3f5e87df0 100644 (file)
--- 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 <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+require_once($path_to_root. "/includes/ui/items_cart.inc");
 
 // fiscal year routines
 function add_fiscalyear($from_date, $to_date, $closed)
@@ -160,7 +161,7 @@ function close_year($year)
        if ($balance != 0.0)
        {
                $cart = new items_cart(ST_JOURNAL);
-               $cart->reference = $Refs->get_next(ST_JOURNAL, null, $to);
+               $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);
@@ -300,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']}";
@@ -323,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']}'";
@@ -341,7 +342,7 @@ 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");
@@ -372,6 +373,7 @@ function delete_this_fiscalyear($selected_id)
                $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_);