Added Direct GRN and Direct invice in Purchases module.

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

diff --git a/purchasing/includes/ui/grn_ui.inc b/purchasing/includes/ui/grn_ui.inc
index f1b271c078ca23cd0b50a0949099c1c9c0743362..986d5a9f3191b1e4fff32b15dc20323083a92533 100644 (file)
--- a/purchasing/includes/ui/grn_ui.inc
+++ b/purchasing/includes/ui/grn_ui.inc
@@ -1,10 +1,19 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       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/gpl-3.0.html>.
+***********************************************************************/
 //---------------------------------------------------------------------------------------------------
 
 function display_grn_summary(&$po, $editable=false)
 {
-       global $table_style2;
+       global $table_style2, $Refs;
     start_table("$table_style2 width=90%");
     
     start_row();
@@ -13,18 +22,17 @@ function display_grn_summary(&$po, $editable=false)
     if (!is_company_currency($po->curr_code))
        label_cells(_("Order Currency"), $po->curr_code, "class='tableheader2'");
     
-    label_cells(_("For Purchase Order"), get_trans_view_str(systypes::po(), $po->order_no),
+    label_cells(_("For Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no),
        "class='tableheader2'");
     
        label_cells(_("Ordered On"), $po->orig_order_date, "class='tableheader2'");
-       label_cells(_("Supplier's Reference"), $po->requisition_no, "class='tableheader2'");
        end_row();
                
        start_row();
     if ($editable) 
     {
        if (!isset($_POST['ref']))
-           $_POST['ref'] = references::get_next(25);
+           $_POST['ref'] = $Refs->get_next(ST_SUPPRECEIVE);
        ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
                
         if (!isset($_POST['Location']))
@@ -33,15 +41,18 @@ function display_grn_summary(&$po, $editable=false)
         locations_list_cells(null, "Location", $_POST['Location']);
         
        if (!isset($_POST['DefaultReceivedDate']))
-               $_POST['DefaultReceivedDate'] = Today();
+               $_POST['DefaultReceivedDate'] = new_doc_date();
        
-       date_cells(_("Date Items Received"), 'DefaultReceivedDate', '', null, 0, 0, 0, "class='tableheader2'");    
-        
+       date_cells(_("Date Items Received"), 'DefaultReceivedDate', '', true, 0, 0, 0, "class='tableheader2'");    
+               // currently this is related order supp reference
+//             ref_cells(_("Supplier's Reference"), 'supp_ref', _("Supplier's Reference"), null, "class='tableheader2'");
+               label_cells(_("Supplier's Reference"), $po->supp_ref, "class='tableheader2'");
     } 
     else 
     {
        label_cells(_("Reference"), $po->reference, "class='tableheader2'");
        label_cells(_("Deliver Into Location"), get_location_name($po->Location), "class='tableheader2'");
+               label_cells(_("Supplier's Reference"), $po->supp_ref, "class='tableheader2'");
     }
     
     end_row();