Purchases/Direct Invoice: added Update button for refreshing tax summary on demand.

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

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index a35533218f0e2f002dd315445255e5d27b24b8ba..19337cbef13a094288de4dba7eca5b08cf439cf5 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -21,9 +21,9 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 
 //----------------------------------------------------------------------------------------
@@ -57,11 +57,10 @@ if (isset($_GET['New']))
                $help_context = "Supplier Credit Note";
                $_SESSION['page_title'] = _("Supplier Credit Note");
 
+       } else {
+               $help_context = "Supplier Credit Note";
+               $_SESSION['page_title'] = _("Supplier Credit Note");
                $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT);
-       } elseif (isset($_GET['ModifyInvoice'])) {
-               $help_context = 'Modifying Purchase Invoice';
-               $_SESSION['page_title'] = sprintf( _("Modifying Supplier Credit # %d"), $_GET['ModifyCredit']);
-               $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT, $_GET['ModifyCredit']);
        }
 }
 page($_SESSION['page_title'], false, false, "", $js);
@@ -99,6 +98,15 @@ function clear_fields()
        $Ajax->activate('gl_items');
        set_focus('gl_code');
 }
+
+function reset_tax_input()
+{
+       global $Ajax;
+
+       unset($_POST['mantax']);
+       $Ajax->activate('inv_tot');
+}
+
 //------------------------------------------------------------------------------------------------
 //     GL postings are often entered in the same form to two accounts
 //  so fileds are cleared only on user demand.
@@ -143,6 +151,7 @@ if (isset($_POST['AddGLCodeToTrans'])) {
                $_SESSION['supp_trans']->add_gl_codes_to_trans($_POST['gl_code'], $gl_act_name,
                        $_POST['dimension_id'], $_POST['dimension2_id'], 
                        input_num('amount'), $_POST['memo_']);
+               reset_tax_input();
                set_focus('gl_code');
        }
 }
@@ -152,7 +161,7 @@ if (isset($_POST['AddGLCodeToTrans'])) {
 
 function check_data()
 {
-       global $total_grn_value, $total_gl_value, $Refs, $SysPrefs;
+       global $Refs, $SysPrefs;
 
        if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
        {
@@ -161,27 +170,12 @@ function check_data()
                return false;
        }
 
-       if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) 
-       {
-               display_error(_("You must enter an credit note reference."));
-               set_focus('reference');
-               return false;
-       }
-
-       if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no))
+       if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no))
        {
-               display_error(_("The entered reference is already in use."));
                set_focus('reference');
                return false;
        }
 
-       if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference)) 
-       {
-               display_error(_("You must enter a supplier's credit note reference."));
-               set_focus('supp_reference');
-               return false;
-       }
-
        if (!is_date($_SESSION['supp_trans']->tran_date))
        {
                display_error(_("The credit note as entered cannot be processed because the date entered is not valid."));
@@ -201,18 +195,11 @@ function check_data()
                return false;
        }
 
-       if ($_SESSION['supp_trans']->ov_amount < ($total_gl_value + $total_grn_value))
-       {
-               display_error(_("The credit note total as entered is less than the sum of the the general ledger entires (if any) and the charges for goods received. There must be a mistake somewhere, the credit note as entered will not be processed."));
-               return false;
-       }
-
        if (!$SysPrefs->allow_negative_stock()) {
                foreach ($_SESSION['supp_trans']->grn_items as $n => $item) {
                        if (is_inventory_item($item->item_code))
                        {
-                               $qoh = get_qoh_on_date($item->item_code, null, $_SESSION['supp_trans']->tran_date);
-                               if ($item->this_quantity_inv > $qoh)
+                               if (check_negative_stock($item->item_code, -$item->this_quantity_inv, null, $_SESSION['supp_trans']->tran_date))
                                {
                                        $stock = get_item($item->item_code);
                                        display_error(_("The return cannot be processed because there is an insufficient quantity for item:") .
@@ -220,7 +207,6 @@ function check_data()
                                                _("Quantity On Hand") . " = " . number_format2($qoh, get_qty_dec($stock['stock_id'])));
                                        return false;
                                }
-                               return true;
                        }
                }
        }
@@ -315,7 +301,7 @@ if ($id3 != -1)
 {
        $_SESSION['supp_trans']->remove_grn_from_trans($id3);
        $Ajax->activate('grn_items');
-       $Ajax->activate('inv_tot');
+       reset_tax_input();
 }
 
 $id4 = find_submit('Delete2');
@@ -323,13 +309,13 @@ if ($id4 != -1)
 {
        $_SESSION['supp_trans']->remove_gl_codes_from_trans($id4);
        clear_fields();
+       reset_tax_input();
        $Ajax->activate('gl_items');
-       $Ajax->activate('inv_tot');
 }
 if (isset($_POST['RefreshInquiry']))
 {
        $Ajax->activate('grn_items');
-       $Ajax->activate('inv_tot');
+       reset_tax_input();
 }
 
 if (isset($_POST['go']))
@@ -337,7 +323,7 @@ if (isset($_POST['go']))
        $Ajax->activate('gl_items');
        display_quick_entries($_SESSION['supp_trans'], $_POST['qid'], input_num('totamount'), QE_SUPPINV);
        $_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
-       $Ajax->activate('inv_tot');
+       reset_tax_input();
 }
 
 
@@ -349,9 +335,9 @@ invoice_header($_SESSION['supp_trans']);
 if ($_POST['supplier_id']=='') 
        display_error('No supplier found for entered search text');
 else {
-       $total_grn_value = display_grn_items($_SESSION['supp_trans'], 1);
+       display_grn_items($_SESSION['supp_trans'], 1);
 
-       $total_gl_value = display_gl_items($_SESSION['supp_trans'], 1);
+       display_gl_items($_SESSION['supp_trans'], 1);
 
        div_start('inv_tot');
        invoice_totals($_SESSION['supp_trans']);
@@ -373,4 +359,3 @@ br();
 
 end_form();
 end_page();
-?>