Merged changes form main trunk (2.2.8, 2.2.9)
[fa-stable.git] / purchasing / po_entry_items.php
index 13897245858c748ca00511d8c23f1137dd5796b9..83923ccbaf09887ac24026c83c0368b3ee5f18f6 100644 (file)
@@ -1,13 +1,30 @@
 <?php
-
-$page_security = 4;
-
-$path_to_root="..";
+/**********************************************************************
+    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>.
+***********************************************************************/
+$path_to_root = "..";
+$page_security = 'SA_PURCHASEORDER';
 include_once($path_to_root . "/purchasing/includes/po_class.inc");
-
 include_once($path_to_root . "/includes/session.inc");
-
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
+include_once($path_to_root . "/reporting/includes/reporting.inc");
+
+set_page_security( @$_SESSION['PO']->trans_type,
+       array(  ST_PURCHORDER => 'SA_PURCHASEORDER',
+                       ST_SUPPRECEIVE => 'SA_GRN',
+                       ST_SUPPINVOICE => 'SA_SUPPLIERINVOICE'),
+       array(  'NewOrder' => 'SA_PURCHASEORDER',
+                       'ModifyOrderNumber' => 'SA_PURCHASEORDER',
+                       'NewGRN' => 'SA_GRN',
+                       'NewInvoice' => 'SA_SUPPLIERINVOICE')
+);
 
 $js = '';
 if ($use_popup_windows)
@@ -15,15 +32,30 @@ if ($use_popup_windows)
 if ($use_date_picker)
        $js .= get_js_date_picker();
 
-if (isset($_GET['ModifyOrderNumber'])) 
-{
-       page(_("Modify Purchase Order #") . $_GET['ModifyOrderNumber'], false, false, "", $js);
-} 
-else 
-{
-       page(_("Purchase Order Entry"), false, false, "", $js);
+if (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) {
+
+       $_SESSION['page_title'] = _($help_context = "Modify Purchase Order #") . $_GET['ModifyOrderNumber'];
+       create_new_po(ST_PURCHORDER, $_GET['ModifyOrderNumber']);
+       copy_from_cart();
+} elseif (isset($_GET['NewOrder'])) {
+
+       $_SESSION['page_title'] = _($help_context = "Purchase Order Entry");
+       create_new_po(ST_PURCHORDER, 0);
+       copy_from_cart();
+} elseif (isset($_GET['NewGRN'])) {
+
+       $_SESSION['page_title'] = _($help_context = "Direct GRN Entry");
+       create_new_po(ST_SUPPRECEIVE, 0);
+       copy_from_cart();
+} elseif (isset($_GET['NewInvoice'])) {
+
+       $_SESSION['page_title'] = _($help_context = "Direct Purchase Invoice Entry");
+       create_new_po(ST_SUPPINVOICE, 0);
+       copy_from_cart();
 }
 
+page($_SESSION['page_title'], false, false, "", $js);
+
 //---------------------------------------------------------------------------------------------------
 
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
@@ -35,49 +67,80 @@ check_db_has_purchasable_items(_("There are no purchasable inventory items defin
 if (isset($_GET['AddedID'])) 
 {
        $order_no = $_GET['AddedID'];
-       $trans_type = systypes::po();   
+       $trans_type = ST_PURCHORDER;    
 
        if (!isset($_GET['Updated']))
                display_notification_centered(_("Purchase Order has been entered"));
        else
                display_notification_centered(_("Purchase Order has been updated") . " #$order_no");
-       display_note(get_trans_view_str($trans_type, $order_no, _("View this order")));
+       display_note(get_trans_view_str($trans_type, $order_no, _("&View this order")), 0, 1);
+
+       display_note(print_document_link($order_no, _("&Print This Order"), true, $trans_type), 0, 1);
+
+       display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "printlink", "", 1));
 
-       hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("Receive Items on this Purchase Order"), "PONumber=$order_no");
+       hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("&Receive Items on this Purchase Order"), "PONumber=$order_no");
 
