X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_journal_ui.inc;h=db92a7bb04660e09836078a881a047fdc88b7e33;hb=36ec54507b7841b2352734b81e45b95e371ecdab;hp=bae82d3b511805b73fc5f6f16cc03f51ed443ffb;hpb=fbb7a3d6150e02e442bd763a717915649fb43437;p=fa-stable.git

diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc
index bae82d3b..db92a7bb 100644
--- a/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/ui/items_cart.inc");
@@ -16,33 +16,45 @@ include_once($path_to_root . "/includes/ui/items_cart.inc");
 
 function display_order_header(&$Order)
 {
-	global $table_style2;
-
-	$qes = has_quick_entries(-1, 0);
+	global $table_style2, $Ajax;
 
+	$qes = has_quick_entries(QE_JOURNAL);
+	$new = $Order->order_id==0;
 	start_outer_table("$table_style2 width=90%");
 	table_section(1);
 
 	start_row();
-    date_cells(_("Date:"), 'date_');
-	ref_cells(_("Reference:"), 'ref', '', references::get_next(0));
+    date_cells(_("Date:"), 'date_', '', $new);
+
+	table_section(2, $qes ? "20%" : "50%");
+	if ($new)
+		ref_cells(_("Reference:"), 'ref', '');
+	else
+		label_cells(_("Reference:"), $Order->reference);
 	end_row();
 
-	if ($qes)
-		table_section(2, "20%");
-	else	
-		table_section(2, "50%");
 
-	start_row();
-	check_cells(_("Reverse Transaction:"), 'Reverse', null);
-	end_row();
+ 	if ($new) {
+		table_section(3, "20%");
+ 		start_row();
+ 		check_cells(_("Reverse Transaction:"), 'Reverse', null);
+ 		end_row();
+ 	}
+
 	if ($qes !== false)
 	{
 		table_section(3, "50%");
 		start_row();
-		quick_entries_list_cells(_("Quick Entry:"), 'person_id', null, -1, 0);
-		amount_cells(_("Total Amount"), 'totamount', null, null, "&nbsp;&nbsp;".submit('go', _("Go"), false, false, true));			
+		quick_entries_list_cells(_("Quick Entry").":", 'person_id', null, QE_JOURNAL, true);
+		$qid = get_quick_entry(get_post('person_id'));
+		if (list_updated('person_id')) {
+			unset($_POST['totamount']); // enable default
+		$Ajax->activate('totamount');
+		}
+		amount_cells($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
+		 null, "&nbsp;&nbsp;".submit('go', _("Go"), false, false, true));
 		end_row();
+
 	}
 		
 	end_outer_table(1);
@@ -77,9 +89,9 @@ function display_gl_items($title, &$order)
 	$k = 0;
 
 	$id = find_submit('Edit');
-	foreach ($order->gl_items as $item) 
+	foreach ($order->gl_items as $line => $item) 
 	{
-		if ($id != $item->index)
+		if ($id != $line)
 		{
     		alt_table_row_color($k);
 
@@ -100,15 +112,15 @@ function display_gl_items($title, &$order)
     		}	
 			label_cell($item->reference);
 
-			edit_button_cell("Edit$item->index", _("Edit"),
+			edit_button_cell("Edit$line", _("Edit"),
 				_('Edit journal line'));
-			delete_button_cell("Delete$item->index", _("Delete"),
+			delete_button_cell("Delete$line", _("Delete"),
 				_('Remove line from journal'));
     		end_row();
 		} 
 		else 
 		{
-			gl_edit_item_controls($order, $dim, $item->index);
+			gl_edit_item_controls($order, $dim, $line);
 		}
 	}
 
@@ -122,6 +134,7 @@ function display_gl_items($title, &$order)
 		label_cell(_("Total"), "align=right colspan=" . $colspan);
 		amount_cell($order->gl_items_total_debit());
 		amount_cell(abs($order->gl_items_total_credit()));
+		label_cell('', "colspan=3");
 		end_row();
 	}
 
@@ -156,7 +169,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 		$_POST['description'] = $item->description;
 		$_POST['LineMemo'] = $item->reference;
 
-		hidden('Index', $item->index);
+		hidden('Index', $id);
 		hidden('code_id', $item->code_id);
 		label_cell($_POST['code_id']);
 		label_cell($item->description);
@@ -179,7 +192,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 			    $Ajax->activate('code_id');
 		}
 		
-		$skip_bank = ($_SESSION["wa_current_user"]->access != 2);
+		$skip_bank = !$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL');
 		gl_all_accounts_list('code_id', null, $skip_bank, true);
 		if ($dim >= 1)
 			dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);