Double semicolon line endings fixed by @apmuthu.

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

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index a88cdabed2aab5159d5070c458a9aa392b9bd28e..e482386b971a7f9f14998fca9fd46cc814b75e6b 100644 (file)
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -20,17 +20,16 @@ $path_to_root = "..";
 include_once($path_to_root . "/sales/includes/cart_class.inc");
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
-include_once($path_to_root . "/includes/manufacturing.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 . "/reporting/includes/reporting.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();
 }
 
@@ -59,6 +58,8 @@ if (isset($_GET['AddedID'])) {
 
        display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1);
 
+       hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$credit_no");
+
        display_footer_exit();
 
 } elseif (isset($_GET['UpdatedID'])) {
@@ -76,7 +77,7 @@ if (isset($_GET['AddedID'])) {
 
        display_footer_exit();
 } else
-       check_edit_conflicts();
+       check_edit_conflicts(get_post('cart_id'));
 
 
 //-----------------------------------------------------------------------------
@@ -86,30 +87,25 @@ function can_process()
        global $Refs;
 
        if (!is_date($_POST['CreditDate'])) {
-               display_error(_("The entered date is invalid."));;
+               display_error(_("The entered date is invalid."));
                set_focus('CreditDate');
                return false;
        } elseif (!is_date_in_fiscalyear($_POST['CreditDate'])) {
-               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('CreditDate');
                return false;
        }
 
     if ($_SESSION['Items']->trans_no==0) {
-               if (!$Refs->is_valid($_POST['ref'])) {
-                       display_error(_("You must enter a reference."));;
+               if (!$Refs->is_valid($_POST['ref'], ST_CUSTCREDIT)) {
+                       display_error(_("You must enter a reference."));
                        set_focus('ref');
                        return false;
                }
 
-               if (!is_new_reference($_POST['ref'], ST_CUSTCREDIT)) {
-                       display_error(_("The entered reference is already in use."));;
-                       set_focus('ref');
-                       return false;
-               }
     }
        if (!check_num('ChargeFreightCost', 0)) {
-               display_error(_("The entered shipping cost is invalid or less than zero."));;
+               display_error(_("The entered shipping cost is invalid or less than zero."));
                set_focus('ChargeFreightCost');
                return false;
        }
@@ -173,7 +169,7 @@ function copy_to_cart()
        $cart->ship_via = $_POST['ShipperID'];
        $cart->freight_cost = input_num('ChargeFreightCost');
        $cart->document_date =  $_POST['CreditDate'];
-       $cart->Location = $_POST['Location'];
+       $cart->Location = (isset($_POST['Location']) ? $_POST['Location'] : "");
        $cart->Comments = $_POST['CreditText'];
        if ($_SESSION['Items']->trans_no == 0)
                $cart->reference = $_POST['ref'];
@@ -194,21 +190,26 @@ function copy_from_cart()
 //-----------------------------------------------------------------------------
 
 if (isset($_POST['ProcessCredit']) && can_process()) {
+       $new_credit = ($_SESSION['Items']->trans_no == 0);
 
-    $new_credit = ($_SESSION['Items']->trans_no == 0);
-
-    if (!isset($_POST['WriteOffGLCode']))
+       if (!isset($_POST['WriteOffGLCode']))
                $_POST['WriteOffGLCode'] = 0;
 
        copy_to_cart();
-       if ($new_credit) new_doc_date($_SESSION['Items']->document_date);
-    $credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
-
-       processing_end();
-       if ($new_credit) {
-               meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
-       } else {
-               meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
+       if ($new_credit) 
+               new_doc_date($_SESSION['Items']->document_date);
+       $credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
+       if ($credit_no == -1)
+       {
+               display_error(_("The entered reference is already in use."));
+               set_focus('ref');
+       } elseif($credit_no) {
+               processing_end();
+               if ($new_credit) {
+                       meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
+               } else {
+                       meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
+               }
        }
 }
 
@@ -225,10 +226,10 @@ function display_credit_items()
     start_form();
        hidden('cart_id');
 
-       start_table(TABLESTYLE2, "width=80%", 5);
+       start_table(TABLESTYLE2, "width='80%'", 5);
        echo "<tr><td>"; // outer table
 
-    start_table(TABLESTYLE, "width=100%");
+    start_table(TABLESTYLE, "width='100%'");
     start_row();
     label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
        label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'");
@@ -236,11 +237,11 @@ function display_credit_items()
     end_row();
     start_row();
 
-//     if (!isset($_POST['ref']))
-//             $_POST['ref'] = $Refs->get_next(11);
-
     if ($_SESSION['Items']->trans_no==0) {
-               ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
+               ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'", false, ST_CUSTCREDIT,
+               array('customer' => $_SESSION['Items']->customer_id,
+                       'branch' => $_SESSION['Items']->Branch,
+                       'date' => get_post('CreditDate')));
        } else {
                label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
        }
@@ -251,17 +252,13 @@ function display_credit_items()
        }
        label_cell(_("Shipping Company"), "class='tableheader2'");
        shippers_list_cells(null, 'ShipperID', $_POST['ShipperID']);
-//     if (!isset($_POST['sales_type_id']))
-//       $_POST['sales_type_id'] = $_SESSION['Items']->sales_type;
-//     label_cell(_("Sales Type"), "class='tableheader2'");
-//     sales_types_list_cells(null, 'sales_type_id', $_POST['sales_type_id']);
 
        end_row();
        end_table();
 
     echo "</td><td>";// outer table
 
-    start_table(TABLESTYLE, "width=100%");
+    start_table(TABLESTYLE, "width='100%'");
 
     label_row(_("Invoice Date"), $_SESSION['Items']->src_date, "class='tableheader2'");
 
@@ -274,7 +271,7 @@ function display_credit_items()
        end_table(1); // outer table
 
        div_start('credit_items');
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
     $th = array(_("Item Code"), _("Item Description"), _("Invoiced Quantity"), _("Units"),
        _("Credit Quantity"), _("Price"), _("Discount %"), _("Total"));
     table_header($th);
@@ -367,6 +364,7 @@ function display_credit_options()
 //-----------------------------------------------------------------------------
 if (get_post('Update'))
 {
+       copy_to_cart();
        $Ajax->activate('credit_items');
 }
 //-----------------------------------------------------------------------------
@@ -385,4 +383,3 @@ end_form();
 
 end_page();
 
-?>