X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=sales%2Fcustomer_credit_invoice.php;h=b19746120882e497d25503e7516ea0edb5395646;hb=7d9fe15f85c15572535c5fa4555b9a72e9d93f04;hp=8ccbb6e9cfcf217faab43851b7b535f91d20ada3;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git
diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 8ccbb6e9..b1974612 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -1,4 +1,14 @@
.
+***********************************************************************/
//---------------------------------------------------------------------------
//
// Entry/Modify Credit Note for selected Sales Invoice
@@ -39,33 +49,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 +122,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 "
";
- 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;
@@ -151,6 +152,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 =
@@ -174,23 +178,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;
}
//-----------------------------------------------------------------------------
@@ -225,6 +233,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 "