-       hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Purchase Order"), "NewOrder=yes");
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter &Another Purchase Order"), "NewOrder=yes");
        
-       hyperlink_no_params($path_to_root."/purchasing/inquiry/po_search.php", _("Select An Outstanding Purchase Order"));
+       hyperlink_no_params($path_to_root."/purchasing/inquiry/po_search.php", _("Select An &Outstanding Purchase Order"));
        
        display_footer_exit();  
-}
 
-//--------------------------------------------------------------------------------------------------
+} elseif (isset($_GET['AddedGRN'])) {
 
-function copy_to_po()
-{
-       $_SESSION['PO']->supplier_id = $_POST['supplier_id'];   
-       $_SESSION['PO']->orig_order_date = $_POST['OrderDate'];
-       $_SESSION['PO']->reference = $_POST['ref'];
-       $_SESSION['PO']->requisition_no = $_POST['Requisition'];
-       $_SESSION['PO']->Comments = $_POST['Comments']; 
-       $_SESSION['PO']->Location = $_POST['StkLocation'];
-       $_SESSION['PO']->delivery_address = $_POST['delivery_address'];
-}
+       $trans_no = $_GET['AddedGRN'];
+       $trans_type = ST_SUPPRECEIVE;
 
-//--------------------------------------------------------------------------------------------------
+       display_notification_centered(_("Direct GRN has been entered"));
 
-function copy_from_po()
-{
-       $_POST['supplier_id'] = $_SESSION['PO']->supplier_id;   
-       $_POST['OrderDate'] = $_SESSION['PO']->orig_order_date; 
-    $_POST['Requisition'] = $_SESSION['PO']->requisition_no;
-    $_POST['ref'] = $_SESSION['PO']->reference;
-       $_POST['Comments'] = $_SESSION['PO']->Comments;
-    $_POST['StkLocation'] = $_SESSION['PO']->Location;
-    $_POST['delivery_address'] = $_SESSION['PO']->delivery_address;    
+       display_note(get_trans_view_str($trans_type, $trans_no, _("&View this GRN")), 0);
+
+// not yet
+//     display_note(print_document_link($trans_no, _("&Print This GRN"), true, $trans_type), 0, 1);
+
+       hyperlink_params("$path_to_root/purchasing/supplier_invoice.php",
+               _("Entry purchase &invoice for this receival"), "New=1");
+
+       hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), 
+               "filterType=$trans_type&trans_no=$trans_no");
+
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter &Another GRN"), "NewGRN=Yes");
+       
+       display_footer_exit();  
+
+} elseif (isset($_GET['AddedPI'])) {
+
+       $trans_no = $_GET['AddedPI'];
+       $trans_type = ST_SUPPINVOICE;
+
+       display_notification_centered(_("Direct Purchase Invoice has been entered"));
+
+       display_note(get_trans_view_str($trans_type, $trans_no, _("&View this Invoice")), 0);
+
+// not yet
+//     display_note(print_document_link($trans_no, _("&Print This Invoice"), true, $trans_type), 0, 1);
+
+       display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Journal Entries for this Invoice")), 1);
+
+       hyperlink_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"),
+               "PInvoice=".$trans_no);
+
+       hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), 
+               "filterType=$trans_type&trans_no=$trans_no");
+
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter &Another Direct Invoice"), "NewInvoice=Yes");
+       
+       display_footer_exit();  
 }
