Journal Entry: cleanup in reconcillation status update during edition.

[fa-stable.git] / gl / includes / ui / gl_journal_ui.inc

diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc
index 67cbb15573112811d2fcff02df48a53c6eeff200..ae8860da624e0ffc7e9661a9694306b42a7765a6 100644 (file)
--- a/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@ -79,6 +79,11 @@ function display_order_header(&$Order)
        }
 
        check_row(_('Include in tax register:'), 'taxable_trans', null, true);
+        // Query the user to retain the reconciled status
+    if (!$new && $Order->reconcile_date) {
+       check_row(_('Reconciled:'), 'reconciled', 1, true);
+       hidden('reconcile_date', $Order->reconcile_date);
+    }
        end_outer_table(1);
 }
 
@@ -101,7 +106,7 @@ function display_gl_items($title, &$order)
        if ($dim == 2)
                $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
                        _("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"), "");
-       else if ($dim == 1)
+       elseif ($dim == 1)
                $th = array(_("Account Code"), _("Account Description"), _("Dimension"),
                        _("Debit"), _("Credit"), _("Memo"), "");
        else
@@ -246,6 +251,7 @@ function gl_edit_item_controls(&$order, $dim, $sub_accounts, $Index=null)
                        dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
                if ($dim > 1)
                        dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2);
+               $_POST['LineMemo'] = "";                        
        }
 
        if (get_post('_code_id_update'))