if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
$_SESSION['page_title'] = _($help_context = "Direct Sales Delivery");
- create_cart(ST_CUSTDELIVERY, 0);
+ create_cart(ST_CUSTDELIVERY, $_GET['NewDelivery']);
} elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) {
$_SESSION['page_title'] = _($help_context = "Direct Sales Invoice");
- create_cart(ST_SALESINVOICE, 0);
+ create_cart(ST_SALESINVOICE, $_GET['NewInvoice']);
} elseif (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) {
}
page($_SESSION['page_title'], false, false, "", $js);
+
+if (isset($_GET['ModifyOrderNumber']))
+ check_is_editable(ST_SALESORDER, $_GET['ModifyOrderNumber']);
+elseif (isset($_GET['ModifyQuotationNumber']))
+ check_is_editable(ST_SALESQUOTE, $_GET['ModifyQuotationNumber']);
+
//-----------------------------------------------------------------------------
if (list_updated('branch_id')) {
submenu_option(_("Enter a &New Direct Invoice"),
"/sales/sales_order_entry.php?NewInvoice=0");
+ if ($row === false)
+ submenu_option(_("Entry &customer payment for this invoice"), "/sales/customer_payments.php?SInvoice=".$invoice);
+
submenu_option(_("Add an Attachment"), "/admin/attachments.php?filterType=".ST_SALESINVOICE."&trans_no=$invoice");
display_footer_exit();
$cart->phone = $cart->cust_ref = $cart->delivery_address = '';
$cart->ship_via = 0;
$cart->deliver_to = '';
+ $cart->prep_amount = 0;
}
} else {
$cart->due_date = $_POST['delivery_date'];
$cart->delivery_address = $_POST['delivery_address'];
$cart->phone = $_POST['phone'];
$cart->ship_via = $_POST['ship_via'];
+ if (!$cart->trans_no || ($cart->trans_type == ST_SALESORDER && !$cart->is_started()))
+ $cart->prep_amount = input_num('prep_amount', 0);
}
$cart->Location = $_POST['Location'];
$cart->freight_cost = input_num('freight_cost');
$cart->dimension_id = $_POST['dimension_id'];
$cart->dimension2_id = $_POST['dimension2_id'];
}
+ $cart->ex_rate = input_num('_ex_rate', null);
}
//-----------------------------------------------------------------------------
$_POST['branch_id'] = $cart->Branch;
$_POST['sales_type'] = $cart->sales_type;
+ $_POST['prep_amount'] = price_format($cart->prep_amount);
// POS
$_POST['payment'] = $cart->payment;
if ($cart->trans_type!=ST_SALESORDER && $cart->trans_type!=ST_SALESQUOTE) { // 2008-11-12 Joe Hunt
$_POST['dimension_id'] = $cart->dimension_id;
$_POST['dimension2_id'] = $cart->dimension2_id;
- }
+ }
$_POST['cart_id'] = $cart->cart_id;
-
+ $_POST['_ex_rate'] = $cart->ex_rate;
}
//--------------------------------------------------------------------------------
return false;
}
if ($_SESSION['Items']->trans_type!=ST_SALESORDER && $_SESSION['Items']->trans_type!=ST_SALESQUOTE && !is_date_in_fiscalyear($_POST['OrderDate'])) {
- display_error(_("The entered date is not in fiscal year"));
+ display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
set_focus('OrderDate');
return false;
}
return false;
}
if ($_SESSION['Items']->payment_terms['cash_sale'] == 0) {
- if (strlen($_POST['deliver_to']) <= 1) {
- display_error(_("You must enter the person or company to whom delivery should be made to."));
- set_focus('deliver_to');
- return false;
- }
+ if (!$_SESSION['Items']->is_started() && ($_SESSION['Items']->payment_terms['days_before_due'] < 0) && ((input_num('prep_amount')<=0) ||
+ input_num('prep_amount')>$_SESSION['Items']->get_trans_total())) {
+ display_error(_("Pre-payment required have to be positive and less than total amount."));
+ set_focus('prep_amount');
+ return false;
+ }
+ if (strlen($_POST['deliver_to']) <= 1) {
+ display_error(_("You must enter the person or company to whom delivery should be made to."));
+ set_focus('deliver_to');
+ return false;
+ }
if ($_SESSION['Items']->trans_type != ST_SALESQUOTE && strlen($_POST['delivery_address']) <= 1) {
submenu_option(_("Enter a New Sales Invoice"), "/sales/sales_order_entry.php?NewInvoice=1");
} elseif ($_SESSION['Items']->trans_type == ST_SALESQUOTE)
{
- delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type);
+ if ($_SESSION['Items']->trans_no != 0)
+ delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type);
display_notification(_("This sales quotation has been cancelled as requested."), 1);
submenu_option(_("Enter a New Sales Quotation"), "/sales/sales_order_entry.php?NewQuotation=Yes");
} else { // sales order
start_form();
hidden('cart_id');
-$customer_error = display_order_header($_SESSION['Items'],
- ($_SESSION['Items']->any_already_delivered() == 0), $idate);
+$customer_error = display_order_header($_SESSION['Items'], !$_SESSION['Items']->is_started(), $idate);
if ($customer_error == "") {
start_table(TABLESTYLE, "width=80%", 10);
submit_center_first('ProcessOrder', $porder,
_('Check entered data and save document'), 'default');
+ submit_center_last('CancelOrder', $cancelorder,
+ _('Cancels document entry or removes sales order when editing an old document'), true);
submit_js_confirm('CancelOrder', _('You are about to void this Document.\nDo you want to continue?'));
} else {
- if ($_SESSION['Items']->trans_type==ST_SALESORDER)
- submit_js_confirm('CancelOrder', _('You are about to cancel undelivered part of this order.\nDo you want to continue?'));
submit_center_first('ProcessOrder', $corder,
_('Validate changes and update document'), 'default');
+ submit_center_last('CancelOrder', $cancelorder,
+ _('Cancels document entry or removes sales order when editing an old document'), true);
+ if ($_SESSION['Items']->trans_type==ST_SALESORDER)
+ submit_js_confirm('CancelOrder', _('You are about to cancel undelivered part of this order.\nDo you want to continue?'));
+ else
+ submit_js_confirm('CancelOrder', _('You are about to void this Document.\nDo you want to continue?'));
}
- submit_center_last('CancelOrder', $cancelorder,
- _('Cancels document entry or removes sales order when editing an old document'));
} else {
display_error($customer_error);
}
projects / fa-stable.git / blobdiff