Fixed new db pager generation on first display of exchange_rates page.

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

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 8ccbb6e9cfcf217faab43851b7b535f91d20ada3..9796bbd73eb190ed5def865d4581e017a0048adb 100644 (file)
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -39,33 +39,33 @@ page($_SESSION['page_title'], false, false, "", $js);
 if (isset($_GET['AddedID'])) {
        $credit_no = $_GET['AddedID'];
        $trans_type = 11;
-       print_hidden_script(11);
 
        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, 11),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;
-       print_hidden_script(11);
 
        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, 11),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();
+
 
 //-----------------------------------------------------------------------------
 
@@ -112,15 +112,6 @@ if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
 
     $ci = new Cart(10, $_GET['InvoiceNumber'], true);
 
-    if ($ci==null) {
-               display_error(_("This invoice can not be credited using the automatic facility."));
-               display_error("Please report that a duplicate debtor_trans header record was found for invoice " . key($ci->src_docs));
-               echo "<br><br>";
-               processing_end();
-               exit;
-    }
-    //valid invoice record returned from the entered invoice number
-
     $ci->trans_type = 11;
     $ci->src_docs = $ci->trans_no;
     $ci->src_date = $ci->document_date;
@@ -191,6 +182,7 @@ function copy_from_cart()
   $_POST['CreditDate']= $cart->document_date;
   $_POST['Location']= $cart->Location;
   $_POST['CreditText']= $cart->Comments;
+  $_POST['cart_id'] = $cart->cart_id;
 }
 //-----------------------------------------------------------------------------
 
@@ -225,6 +217,7 @@ function display_credit_items()
        global $table_style, $table_style2;
 
     start_form(false, true);
+       hidden('cart_id');
 
        start_table("$table_style2 width=80%", 5);
        echo "<tr><td>"; // outer table