include_once($path_to_root . "/sales/includes/cart_class.inc");
include_once($path_to_root . "/includes/session.inc");
-include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/sales/includes/sales_ui.inc");
include_once($path_to_root . "/sales/includes/ui/sales_order_ui.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
include_once($path_to_root . "/reporting/includes/reporting.inc");
+$js = '';
-$js = get_js_form_entry("StockID2", "stock_id", "qty");
if ($use_popup_windows) {
$js .= get_js_open_window(900, 500);
}
+
if ($use_date_picker) {
$js .= get_js_date_picker();
}
}
page($_SESSION['page_title'], false, false, "", $js);
-
//-----------------------------------------------------------------------------
if (isset($_GET['AddedID'])) {
if ($cart->trans_type!=30) {
$cart->reference = $_POST['ref'];
}
- $cart->Comments = str_replace("'", "\\'", $_POST['Comments']);
+ $cart->Comments = $_POST['Comments'];
$cart->document_date = $_POST['OrderDate'];
$cart->due_date = $_POST['delivery_date'];
$cart->cust_ref = $_POST['cust_ref'];
- $cart->freight_cost = $_POST['freight_cost'];
+ $cart->freight_cost = input_num('freight_cost');
$cart->deliver_to = $_POST['deliver_to'];
$cart->delivery_address = $_POST['delivery_address'];
$cart->phone = $_POST['phone'];
$_POST['OrderDate'] = $cart->document_date;
$_POST['delivery_date'] = $cart->due_date;
$_POST['cust_ref'] = $cart->cust_ref;
- $_POST['freight_cost'] = $cart->freight_cost;
+ $_POST['freight_cost'] = price_format($cart->freight_cost);
$_POST['deliver_to'] = $cart->deliver_to;
$_POST['delivery_address'] = $cart->delivery_address;
$_POST['ship_via'] = $cart->ship_via;
$_POST['customer_id'] = $cart->customer_id;
+
$_POST['branch_id'] = $cart->Branch;
$_POST['sales_type'] = $cart->sales_type;
}
+//--------------------------------------------------------------------------------
+
+function line_start_focus() {
+ global $Ajax;
+ $Ajax->activate('items_table');
+ set_focus('_stock_id_edit');
+}
//--------------------------------------------------------------------------------
function can_process() {
if (!is_date($_POST['OrderDate'])) {
display_error(_("The entered date is invalid."));
+ set_focus('OrderDate');
return false;
}
if ($_SESSION['Items']->trans_type!=30 && !is_date_in_fiscalyear($_POST['OrderDate'])) {
display_error(_("The entered date is not in fiscal year"));
+ set_focus('OrderDate');
return false;
}
if (count($_SESSION['Items']->line_items) == 0) {
display_error(_("You must enter at least one non empty item line."));
+ set_focus('AddItem');
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 (strlen($_POST['delivery_address']) <= 1) {
display_error( _("You should enter the street address in the box provided. Orders cannot be accepted without a valid street address."));
+ set_focus('delivery_address');
return false;
}
if ($_POST['freight_cost'] == "")
- $_POST['freight_cost'] = 0;
+ $_POST['freight_cost'] = price_format(0);
- if (!is_numeric($_POST['freight_cost'])) {
+ if (!check_num('freight_cost',0)) {
display_error(_("The shipping cost entered is expected to be numeric."));
+ set_focus('freight_cost');
return false;
}
if (!is_date($_POST['delivery_date'])) {
display_error(_("The delivery date is invalid."));
+ set_focus('delivery_date');
return false;
}
- if (date1_greater_date2($_SESSION['Items']->document_date, $_POST['delivery_date'])) {
+ //if (date1_greater_date2($_SESSION['Items']->document_date, $_POST['delivery_date'])) {
+ if (date1_greater_date2($_POST['OrderDate'], $_POST['delivery_date'])) {
display_error(_("The requested delivery date is before the date of the order."));
+ set_focus('delivery_date');
return false;
}
if ($_SESSION['Items']->trans_type != 30 && !references::is_valid($_POST['ref'])) {
display_error(_("You must enter a reference."));
+ set_focus('ref');
return false;
}
-
return true;
}
function check_item_data()
{
- if (!is_numeric($_POST['qty']) || $_POST['qty'] < 0 || $_POST['Disc'] > 100 || $_POST['Disc'] < 0) {
+
+ if (!check_num('qty', 0) || !check_num('Disc', 0, 100)) {
display_error( _("The item could not be updated because you are attempting to set the quantity ordered to less than 0, or the discount percent to more than 100."));
+ set_focus('qty');
return false;
- } elseif (!is_numeric($_POST['price']) || $_POST['price'] < 0) {
-
- display_error( _("Price for item must be entered and can not be less then 0"));
+ } elseif (!check_num('price', 0)) {
+ display_error( _("Price for item must be entered and can not be less than 0"));
+ set_focus('price');
return false;
} elseif (isset($_POST['LineNo']) && isset($_SESSION['Items']->line_items[$_POST['LineNo']])
- && $_SESSION['Items']->line_items[$_POST['LineNo']]->qty_done > $_POST['qty']) {
+ && !check_num('qty', $_SESSION['Items']->line_items[$_POST['LineNo']]->qty_done)) {
+ set_focus('qty');
display_error(_("You attempting to make the quantity ordered a quantity less than has already been delivered. The quantity delivered cannot be modified retrospectively."));
return false;
}
function handle_update_item()
{
if ($_POST['UpdateItem'] != '' && check_item_data()) {
- $_SESSION['Items']->update_cart_item($_POST['LineNo'], $_POST['qty'],
- $_POST['price'], ($_POST['Disc'] / 100));
+ $_SESSION['Items']->update_cart_item($_POST['LineNo'],
+ input_num('qty'), input_num('price'),
+ input_num('Disc') / 100 );
}
+ line_start_focus();
}
//--------------------------------------------------------------------------------
-function handle_delete_item()
+function handle_delete_item($line_no)
{
- if ($_GET['Delete'] != ""){
- $line_no = $_GET['Delete'];
- if ($_SESSION['Items']->some_already_delivered($line_no) == 0) {
- $_SESSION['Items']->remove_from_cart($line_no);
- } else {
- display_error(_("This item cannot be deleted because some of it has already been delivered."));
- }
- }
+ if ($_SESSION['Items']->some_already_delivered($line_no) == 0) {
+ $_SESSION['Items']->remove_from_cart($line_no);
+ } else {
+ display_error(_("This item cannot be deleted because some of it has already been delivered."));
+ }
+ line_start_focus();
}
//--------------------------------------------------------------------------------
function handle_new_item()
{
+
if (!check_item_data()) {
return;
}
- add_to_order($_SESSION['Items'], $_POST['stock_id'], $_POST['qty'],
- $_POST['price'], $_POST['Disc'] / 100);
-
- $_POST['StockID2'] = $_POST['stock_id'] = "";
+ add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
+ input_num('price'), input_num('Disc') / 100);
+ $_POST['_stock_id_edit'] = $_POST['stock_id'] = "";
+ line_start_focus();
}
//--------------------------------------------------------------------------------
$doc = new Cart(30, array($trans_no));
$doc->trans_type = $type;
$doc->trans_no = 0;
-
- $doc->due_date = $doc->document_date = Today();
+ $doc->document_date = Today(); // 2006-06-15. Added so Invoices and Deliveries get current day
+ if ($type == 10)
+ $doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date);
+ else
+ $doc->due_date = $doc->document_date;
$doc->reference = references::get_next($doc->trans_type);
$doc->Comments='';
foreach($doc->line_items as $line_no => $line) {
$_SESSION['Items'] = $doc;
} else
$_SESSION['Items'] = new Cart($type,array($trans_no));
-
copy_from_cart();
}
if (isset($_POST['CancelOrder']))
handle_cancel_order();
-if (isset($_GET['Delete']))
- handle_delete_item();
+$id = find_submit('Delete');
+if ($id!=-1)
+ handle_delete_item($id);
if (isset($_POST['UpdateItem']))
handle_update_item();
if (isset($_POST['AddItem']))
handle_new_item();
-//--------------------------------------------------------------------------------
+if (isset($_POST['CancelItemChanges'])) {
+ line_start_focus();
+}
+//--------------------------------------------------------------------------------
check_db_has_stock_items(_("There are no inventory items defined in the system."));
check_db_has_customer_branches(_("There are no customers, or there are no customers with branches. Please define customers and customer branches."));
end_table(1);
if ($_SESSION['Items']->trans_no == 0) {
- submit_center_first('ProcessOrder', $porder);
+
+ submit_center_first('ProcessOrder', $porder,
+ _('Check entered data and save document'), true);
} else {
- submit_center_first('ProcessOrder', $corder);
+ submit_center_first('ProcessOrder', $corder,
+ _('Validate changes and update document'), true);
}
- submit_center_last('CancelOrder', $cancelorder);
+ submit_center_last('CancelOrder', $cancelorder,
+ _('Cancels document entry or removes sales order when editing an old document'));
} else {
display_error($customer_error);
}
end_form();
-//--------------------------------------------------------------------------------
end_page();
+
?>
\ No newline at end of file
projects / fa-stable.git / blobdiff