X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=1e29859ea49905f170704b7f19967f9c62c0a4e7;hb=25379bdc9f10bda4aae4b37f04d16eb1bbe7e4f6;hp=a49c5c55c236c5a0d95156f9fd44ba8e15740eac;hpb=f2343f51b0ed0d9abd2ec98b64f202beb9716d37;p=fa-stable.git diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index a49c5c55..1e29859e 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -173,7 +173,7 @@ function check_data() } if ($_SESSION['Items']->trans_no==0) { - if (!$Refs->is_valid($_POST['ref'])) { + if (!$Refs->is_valid($_POST['ref'], ST_CUSTDELIVERY)) { display_error(_("You must enter a reference.")); set_focus('ref'); return false; @@ -248,13 +248,13 @@ function check_quantities() // Update cart delivery quantities/descriptions foreach ($_SESSION['Items']->line_items as $line=>$itm) { if (isset($_POST['Line'.$line])) { - if($_SESSION['Items']->trans_no) { - $min = $itm->qty_done; - $max = $itm->quantity; - } else { - $min = 0; - $max = $itm->quantity - $itm->qty_done; - } + if($_SESSION['Items']->trans_no) { + $min = $itm->qty_done; + $max = $itm->quantity; + } else { + $min = 0; + $max = $itm->quantity - $itm->qty_done; + } if (check_num('Line'.$line, $min, $max)) { $_SESSION['Items']->line_items[$line]->qty_dispatched = @@ -329,11 +329,11 @@ label_cells(_("Currency"), $_SESSION['Items']->customer_currency, "class='tableh end_row(); start_row(); -//if (!isset($_POST['ref'])) -// $_POST['ref'] = $Refs->get_next(ST_CUSTDELIVERY); - if ($_SESSION['Items']->trans_no==0) { - ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'"); + ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'", false, ST_CUSTDELIVERY, + array('customer' => $_SESSION['Items']->customer_id, + 'branch' => $_SESSION['Items']->Branch, + 'date' => get_post('DispatchDate'))); } else { label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'"); } @@ -376,7 +376,7 @@ if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) { $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['DispatchDate']); } customer_credit_row($_SESSION['Items']->customer_id, $_SESSION['Items']->credit, "class='tableheader2'"); -// 2010-09-03 Joe Hunt + $dim = get_company_pref('use_dimension'); if ($dim > 0) { start_row();