X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=d87653e0847e2193de13bfa8bb278717dc534585;hb=13aa48ccc9265df336a1805d2e4709365f19c956;hp=9b8c0d86000a80efe85afb8966a92a058d0d3d2f;hpb=6e349a924dd02e35d94555807d34b25e4427ab6e;p=fa-stable.git
diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 9b8c0d86..d87653e0 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -39,7 +39,6 @@ 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"));
@@ -54,7 +53,6 @@ if (isset($_GET['AddedID'])) {
} elseif (isset($_GET['UpdatedID'])) {
$credit_no = $_GET['UpdatedID'];
$trans_type = 11;
- print_hidden_script(11);
display_notification_centered(_("Credit Note has been updated"));
@@ -99,7 +97,10 @@ function can_process()
set_focus('ChargeFreightCost');
return false;
}
-
+ if (!check_quantities()) {
+ display_error(_("Selected quantity cannot be less than zero nor more than quantity not credited yet."));
+ return false;
+ }
return true;
}
@@ -109,15 +110,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;
@@ -140,14 +132,23 @@ if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
} elseif (!processing_active()) {
/* This page can only be called with an invoice number for crediting*/
die (_("This page can only be opened if an invoice has been selected for crediting."));
-} else {
+} elseif (!check_quantities()) {
+ display_error(_("Selected quantity cannot be less than zero nor more than quantity not credited yet."));
+}
+
+function check_quantities()
+{
+ $ok =1;
foreach ($_SESSION['Items']->line_items as $line_no=>$itm) {
if (isset($_POST['Line'.$line_no])) {
- if (check_num('Line'.$line_no, ($itm->quantity - $itm->qty_done))) {
+ if (check_num('Line'.$line_no, 0, $itm->quantity)) {
$_SESSION['Items']->line_items[$line_no]->qty_dispatched =
input_num('Line'.$line_no);
}
}
+ else {
+ $ok = 0;
+ }
if (isset($_POST['Line'.$line_no.'Desc'])) {
$line_desc = $_POST['Line'.$line_no.'Desc'];
@@ -156,6 +157,7 @@ if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
}
}
}
+ return $ok;
}
//-----------------------------------------------------------------------------
@@ -262,6 +264,7 @@ function display_credit_items()
end_table(1); // outer table
+ div_start('credit_items');
start_table("$table_style width=80%");
$th = array(_("Item Code"), _("Item Description"), _("Invoiced Quantity"), _("Units"),
_("Credit Quantity"), _("Price"), _("Discount %"), _("Total"));
@@ -283,9 +286,8 @@ function display_credit_items()
$dec = get_qty_dec($ln_itm->stock_id);
qty_cell($ln_itm->quantity, false, $dec);
label_cell($ln_itm->units);
-
- amount_cells(null, 'Line'.$line_no, number_format2($ln_itm->qty_dispatched, $dec));
-
+ amount_cells(null, 'Line'.$line_no, number_format2($ln_itm->qty_dispatched, $dec),
+ null, null, $dec);
$line_total =($ln_itm->qty_dispatched * $ln_itm->price * (1 - $ln_itm->discount_percent));
amount_cell($ln_itm->price);
@@ -300,7 +302,7 @@ function display_credit_items()
start_row();
label_cell(_("Credit Shipping Cost"), "colspan=7 align=right");
- amount_cells(null, "ChargeFreightCost", $_POST['ChargeFreightCost'], 6, 6);
+ amount_cells_ex(null, "ChargeFreightCost", 6, 8, $_POST['ChargeFreightCost']);
end_row();
$inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
@@ -317,53 +319,56 @@ function display_credit_items()
label_row(_("Credit Note Total"), $display_total, "colspan=7 align=right", "align=right");
end_table();
+ div_end();
}
//-----------------------------------------------------------------------------
-
function display_credit_options()
{
- global $table_style2;
-
- echo " ";
- start_table($table_style2);
-
- echo "
" . _("Credit Note Type") . "
";
- echo "
";
- echo"
";
+ global $table_style2, $Ajax;
+ echo " ";
- if (!isset($_POST['CreditType']) || $_POST['CreditType'] == "Return") {
+if (isset($_POST['_CreditType_update']))
+ $Ajax->activate('options');
- /*if the credit note is a return of goods then need to know which location to receive them into */
- if (!isset($_POST['Location'])) {
- $_POST['Location'] = $_SESSION['Items']->Location;
- }
+ div_start('options');
+ start_table("$table_style2");
- locations_list_row(_("Items Returned to Inventory Location"), 'Location', $_POST['Location']);
- } else { /* the goods are to be written off to somewhere */
- gl_all_accounts_list_row(_("Write Off the Cost of the Items to"), 'WriteOffGLCode', $_POST['WriteOffGLCode']);
- }
- textarea_row(_("Memo"), "CreditText", null, 45, 3);
- end_table();
+ credit_type_list_row(_("Credit Note Type"), 'CreditType', null, true);
+
+ if ($_POST['CreditType'] == "Return")
+ {
+
+ /*if the credit note is a return of goods then need to know which location to receive them into */
+ if (!isset($_POST['Location']))
+ $_POST['Location'] = $_SESSION['Items']->Location;
+ locations_list_row(_("Items Returned to Location"), 'Location', $_POST['Location']);
+ }
+ else
+ {
+ /* the goods are to be written off to somewhere */
+ gl_all_accounts_list_row(_("Write off the cost of the items to"), 'WriteOffGLCode', null);
+ }
+
+ textarea_row(_("Memo"), "CreditText", null, 51, 3);
+ echo "";
+ div_end();
}
+//-----------------------------------------------------------------------------
+if (get_post('Update'))
+{
+ $Ajax->activate('credit_items');
+}
//-----------------------------------------------------------------------------
display_credit_items();
display_credit_options();
echo "