if (isset($_GET['AddedID'])) {
$dispatch_no = $_GET['AddedID'];
- print_hidden_script(13);
display_notification(_("Dispatch processed:") . ' '.$_GET['AddedID'], true);
} elseif (isset($_GET['UpdatedID'])) {
$delivery_no = $_GET['UpdatedID'];
- print_hidden_script(13);
display_notification_centered(sprintf(_('Delivery Note # %d has been updated.'),$delivery_no));
if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
- $ord = new Cart(30,$_GET['OrderNumber'], true);
+ $ord = new Cart(30, $_GET['OrderNumber'], true);
/*read in all the selected order into the Items cart */
$ord->order_no = key($ord->trans_no);
$ord->trans_no = 0;
$ord->reference = references::get_next(13);
+ $ord->document_date = Today();
$_SESSION['Items'] = $ord;
copy_from_cart();
}
copy_from_cart();
-
+
} elseif ( !processing_active() ) {
/* This page can only be called with an order number for invoicing*/
exit;
} elseif (!check_quantities()) {
- display_error(_("Selected quantity cannot be less then quantity invoiced nor more then quantity
+ display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
not dispatched on sales order."));
-}
+
+} elseif(!check_num('ChargeFreightCost', 0))
+ display_error(_("Freight cost cannot be less than zero"));
+ set_focus('ChargeFreightCost');
+
+
//-----------------------------------------------------------------------------
function check_data()
{
if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
display_error(_("The entered date of delivery is invalid."));
+ set_focus('DispatchDate');
return false;
}
if (!is_date_in_fiscalyear($_POST['DispatchDate'])) {
display_error(_("The entered date of delivery is not in fiscal year."));
+ set_focus('DispatchDate');
return false;
}
if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
display_error(_("The entered dead-line for invoice is invalid."));
+ set_focus('due_date');
return false;
}
if ($_SESSION['Items']->trans_no==0) {
if (!references::is_valid($_POST['ref'])) {
display_error(_("You must enter a reference."));
+ set_focus('ref');
return false;
}
if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], 13)) {
display_error(_("The entered reference is already in use."));
+ set_focus('ref');
return false;
}
}
if ($_POST['ChargeFreightCost'] == "") {
- $_POST['ChargeFreightCost'] = 0;
+ $_POST['ChargeFreightCost'] = price_format(0);
}
- if (!is_numeric($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] < 0) {
+ if (!check_num('ChargeFreightCost',0)) {
display_error(_("The entered shipping value is not numeric."));
+ set_focus('ChargeFreightCost');
return false;
}
- if ($_SESSION['Items']->has_items_dispatch() == 0 && $_POST['ChargeFreightCost'] == 0) {
+ if ($_SESSION['Items']->has_items_dispatch() == 0 && input_num('ChargeFreightCost') == 0) {
display_error(_("There are no item quantities on this delivery note."));
return false;
}
if (!check_quantities()) {
- display_error(_("Selected quantity cannot be less then quantity invoiced nor more then quantity
+ display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
not dispatched on sales order."));
return false;
}
{
$cart = &$_SESSION['Items'];
$cart->ship_via = $_POST['ship_via'];
- $cart->freight_cost = $_POST['ChargeFreightCost'];
- $cart->document_date = $_POST['DispatchDate'];
+ $cart->freight_cost = input_num('ChargeFreightCost');
+ $cart->document_date = $_POST['DispatchDate'];
$cart->due_date = $_POST['due_date'];
$cart->Location = $_POST['Location'];
$cart->Comments = $_POST['Comments'];
{
$cart = &$_SESSION['Items'];
$_POST['ship_via'] = $cart->ship_via;
- $_POST['ChargeFreightCost'] = $cart->freight_cost;
- $_POST['DispatchDate']= $cart->document_date;
+ $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
+ $_POST['DispatchDate'] = $cart->document_date;
$_POST['due_date'] = $cart->due_date;
- $_POST['Location']= $cart->Location;
- $_POST['Comments']= $cart->Comments;
+ $_POST['Location'] = $cart->Location;
+ $_POST['Comments'] = $cart->Comments;
}
//------------------------------------------------------------------------------
// Update cart delivery quantities/descriptions
foreach ($_SESSION['Items']->line_items as $line=>$itm) {
if (isset($_POST['Line'.$line])) {
- $line_qty = $_POST['Line'.$line];
- if (is_numeric($line_qty) && ($_POST['Line'.$line] <= $itm->quantity) &&
- ($_POST['Line'.$line] >= $itm->qty_done)) {
-
- $_SESSION['Items']->line_items[$line]->qty_dispatched = $line_qty;
+ 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 =
+ input_num('Line'.$line);
} else {
+ set_focus('Line'.$line);
$ok = 0;
}
}
}
}
- $_SESSION['Items']->freight_cost = $_POST['ChargeFreightCost'];
-
+// ...
+// else
+// $_SESSION['Items']->freight_cost = input_num('ChargeFreightCost');
return $ok;
}
//------------------------------------------------------------------------------
}
}
+if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
+ $Ajax->activate('Items');
+}
//------------------------------------------------------------------------------
start_form(false, true);
// $_POST['ref'] = references::get_next(13);
if ($_SESSION['Items']->trans_no==0) {
- ref_cells(_("Reference"), 'ref', $_SESSION['Items']->reference, "class='tableheader2'");
+ ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
} else {
label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
}
$_POST['Location'] = $_SESSION['Items']->Location;
}
label_cell(_("Delivery From"), "class='tableheader2'");
-locations_list_cells(null, 'Location',$_POST['Location'], false, true);
+locations_list_cells(null, 'Location', null, false, true);
if (!isset($_POST['ship_via'])) {
$_POST['ship_via'] = $_SESSION['Items']->ship_via;
$_POST['DispatchDate'] = end_fiscalyear();
}
}
-date_cells(_("Date"), 'DispatchDate', $_POST['DispatchDate'], 0, 0, 0, "class='tableheader'");
+date_cells(_("Date"), 'DispatchDate', '', $_POST['DispatchDate'], 0, 0, 0, "class='tableheader2'");
end_row();
end_table();
if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['DispatchDate']);
}
-date_row(_("Invoice Dead-line"), 'due_date', $_POST['due_date'], 0, 0, 0, "class='tableheader'");
+date_row(_("Invoice Dead-line"), 'due_date', '', $_POST['due_date'], 0, 0, 0, "class='tableheader2'");
end_table();
echo "</td></tr>";
end_table(1); // outer table
display_heading(_("Delivery Items"));
-
+div_start('Items');
start_table("$table_style width=80%");
$th = array(_("Item Code"), _("Item Description"), _("Ordered"), _("Units"), _("Delivered"),
_("This Delivery"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
view_stock_status_cell($ln_itm->stock_id);
text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
- qty_cell($ln_itm->quantity);
+ $dec = get_qty_dec($ln_itm->stock_id);
+ qty_cell($ln_itm->quantity, false, $dec);
label_cell($ln_itm->units);
- qty_cell($ln_itm->qty_done);
+ qty_cell($ln_itm->qty_done, false, $dec);
- text_cells(null, 'Line'.$line, $ln_itm->qty_dispatched, 10, 10);
+ small_qty_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched, $ln_itm->stock_id, $dec), null, null, $dec);
- $display_discount_percent = number_format2($ln_itm->discount_percent*100,user_percent_dec()) . "%";
+ $display_discount_percent = percent_format($ln_itm->discount_percent*100) . "%";
$line_total = ($ln_itm->qty_dispatched * $ln_itm->price * (1 - $ln_itm->discount_percent));
end_row();
}
-$_POST['ChargeFreightCost'] = $_SESSION['Items']->freight_cost;
-
-if (!is_numeric($_POST['ChargeFreightCost'])) {
- $_POST['ChargeFreightCost'] = 0;
-}
+$_POST['ChargeFreightCost'] = get_post('ChargeFreightCost',
+ price_format($_SESSION['Items']->freight_cost));
start_row();
$inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
-$display_sub_total = number_format2($inv_items_total + $_POST['ChargeFreightCost'],user_price_dec());
+$display_sub_total = price_format($inv_items_total + input_num('ChargeFreightCost'));
label_row(_("Sub-total"), $display_sub_total, "colspan=9 align=right","align=right");
-$taxes = $_SESSION['Items']->get_taxes($_POST['ChargeFreightCost']);
+$taxes = $_SESSION['Items']->get_taxes(input_num('ChargeFreightCost'));
$tax_total = display_edit_tax_items($taxes, 9, $_SESSION['Items']->tax_included);
-$display_total = number_format2(($inv_items_total + $_POST['ChargeFreightCost'] + $tax_total), user_price_dec());
+$display_total = price_format(($inv_items_total + input_num('ChargeFreightCost') + $tax_total));
label_row(_("Amount Total"), $display_total, "colspan=9 align=right","align=right");
textarea_row(_("Memo"), 'Comments', null, 50, 4);
end_table(1);
-
-submit_center_first('Update', _("Update"));
-submit_center_last('process_delivery', _("Process Dispatch"));
+div_end();
+submit_center_first('Update', _("Update"),
+ _('Refresh document page'), true);
+submit_center_last('process_delivery', _("Process Dispatch"),
+ _('Check entered data and save document'), true);
end_form();