Pressing the link -Entry customer payment for this invoice- now shows correct branch...

[fa-stable.git] / gl / manage / gl_quick_entries.php

diff --git a/gl/manage/gl_quick_entries.php b/gl/manage/gl_quick_entries.php
index d5d0ef345147ae79b638630c838595031862d344..d314b6902db0a5174f96acd3094654899f0962ad 100644 (file)
--- a/gl/manage/gl_quick_entries.php
+++ b/gl/manage/gl_quick_entries.php
@@ -102,13 +102,13 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                if ($selected_id != -1) 
                {
                        update_quick_entry($selected_id, $_POST['description'], $_POST['type'],
-                                input_num('base_amount'), $_POST['base_desc'], get_post('bal_type'));
+                                input_num('base_amount'), $_POST['base_desc'], get_post('bal_type', 0));
                        display_notification(_('Selected quick entry has been updated'));
                } 
                else 
                {
                        add_quick_entry($_POST['description'], $_POST['type'], 
-                               input_num('base_amount'), $_POST['base_desc'], get_post('bal_type'));
+                               input_num('base_amount'), $_POST['base_desc'], get_post('bal_type', 0));
                        display_notification(_('New quick entry has been added'));
                }
                $Mode = 'RESET';
@@ -149,6 +149,14 @@ if ($Mode == 'Delete')
        }
 }
 
+if (find_submit('Edit') != -1) {
+       $Mode2 = 'RESET2';
+       set_focus('description');
+}
+if (find_submit('BEd') != -1 || get_post('ADD_ITEM2')) {
+       set_focus('actn');
+}
+
 if ($Mode2 == 'BDel')
 {
        delete_quick_entry_line($selected_id2);
@@ -191,60 +199,62 @@ while ($myrow = db_fetch($result))
 }
 
 end_table(1);
-end_form();
 //-----------------------------------------------------------------------------------
 
-if (list_updated('type') || (isset($_POST['bal_type']) && list_updated('bal_type')))
-{
-       $Ajax->activate('qe');
-}
-start_form();
 div_start('qe');
 start_table(TABLESTYLE2);
 
 if ($selected_id != -1) 
 {
-       $myrow = get_quick_entry($selected_id);
-
-       $_POST['id']  = $myrow["id"];
-       $_POST['description']  = $myrow["description"];
-       $_POST['type']  = $myrow["type"];
-       $_POST['base_desc']  = $myrow["base_desc"];
-       $_POST['base_amount']  = price_format($myrow["base_amount"]);
-       $_POST['bal_type']  = $myrow["bal_type"];
+       if ($Mode == 'Edit') // changed by Joe 2010-11-09
+       {
+               $myrow = get_quick_entry($selected_id);
+
+               $_POST['id']  = $myrow["id"];
+               $_POST['description']  = $myrow["description"];
+               $_POST['type']  = $myrow["type"];
+               $_POST['base_desc']  = $myrow["base_desc"];
+               $_POST['bal_type']  = $myrow["bal_type"];
+               $_POST['base_amount']  = $myrow["bal_type"] ?
+                       $myrow["base_amount"] : price_format($myrow["base_amount"]);
+       }       
        hidden('selected_id', $selected_id);
 } 
 
 text_row_ex(_("Description").':', 'description', 50, 60);
 
-quick_entry_types_list_row(_("Entry Type").':', 'type', null, $selected_id == -1);
+quick_entry_types_list_row(_("Entry Type").':', 'type', null, true);
 
 if (get_post('type') == QE_JOURNAL)
+{
        yesno_list_row(_("Balance Based"), 'bal_type', null, _("Yes"), _("No"), true);
-if (get_post('bal_type') == 1)
+}      
+
+if (list_updated('bal_type') || list_updated('type'))
+{
+       $Ajax->activate('qe');
+}
+
+if (get_post('type') == QE_JOURNAL && get_post('bal_type') == 1)
 {
        yesno_list_row(_("Period"), 'base_amount', null, _("Monthly"), _("Yearly"));
        gl_all_accounts_list_row(_("Account"), 'base_desc', null, true);
 }
 else
 {
-       if ($selected_id == -1)
-               $_POST['base_desc'] = _("Base Amount");
-       text_row_ex(_("Base Amount Description").':', 'base_desc', 50, 60, '',_('Base Amount'));
+       text_row_ex(_("Base Amount Description").':', 'base_desc', 50, 60, '');
        amount_row(_("Default Base Amount").':', 'base_amount', price_format(0));
 }
 end_table(1);
 submit_add_or_update_center($selected_id == -1, '', 'both');
 div_end();
 
-end_form();
-
 
 if ($selected_id != -1)
 {
        display_heading(_("Quick Entry Lines") . " - " . $_POST['description']);
        $result = get_quick_entry_lines($selected_id);
-       start_form();
+
        start_table(TABLESTYLE2);
        $dim = get_company_pref('use_dimension');
        if ($dim == 2)
@@ -287,12 +297,6 @@ if ($selected_id != -1)
                end_row();
        }
        end_table(1);
-       hidden('selected_id', $selected_id);
-       hidden('selected_id2', $selected_id2);
-       hidden('description', $_POST['description']);
-       hidden('type', $_POST['type']);
-       end_form();
-       start_form();
 
        div_start('edit_line');
        start_table(TABLESTYLE2);
@@ -346,18 +350,15 @@ if ($selected_id != -1)
        if ($dim < 1)
                hidden('dimension_id', 0);
        div_end();
-
+       
        hidden('selected_id', $selected_id);
        hidden('selected_id2', $selected_id2);
-       hidden('description', $_POST['description']);
-       hidden('type', $_POST['type']);
 
        submit_add_or_update_center2($selected_id2 == -1, '', true);
 
-       end_form();
 }              
+end_form();
 //------------------------------------------------------------------------------------
 
 end_page();
 
-?>
\ No newline at end of file