X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=gl%2Fincludes%2Fui%2Fgl_journal_ui.inc;h=d68f09140bbb951795a7687dc129fc8f905fe647;hb=90b3d069d96b99671af51726e2953352738abb75;hp=3b4698c04b5043882bcbe5f2d0599a3303d95e9e;hpb=b5c5d915d8ce6e85605dce6efc5d2b61ea02f3ee;p=fa-stable.git

diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc
index 3b4698c0..d68f0914 100644
--- a/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@ -16,12 +16,12 @@ include_once($path_to_root . "/includes/ui/items_cart.inc");
 
 function display_order_header(&$Order)
 {
-	global $table_style2, $Ajax;
+	global $Ajax;
 
 	$qes = has_quick_entries(QE_JOURNAL);
 	$new = $Order->order_id==0;
-	start_outer_table("$table_style2 width=90%");
-	table_section(1);
+	start_outer_table(TABLESTYLE2, "width=90%");
+	table_section(1, $qes ? "20%" : "");
 
 	start_row();
     date_cells(_("Date:"), 'date_', '', $new);
@@ -41,20 +41,29 @@ function display_order_header(&$Order)
 
 	if ($qes !== false)
 	{
-		table_section(3, "50%");
+		table_section(3, "40%");
 		start_row();
-		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')) {
+		quick_entries_list_cells(_("Quick Entry").":", 'quick', null, QE_JOURNAL, true);
+		$qid = get_quick_entry(get_post('quick'));
+		if (list_updated('quick')) {
 			unset($_POST['totamount']); // enable default
 		$Ajax->activate('totamount');
 		}
-		amount_cells($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
-		 null, "  ".submit('go', _("Go"), false, false, true));
+		if ($qid['bal_type'] == 1)
+		{
+			end_row();
+			start_row();
+			$accname = get_gl_account_name($qid['base_desc']);
+			label_cell(($qid['base_amount'] == 0 ? _("Yearly") : _("Monthly")) . " ". _("balance from account")." ".
+				$qid['base_desc']." ".$accname."  ".submit('go', _("Go"), false, false, true), "colspan=2");
+		}
+		else
+			amount_cells($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
+		 		null, "  ".submit('go', _("Go"), false, false, true));
 		end_row();
 
 	}
-		
+
 	end_outer_table(1);
 }
 
@@ -62,14 +71,17 @@ function display_order_header(&$Order)
 
 function display_gl_items($title, &$order)
 {
-	global $table_style, $path_to_root;
+	global $path_to_root;
 
 	display_heading($title);
 
 	$dim = get_company_pref('use_dimension');
 
+	$sub_type = is_subledger_account(get_post('code_id'));
+	$has_subaccounts = $order->has_sub_accounts();
+
     div_start('items_table');
-	start_table("$table_style colspan=7 width=95%");
+	start_table(TABLESTYLE, "colspan=7 width=95%");
 	if ($dim == 2)
 		$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
 			_("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"), "");
@@ -81,19 +93,28 @@ function display_gl_items($title, &$order)
 			_("Debit"), _("Credit"), _("Memo"), "");
 
 	if (count($order->gl_items)) $th[] = '';
+	if ($sub_type || $has_subaccounts)
+		array_insert($th, 2, _("Counterparty"));
 
-	table_header($th);	
+	table_header($th);
 
 	$k = 0;
 
 	$id = find_submit('Edit');
+	if ($id == -1) 
+		$id = get_post('Index', -1);
+
 	foreach ($order->gl_items as $line => $item) 
 	{
 		if ($id != $line)
 		{
     		alt_table_row_color($k);
 
-			label_cells($item->code_id, $item->description);
+			$acc = $item->code_id . ($item->person_id ? sprintf(' %05d', $item->person_id) : '');
+			label_cells($acc, $item->description);
+
+			label_cell($item->person_name);
+
     		if ($dim >= 1)
    				label_cell(get_dimension_string($item->dimension_id, true));
     		if ($dim > 1)
@@ -102,7 +123,7 @@ function display_gl_items($title, &$order)
     		{
     			amount_cell(abs($item->amount));
     			label_cell("");
-    		}	
+    		}
     		else
     		{
     			label_cell("");
@@ -118,12 +139,12 @@ function display_gl_items($title, &$order)
 		} 
 		else 
 		{
-			gl_edit_item_controls($order, $dim, $line);
+			gl_edit_item_controls($order, $dim, $item->person_id, $line);
 		}
 	}
 
 	if ($id == -1)
