Added Quick Entries in Bank Payments/Deposits (Banking and General Ledger).

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

diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 7e8c9375390852600b8541a8a6ef92182e9885ae..a0a1ed7a77119b5d44f60497b910eff1319c1114 100644 (file)
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -13,7 +13,7 @@ function display_bank_header(&$order)
 
     bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true);
 
-    date_row(_("Date:"), 'date_');
+    date_row(_("Date:"), 'date_', '', null, 0, 0, 0, null, true);
 
        echo "</table>"; // inner table
 
@@ -67,20 +67,20 @@ function display_bank_header(&$order)
                        hidden('PersonDetailID');
                }
                break;
+               case payment_person_types::QuickEntry() :
+                       quick_entries_list_row(_("Description:"), 'person_id', null, $payment);
+                       amount_row(_("Total Amount"), 'totamount', null, 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);
        //      break;
     }
 
-       //$homeCurrency = get_company_currency();
        $person_currency = payment_person_types::person_currency($_POST['PayType'], $_POST['person_id']);
        $bank_currency = get_bank_account_currency($_POST['bank_account']);
 
-       if ($bank_currency != "" && $bank_currency != $person_currency)
-       {
-               exchange_rate_display($bank_currency, $person_currency, $_POST['date_']);
-       }
-       
+       exchange_rate_display($bank_currency, $person_currency, $_POST['date_']);
+
        echo "</table>"; // inner table
 
        echo "</td><td>";
@@ -89,7 +89,10 @@ function display_bank_header(&$order)
 
        bank_trans_types_list_row(_("Type:"), 'type', null);
 
-    ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_payment()));
+       if (isset($_GET['NewPayment']))
+       ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_payment()));
+    else
+       ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_deposit()));
 
        echo "</table>"; // inner table
 
@@ -175,18 +178,18 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
        $id = find_submit('Edit');
        if ($Index != -1 && $Index == $id)
        {
-               $_POST['code_id'] = $order->gl_items[$Index]->code_id;
-               $_POST['dimension_id'] = $order->gl_items[$Index]->dimension_id;
-               $_POST['dimension2_id'] = $order->gl_items[$Index]->dimension2_id;
-               $_POST['amount'] = 
-                       price_format(($payment ? 1 : -1) * $order->gl_items[$Index]->amount);
-               $_POST['description'] = $order->gl_items[$Index]->description;
-               $_POST['LineMemo'] = $order->gl_items[$Index]->reference;
-
-               hidden('Index', $order->gl_items[$Index]->index);
-               hidden('code_id', $order->gl_items[$Index]->code_id);
+               $item = $order->gl_items[$Index];
+               $_POST['code_id'] = $item->code_id;
+               $_POST['dimension_id'] = $item->dimension_id;
+               $_POST['dimension2_id'] = $item->dimension2_id;
+               $_POST['amount'] = price_format(abs($item->amount));
+               $_POST['description'] = $item->description;
+               $_POST['LineMemo'] = $item->reference;
+
+               hidden('Index', $item->index);
+               hidden('code_id', $item->code_id);
                label_cell($_POST['code_id']);
-               label_cell($order->gl_items[$Index]->description);
+               label_cell($item->description);
                if ($dim >= 1)
                        dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
                if ($dim > 1)
@@ -216,7 +219,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
                elseif ($_POST['PayType'] == payment_person_types::WorkOrder())
                        $_POST['code_id'] = get_company_pref('default_assembly_act');
                else {
-                       $_POST['code_id'] = 
+                       $_POST['code_id'] =
                                get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act');
                }
                gl_all_accounts_list('code_id', null, true, false, true);