projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed API for input/lists functions, added empty hints when needed
[fa-stable.git]
/
sales
/
customer_delivery.php
diff --git
a/sales/customer_delivery.php
b/sales/customer_delivery.php
index eca3446868a64aa6cda2b774f445016d6a117204..5d0aaa1cbda6bab31974b0cf2b2b767173139fce 100644
(file)
--- a/
sales/customer_delivery.php
+++ b/
sales/customer_delivery.php
@@
-121,6
+121,7
@@
if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
} elseif(!check_num('ChargeFreightCost', 0))
display_error(_("Freight cost cannot be less than zero"));
} elseif(!check_num('ChargeFreightCost', 0))
display_error(_("Freight cost cannot be less than zero"));
+ set_focus('ChargeFreightCost');
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@
-129,27
+130,32
@@
function check_data()
{
if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
display_error(_("The entered date of delivery is invalid."));
{
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."));
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."));
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."));
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."));
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;
}
}
return false;
}
}
@@
-159,6
+165,7
@@
function check_data()
if (!check_num('ChargeFreightCost',0)) {
display_error(_("The entered shipping value is not numeric."));
if (!check_num('ChargeFreightCost',0)) {
display_error(_("The entered shipping value is not numeric."));
+ set_focus('ChargeFreightCost');
return false;
}
return false;
}
@@
-292,7
+299,7
@@
start_row();
// $_POST['ref'] = references::get_next(13);
if ($_SESSION['Items']->trans_no==0) {
// $_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'");
}
} else {
label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
}
@@
-322,7
+329,7
@@
if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
$_POST['DispatchDate'] = end_fiscalyear();
}
}
$_POST['DispatchDate'] = end_fiscalyear();
}
}
-date_cells(_("Date"), 'DispatchDate', $_POST['DispatchDate'], 0, 0, 0, "class='tableheader2'");
+date_cells(_("Date"), 'DispatchDate',
'',
$_POST['DispatchDate'], 0, 0, 0, "class='tableheader2'");
end_row();
end_table();
end_row();
end_table();
@@
-334,7
+341,7
@@
start_table("$table_style width=90%");
if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['DispatchDate']);
}
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='tableheader2'");
+date_row(_("Invoice Dead-line"), 'due_date',
'',
$_POST['due_date'], 0, 0, 0, "class='tableheader2'");
end_table();
echo "</td></tr>";
end_table();
echo "</td></tr>";
@@
-378,7
+385,7
@@
foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
label_cell($ln_itm->units);
qty_cell($ln_itm->qty_done);
label_cell($ln_itm->units);
qty_cell($ln_itm->qty_done);
- small_
amount
_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched));
+ small_
qty
_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched));
$display_discount_percent = percent_format($ln_itm->discount_percent*100) . "%";
$display_discount_percent = percent_format($ln_itm->discount_percent*100) . "%";