X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_bank_ui.inc;h=f42e8e36b96dcd94b71e4cce443daa823880c529;hb=cf7be1f00c6abe59755286e0c3108d9d3c0356da;hp=5f95c3dfa63dd10b6de3c74393905d4c17f69b0c;hpb=fbb7a3d6150e02e442bd763a717915649fb43437;p=fa-stable.git

diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 5f95c3df..f42e8e36 100644
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_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>.
 ***********************************************************************/
 function display_bank_header(&$order)
 {
@@ -22,7 +22,7 @@ function display_bank_header(&$order)
 	
     bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true);
 
-    date_row(_("Date:"), 'date_', '', null, 0, 0, 0, null, true);
+    date_row(_("Date:"), 'date_', '', true, 0, 0, 0, null, true);
 
 	table_section(2, "33%");
 
@@ -44,6 +44,8 @@ function display_bank_header(&$order)
 		$_POST['person_id'] = '';
 		$Ajax->activate('pmt_header');
 		$Ajax->activate('code_id');
+		$Ajax->activate('pagehelp');
+		$Ajax->activate('editors');
 	}
     payment_person_types_list_row( $payment ? _("Pay To:"):_("From:"),
 		 'PayType', $_POST['PayType'], true);
@@ -53,18 +55,19 @@ function display_bank_header(&$order)
     		text_row_ex($payment ?_("To the Order of:"):_("Name:"),
 				 'person_id', 40, 50);
     		break;
-		case payment_person_types::WorkOrder() :
-    		workorders_list_row(_("Work Order:"), 'person_id', null);
-    		break;
+		//case payment_person_types::WorkOrder() :
+    	//	workorders_list_row(_("Work Order:"), 'person_id', null);
+    	//	break;
 		case payment_person_types::supplier() :
-    		supplier_list_row(_("Supplier:"), 'person_id', null, false, true);
+    		supplier_list_row(_("Supplier:"), 'person_id', null, false, true, false, true);
     		break;
 		case payment_person_types::customer() :
-    		customer_list_row(_("Customer:"), 'person_id', null, false, true);
+    		customer_list_row(_("Customer:"), 'person_id', null, false, true, false, true);
 
         	if (db_customer_has_branches($_POST['person_id']))
         	{
-        		customer_branches_list_row(_("Branch:"), $_POST['person_id'], 'PersonDetailID', null, false, true, true);
+        		customer_branches_list_row(_("Branch:"), $_POST['person_id'], 
+					'PersonDetailID', null, false, true, true, true);
         	}
         	else
         	{
@@ -72,9 +75,16 @@ function display_bank_header(&$order)
         		hidden('PersonDetailID');
         	}
     		break;
+
 		case payment_person_types::QuickEntry() :
-			quick_entries_list_row(_("Description:"), 'person_id', null, ($payment ? 0 : 1), 1);
-			amount_row(_("Total Amount"), 'totamount', null, null, "&nbsp;&nbsp;".submit('go', _("Go"), false, false, true));			
+			quick_entries_list_row(_("Type").":", 'person_id', null, ($payment ? QE_PAYMENT : QE_DEPOSIT), true);
+			$qid = get_quick_entry(get_post('person_id'));
+			if (list_updated('person_id')) {
+				unset($_POST['totamount']); // enable default
+				$Ajax->activate('totamount');
+			}
+			amount_row($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
+				 null, "&nbsp;&nbsp;".submit('go', _("Go"), false, false, true));
 			break;	
 		//case payment_person_types::Project() :
     	//	dimensions_list_row(_("Dimension:"), 'person_id', $_POST['person_id'], false, null, true);
@@ -126,9 +136,9 @@ function display_gl_items($title, &$order)
 	$k = 0;  //row colour counter
 
 	$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);
 
@@ -145,15 +155,15 @@ function display_gl_items($title, &$order)
 				amount_cell($item->amount);
 			label_cell($item->reference);
 
-			edit_button_cell("Edit$item->index", _("Edit"),
+			edit_button_cell("Edit$line", _("Edit"),
 				_('Edit document line'));
-			delete_button_cell("Delete$item->index", _("Delete"),
+			delete_button_cell("Delete$line", _("Delete"),
 				_('Remove line from document'));
     		end_row();
 		}
 		else
 		{
-			gl_edit_item_controls($order, $dim, $item->index);
+			gl_edit_item_controls($order, $dim, $line);
 		}
 	}
 
@@ -161,7 +171,7 @@ function display_gl_items($title, &$order)
 		gl_edit_item_controls($order, $dim);
 
 	if ($order->count_gl_items())
-		label_row(_("Total"), number_format2(abs($order->gl_items_total()), user_price_dec()),"colspan=" . $colspan . " align=right", "align=right");
+		label_row(_("Total"), number_format2(abs($order->gl_items_total()), user_price_dec()),"colspan=" . $colspan . " align=right", "align=right",3);
 
     end_table();
 	div_end();
@@ -186,7 +196,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);
@@ -216,8 +226,8 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 			$acc = get_supplier_accounts($_POST['person_id']);
 			$_POST['code_id'] = $acc['payable_account'];
 		}
-		elseif ($_POST['PayType'] == payment_person_types::WorkOrder())
-			$_POST['code_id'] = get_company_pref('default_assembly_act');
+		//elseif ($_POST['PayType'] == payment_person_types::WorkOrder())
+		//	$_POST['code_id'] = get_company_pref('default_assembly_act');
 		else {
 			$_POST['code_id'] =
 				get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act');