Improved quick entries.

[fa-stable.git] / purchasing / includes / ui / invoice_ui.inc

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 693b6f92ea8c777cafc955c5136030e34083df31..2e2d17cc6d5d48fca0b3cd3ad769c00de8d80920 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -63,11 +63,20 @@ function invoice_header(&$supp_trans)
 
        table_section(1);
 
-    if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
-       $_POST['supplier_id'] = get_global_supplier();
-
-       supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true);
+       if (isset($_POST['invoice_no']))
+       {
+               $trans = get_supp_trans($_POST['invoice_no'], 20);
+               $_POST['supplier_id'] = $trans['supplier_id'];
+               $supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode'];
+               label_row(_("Supplier:"), $supp.hidden('supplier_id', $_POST['supplier_id'], false));
+       }       
+       else
+       {
+       if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
+               $_POST['supplier_id'] = get_global_supplier();
 
+               supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true);
+       }
        if ($supp_trans->supplier_id != $_POST['supplier_id'])
        {
                // supplier has changed
@@ -83,7 +92,12 @@ function invoice_header(&$supp_trans)
     else
        ref_row(_("Reference:"), 'reference', '', references::get_next(21));
 
-       text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 20);
+       if (isset($_POST['invoice_no']))
+       {
+               label_row(_("Supplier's Ref.:"), $_POST['invoice_no'].hidden('invoice_no', $_POST['invoice_no'], false).hidden('supp_reference', $_POST['invoice_no'], false));
+       }       
+       else
+               text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 20);
 
        table_section(2, "33%");
 
@@ -114,7 +128,7 @@ function invoice_header(&$supp_trans)
 
        label_row(_("Tax Group:"), $supp_trans->tax_description);
 
-       end_outer_table();
+       end_outer_table(1);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -181,7 +195,7 @@ function display_gl_controls(&$supp_trans, $k)
 
 function display_gl_items(&$supp_trans, $mode=0)
 {
-       global $table_style, $path_to_root;
+       global $table_style, $path_to_root, $Ajax;
 
     // if displaying in form, and no items, exit
     if (($mode == 2 || $mode == 3) && count($supp_trans->gl_codes) == 0)
@@ -198,18 +212,25 @@ function display_gl_items(&$supp_trans, $mode=0)
 
        if ($mode == 1)
        {
-               $qes = has_quick_entries(-1, 0);
+               $qes = has_quick_entries(QE_SUPPINV);
                if ($qes !== false)
                {
                        echo "<div style='float:right;'>";
                        echo _("Quick Entry:")."&nbsp;"; 
-                       quick_entries_list('qid', null, 0, 1);
-                       echo "&nbsp;"._("Amount")."&nbsp;";
-                       $amount = input_num('totamount');
+                       quick_entries_list('qid', null, QE_SUPPINV, true);
+                       $qid = get_quick_entry(get_post('qid'));
+                       if (list_updated('qid')) {
+                               unset($_POST['totamount']); // enable default
+                               $Ajax->activate('totamount');
+                       }
+                       echo "&nbsp;".$qid['base_desc'].":"."&nbsp;";
+
+                       $amount = input_num('totamount', $qid['base_amount']);
                        $dec = user_price_dec();
                        echo "<input class='amount' type='text' name='totamount' size='7' maxlength='12' dec='$dec' value='$amount'>&nbsp;";
                        submit('go', _("Go"), true, false, true);
                        echo "</div>";
+
                }       
        }
        display_heading($heading);
@@ -300,9 +321,15 @@ function display_grn_items_for_selection(&$supp_trans, $k)
 
        if ($supp_trans->is_invoice)
                $result = get_grn_items(0, $supp_trans->supplier_id, true);
-       else    
-               $result = get_grn_items(0, $supp_trans->supplier_id, false, true);
-
+       else
+       {
+               if (isset($_POST['receive_begin']) && isset($_POST['receive_end']))
+                       $result = get_grn_items(0, $supp_trans->supplier_id, false, true, 0, $_POST['receive_begin'], $_POST['receive_end']);
+               else if (isset($_POST['invoice_no']))
+                       $result = get_grn_items(0, $supp_trans->supplier_id, false, true, $_POST['invoice_no']);
+               else    
+                       $result = get_grn_items(0, $supp_trans->supplier_id, false, true);
+       }
     if (db_num_rows($result) == 0)
     {
        return false;
@@ -410,6 +437,15 @@ function display_grn_items(&$supp_trans, $mode=0)
 
        if ($mode == 1)
        {
+               if (!$supp_trans->is_invoice && !isset($_POST['invoice_no']))
+               {
+                       echo "</td>";
+                       date_cells(_("Received between"), 'receive_begin', "", null, -30);
+                       date_cells(_("and"), 'receive_end', '', null, 1);
+                       submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
+                       echo "<td>";
+               }       
+                       
                if ($heading2 != "")
                {
                        //br();