Merged last changes from stable.

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

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 40c62435f0315002fa4414550d8926270ec0d562..1a0ac95c5be03436a87c3c270a1597767a944439 100644 (file)
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -25,12 +25,35 @@ if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
 if ($use_date_picker)
        $js .= get_js_date_picker();
-page(_($help_context = "Enter Supplier Invoice"), false, false, "", $js);
-
 //----------------------------------------------------------------------------------------
 
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
 
+//--------------------------------------------------------------------------------------------------
+
+if (isset($_GET['New']))
+{
+       if (isset( $_SESSION['supp_trans']))
+       {
+               unset ($_SESSION['supp_trans']->grn_items);
+               unset ($_SESSION['supp_trans']->gl_codes);
+               unset ($_SESSION['supp_trans']);
+       }
+       $help_context = "Enter Supplier Invoice";
+       $_SESSION['page_title'] = _("Enter Supplier Invoice");
+
+       $_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE);
+} else if(isset($_GET['ModifyInvoice'])) {
+       $help_context = 'Modifying Purchase Invoice';
+       $_SESSION['page_title'] = sprintf( _("Modifying Purchase Invoice # %d"), $_GET['ModifyInvoice']);
+       $_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE, $_GET['ModifyInvoice']);
+}
+
+page($_SESSION['page_title'], false, false, "", $js);
+
+if (isset($_GET['ModifyInvoice']))
+       check_is_editable(ST_SUPPINVOICE, $_GET['ModifyInvoice']);
+
 //---------------------------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
@@ -65,10 +88,9 @@ if (isset($_GET['New']))
                unset ($_SESSION['supp_trans']);
        }
 
-       //session_register("SuppInv");
-       //session_register("supp_trans");
-       $_SESSION['supp_trans'] = new supp_trans;
-       $_SESSION['supp_trans']->is_invoice = true;
+       $_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE);
+} else if(isset($_GET['ModifyInvoice'])) {
+       $_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE, $_GET['ModifyInvoice']);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -152,7 +174,7 @@ function check_data()
                return false;
        }
 
-       if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE)) 
+       if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE, $_SESSION['supp_trans']->trans_no))
        {
                display_error(_("The entered reference is already in use."));
                set_focus('reference');
@@ -174,7 +196,7 @@ function check_data()
        } 
        elseif (!is_date_in_fiscalyear($_SESSION['supp_trans']->tran_date)) 
        {
-               display_error(_("The entered date is not in fiscal year."));
+               display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
                set_focus('trans_date');
                return false;
        }
@@ -185,9 +207,9 @@ function check_data()
                return false;
        }
 
-       if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference']))
+       if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference'], $_SESSION['supp_trans']->trans_no))
        {       /*Transaction reference already entered */
-               display_error(_("This invoice number has already been entered. It cannot be entered again." . " (" . $_POST['supp_reference'] . ")"));
+               display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")");
                return false;
        }
 
@@ -202,8 +224,12 @@ function handle_commit_invoice()
 
        if (!check_data())
                return;
+       $inv = $_SESSION['supp_trans'];
+       $invoice_no = add_supp_invoice($inv);
 
-       $invoice_no = add_supp_invoice($_SESSION['supp_trans']);
+       // presume supplier data need correction
+       if ($inv->stored_algorithm != $inv->tax_algorithm)
+               update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm);
 
     $_SESSION['supp_trans']->clear_items();
     unset($_SESSION['supp_trans']);
@@ -222,6 +248,7 @@ function check_item_data($n)
 {
        global $check_price_charged_vs_order_price,
                $check_qty_charged_vs_del_qty, $SysPrefs;
+
        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."));
@@ -285,6 +312,7 @@ function commit_item_data($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], "");
+               unset($_POST['mantax']);
        }
 }
 
@@ -314,6 +342,7 @@ $id3 = find_submit('Delete');
 if ($id3 != -1)
 {
        $_SESSION['supp_trans']->remove_grn_from_trans($id3);
+       unset($_POST['mantax']);
        $Ajax->activate('grn_items');
        $Ajax->activate('inv_tot');
 }
@@ -352,10 +381,8 @@ start_form();
 invoice_header($_SESSION['supp_trans']);
 
 if ($_POST['supplier_id']=='') 
-       display_error('No supplier found for entered search text');
+               display_error(_("There is no supplier selected."));
 else {
-       start_outer_table("$table_style2 width=98%", 5);
-
        display_grn_items($_SESSION['supp_trans'], 1);
 
        display_gl_items($_SESSION['supp_trans'], 1);
@@ -364,7 +391,6 @@ else {
        invoice_totals($_SESSION['supp_trans']);
        div_end();
 
-       end_outer_table(0, false);
 }
 
 //-----------------------------------------------------------------------------------------