X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=cdd6ebe464ff3c72003ea99948c37b70c41c1747;hb=ed0785a414d898b8024bb5d30247bb64bf4a968b;hp=51d75ab7e27f562e7d46feedeae34da58e71891f;hpb=f0f8ddf8c1a03244610594f24263443c41b4b086;p=fa-stable.git diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php index 51d75ab7..cdd6ebe4 100644 --- a/sales/credit_note_entry.php +++ b/sales/credit_note_entry.php @@ -1,10 +1,20 @@ . +***********************************************************************/ //--------------------------------------------------------------------------- // // Entry/Modify free hand Credit Note // -$page_security = 3; -$path_to_root=".."; +$page_security = 'SA_SALESCREDIT'; +$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"); @@ -13,6 +23,7 @@ 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"); +include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; if ($use_popup_windows) { @@ -23,12 +34,12 @@ if ($use_date_picker) { } if(isset($_GET['NewCredit'])) { - $_SESSION['page_title'] = _("Customer Credit Note"); + $_SESSION['page_title'] = _($help_context = "Customer Credit Note"); handle_new_credit(0); } elseif (isset($_GET['ModifyCredit'])) { $_SESSION['page_title'] = sprintf(_("Modifying Customer Credit Note #%d"), $_GET['ModifyCredit']); handle_new_credit($_GET['ModifyCredit']); - $help_page_title = _("Modifying Customer Credit Note"); + $help_context = "Modifying Customer Credit Note"; } page($_SESSION['page_title'],false, false, "", $js); @@ -40,33 +51,35 @@ 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 (list_updated('branch_id')) { + // when branch is selected via external editor also customer can change + $br = get_branch(get_post('branch_id')); + $_POST['customer_id'] = $br['debtor_no']; + $Ajax->activate('customer_id'); } if (isset($_GET['AddedID'])) { $credit_no = $_GET['AddedID']; - $trans_type = 11; + $trans_type = ST_CUSTCREDIT; 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(print_document_link($credit_no."-".$trans_type, _("&Print This Credit Invoice"), true, ST_CUSTCREDIT),0, 1); + display_note(print_document_link($credit_no."-".$trans_type, _("&Email This Credit Invoice"), true, ST_CUSTCREDIT, false, "printlink", "", 1),0, 1); + + display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note"))); - 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"); - 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(); + //-------------------------------------------------------------------------------- function line_start_focus() { @@ -80,14 +93,16 @@ function line_start_focus() { function copy_to_cn() { $cart = &$_SESSION['Items']; - $cart->Comments = $_POST['CreditText']; $cart->document_date = $_POST['OrderDate']; $cart->freight_cost = input_num('ChargeFreightCost'); - $cart->Location = $_POST["Location"]; + $cart->Location = (isset($_POST["Location"]) ? $_POST["Location"] : ""); $cart->sales_type = $_POST['sales_type_id']; - $cart->reference = $_POST['ref']; + if ($cart->trans_no == 0) + $cart->reference = $_POST['ref']; $cart->ship_via = $_POST['ShipperID']; + $cart->dimension_id = $_POST['dimension_id']; + $cart->dimension2_id = $_POST['dimension2_id']; } //----------------------------------------------------------------------------- @@ -95,14 +110,17 @@ function copy_to_cn() function copy_from_cn() { $cart = &$_SESSION['Items']; - $_POST['CreditText'] = $cart->Comments; $_POST['OrderDate'] = $cart->document_date; $_POST['ChargeFreightCost'] = price_format($cart->freight_cost); $_POST['Location'] = $cart->Location; $_POST['sales_type_id'] = $cart->sales_type; - $_POST['ref'] = $cart->reference; + if ($cart->trans_no == 0) + $_POST['ref'] = $cart->reference; $_POST['ShipperID'] = $cart->ship_via; + $_POST['dimension_id'] = $cart->dimension_id; + $_POST['dimension2_id'] = $cart->dimension2_id; + $_POST['cart_id'] = $cart->cart_id; } //----------------------------------------------------------------------------- @@ -110,7 +128,7 @@ function copy_from_cn() function handle_new_credit($trans_no) { processing_start(); - $_SESSION['Items'] = new Cart(11,$trans_no); + $_SESSION['Items'] = new Cart(ST_CUSTCREDIT,$trans_no); copy_from_cn(); } @@ -118,21 +136,18 @@ function handle_new_credit($trans_no) function can_process() { + global $Refs; $input_error = 0; if ($_SESSION['Items']->count_items() == 0 && (!check_num('ChargeFreightCost',0))) return false; 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 (!$Refs->is_valid($_POST['ref'])) { + 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.")); @@ -149,21 +164,29 @@ function can_process() //----------------------------------------------------------------------------- if (isset($_POST['ProcessCredit']) && can_process()) { + copy_to_cn(); if ($_POST['CreditType'] == "WriteOff" && (!isset($_POST['WriteOffGLCode']) || $_POST['WriteOffGLCode'] == '')) { 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']); - 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 */ //----------------------------------------------------------------------------- @@ -236,20 +259,21 @@ if (isset($_POST['CancelItemChanges'])) //----------------------------------------------------------------------------- if (!processing_active()) { - handle_new_credit(); + handle_new_credit(0); } //----------------------------------------------------------------------------- -start_form(false, true); +start_form(); +hidden('cart_id'); $customer_error = display_credit_header($_SESSION['Items']); if ($customer_error == "") { - start_table("$table_style width=80%", 10); + start_table(TABLESTYLE, "width='80%'", 10); echo ""; display_credit_items(_("Credit Note Items"), $_SESSION['Items']); - credit_options_controls(); + credit_options_controls($_SESSION['Items']); echo ""; end_table(); } else { @@ -258,7 +282,7 @@ if ($customer_error == "") { echo "
"; submit_cells('Update', _("Update")); -submit_cells('ProcessCredit', _("Process Credit Note")); +submit_cells('ProcessCredit', _("Process Credit Note"), '', false, 'default'); echo "
"; end_form();