| "; // outer table
-start_table("$table_style 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'");
@@ -287,16 +329,16 @@ label_cells(_("Currency"), $_SESSION['Items']->customer_currency, "class='tableh
end_row();
start_row();
-//if (!isset($_POST['ref']))
-// $_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', '', 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'");
}
-label_cells(_("For Sales Order"), get_customer_trans_view_str(systypes::sales_order(), $_SESSION['Items']->order_no), "class='tableheader2'");
+label_cells(_("For Sales Order"), get_customer_trans_view_str(ST_SALESORDER, $_SESSION['Items']->order_no), "class='tableheader2'");
label_cells(_("Sales Type"), $_SESSION['Items']->sales_type_name, "class='tableheader2'");
end_row();
@@ -306,7 +348,7 @@ if (!isset($_POST['Location'])) {
$_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;
@@ -316,70 +358,125 @@ shippers_list_cells(null, 'ship_via', $_POST['ship_via']);
// set this up here cuz it's used to calc qoh
if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
- $_POST['DispatchDate'] = Today();
+ $_POST['DispatchDate'] = new_doc_date();
if (!is_date_in_fiscalyear($_POST['DispatchDate'])) {
$_POST['DispatchDate'] = end_fiscalyear();
}
}
-date_cells(_("Date"), 'DispatchDate', $_POST['DispatchDate'], 0, 0, 0, "class='tableheader'");
+date_cells(_("Date"), 'DispatchDate', '', $_SESSION['Items']->trans_no==0, 0, 0, 0, "class='tableheader2'");
end_row();
end_table();
echo " | ";// outer table
-start_table("$table_style 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']->customer_id, $_POST['DispatchDate']);
+ $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['DispatchDate']);
}
-date_row(_("Invoice Dead-line"), 'due_date', $_POST['due_date'], 0, 0, 0, "class='tableheader'");
+customer_credit_row($_SESSION['Items']->customer_id, $_SESSION['Items']->credit, "class='tableheader2'");
+
+$dim = get_company_pref('use_dimension');
+if ($dim > 0) {
+ start_row();
+ label_cell(_("Dimension").":", "class='tableheader2'");
+ dimensions_list_cells(null, 'dimension_id', null, true, ' ', false, 1, false);
+ end_row();
+}
+else
+ hidden('dimension_id', 0);
+if ($dim > 1) {
+ start_row();
+ label_cell(_("Dimension")." 2:", "class='tableheader2'");
+ dimensions_list_cells(null, 'dimension2_id', null, true, ' ', false, 2, false);
+ end_row();
+}
+else
+ hidden('dimension2_id', 0);
+//---------
+start_row();
+date_cells(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
+end_row();
end_table();
echo " |
";
end_table(1); // outer table
+$row = get_customer_to_order($_SESSION['Items']->customer_id);
+if ($row['dissallow_invoices'] == 1)
+{
+ display_error(_("The selected customer account is currently on hold. Please contact the credit control personnel to discuss."));
+ end_form();
+ end_page();
+ exit();
+}
display_heading(_("Delivery Items"));
+div_start('Items');
+start_table(TABLESTYLE, "width='80%'");
-start_table("$table_style width=80%");
-$th = array(_("Item Code"), _("Item Description"), _("Ordered"), _("Units"), _("Delivered"),
+$new = $_SESSION['Items']->trans_no==0;
+$th = array(_("Item Code"), _("Item Description"),
+ $new ? _("Ordered") : _("Max. delivery"), _("Units"), $new ? _("Delivered") : _("Invoiced"),
_("This Delivery"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
+
table_header($th);
$k = 0;
$has_marked = false;
-$show_qoh = true;
foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
if ($ln_itm->quantity==$ln_itm->qty_done) {
continue; //this line is fully delivered
}
- // if it's a non-stock item (eg. service) don't show qoh
- if (sys_prefs::allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) ||
- $ln_itm->qty_dispatched == 0) {
- $show_qoh = false;
+ if(isset($_POST['_Location_update']) || isset($_POST['clear_quantity']) || isset($_POST['reset_quantity'])) {
+ // reset quantity
+ $ln_itm->qty_dispatched = $ln_itm->quantity-$ln_itm->qty_done;
}
-
- if ($show_qoh) {
- $qoh = get_qoh_on_date($ln_itm->stock_id, $_POST['Location'], $_POST['DispatchDate']);
+ // if it's a non-stock item (eg. service) don't show qoh
+ $row_classes = null;
+ if (has_stock_holding($ln_itm->mb_flag) && $ln_itm->qty_dispatched) {
+ // It's a stock : call get_dispatchable_quantity hook to get which quantity to preset in the
+ // 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);
+
+ // 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;
+ }
}
- if ($show_qoh && ($ln_itm->qty_dispatched > $qoh)) {
- // oops, we don't have enough of one of the component items
- start_row("class='stockmankobg'");
- $has_marked = true;
- } else {
- alt_table_row_color($k);
- }
+ alt_table_row_color($k, $row_classes);
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);
+ if ($ln_itm->descr_editable)
+ text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
+ else
+ label_cell($ln_itm->item_description);
+
+ $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);
+ if(isset($_POST['clear_quantity'])) {
+ $ln_itm->qty_dispatched = 0;
+ }
+ $_POST['Line'.$line]=$ln_itm->qty_dispatched; /// clear post so value displayed in the fiel is the 'new' quantity
+ 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));
@@ -391,48 +488,55 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
end_row();
}
-$_POST['ChargeFreightCost'] = $_SESSION['Items']->freight_cost;
+$_POST['ChargeFreightCost'] = get_post('ChargeFreightCost',
+ price_format($_SESSION['Items']->freight_cost));
-if (!is_numeric($_POST['ChargeFreightCost'])) {
- $_POST['ChargeFreightCost'] = 0;
-}
+$colspan = 9;
start_row();
-
-small_amount_cells(_("Shipping Cost"), 'ChargeFreightCost', $_SESSION['Items']->freight_cost, "colspan=9 align=right");
+label_cell(_("Shipping Cost"), "colspan=$colspan align=right");
+small_amount_cells(null, 'ChargeFreightCost', $_SESSION['Items']->freight_cost);
+end_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");
+label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right");
-$taxes = $_SESSION['Items']->get_taxes($_POST['ChargeFreightCost']);
-$tax_total = display_edit_tax_items($taxes, 9, $_SESSION['Items']->tax_included);
+$taxes = $_SESSION['Items']->get_taxes(input_num('ChargeFreightCost'));
+$tax_total = display_edit_tax_items($taxes, $colspan, $_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");
+label_row(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right");
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($table_style2);
+start_table(TABLESTYLE2);
policy_list_row(_("Action For Balance"), "bo_policy", null);
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);
+if(isset($_POST['clear_quantity'])) {
+ submit('reset_quantity', _('Reset quantity'), true, _('Refresh document page'));
+}
+else {
+ submit('clear_quantity', _('Clear quantity'), true, _('Refresh document page'));
+}
+submit_center_last('process_delivery', _("Process Dispatch"),
+ _('Check entered data and save document'), 'default');
end_form();
end_page();
-?>