X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_journal_ui.inc;h=ae8860da624e0ffc7e9661a9694306b42a7765a6;hb=64f24ae3a63762d18b1ab6408263ec6ca1e14fb2;hp=44762f7e753e4c1c902206f2c800a7a0cc36de3c;hpb=c23ac0e7ff87228e01c3f84ba72aac9084b7c88e;p=fa-stable.git

diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc
index 44762f7e..ae8860da 100644
--- a/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@ -80,15 +80,10 @@ 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) {
-            $result = get_bank_trans(ST_JOURNAL, $Order->order_id);
-            $row = db_fetch($result);
-            if ($row
-                && $row['reconciled']) {
-                check_row(_('Reconciled:'), 'reconciled', 1, true);
-                hidden('reconciled_date', $row['reconciled']);
-            }
-        }
+    if (!$new && $Order->reconcile_date) {
+    	check_row(_('Reconciled:'), 'reconciled', 1, true);
+    	hidden('reconcile_date', $Order->reconcile_date);
+    }
 	end_outer_table(1);
 }
 
@@ -256,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'))