Recurrent Invoices: fixed buggy call to non existing function and payment terms type...

[fa-stable.git] / purchasing / supplier_invoice.php

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index e527a980b8fc39011d5012dcb17eaf2593cf4a18..0ac3052d97c3867e6cb436804900e78421cf800d 100644 (file)
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -27,10 +27,6 @@ if (user_use_date_picker())
        $js .= get_js_date_picker();
 //----------------------------------------------------------------------------------------
 
-check_db_has_suppliers(_("There are no suppliers defined in the system."));
-
-//--------------------------------------------------------------------------------------------------
-
 if (isset($_GET['New']))
 {
        if (isset( $_SESSION['supp_trans']))
@@ -54,6 +50,8 @@ page($_SESSION['page_title'], false, false, "", $js);
 if (isset($_GET['ModifyInvoice']))
        check_is_editable(ST_SUPPINVOICE, $_GET['ModifyInvoice']);
 
+check_db_has_suppliers(_("There are no suppliers defined in the system."));
+
 //---------------------------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
@@ -248,6 +246,14 @@ function check_item_data($n)
 {
        global $SysPrefs;
 
+       $item = get_grn_item($n);
+
+       if (!$item)
+       {
+               display_error( _("Invalid GRN item selected."));
+               return false;
+       }
+
        if (!check_num('this_quantity_inv'.$n, 0) || input_num('this_quantity_inv'.$n)==0)
        {
                display_error( _("The quantity to invoice must be numeric and greater than zero."));
@@ -265,10 +271,8 @@ function check_item_data($n)
        $margin = $SysPrefs->over_charge_allowance();
        if ($SysPrefs->check_price_charged_vs_order_price == True)
        {
-               if ($_POST['order_price'.$n]!=input_num('ChgPrice'.$n)) {
-                    if ($_POST['order_price'.$n]==0 ||
-                               input_num('ChgPrice'.$n)/$_POST['order_price'.$n] >
-                           (1 + ($margin/ 100)))
+               if ($item['unit_price'] != input_num('ChgPrice'.$n)) {
+                    if ($item['unit_price'] == 0 || input_num('ChgPrice'.$n)/$item['unit_price'] > (1 + ($margin/ 100)))
                    {
                        display_error(_("The price being invoiced is more than the purchase order price by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.") .
                        _("The over-charge percentage allowance is :") . $margin . "%");
@@ -278,9 +282,9 @@ function check_item_data($n)
                }
        }
 
-       if ($SysPrefs->check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n]))
+       if ($SysPrefs->check_qty_charged_vs_del_qty == true && ($item['qty_recd'] != $item['quantity_inv']))
        {
-               if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) >
+               if (input_num('this_quantity_inv'.$n) / ($item['qty_recd'] - $item['quantity_inv']) >
                        (1+ ($margin / 100)))
                {
                        display_error( _("The quantity being invoiced is more than the outstanding quantity by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.")
@@ -290,27 +294,23 @@ function check_item_data($n)
                }
        }
 
-       return true;
+       $item['quantity'] = input_num('this_quantity_inv'.$n);
+       $item['chg_price'] = input_num('ChgPrice'.$n);
+
+       return $item;
 }
 
 function commit_item_data($n)
 {
-       if (check_item_data($n))
+       $item  = check_item_data($n);
+       if ($item)
        {
-       if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]))
-       {
-               $complete = true;
-       }
-       else
-       {
-               $complete = false;
-       }
-
-               $_SESSION['supp_trans']->add_grn_to_trans($n, $_POST['po_detail_item'.$n],
-                       $_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n],
-                       $_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n),
-                       $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
-                       $_POST['std_cost_unit'.$n], "");
+               $_SESSION['supp_trans']->add_grn_to_trans($n,
+               $item['po_detail_item'], $item['item_code'],
+               $item['description'], $item['qty_recd'],
+               $item['quantity_inv'], $item['quantity'],
+               $item['unit_price'], $item['chg_price'], $item['std_cost_unit']);
+
                reset_tax_input();
        }
 }
@@ -327,9 +327,9 @@ if (isset($_POST['InvGRNAll']))
 {
        foreach($_POST as $postkey=>$postval )
     {
-               if (strpos($postkey, "qty_recd") === 0)
+               if (strpos($postkey, "this_quantity_inv") === 0)
                {
-                       $id = substr($postkey, strlen("qty_recd"));
+                       $id = substr($postkey, strlen("this_quantity_inv"));
                        $id = (int)$id;
                        commit_item_data($id);
                }
@@ -354,16 +354,18 @@ if ($id4 != -1)
        $Ajax->activate('gl_items');
 }
 
-$id2 = -1;
-if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
+$id5 = find_submit('Edit');
+if ($id5 != -1)
 {
-       $id2 = find_submit('void_item_id');
-       if ($id2 != -1) 
-       {
-               remove_not_invoice_item($id2);
-               display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
-
-       }
+    $_POST['gl_code'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_code;
+    $_POST['dimension_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim;
+    $_POST['dimension2_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim2;
+    $_POST['amount'] = $_SESSION['supp_trans']->gl_codes[$id5]->amount;
+    $_POST['memo_'] = $_SESSION['supp_trans']->gl_codes[$id5]->memo_;
+
+       $_SESSION['supp_trans']->remove_gl_codes_from_trans($id5);
+       reset_tax_input();
+       $Ajax->activate('gl_items');
 }
 
 if (isset($_POST['go']))
@@ -393,7 +395,7 @@ else {
 
 //-----------------------------------------------------------------------------------------
 
-if ($id != -1 || $id2 != -1)
+if ($id != -1)
 {
        $Ajax->activate('grn_items');
        $Ajax->activate('inv_tot');