//
// Entry/Modify Delivery Note against Sales Order
//
-$page_security = 2;
-$path_to_root="..";
+$page_security = 'SA_SALESDELIVERY';
+$path_to_root = "..";
include_once($path_to_root . "/sales/includes/cart_class.inc");
include_once($path_to_root . "/includes/session.inc");
if (isset($_GET['ModifyDelivery'])) {
$_SESSION['page_title'] = sprintf(_("Modifying Delivery Note # %d."), $_GET['ModifyDelivery']);
- $help_page_title = _("Modifying Delivery Note");
+ $help_context = "Modifying Delivery Note";
processing_start();
} elseif (isset($_GET['OrderNumber'])) {
- $_SESSION['page_title'] = _("Deliver Items for a Sales Order");
+ $_SESSION['page_title'] = _($help_context = "Deliver Items for a Sales Order");
processing_start();
}
if (isset($_GET['AddedID'])) {
$dispatch_no = $_GET['AddedID'];
- display_notification(_("Dispatch processed:") . ' '.$_GET['AddedID'], true);
+ display_notification_centered(sprintf(_("Delivery # %d has been entered."),$dispatch_no));
- display_note(get_customer_trans_view_str(13, $dispatch_no, _("View this dispatch")), 0, 1);
+ display_note(get_customer_trans_view_str(ST_CUSTDELIVERY, $dispatch_no, _("&View This Delivery")), 0, 1);
- display_note(print_document_link($dispatch_no, _("Print this delivery"), true, 13));
+ display_note(print_document_link($dispatch_no, _("&Print Delivery Note"), true, ST_CUSTDELIVERY));
+ display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "", "", 1), 1, 1);
+ display_note(print_document_link($dispatch_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 0, 1));
+ display_note(print_document_link($dispatch_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 1, 1), 1);
display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1);
display_notification_centered(sprintf(_('Delivery Note # %d has been updated.'),$delivery_no));
- display_note(get_trans_view_str(13, $delivery_no, _("View this delivery")));
- echo '<br>';
- display_note(print_document_link($delivery_no, _("Print this delivery"), true, 13));
+ display_note(get_trans_view_str(ST_CUSTDELIVERY, $delivery_no, _("View this delivery")), 0, 1);
+
+ display_note(print_document_link($delivery_no, _("&Print Delivery Note"), true, ST_CUSTDELIVERY));
+ display_note(print_document_link($delivery_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "", "", 1), 1, 1);
+ display_note(print_document_link($delivery_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 0, 1));
+ display_note(print_document_link($delivery_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 1, 1), 1);
hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no");
if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
- $ord = new Cart(30, $_GET['OrderNumber'], true);
+ $ord = new Cart(ST_SALESORDER, $_GET['OrderNumber'], true);
/*read in all the selected order into the Items cart */
die ("<br><b>" . _("This order has no items. There is nothing to delivery.") . "</b>");
}
- $ord->trans_type = 13;
+ $ord->trans_type = ST_CUSTDELIVERY;
$ord->src_docs = $ord->trans_no;
$ord->order_no = key($ord->trans_no);
$ord->trans_no = 0;
- $ord->reference = references::get_next(13);
- $ord->document_date = Today();
+ $ord->reference = $Refs->get_next(ST_CUSTDELIVERY);
+ $ord->document_date = new_doc_date();
$_SESSION['Items'] = $ord;
copy_from_cart();
} elseif (isset($_GET['ModifyDelivery']) && $_GET['ModifyDelivery'] > 0) {
- $_SESSION['Items'] = new Cart(13,$_GET['ModifyDelivery']);
+ $_SESSION['Items'] = new Cart(ST_CUSTDELIVERY,$_GET['ModifyDelivery']);
if ($_SESSION['Items']->count_items() == 0) {
hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
check_edit_conflicts();
if (!check_quantities()) {
- display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
- not dispatched on sales order."));
+ display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity not dispatched on sales order."));
- } elseif(!check_num('ChargeFreightCost', 0))
+ } elseif(!check_num('ChargeFreightCost', 0)) {
display_error(_("Freight cost cannot be less than zero"));
set_focus('ChargeFreightCost');
+ }
}
//-----------------------------------------------------------------------------
function check_data()
{
+ global $Refs;
+
if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
display_error(_("The entered date of delivery is invalid."));
set_focus('DispatchDate');
}
if ($_SESSION['Items']->trans_no==0) {
- if (!references::is_valid($_POST['ref'])) {
+ if (!$Refs->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)) {
+ 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 (!check_quantities()) {
- display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
- not dispatched on sales order."));
return false;
}
$cart->Location = $_POST['Location'];
$cart->Comments = $_POST['Comments'];
if ($cart->trans_no == 0)
- $dn->ref = $_POST['ref'];
+ $cart->reference = $_POST['ref'];
}
//------------------------------------------------------------------------------
$_POST['Location'] = $cart->Location;
$_POST['Comments'] = $cart->Comments;
$_POST['cart_id'] = $cart->cart_id;
+ $_POST['ref'] = $cart->reference;
}
//------------------------------------------------------------------------------
function check_qoh()
{
- if (!sys_prefs::allow_negative_stock()) {
+ global $SysPrefs;
+
+ if (!$SysPrefs->allow_negative_stock()) {
foreach ($_SESSION['Items']->line_items as $itm) {
if ($itm->qty_dispatched && has_stock_holding($itm->mb_flag)) {
$newdelivery = ($dn->trans_no == 0);
copy_to_cart();
+ if ($newdelivery) new_doc_date($dn->document_date);
$delivery_no = $dn->write($bo_policy);
processing_end();
$Ajax->activate('Items');
}
//------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
hidden('cart_id');
start_table("$table_style2 width=80%", 5);
start_row();
//if (!isset($_POST['ref']))
-// $_POST['ref'] = references::get_next(13);
+// $_POST['ref'] = $Refs->get_next(ST_CUSTDELIVERY);
if ($_SESSION['Items']->trans_no==0) {
- ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+ ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
} 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();
// 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='tableheader2'");
+date_cells(_("Date"), 'DispatchDate', '', $_SESSION['Items']->trans_no==0, 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='tableheader2'");
+date_row(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
end_table();
echo "</td></tr>";
display_heading(_("Delivery Items"));
div_start('Items');
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;
}
// if it's a non-stock item (eg. service) don't show qoh
$show_qoh = true;
- if (sys_prefs::allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) ||
+ if ($SysPrefs->allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) ||
$ln_itm->qty_dispatched == 0) {
$show_qoh = false;
}
$_POST['ChargeFreightCost'] = get_post('ChargeFreightCost',
price_format($_SESSION['Items']->freight_cost));
-start_row();
+$colspan = 9;
-small_amount_cells(_("Shipping Cost"), 'ChargeFreightCost', $_SESSION['Items']->freight_cost, "colspan=9 align=right");
+start_row();
+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 = 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(input_num('ChargeFreightCost'));
-$tax_total = display_edit_tax_items($taxes, 9, $_SESSION['Items']->tax_included);
+$tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['Items']->tax_included);
$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);
submit_center_first('Update', _("Update"),
_('Refresh document page'), true);
submit_center_last('process_delivery', _("Process Dispatch"),
- _('Check entered data and save document'), true);
+ _('Check entered data and save document'), 'default');
end_form();
projects / fa-stable.git / blobdiff