X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=77ef73366f72c89d39837f31628559227571af3d;hb=d2cc0860eccf02eaefcd90731ac3af141a841529;hp=d87653e0847e2193de13bfa8bb278717dc534585;hpb=f6857ddce763542393996620848daa7ce519842d;p=fa-stable.git diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php index d87653e0..77ef7336 100644 --- a/sales/customer_credit_invoice.php +++ b/sales/customer_credit_invoice.php @@ -1,10 +1,20 @@ . +***********************************************************************/ //--------------------------------------------------------------------------- // // Entry/Modify Credit Note for selected Sales Invoice // -$page_security = 3; +$page_security = 'SA_SALESCREDITINV'; $path_to_root = ".."; include_once($path_to_root . "/sales/includes/cart_class.inc"); @@ -26,10 +36,10 @@ if ($use_date_picker) { if (isset($_GET['ModifyCredit'])) { $_SESSION['page_title'] = sprintf(_("Modifying Credit Invoice # %d."), $_GET['ModifyCredit']); - $help_page_title =_("Modifying Credit Invoice"); + $help_context = "Modifying Credit Invoice"; processing_start(); } elseif (isset($_GET['InvoiceNumber'])) { - $_SESSION['page_title'] = _("Credit all or part of an Invoice"); + $_SESSION['page_title'] = _($help_context = "Credit all or part of an Invoice"); processing_start(); } page($_SESSION['page_title'], false, false, "", $js); @@ -38,37 +48,41 @@ page($_SESSION['page_title'], false, false, "", $js); if (isset($_GET['AddedID'])) { $credit_no = $_GET['AddedID']; - $trans_type = 11; + $trans_type = ST_CUSTCREDIT; display_notification_centered(_("Credit Note has been processed")); - display_note(get_customer_trans_view_str($trans_type, $credit_no, _("View This Credit Note")), 0, 0); + display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View This Credit Note")), 0, 0); - display_note(print_document_link($credit_no, _("Print This Credit Note"), true, 11),1); + display_note(print_document_link($credit_no, _("&Print This Credit Note"), true, $trans_type),1); - display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL Journal Entries for this Credit Note")),1); + display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1); display_footer_exit(); } elseif (isset($_GET['UpdatedID'])) { $credit_no = $_GET['UpdatedID']; - $trans_type = 11; + $trans_type = ST_CUSTCREDIT; display_notification_centered(_("Credit Note has been updated")); - display_note(get_customer_trans_view_str($trans_type, $credit_no, _("View This Credit Note")), 0, 0); + display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View This Credit Note")), 0, 0); - display_note(print_document_link($credit_no, _("Print This Credit Note"), true, 11),1); + display_note(print_document_link($credit_no, _("&Print This Credit Note"), true, $trans_type),1); - display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL Journal Entries for this Credit Note")),1); + display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1); display_footer_exit(); -} +} else + check_edit_conflicts(); + //----------------------------------------------------------------------------- function can_process() { + global $Refs; + if (!is_date($_POST['CreditDate'])) { display_error(_("The entered date is invalid."));; set_focus('CreditDate'); @@ -80,13 +94,13 @@ function can_process() } if ($_SESSION['Items']->trans_no==0) { - if (!references::is_valid($_POST['ref'])) { + if (!$Refs->is_valid($_POST['ref'])) { display_error(_("You must enter a reference."));; set_focus('ref'); return false; } - if (!is_new_reference($_POST['ref'], 11)) { + if (!is_new_reference($_POST['ref'], ST_CUSTCREDIT)) { display_error(_("The entered reference is already in use."));; set_focus('ref'); return false; @@ -108,14 +122,14 @@ function can_process() if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) { - $ci = new Cart(10, $_GET['InvoiceNumber'], true); + $ci = new Cart(ST_SALESINVOICE, $_GET['InvoiceNumber'], true); - $ci->trans_type = 11; + $ci->trans_type = ST_CUSTCREDIT; $ci->src_docs = $ci->trans_no; $ci->src_date = $ci->document_date; $ci->trans_no = 0; - $ci->document_date = Today(); - $ci->reference = references::get_next(11); + $ci->document_date = new_doc_date(); + $ci->reference = $Refs->get_next(ST_CUSTCREDIT); for ($line_no=0; $line_noline_items); $line_no++) { $ci->line_items[$line_no]->qty_dispatched = '0'; @@ -126,7 +140,7 @@ if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) { } elseif ( isset($_GET['ModifyCredit']) && $_GET['ModifyCredit']>0) { - $_SESSION['Items'] = new Cart(11,$_GET['ModifyCredit']); + $_SESSION['Items'] = new Cart(ST_CUSTCREDIT,$_GET['ModifyCredit']); copy_from_cart(); } elseif (!processing_active()) { @@ -140,6 +154,9 @@ function check_quantities() { $ok =1; foreach ($_SESSION['Items']->line_items as $line_no=>$itm) { + if ($itm->quantity == $itm->qty_done) { + continue; // this line was fully credited/removed + } if (isset($_POST['Line'.$line_no])) { if (check_num('Line'.$line_no, 0, $itm->quantity)) { $_SESSION['Items']->line_items[$line_no]->qty_dispatched = @@ -163,23 +180,27 @@ function check_quantities() function copy_to_cart() { - $cart = &$_SESSION['Items']; - $cart->ship_via = $_POST['ShipperID']; - $cart->freight_cost = input_num('ChargeFreightCost'); - $cart->document_date = $_POST['CreditDate']; - $cart->Location = $_POST['Location']; - $cart->Comments = $_POST['CreditText']; + $cart = &$_SESSION['Items']; + $cart->ship_via = $_POST['ShipperID']; + $cart->freight_cost = input_num('ChargeFreightCost'); + $cart->document_date = $_POST['CreditDate']; + $cart->Location = $_POST['Location']; + $cart->Comments = $_POST['CreditText']; + if ($_SESSION['Items']->trans_no == 0) + $cart->reference = $_POST['ref']; } //----------------------------------------------------------------------------- function copy_from_cart() { - $cart = &$_SESSION['Items']; - $_POST['ShipperID'] = $cart->ship_via; - $_POST['ChargeFreightCost'] = price_format($cart->freight_cost); - $_POST['CreditDate']= $cart->document_date; - $_POST['Location']= $cart->Location; - $_POST['CreditText']= $cart->Comments; + $cart = &$_SESSION['Items']; + $_POST['ShipperID'] = $cart->ship_via; + $_POST['ChargeFreightCost'] = price_format($cart->freight_cost); + $_POST['CreditDate']= $cart->document_date; + $_POST['Location']= $cart->Location; + $_POST['CreditText']= $cart->Comments; + $_POST['cart_id'] = $cart->cart_id; + $_POST['ref'] = $cart->reference; } //----------------------------------------------------------------------------- @@ -191,6 +212,7 @@ if (isset($_POST['ProcessCredit']) && can_process()) { $_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(); @@ -213,7 +235,8 @@ function display_credit_items() { global $table_style, $table_style2; - start_form(false, true); + start_form(); + hidden('cart_id'); start_table("$table_style2 width=80%", 5); echo ""; // outer table @@ -227,15 +250,14 @@ function display_credit_items() start_row(); // if (!isset($_POST['ref'])) -// $_POST['ref'] = references::get_next(11); +// $_POST['ref'] = $Refs->get_next(11); if ($_SESSION['Items']->trans_no==0) { - ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'"); + ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'"); } else { label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'"); } -// label_cells(_("Crediting Invoice"), get_customer_trans_view_str(10, $_SESSION['InvoiceToCredit']), "class='tableheader2'"); - label_cells(_("Crediting Invoice"), get_customer_trans_view_str(10, array_keys($_SESSION['Items']->src_docs)), "class='tableheader2'"); + label_cells(_("Crediting Invoice"), get_customer_trans_view_str(ST_SALESINVOICE, array_keys($_SESSION['Items']->src_docs)), "class='tableheader2'"); if (!isset($_POST['ShipperID'])) { $_POST['ShipperID'] = $_SESSION['Items']->ship_via; @@ -256,7 +278,7 @@ function display_credit_items() label_row(_("Invoice Date"), $_SESSION['Items']->src_date, "class='tableheader2'"); - date_row(_("Credit Note Date"), 'CreditDate', '', null, 0, 0, 0, "class='tableheader2'"); + date_row(_("Credit Note Date"), 'CreditDate', '', $_SESSION['Items']->trans_no==0, 0, 0, 0, "class='tableheader2'"); end_table(); @@ -273,8 +295,8 @@ function display_credit_items() $k = 0; //row colour counter foreach ($_SESSION['Items']->line_items as $line_no=>$ln_itm) { - if ($ln_itm->quantity==$ln_itm->qty_done) { - continue; // this line was fully credited + if ($ln_itm->quantity == $ln_itm->qty_done) { + continue; // this line was fully credited/removed } alt_table_row_color($k); @@ -368,7 +390,7 @@ display_credit_options(); echo "
"; submit('Update', _("Update"), true, _('Update credit value for quantities entered'), true); echo " "; -submit('ProcessCredit', _("Process Credit Note"), true, '', true); +submit('ProcessCredit', _("Process Credit Note"), true, '', 'default'); echo "
"; end_form();