ST_CUSTDELIVERY => 'SA_SALESDELIVERY',
ST_SALESINVOICE => 'SA_SALESINVOICE'),
array( 'NewOrder' => 'SA_SALESORDER',
- 'ModifySalesOrder' => 'SA_SALESORDER',
+ 'ModifyOrderNumber' => 'SA_SALESORDER',
+ 'AddedID' => 'SA_SALESORDER',
+ 'UpdatedID' => 'SA_SALESORDER',
'NewQuotation' => 'SA_SALESQUOTE',
'ModifyQuotationNumber' => 'SA_SALESQUOTE',
+ 'NewQuoteToSalesOrder' => 'SA_SALESQUOTE',
+ 'AddedQU' => 'SA_SALESQUOTE',
+ 'UpdatedQU' => 'SA_SALESQUOTE',
'NewDelivery' => 'SA_SALESDELIVERY',
- 'NewInvoice' => 'SA_SALESINVOICE')
+ 'AddedDN' => 'SA_SALESDELIVERY',
+ 'NewInvoice' => 'SA_SALESINVOICE',
+ 'AddedDI' => 'SA_SALESINVOICE'
+ )
);
$js = '';
if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
$_SESSION['page_title'] = _($help_context = "Direct Sales Delivery");
- create_cart(ST_CUSTDELIVERY, $_GET['NewDelivery']);
+ create_cart(ST_CUSTDELIVERY, 0);
} elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) {
$_SESSION['page_title'] = _($help_context = "Direct Sales Invoice");
- create_cart(ST_SALESINVOICE, $_GET['NewInvoice']);
+ create_cart(ST_SALESINVOICE, 0);
} 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");
+ submenu_option(_("Add an Attachment"), "/admin/attachments.php?filterType=".ST_SALESINVOICE."&trans_no=$invoice");
+
display_footer_exit();
} else
check_edit_conflicts();
$cart->document_date = $_POST['OrderDate'];
$newpayment = false;
+
if (isset($_POST['payment']) && ($cart->payment != $_POST['payment'])) {
$cart->payment = $_POST['payment'];
$cart->payment_terms = get_payment_terms($_POST['payment']);
if ($newpayment) {
$cart->due_date = $cart->document_date;
$cart->phone = $cart->cust_ref = $cart->delivery_address = '';
- $cart->freight_cost = input_num('freight_cost');
- $cart->ship_via = 1;
+ $cart->ship_via = 0;
$cart->deliver_to = '';
- $cart->Location = $cart->pos['pos_location'];
- $cart->location_name = $cart->pos['location_name'];
+ $cart->prep_amount = 0;
}
} else {
$cart->due_date = $_POST['delivery_date'];
$cart->cust_ref = $_POST['cust_ref'];
- $cart->freight_cost = input_num('freight_cost');
$cart->deliver_to = $_POST['deliver_to'];
$cart->delivery_address = $_POST['delivery_address'];
$cart->phone = $_POST['phone'];
$cart->ship_via = $_POST['ship_via'];
- $cart->Location = $_POST['Location'];
+ 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');
if (isset($_POST['email']))
$cart->email =$_POST['email'];
else
$_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
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) {
set_focus('ref');
return false;
}
- if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'],
- $_SESSION['Items']->trans_type)) {
- display_error(_("The entered reference is already in use."));
- set_focus('ref');
- return false;
- } elseif ($_SESSION['Items']->get_items_total() < 0) {
+ if (!db_has_currency_rates($_SESSION['Items']->customer_currency, $_POST['OrderDate']))
+ return false;
+
+ if ($_SESSION['Items']->get_items_total() < 0) {
display_error("Invoice total amount cannot be less than zero.");
return false;
}
//-----------------------------------------------------------------------------
+if (isset($_POST['update'])) {
+ copy_to_cart();
+ $Ajax->activate('items_table');
+}
+
if (isset($_POST['ProcessOrder']) && can_process()) {
copy_to_cart();
$modified = ($_SESSION['Items']->trans_no != 0);
$so_type = $_SESSION['Items']->so_type;
- $_SESSION['Items']->write(1);
- if (count($messages)) { // abort on failure or error messages are lost
- $Ajax->activate('_page_body');
- display_footer_exit();
- }
- $trans_no = key($_SESSION['Items']->trans_no);
- $trans_type = $_SESSION['Items']->trans_type;
- new_doc_date($_SESSION['Items']->document_date);
- processing_end();
- if ($modified) {
- if ($trans_type == ST_SALESQUOTE)
- meta_forward($_SERVER['PHP_SELF'], "UpdatedQU=$trans_no");
- else
- meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
- } elseif ($trans_type == ST_SALESORDER) {
- meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
- } elseif ($trans_type == ST_SALESQUOTE) {
- meta_forward($_SERVER['PHP_SELF'], "AddedQU=$trans_no");
- } elseif ($trans_type == ST_SALESINVOICE) {
- meta_forward($_SERVER['PHP_SELF'], "AddedDI=$trans_no&Type=$so_type");
- } else {
- meta_forward($_SERVER['PHP_SELF'], "AddedDN=$trans_no&Type=$so_type");
- }
-}
-if (isset($_POST['update'])) {
- $Ajax->activate('items_table');
+ $ret = $_SESSION['Items']->write(1);
+ if ($ret == -1)
+ {
+ display_error(_("The entered reference is already in use."));
+ set_focus('ref');
+ }
+ else
+ {
+ if (count($messages)) { // abort on failure or error messages are lost
+ $Ajax->activate('_page_body');
+ display_footer_exit();
+ }
+ $trans_no = key($_SESSION['Items']->trans_no);
+ $trans_type = $_SESSION['Items']->trans_type;
+ new_doc_date($_SESSION['Items']->document_date);
+ processing_end();
+ if ($modified) {
+ if ($trans_type == ST_SALESQUOTE)
+ meta_forward($_SERVER['PHP_SELF'], "UpdatedQU=$trans_no");
+ else
+ meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
+ } elseif ($trans_type == ST_SALESORDER) {
+ meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
+ } elseif ($trans_type == ST_SALESQUOTE) {
+ meta_forward($_SERVER['PHP_SELF'], "AddedQU=$trans_no");
+ } elseif ($trans_type == ST_SALESINVOICE) {
+ meta_forward($_SERVER['PHP_SELF'], "AddedDI=$trans_no&Type=$so_type");
+ } else {
+ meta_forward($_SERVER['PHP_SELF'], "AddedDN=$trans_no&Type=$so_type");
+ }
+ }
}
//--------------------------------------------------------------------------------
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);
} else {
display_error($customer_error);
}
+
end_form();
end_page();
?>
\ No newline at end of file
projects / fa-stable.git / blobdiff