X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=26bd6eeccde8dd9dcc4790094ddf4556824c55c8;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=cbc5e08107c4e9909dbcc2abd51b9376b3358caa;hpb=0da4935c1fb5b588bfd7ead31f05069c9566eb8d;p=fa-stable.git
diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index cbc5e081..26bd6eec 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -49,10 +49,12 @@ if (isset($_GET['AddedID'])) {
display_notification_centered(sprintf(_("Delivery # %d has been entered."),$dispatch_no));
- display_note(get_customer_trans_view_str(13, $dispatch_no, _("&View This Delivery")), 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 Delivery Note"), true, 13));
- display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, 13, false, "", "", 1), 1);
+ 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);
@@ -68,9 +70,12 @@ if (isset($_GET['AddedID'])) {
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 '
';
- 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");
@@ -82,7 +87,7 @@ if (isset($_GET['AddedID'])) {
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 */
@@ -92,18 +97,18 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
die ("
" . _("This order has no items. There is nothing to delivery.") . "");
}
- $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->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",
@@ -140,6 +145,8 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
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');
@@ -159,13 +166,13 @@ function check_data()
}
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;
@@ -264,7 +271,9 @@ function check_quantities()
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)) {
@@ -324,7 +333,7 @@ end_row();
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', '', null, "class='tableheader2'");
@@ -332,7 +341,7 @@ if ($_SESSION['Items']->trans_no==0) {
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();
@@ -398,7 +407,7 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
}
// 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;
}