+//--------------------------------------------------------------------------------------------------
+
+function line_start_focus() {
+  global       $Ajax;
 
+  $Ajax->activate('items_table');
+  set_focus('_stock_id_edit');
+}
 //--------------------------------------------------------------------------------------------------
 
 function unset_form_variables() {
@@ -89,9 +152,8 @@ function unset_form_variables() {
 
 //---------------------------------------------------------------------------------------------------
 
-function handle_delete_item()
+function handle_delete_item($line_no)
 {
-       $line_no = $_GET['Delete'];
        if($_SESSION['PO']->some_already_received($line_no) == 0)
        {
                $_SESSION['PO']->remove_from_order($line_no);
@@ -101,6 +163,7 @@ function handle_delete_item()
        {
                display_error(_("This item cannot be deleted because some of it has already been received."));
        }       
+    line_start_focus();
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -121,12 +184,15 @@ function handle_cancel_po()
        if($_SESSION['PO']->order_no != 0)
        {
                delete_po($_SESSION['PO']->order_no);
-       }       
+       } else {
+               unset($_SESSION['PO']);
+               meta_forward($path_to_root.'/index.php','application=AP');
+       }
 
        $_SESSION['PO']->clear_items();
        $_SESSION['PO'] = new purch_order;
 
-       display_note(_("This purchase order has been cancelled."), 0, 1);
+       display_notification(_("This purchase order has been cancelled."));
 
        hyperlink_params($path_to_root . "/purchasing/po_entry_items.php", _("Enter a new purchase order"), "NewOrder=Yes");
        echo "<br>";
@@ -135,24 +201,22 @@ function handle_cancel_po()
        exit;
 }
 
-//---------------------------------------------------------------------------------------------------
-if (isset($_GET['Delete']) || isset($_GET['Edit']))
-{
-       copy_from_po();
-}
-       
-if (isset($_GET['Delete']))
-{
-       handle_delete_item();
-}
-
 //---------------------------------------------------------------------------------------------------
 
 function check_data()
 {
-    if (!check_num('qty',0))
+       if(!get_post('stock_id_text', true)) {
+               display_error( _("Item description cannot be empty."));
+               set_focus('stock_id_edit');
+               return false;
+       }
+
+       $dec = get_qty_dec($_POST['stock_id']);
+       $min = 1 / pow(10, $dec);
+    if (!check_num('qty',$min))
     {
-               display_error(_("The quantity of the order item must be numeric and not less than zero."));
+       $min = number_format2($min, $dec);
+               display_error(_("The quantity of the order item must be numeric and not less than ").$min);
                set_focus('qty');
                return false;
     }
@@ -163,7 +227,7 @@ function check_data()
                set_focus('price');
                return false;      
     }
-    if (!is_date($_POST['req_del_date'])){
+    if ($_SESSION['PO']->trans_type == ST_PURCHORDER && !is_date($_POST['req_del_date'])){
                display_error(_("The date entered is in an invalid format."));
                set_focus('req_del_date');
                return false;            
@@ -178,19 +242,22 @@ function handle_update_item()
 {
        $allow_update = check_data(); 
 
-       if ($allow_update && 
-               ($_SESSION['PO']->line_items[$_POST['line_no']]->qty_inv > input_num('qty') ||
-               $_SESSION['PO']->line_items[$_POST['line_no']]->qty_received > input_num('qty')))
+       if ($allow_update)
        {
-               display_error(_("You are attempting to make the quantity ordered a quantity less than has already been invoiced or received.  This is prohibited.") .
-                       "<br>" . _("The quantity received can only be modified by entering a negative receipt and the quantity invoiced can only be reduced by entering a credit note against this item."));
-               set_focus('qty');
-               return;
-       }
+               if ($_SESSION['PO']->line_items[$_POST['line_no']]->qty_inv > input_num('qty') ||
+                       $_SESSION['PO']->line_items[$_POST['line_no']]->qty_received > input_num('qty'))
+               {
+                       display_error(_("You are attempting to make the quantity ordered a quantity less than has already been invoiced or received.  This is prohibited.") .
+                               "<br>" . _("The quantity received can only be modified by entering a negative receipt and the quantity invoiced can only be reduced by entering a credit note against this item."));
+                       set_focus('qty');
+                       return;
+               }
        
-       $_SESSION['PO']->update_order_item($_POST['line_no'], input_num('qty'), input_num('price'),
-               $_POST['req_del_date']);
-       unset_form_variables();
+               $_SESSION['PO']->update_order_item($_POST['line_no'], input_num('qty'), input_num('price'),
+                       @$_POST['req_del_date'], $_POST['item_description'] );
+               unset_form_variables();
+       }       
+    line_start_focus();
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -203,41 +270,36 @@ function handle_add_new_item()
        { 
                if (count($_SESSION['PO']->line_items) > 0)
                {
-                   foreach ($_SESSION['PO']->line_items AS $order_item) 
+                   foreach ($_SESSION['PO']->line_items as $order_item) 
                    {
-
                        /* do a loop round the items on the order to see that the item
                        is not already on this order */
-                           if (($order_item->stock_id == $_POST['stock_id']) && 
-                               ($order_item->Deleted==False)) 
+                           if (($order_item->stock_id == $_POST['stock_id'])) 
                            {
-                                       $allow_update = False;
-                                       display_error(_("The selected item is already on this order."));
+                                       display_warning(_("The selected item is already on this order."));
                            }
                    } /* end of the foreach loop to look for pre-existing items of the same code */
                }
 
                if ($allow_update == true)
                {
-                       $sql = "SELECT description, units, mb_flag
-                               FROM ".TB_PREF."stock_master WHERE stock_id = '". $_POST['stock_id'] . "'";
-
-                   $result = db_query($sql,"The stock details for " . $_POST['stock_id'] . " could not be retrieved");
+                       $result = get_short_info($_POST['stock_id']);
 
-                   if (db_num_rows($result) == 0)
-                   {
-                               $allow_update = False;
-                   }               
+                       if (db_num_rows($result) == 0)
+                       {
+                               $allow_update = false;
+                       }
 
                        if ($allow_update)
-                       {
+                       {
                                $myrow = db_fetch($result);
-                               $_SESSION['PO']->add_to_order ($_POST['line_no'], $_POST['stock_id'], input_num('qty'), 
-                                       $myrow["description"], input_num('price'), $myrow["units"],
-                                       $_POST['req_del_date'], 0, 0);
+                               $_SESSION['PO']->add_to_order (count($_SESSION['PO']->line_items), $_POST['stock_id'], input_num('qty'), 
+                                       get_post('stock_id_text'), //$myrow["description"], 
+                                       input_num('price'), '', // $myrow["units"], (retrived in cart)
+                                       $_SESSION['PO']->trans_type == ST_PURCHORDER ? $_POST['req_del_date'] : '', 0, 0);
 
                                unset_form_variables();
-                               $_POST['StockID2'] = $_POST['stock_id'] = "";
+                               $_POST['stock_id']      = "";
                        } 
                        else 
                        {
@@ -246,12 +308,22 @@ function handle_add_new_item()
 
                } /* end of if not already on the order and allow input was true*/
     }
+       line_start_focus();
 }
 
 //---------------------------------------------------------------------------------------------------
 
 function can_commit()
 {
+       global $Refs;
+
+       if (!get_post('supplier_id')) 
+       {
+               display_error(_("There is no supplier selected."));
+               set_focus('supplier_id');
+               return false;
+       } 
+       
        if (!is_date($_POST['OrderDate'])) 
        {
                display_error(_("The entered order date is invalid."));
@@ -261,29 +333,29 @@ function can_commit()
        
        if (!$_SESSION['PO']->order_no) 
        {
-       if (!references::is_valid($_SESSION['PO']->reference)) 
+       if (!$Refs->is_valid(get_post('ref'))) 
        {
                display_error(_("There is no reference entered for this purchase order."));
-               set_focus('ref');
+                       set_focus('ref');
                return false;
        } 
        
-       if (!is_new_reference($_SESSION['PO']->reference, systypes::po())) 
+       if (!is_new_reference(get_post('ref'), $_SESSION['PO']->trans_type)) 
        {
                display_error(_("The entered reference is already in use."));
-               set_focus('ref');
+                       set_focus('ref');
                return false;
        }
        }
        
-       if ($_SESSION['PO']->delivery_address == "")
+       if ($_SESSION['PO']->trans_type == ST_PURCHORDER && get_post('delivery_address') == '')
        {
                display_error(_("There is no delivery address specified."));
                set_focus('delivery_address');
                return false;
        } 
        
-       if (!isset($_SESSION['PO']->Location) || $_SESSION['PO']->Location == "")
+       if (get_post('StkLocation') == '')
        {
                display_error(_("There is no location specified to move any items into."));
                set_focus('StkLocation');
@@ -303,128 +375,133 @@ function can_commit()
 
 function handle_commit_order()
 {
-       copy_to_po();
+       $cart = &$_SESSION['PO'];
 
-       if (can_commit())
-       {
+       if (can_commit()) {
 
-               if ($_SESSION['PO']->order_no == 0)
-               { 
-                       
+               copy_to_cart();
+               if ($cart->trans_type != ST_PURCHORDER) {
+                       // for direct grn/invoice set same dates for lines as for whole document
+                       foreach ($cart->line_items as $line_no =>$line)
+                               $cart->line_items[$line_no]->req_del_date = $cart->orig_order_date;
+               }
+               if ($cart->order_no == 0) { // new po/grn/invoice
                        /*its a new order to be inserted */
-                       $order_no = add_po($_SESSION['PO']);
-                        
+                       $ref = $cart->reference;
+                       if ($cart->trans_type != ST_PURCHORDER) {
+                               $cart->reference = 'auto';
+                               begin_transaction();    // all db changes as single transaction for direct document
+                       }
+                       $order_no = add_po($cart);
+                       new_doc_date($cart->orig_order_date); 
+               $cart->order_no = $order_no;
+
+                       if ($cart->trans_type == ST_PURCHORDER) {
+                               unset($_SESSION['PO']);
+                       meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no");
+               }
+                       //Direct GRN
+                       if ($cart->trans_type == ST_SUPPRECEIVE)
+                               $cart->reference = $ref;
+                       $cart->Comments = $cart->reference; //grn does not hold supp_ref
+                       foreach($cart->line_items as $key => $line)
+                               $cart->line_items[$key]->receive_qty = $line->quantity;
+                       $grn_no = add_grn($cart);
+                       if ($cart->trans_type == ST_SUPPRECEIVE) {
+                               commit_transaction(); // save PO+GRN
+                               unset($_SESSION['PO']);
+                       meta_forward($_SERVER['PHP_SELF'], "AddedGRN=$grn_no");
+                       }
+//                     Direct Purchase Invoice
+                       $inv = new supp_trans;
+                       $inv->is_invoice = true;
+                       $inv->Comments = $cart->Comments;
+                       $inv->supplier_id = $cart->supplier_id;
+                       $inv->tran_date = $cart->orig_order_date;
+                       $inv->reference = $ref;
+                       $inv->supp_reference = $cart->supp_ref;
+                       $supp = get_supplier($cart->supplier_id);
+                       $inv->tax_group_id = $supp['tax_group_id'];
+//                     $inv->ov_discount 'this isn't used at all'
+//                     $inv->terms = not used, TODO
+                       $terms =  $supp['payment_terms'];
+                       $inv->ov_amount = $inv->ov_gst = 0;
+                       $inv->due_date = get_invoice_duedate($terms, $inv->tran_date);
+                       foreach($cart->line_items as $key => $line) {
+                               $inv->add_grn_to_trans($line->grn_item_id, $line->po_detail_rec, $line->stock_id,
+                                       $line->item_description, $line->receive_qty, 0, $line->receive_qty,
+                                       $line->price, $line->price, true, get_standard_cost($line->stock_id), '');
+                               $inv->ov_amount += round2(($line->receive_qty * $line->price), user_price_dec());
+                       }
+                       $taxes = $inv->get_taxes($inv->tax_group_id, 0, false);
+                       foreach( $taxes as $taxitem) {
+                               $inv->ov_gst += round2($taxitem['Value'], user_price_dec());
+                       }
+                       $inv_no = add_supp_invoice($inv);
+                       commit_transaction(); // save PO+GRN+PI
+                       // payment for cash terms...
                        unset($_SESSION['PO']);
-                        
-               meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no");        
-
-               } 
-               else 
-               { 
-
-                       /*its an existing order need to update the old order info */
-                       $order_no = update_po($_SESSION['PO']);
-                       
+                       meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no");
+               }
+               else { // order modification
+               
+                       $order_no = update_po($cart);
                        unset($_SESSION['PO']);
-                       
                meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no&Updated=1");      
                }
-       }       
+       }
 }
-
 //---------------------------------------------------------------------------------------------------
+$id = find_submit('Delete');
+if ($id != -1)
+       handle_delete_item($id);
 
 if (isset($_POST['Commit']))
 {
        handle_commit_order();
 }
-
-//--------------------------------------------------------------------------------------------------- 
-
 if (isset($_POST['UpdateLine']))
-{
-       copy_to_po();
        handle_update_item();
-}
-
-//---------------------------------------------------------------------------------------------------
 
-If (isset($_POST['EnterLine']))
-{
-       copy_to_po();
+if (isset($_POST['EnterLine']))
        handle_add_new_item();
-} 
-
-//---------------------------------------------------------------------------------------------------
 
 if (isset($_POST['CancelOrder'])) 
-{
        handle_cancel_po();
-}
-
-//---------------------------------------------------------------------------------------------------
 
 if (isset($_POST['CancelUpdate']))
-{
-       copy_to_po();
        unset_form_variables();
-}
 
-//---------------------------------------------------------------------------------------------------
-
-if (isset($_GET['ModifyOrderNumber']) && $_GET['ModifyOrderNumber'] != "")
-{
-       create_new_po();
-       
-       $_SESSION['PO']->order_no = $_GET['ModifyOrderNumber']; 
-
-       /*read in all the selected order into the Items cart  */
-       read_po($_SESSION['PO']->order_no, $_SESSION['PO']);
-       copy_from_po();
-}
-
-//--------------------------------------------------------------------------------
-
-if (isset($_GET['NewOrder']))
-{
-       create_new_po();
-} 
-else 
-{
-       if (!isset($_POST['supplier_id']))
-               $_POST['supplier_id'] = $_SESSION['PO']->supplier_id;
-       if (!isset($_POST['OrderDate']))                
-               $_POST['OrderDate'] = $_SESSION['PO']->orig_order_date;
-       if (!isset($_POST['Requisition']))              
-               $_POST['Requisition'] = $_SESSION['PO']->requisition_no;
-       if (!isset($_POST['Comments']))         
-               $_POST['Comments'] = $_SESSION['PO']->Comments;
+if (isset($_POST['CancelUpdate']) || isset($_POST['UpdateLine'])) {
+       line_start_focus();
 }
 
 //---------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 display_po_header($_SESSION['PO']);
 echo "<br>";
 
 display_po_items($_SESSION['PO']);
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 textarea_row(_("Memo:"), 'Comments', null, 70, 4);
 
 end_table(1);
+
+div_start('controls', 'items_table');
 if ($_SESSION['PO']->order_has_items()) 
 {
        if ($_SESSION['PO']->order_no)
-               submit_center_first('Commit', _("Update Order"));
+               submit_center_first('Commit', _("Update Order"), '', 'default');
        else
-               submit_center_first('Commit', _("Place Order"));
+               submit_center_first('Commit', _("Place Order"), '', 'default');
        submit_center_last('CancelOrder', _("Cancel Order"));   
 }
 else
-       submit_center('CancelOrder', _("Cancel Order"));        
-
+       submit_center('CancelOrder', _("Cancel Order"), true, false, 'cancel');
+div_end();
 //---------------------------------------------------------------------------------------------------
 
 end_form();