Deleting a fiscal year problem. Fixed.

diff --git a/admin/db/fiscalyears_db.inc b/admin/db/fiscalyears_db.inc
index 6281268ba897d0be203511edd2b801f00836badf..de87036608c1c2b7a14ba060f2ccc12fb25bbb43 100644 (file)
--- a/admin/db/fiscalyears_db.inc
+++ b/admin/db/fiscalyears_db.inc
@@ -161,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, sql2date($to));
+               $cart->reference = $Refs->get_next(ST_JOURNAL, null, $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);
@@ -263,7 +263,9 @@ function delete_this_fiscalyear($selected_id)
                delete_attachments_and_comments(25, $row['id']);
        }
        $sql = "SELECT trans_no, type FROM ".TB_PREF."debtor_trans WHERE tran_date <= '$to' AND 
-               (ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) = alloc";
+               (ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) = 
+               (SELECT SUM(amt) FROM ".TB_PREF."cust_allocations WHERE date_alloc <= '$to' AND trans_no = trans_no_to AND
+               type = trans_type_to)";
        $result = db_query($sql, "Could not retrieve debtor trans");
        while ($row = db_fetch($result))
        {
@@ -288,7 +290,7 @@ function delete_this_fiscalyear($selected_id)
                delete_attachments_and_comments($row['type'], $row['trans_no']);
        }
        $sql = "SELECT trans_no, type FROM ".TB_PREF."supp_trans WHERE tran_date <= '$to' AND 
-               ABS(ov_amount + ov_gst + ov_discount) = alloc";
+               ABS(ov_amount + ov_gst + ov_discount) = (SELECT ABS(SUM(amt)) FROM ".TB_PREF."supp_allocations WHERE date_alloc <= '$to' AND trans_no = trans_no_to AND type = trans_type_to)";
        $result = db_query($sql, "Could not retrieve supp trans");
        while ($row = db_fetch($result))
        {