-		gl_edit_item_controls($order, $dim);
+		gl_edit_item_controls($order, $dim, $sub_type);
 
 	if ($order->count_gl_items()) 
 	{
@@ -142,35 +163,47 @@ function display_gl_items($title, &$order)
 
 //---------------------------------------------------------------------------------
 
-function gl_edit_item_controls(&$order, $dim, $Index=null)
+function gl_edit_item_controls(&$order, $dim, $sub_accounts, $Index=null)
 {
 	global $Ajax;
 	start_row();
 
 	$id = find_submit('Edit');
+	if ($id == -1) 
+		$continue = $id = get_post('Index', -1);
+
 	if ($Index != -1 && $Index == $id)
 	{
 	    // Modifying an existing row
 		$item = $order->gl_items[$Index];
-		$_POST['code_id'] = $item->code_id;
-		$_POST['dimension_id'] = $item->dimension_id;
-		$_POST['dimension2_id'] = $item->dimension2_id;
-		if ($item->amount > 0)
+		if (!isset($continue))
 		{
-			$_POST['AmountDebit'] = price_format($item->amount);
-			$_POST['AmountCredit'] = "";
+			$_POST['code_id'] = $item->code_id;
+			$_POST['dimension_id'] = $item->dimension_id;
+			$_POST['dimension2_id'] = $item->dimension2_id;
+			$_POST['person_id'] = $item->person_id;
+			if ($item->amount > 0)
+			{
+				$_POST['AmountDebit'] = price_format($item->amount);
+				$_POST['AmountCredit'] = "";
+			}
+			else
+			{
+				$_POST['AmountDebit'] = "";
+				$_POST['AmountCredit'] = price_format(abs($item->amount));
+			}
+			$_POST['description'] = $item->description;
+			$_POST['LineMemo'] = $item->reference;
 		}
-		else
-		{
-			$_POST['AmountDebit'] = "";
-			$_POST['AmountCredit'] = price_format(abs($item->amount));
-		}	
-		$_POST['description'] = $item->description;
-		$_POST['LineMemo'] = $item->reference;
-
 		hidden('Index', $id);
 		$skip_bank = !$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL');
-		echo gl_all_accounts_list('code_id', null, $skip_bank, true);
+		echo gl_all_accounts_list('code_id', null, $skip_bank, true, _('[Select account]'), true, false, false);
+
+		if (is_subledger_account(get_post('code_id')))
+		{
+			subledger_list_cells(null, 'person_id', get_post('code_id'));
+		} elseif ($order->has_sub_accounts())
+			label_cell('');
 		if ($dim >= 1) 
 			dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
 		if ($dim > 1) 
@@ -179,20 +212,32 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 	}
 	else
 	{
-	    // Adding a new row
-		$_POST['AmountDebit'] = '';  //price_format(0);
-		$_POST['AmountCredit'] = ''; //price_format(0);
-		$_POST['dimension_id'] = 0;
-		$_POST['dimension2_id'] = 0;
-		//$_POST['LineMemo'] = ""; // let memo go to next line Joe Hunt 2010-05-30
-		$_POST['_code_id_edit'] = "";
-		$_POST['code_id'] = "";
+
+		if (!list_updated('code_id'))
+		{
+		    // Adding a new row
+			$_POST['AmountDebit'] = '';  //price_format(0);
+			$_POST['AmountCredit'] = ''; //price_format(0);
+			$_POST['dimension_id'] = 0;
+			$_POST['dimension2_id'] = 0;
+			//$_POST['LineMemo'] = ""; // let memo go to next line Joe Hunt 2010-05-30
+			$_POST['_code_id_edit'] = "";
+			$_POST['code_id'] = "";
+		}
 		if(isset($_POST['_code_id_update'])) {
-			    $Ajax->activate('code_id');
+		    $Ajax->activate('code_id');
 		}
-		
+
 		$skip_bank = !$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL');
-		echo gl_all_accounts_list('code_id', null, $skip_bank, true);
+		echo gl_all_accounts_list('code_id', null, $skip_bank, true, _('[Select account]'), true, false, false);
+
+		if ($sub_accounts)
+		{
+			subledger_list_cells(null, 'person_id', get_post('code_id'));
+		}
+		elseif ($order->has_sub_accounts())
+			label_cell('');
+
 		if ($dim >= 1)
 			dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
 		if ($dim > 1)
@@ -232,8 +277,3 @@ function gl_options_controls()
 
 	  echo "</table>";
 }
-
-
-//---------------------------------------------------------------------------------
-
-?>
\ No newline at end of file