Code cleanup.

[fa-stable.git] / sales / credit_note_entry.php

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 86ce24663f335ef4b35f157d2cbc66ea4ec4fedc..bfa8b788392f8e899e2e45eaabb7eded018ced54 100644 (file)
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -10,6 +10,7 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
+include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
 include_once($path_to_root . "/sales/includes/ui/sales_credit_ui.inc");
 include_once($path_to_root . "/sales/includes/ui/sales_order_ui.inc");
 
@@ -39,6 +40,18 @@ check_db_has_stock_items(_("There are no items defined in the system."));
 check_db_has_customer_branches(_("There are no customers, or there are no customers with branches. Please define customers and customer branches."));
 
 //-----------------------------------------------------------------------------
+if ($ret = context_restore()) {
+ // return from new customer add
+       copy_from_cn();
+       if(isset($ret['customer_id']))
+               $_POST['customer_id'] = $ret['customer_id'];
+       if(isset($ret['branch_id']))
+               $_POST['branch_id'] = $ret['branch_id'];
+}
+if (isset($_POST['_customer_id_editor'])) {
+       copy_to_cn(); //store context
+       context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'], 'Items');
+}
 
 if (isset($_GET['AddedID'])) {
        $credit_no = $_GET['AddedID'];
@@ -46,18 +59,22 @@ if (isset($_GET['AddedID'])) {
 
        display_notification_centered(sprintf(_("Credit Note # %d has been processed"),$credit_no));
 
-       display_note(get_customer_trans_view_str($trans_type, $credit_no, _("View this credit note")), 0, 1);
+       display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View this credit note")), 0, 1);
 
-       display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL Journal Entries for this Credit Note")));
+       display_note(print_document_link($credit_no, _("&Print This Credit Invoice"), true, 11),1);
 
-       hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Credit Note"), "NewCredit=yes");
+       display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")));
+
+       hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Credit Note"), "NewCredit=yes");
 
        display_footer_exit();
 }
 //--------------------------------------------------------------------------------
 
 function line_start_focus() {
-  set_focus(get_company_pref('no_supplier_list') ? 'stock_id_edit' : 'StockID2');
+  global $Ajax;
+  $Ajax->activate('items_table');
+  set_focus('_stock_id_edit');
 }
 
 //-----------------------------------------------------------------------------
@@ -107,17 +124,21 @@ function can_process()
        if($_SESSION['Items']->trans_no == 0) {
            if (!references::is_valid($_POST['ref'])) {
                display_error( _("You must enter a reference."));
+               set_focus('ref');
                $input_error = 1;
            } elseif (!is_new_reference($_POST['ref'], 11))     {
                display_error( _("The entered reference is already in use."));
+               set_focus('ref');
                $input_error = 1;
-           } 
+           }
        }
        if (!is_date($_POST['OrderDate'])) {
                display_error(_("The entered date for the credit note is invalid."));
+               set_focus('OrderDate');
                $input_error = 1;
        } elseif (!is_date_in_fiscalyear($_POST['OrderDate'])) {
                display_error(_("The entered date is not in fiscal year."));
+               set_focus('OrderDate');
                $input_error = 1;
        }
        return ($input_error == 0);
@@ -131,6 +152,7 @@ if (isset($_POST['ProcessCredit']) && can_process()) {
                display_note(_("For credit notes created to write off the stock, a general ledger account is required to be selected."), 1, 0);
                display_note(_("Please select an account to write the cost of the stock off to, then click on Process again."), 1, 0);
                exit;
+               
        }
        if (!isset($_POST['WriteOffGLCode'])) {
                $_POST['WriteOffGLCode'] = 0;
@@ -147,14 +169,17 @@ function check_item_data()
 {
        if (!check_num('qty',0)) {
                display_error(_("The quantity must be greater than zero."));
+               set_focus('qty');
                return false;
        }
        if (!check_num('price',0)) {
                display_error(_("The entered price is negative or invalid."));
+               set_focus('price');
                return false;
        }
        if (!check_num('Disc', 0, 100)) {
                display_error(_("The entered discount percent is negative, greater than 100 or invalid."));
+               set_focus('Disc');
                return false;
        }
        return true;
@@ -196,27 +221,19 @@ $id = find_submit('Delete');
 if ($id!=-1)
        handle_delete_item($id);
 
-if (isset($_POST['AddItem']) || isset($_POST['UpdateItem']))
-       copy_to_cn();
-
 if (isset($_POST['AddItem']))
        handle_new_item();
 
 if (isset($_POST['UpdateItem']))
        handle_update_item();
 
-if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem']))
+if (isset($_POST['CancelItemChanges']))
        line_start_focus();
 
 //-----------------------------------------------------------------------------
 
 if (!processing_active()) {
        handle_new_credit();
-} else {
-       if (!isset($_POST['customer_id']))
-               $_POST['customer_id'] = $_SESSION['Items']->customer_id;
-       if (!isset($_POST['branch_id']))
-               $_POST['branch_id'] = $_SESSION['Items']->Branch;
 }
 
 //-----------------------------------------------------------------------------
@@ -239,7 +256,7 @@ if ($customer_error == "") {
 echo "<br><center><table><tr>";
 submit_cells('Update', _("Update"));
 submit_cells('ProcessCredit', _("Process Credit Note"));
-echo "</tr></table>";
+echo "</tr></table></center>";
 
 end_form();
 end_page();