if ($use_popup_windows) {
$js .= get_js_open_window(900, 500);
}
-if ($use_date_picker) {
+if (user_use_date_picker()) {
$js .= get_js_date_picker();
}
display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1);
- hyperlink_params("$path_to_root/sales/customer_invoice.php", _("Invoice This Delivery"), "DeliveryNumber=$dispatch_no");
+ if (!isset($_GET['prepaid']))
+ hyperlink_params("$path_to_root/sales/customer_invoice.php", _("Invoice This Delivery"), "DeliveryNumber=$dispatch_no");
hyperlink_params("$path_to_root/sales/inquiry/sales_orders_view.php", _("Select Another Order For Dispatch"), "OutstandingOnly=1");
display_note(print_document_link($delivery_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 0, 1));
display_note(print_document_link($delivery_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 1, 1), 1);
- hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no");
+ if (!isset($_GET['prepaid']))
+ hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no");
hyperlink_params($path_to_root . "/sales/inquiry/sales_deliveries_view.php", _("Select A Different Delivery"), "OutstandingOnly=1");
if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
$ord = new Cart(ST_SALESORDER, $_GET['OrderNumber'], true);
+ if ($ord->is_prepaid())
+ check_deferred_income_act(_("You have to set Deferred Income Account in GL Setup to entry prepayment invoices."));
if ($ord->count_items() == 0) {
hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
exit;
} else {
- check_edit_conflicts();
+ check_edit_conflicts(get_post('cart_id'));
if (!check_quantities()) {
display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity not dispatched on sales order."));
function check_data()
{
- global $Refs;
+ global $Refs, $SysPrefs;
if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
display_error(_("The entered date of delivery is invalid."));
set_focus('ref');
return false;
}
-
- if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], ST_CUSTDELIVERY)) {
- display_error(_("The entered reference is already in use."));
- set_focus('ref');
- return false;
- }
}
if ($_POST['ChargeFreightCost'] == "") {
$_POST['ChargeFreightCost'] = price_format(0);
return false;
}
+ copy_to_cart();
+
+ if (!$SysPrefs->allow_negative_stock() && ($low_stock = $_SESSION['Items']->check_qoh()))
+ {
+ display_error(_("This document cannot be processed because there is insufficient quantity for: ").implode(',', $low_stock));
+ return false;
+ }
+
return true;
}
//------------------------------------------------------------------------------
$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
-// $_SESSION['Items']->freight_cost = input_num('ChargeFreightCost');
return $ok;
}
-//------------------------------------------------------------------------------
-
-function check_qoh()
-{
- global $SysPrefs;
- $dn = &$_SESSION['Items'];
- $newdelivery = ($dn->trans_no==0);
- if (!$SysPrefs->allow_negative_stock()) {
- foreach ($_SESSION['Items']->line_items as $itm) {
-
- if ($itm->qty_dispatched && has_stock_holding($itm->mb_flag)) {
- $qoh_by_date = get_qoh_on_date($itm->stock_id, $_POST['Location'], $_POST['DispatchDate']);
- $qoh_abs = get_qoh_on_date($itm->stock_id, $_POST['Location'], null);
- //If editing current delivery delivered qty should be added
- if (!$newdelivery)
- {
- $delivered = get_already_delivered($itm->stock_id, $_POST['Location'], key($dn->trans_no));
-
- $qoh_abs = $qoh_abs - $delivered;
- $qoh_by_date = $qoh_by_date - $delivered;
- }
- $qoh = ($qoh_by_date < $qoh_abs ? $qoh_by_date : $qoh_abs);
- if ($itm->qty_dispatched > $qoh) {
- display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") .
- " " . $itm->stock_id . " - " . $itm->item_description);
- return false;
- }
- }
- }
- }
- return true;
-}
//------------------------------------------------------------------------------
-if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
-
+if (isset($_POST['process_delivery']) && check_data()) {
$dn = &$_SESSION['Items'];
if ($_POST['bo_policy']) {
}
$newdelivery = ($dn->trans_no == 0);
- copy_to_cart();
- if ($newdelivery) new_doc_date($dn->document_date);
+ if ($newdelivery)
+ new_doc_date($dn->document_date);
+
$delivery_no = $dn->write($bo_policy);
- processing_end();
- if ($newdelivery) {
- meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no");
- } else {
- meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no");
+ if ($delivery_no == -1)
+ {
+ display_error(_("The entered reference is already in use."));
+ set_focus('ref');
+ }
+ else
+ {
+ $is_prepaid = $dn->is_prepaid() ? "&prepaid=Yes" : '';
+
+ processing_end();
+ if ($newdelivery) {
+ meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no$is_prepaid");
+ } else {
+ meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no$is_prepaid");
+ }
}
}
-if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
+if (isset($_POST['Update']) || isset($_POST['_Location_update']) || isset($_POST['qty']) || isset($_POST['process_delivery'])) {
$Ajax->activate('Items');
}
//------------------------------------------------------------------------------
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
- $show_qoh = true;
- if ($SysPrefs->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);
if ($ln_itm->descr_editable)
label_cell($ln_itm->units);
qty_cell($ln_itm->qty_done, false, $dec);
+ 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 = percent_format($ln_itm->discount_percent*100) . "%";
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);
end_table(1);
div_end();
submit_center_first('Update', _("Update"),
- _('Refresh document page'), true);
+ _('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');
+ _('Check entered data and save document'), 'default');
end_form();
end_page();
-?>
projects / fa-stable.git / blobdiff