| "; // outer table
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
start_row();
label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'");
@@ -341,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'");
}
@@ -382,13 +370,13 @@ end_table();
echo " | ";// outer table
-start_table(TABLESTYLE, "width=90%");
+start_table(TABLESTYLE, "width='90%'");
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();
@@ -425,7 +413,7 @@ if ($row['dissallow_invoices'] == 1)
}
display_heading(_("Delivery Items"));
div_start('Items');
-start_table(TABLESTYLE, "width=80%");
+start_table(TABLESTYLE, "width='80%'");
$new = $_SESSION['Items']->trans_no==0;
$th = array(_("Item Code"), _("Item Description"),
@@ -451,16 +439,22 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
// quantity input box. This allows for example a hook to modify the default quantity to what's dispatchable
// (if there is not enough in hand), check at other location or other order people etc ...
// This hook also returns a 'reason' (css classes) which can be used to theme the row.
+ //
+ // FIXME: hook_get_dispatchable definition does not allow qoh checks on transaction level
+ // (but anyway dispatch is checked again later before transaction is saved)
+
+ $qty = $ln_itm->qty_dispatched;
+ if ($check = check_negative_stock($ln_itm->stock_id, $ln_itm->qty_done-$ln_itm->qty_dispatched, $_POST['Location'], $_POST['DispatchDate']))
+ $qty = $check['qty'];
+
+ $q_class = hook_get_dispatchable_quantity($ln_itm, $_POST['Location'], $_POST['DispatchDate'], $qty);
- $qoh = get_qoh_on_date($ln_itm->stock_id, $_POST['Location'], $_POST['DispatchDate']);
- $q_class = hook_get_dispatchable_quantity($ln_itm, $_POST['Location'], $_POST['DispatchDate'], $qoh);
// Skip line if needed
if($q_class === 'skip') continue;
if(is_array($q_class)) {
list($ln_itm->qty_dispatched, $row_classes) = $q_class;
$has_marked = true;
}
-
}
alt_table_row_color($k, $row_classes);
@@ -520,7 +514,7 @@ label_row(_("Amount Total"), $display_total, "colspan=$colspan align=right","ali
end_table(1);
if ($has_marked) {
- display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='red'");
+ display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='stockmankofg'");
}
start_table(TABLESTYLE2);
@@ -546,4 +540,3 @@ end_form();
end_page();
-?>
|