X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=63c5ea2ff8541054ba58c6adee7781d097200cc1;hb=499e0e615d1a845c6c519754b3a213fdda0513ba;hp=2b7ded83236daa577c6924951679893b429f9086;hpb=fed6bc04a7b050a0b69136a332e92ee651812487;p=fa-stable.git diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php index 2b7ded83..63c5ea2f 100644 --- a/sales/credit_note_entry.php +++ b/sales/credit_note_entry.php @@ -1,4 +1,14 @@ . +***********************************************************************/ //--------------------------------------------------------------------------- // // Entry/Modify free hand Credit Note @@ -10,8 +20,10 @@ 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"); +include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; if ($use_popup_windows) { @@ -39,6 +51,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,14 +70,18 @@ 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),0, 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(); -} +} else + check_edit_conflicts(); + //-------------------------------------------------------------------------------- function line_start_focus() { @@ -66,26 +94,33 @@ function line_start_focus() { function copy_to_cn() { - $_SESSION['Items']->Comments = $_POST['CreditText']; - $_SESSION['Items']->document_date = $_POST['OrderDate']; - $_SESSION['Items']->freight_cost = input_num('ChargeFreightCost'); - $_SESSION['Items']->Location = $_POST["Location"]; - $_SESSION['Items']->sales_type = $_POST['sales_type_id']; - $_SESSION['Items']->reference = $_POST['ref']; - $_SESSION['Items']->ship_via = $_POST['ShipperID']; + $cart = &$_SESSION['Items']; + $cart->Comments = $_POST['CreditText']; + $cart->document_date = $_POST['OrderDate']; + $cart->freight_cost = input_num('ChargeFreightCost'); + $cart->Location = $_POST["Location"]; + $cart->sales_type = $_POST['sales_type_id']; + $cart->reference = $_POST['ref']; + $cart->ship_via = $_POST['ShipperID']; + $cart->dimension_id = $_POST['dimension_id']; + $cart->dimension2_id = $_POST['dimension2_id']; } //----------------------------------------------------------------------------- function copy_from_cn() { - $_POST['CreditText'] = $_SESSION['Items']->Comments; - $_POST['OrderDate'] = $_SESSION['Items']->document_date; - $_POST['ChargeFreightCost'] = price_format($_SESSION['Items']->freight_cost); - $_POST['Location'] = $_SESSION['Items']->Location; - $_POST['sales_type_id'] = $_SESSION['Items']->sales_type; - $_POST['ref'] = $_SESSION['Items']->reference; - $_POST['ShipperID'] = $_SESSION['Items']->ship_via; + $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; + $_POST['ShipperID'] = $cart->ship_via; + $_POST['dimension_id'] = $cart->dimension_id; + $_POST['dimension2_id'] = $cart->dimension2_id; + $_POST['cart_id'] = $cart->cart_id; } //----------------------------------------------------------------------------- @@ -95,7 +130,6 @@ function handle_new_credit($trans_no) processing_start(); $_SESSION['Items'] = new Cart(11,$trans_no); copy_from_cn(); - line_start_focus(); } //----------------------------------------------------------------------------- @@ -133,6 +167,7 @@ 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); @@ -143,6 +178,7 @@ if (isset($_POST['ProcessCredit']) && can_process()) { 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"); @@ -207,32 +243,25 @@ $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; } //----------------------------------------------------------------------------- -start_form(false, true); +start_form(); +hidden('cart_id'); $customer_error = display_credit_header($_SESSION['Items']); @@ -240,7 +269,7 @@ if ($customer_error == "") { start_table("$table_style width=80%", 10); echo "