X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fcredit_note_entry.php;h=cdd6ebe464ff3c72003ea99948c37b70c41c1747;hb=e79c80704f4d0bc3d3792365dfd7ebf32f9b4227;hp=56e81a1dbfee6cd6928ee8c1e695676ec81f87fa;hpb=cf075cde0c002313459cad1a7ffaab64d244caea;p=fa-stable.git diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php index 56e81a1d..cdd6ebe4 100644 --- a/sales/credit_note_entry.php +++ b/sales/credit_note_entry.php @@ -74,6 +74,8 @@ if (isset($_GET['AddedID'])) { hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Credit Note"), "NewCredit=yes"); + hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$credit_no"); + display_footer_exit(); } else check_edit_conflicts(); @@ -142,14 +144,10 @@ function can_process() return false; if($_SESSION['Items']->trans_no == 0) { if (!$Refs->is_valid($_POST['ref'])) { - display_error( _("You must enter a reference.")); - set_focus('ref'); - $input_error = 1; - } elseif (!is_new_reference($_POST['ref'], ST_CUSTCREDIT)) { - display_error( _("The entered reference is already in use.")); - set_focus('ref'); - $input_error = 1; - } + display_error( _("You must enter a reference.")); + set_focus('ref'); + $input_error = 1; + } } if (!is_date($_POST['OrderDate'])) { display_error(_("The entered date for the credit note is invalid.")); @@ -172,17 +170,23 @@ 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; } copy_to_cn(); $credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']); - new_doc_date($_SESSION['Items']->document_date); - processing_end(); - meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no"); - + if ($credit_no == -1) + { + display_error(_("The entered reference is already in use.")); + set_focus('ref'); + } + else + { + new_doc_date($_SESSION['Items']->document_date); + processing_end(); + meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no"); + } } /*end of process credit note */ //----------------------------------------------------------------------------- @@ -266,7 +270,7 @@ hidden('cart_id'); $customer_error = display_credit_header($_SESSION['Items']); if ($customer_error == "") { - start_table(TABLESTYLE, "width=80%", 10); + start_table(TABLESTYLE, "width='80%'", 10); echo ""; display_credit_items(_("Credit Note Items"), $_SESSION['Items']); credit_options_controls($_SESSION['Items']);