X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=fcec49da05b23651aa0c842fcecb72ef31a39dea;hb=499e0e615d1a845c6c519754b3a213fdda0513ba;hp=7e271a5686ee3c78ccac4ce4e910ebd4893f03a2;hpb=5af53b13622ca77bc851cccaa087d7e2aedc3401;p=fa-stable.git
diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 7e271a56..fcec49da 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -1,4 +1,14 @@
.
+***********************************************************************/
//-----------------------------------------------------------------------------
//
// Entry/Modify Sales Order
@@ -16,11 +26,21 @@ 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 = '';
+
+editor_redirect( array(
+ 'customer_id' => $path_to_root.'/sales/manage/customers.php?debtor_no='.get_post('customer_id'),
+ 'branch_id' => $path_to_root.'/sales/manage/customer_branches.php?branch_id='.get_post('branch_id'),
+ ));
+
+editor_return( array(
+ 'customer_id'=>'customer_id',
+ 'branch_id'=>'branch_id'));
+
if ($use_popup_windows) {
$js .= get_js_open_window(900, 500);
}
+
if ($use_date_picker) {
$js .= get_js_date_picker();
}
@@ -48,83 +68,84 @@ if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
}
page($_SESSION['page_title'], false, false, "", $js);
-
//-----------------------------------------------------------------------------
if (isset($_GET['AddedID'])) {
$order_no = $_GET['AddedID'];
- print_hidden_script(30);
-
display_notification_centered(sprintf( _("Order # %d has been entered."),$order_no));
- display_note(get_trans_view_str(30, $order_no, _("View This Order")));
- echo '
';
- display_note(print_document_link($order_no, _("Print This Order"), true, 30));
+ submenu_view(_("&View This Order"), 30, $order_no);
- hyperlink_params($path_to_root . "/sales/customer_delivery.php",
- _("Make Delivery Against This Order"), "OrderNumber=$order_no");
+ submenu_print(_("&Print This Order"), 30, $order_no, 'prtopt');
+ set_focus('prtopt');
+
+ submenu_option(_("Make &Delivery Against This Order"),
+ "/sales/customer_delivery.php?OrderNumber=$order_no");
- hyperlink_params($_SERVER['PHP_SELF'], _("Enter a New Order"), "NewOrder=0");
+ submenu_option(_("Enter a &New Order"), $_SERVER['PHP_SELF']."?NewOrder=0");
display_footer_exit();
} elseif (isset($_GET['UpdatedID'])) {
$order_no = $_GET['UpdatedID'];
- print_hidden_script(30);
display_notification_centered(sprintf( _("Order # %d has been updated."),$order_no));
- display_note(get_trans_view_str(30, $order_no, _("View This Order")));
- echo '
';
- display_note(print_document_link($order_no, _("Print This Order"), true, 30));
+ submenu_view(_("&View This Order"), 30, $order_no);
- hyperlink_params($path_to_root . "/sales/customer_delivery.php",
- _("Confirm Order Quantities and Make Delivery"), "OrderNumber=$order_no");
+ submenu_print(_("&Print This Order"), 30, $order_no, 'prtopt');
+ set_focus('prtopt');
- hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
- _("Select A Different Order"), "OutstandingOnly=1");
+ submenu_option(_("Confirm Order Quantities and Make &Delivery"),
+ "/sales/customer_delivery.php?OrderNumber=$order_no");
+
+ submenu_option(_("Select A Different &Order"),
+ "/sales/inquiry/sales_orders_view.php?OutstandingOnly=1");
display_footer_exit();
} elseif (isset($_GET['AddedDN'])) {
$delivery = $_GET['AddedDN'];
- print_hidden_script(13);
display_notification_centered(sprintf(_("Delivery # %d has been entered."),$delivery));
- display_note(get_trans_view_str(13, $delivery, _("View This Delivery")));
- echo '
';
- display_note(print_document_link($delivery, _("Print Delivery Note"), true, 13));
+ submenu_view(_("&View This Delivery"), 13, $delivery);
+
+ submenu_print(_("&Print Delivery Note"), 13, $delivery, 'prtopt');
+ set_focus('prtopt');
- hyperlink_params($path_to_root . "/sales/customer_invoice.php",
- _("Make Invoice Against This Delivery"), "DeliveryNumber=$delivery");
+ submenu_option(_("Make &Invoice Against This Delivery"),
+ "/sales/customer_invoice.php?DeliveryNumber=$delivery");
if ((isset($_GET['Type']) && $_GET['Type'] == 1))
- hyperlink_params("inquiry/sales_orders_view.php",
- _("Enter a New Template Delivery"), "DeliveryTemplates=Yes");
+ submenu_option(_("Enter a New Template &Delivery"),
+ "inquiry/sales_orders_view.php?DeliveryTemplates=Yes");
else
- hyperlink_params($_SERVER['PHP_SELF'], _("Enter a New Delivery"), "NewDelivery=0");
+ submenu_option(_("Enter a &New Delivery"),
+ $_SERVER['PHP_SELF']."?NewDelivery=0");
display_footer_exit();
} elseif (isset($_GET['AddedDI'])) {
$invoice = $_GET['AddedDI'];
- print_hidden_script(10);
- display_notification_centered(sprintf(_("Invoice # %d has been entered."),$invoice));
+ display_notification_centered(sprintf(_("Invoice # %d has been entered."), $invoice));
+
+ submenu_view(_("&View This Invoice"), 10, $invoice);
- display_note(get_trans_view_str(10, $invoice, _("View This Invoice")));
- echo '
';
- display_note(print_document_link($invoice, _("Print Sales Invoice"), true, 10));
+ submenu_print(_("&Print Sales Invoice"), 10, $invoice, 'prtopt');
+ set_focus('prtopt');
if ((isset($_GET['Type']) && $_GET['Type'] == 1))
- hyperlink_params("inquiry/sales_orders_view.php",
- _("Enter a New Template Invoice"), "InvoiceTemplates=Yes");
+ submenu_option(_("Enter a &New Template Invoice"),
+ "inquiry/sales_orders_view.php?InvoiceTemplates=Yes");
else
- hyperlink_params($_SERVER['PHP_SELF'], _("Enter a New Direct Invoice"), "NewInvoice=0");
+ submenu_option(_("Enter a &New Direct Invoice"),
+ $_SERVER['PHP_SELF']."?NewInvoice=0");
display_footer_exit();
-}
+} else
+ check_edit_conflicts();
//-----------------------------------------------------------------------------
@@ -134,19 +155,28 @@ function copy_to_cart()
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 = input_num('freight_cost');
- $cart->deliver_to = $_POST['deliver_to'];
- $cart->delivery_address = $_POST['delivery_address'];
- $cart->phone = $_POST['phone'];
- $cart->Location = $_POST['Location'];
- $cart->ship_via = $_POST['ship_via'];
-
+ if ($cart->trans_type == 10)
+ $cart->cash = $_POST['cash'];
+ if ($cart->cash) {
+ $cart->due_date = $cart->document_date;
+ $cart->phone = $cart->cust_ref = $cart->delivery_address = '';
+ $cart->freight_cost = 0;
+ $cart->ship_via = 1;
+ $cart->deliver_to = '';//$_POST['deliver_to'];
+ } 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->Location = $_POST['Location'];
+ $cart->ship_via = $_POST['ship_via'];
+ }
if (isset($_POST['email']))
$cart->email =$_POST['email'];
else
@@ -154,6 +184,11 @@ function copy_to_cart()
$cart->customer_id = $_POST['customer_id'];
$cart->Branch = $_POST['branch_id'];
$cart->sales_type = $_POST['sales_type'];
+ // POS
+ if ($cart->trans_type!=30) { // 2008-11-12 Joe Hunt
+ $cart->dimension_id = $_POST['dimension_id'];
+ $cart->dimension2_id = $_POST['dimension2_id'];
+ }
}
//-----------------------------------------------------------------------------
@@ -178,54 +213,83 @@ function copy_from_cart()
$_POST['ship_via'] = $cart->ship_via;
$_POST['customer_id'] = $cart->customer_id;
+
$_POST['branch_id'] = $cart->Branch;
$_POST['sales_type'] = $cart->sales_type;
+ // POS
+ if ($cart->trans_type == 10)
+ $_POST['cash'] = $cart->cash;
+ if ($cart->trans_type!=30) { // 2008-11-12 Joe Hunt
+ $_POST['dimension_id'] = $cart->dimension_id;
+ $_POST['dimension2_id'] = $cart->dimension2_id;
+ }
+ $_POST['cart_id'] = $cart->cart_id;
+
}
+//--------------------------------------------------------------------------------
+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 ($_SESSION['Items']->cash == 0) {
if (strlen($_POST['deliver_to']) <= 1) {
display_error(_("You must enter the person or company to whom delivery should be made 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('deliver_to');
return false;
}
- if ($_POST['freight_cost'] == "")
- $_POST['freight_cost'] = price_format(0);
+ 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 (!check_num('freight_cost',0)) {
- display_error(_("The shipping cost entered is expected to be numeric."));
- return false;
- }
- if (!is_date($_POST['delivery_date'])) {
- display_error(_("The delivery date is invalid."));
- return false;
- }
- if (date1_greater_date2($_SESSION['Items']->document_date, $_POST['delivery_date'])) {
- display_error(_("The requested delivery date is before the date of the order."));
- return false;
+ if ($_POST['freight_cost'] == "")
+ $_POST['freight_cost'] = price_format(0);
+
+ 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($_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;
}
@@ -236,9 +300,11 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
$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;
@@ -258,18 +324,34 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
function check_item_data()
{
-
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 (!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']])
&& !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;
+ } // Joe Hunt added 2008-09-22 -------------------------
+ elseif ($_SESSION['Items']->trans_type!=30 && !sys_prefs::allow_negative_stock() &&
+ is_inventory_item($_POST['stock_id']))
+ {
+ $qoh = get_qoh_on_date($_POST['stock_id'], $_POST['Location'], $_POST['OrderDate']);
+ if (input_num('qty') > $qoh)
+ {
+ $stock = get_item($_POST['stock_id']);
+ display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") .
+ " " . $stock['stock_id'] . " - " . $stock['description'] . " - " .
+ _("Quantity On Hand") . " = " . number_format2($qoh, get_qty_dec($_POST['stock_id'])));
+ return false;
+ }
+ return true;
}
return true;
}
@@ -279,12 +361,13 @@ function check_item_data()
function handle_update_item()
{
if ($_POST['UpdateItem'] != '' && check_item_data()) {
+ //alert("description=".$_POST['item_description']);
+ //$_SESSION['items']->line_items[$_POST['LineNo']]->item_description = $_POST['item_description'];
$_SESSION['Items']->update_cart_item($_POST['LineNo'],
- input_num('qty'), input_num('price'),
- input_num('Disc') / 100 );
+ input_num('qty'), input_num('price'),
+ input_num('Disc') / 100, $_POST['item_description'] );
}
- copy_from_cart();
- set_focus('StockID2');
+ line_start_focus();
}
//--------------------------------------------------------------------------------
@@ -292,60 +375,61 @@ function handle_update_item()
function handle_delete_item($line_no)
{
if ($_SESSION['Items']->some_already_delivered($line_no) == 0) {
- $_SESSION['Items']->remove_from_cart($line_no);
+ $_SESSION['Items']->remove_from_cart($line_no);
} else {
display_error(_("This item cannot be deleted because some of it has already been delivered."));
}
- set_focus('StockID2');
+ line_start_focus();
}
//--------------------------------------------------------------------------------
function handle_new_item()
{
+
if (!check_item_data()) {
return;
}
add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
input_num('price'), input_num('Disc') / 100);
-
- $_POST['StockID2'] = $_POST['stock_id'] = "";
- set_focus('StockID2');
+ $_POST['_stock_id_edit'] = $_POST['stock_id'] = "";
+ line_start_focus();
}
//--------------------------------------------------------------------------------
function handle_cancel_order()
{
- global $path_to_root;
+ global $path_to_root, $Ajax;
- if ($_POST['CancelOrder'] != "") {
if ($_SESSION['Items']->trans_type == 13) {
- display_note(_("Direct delivery entry has been cancelled as requested."), 1);
- hyperlink_params($path_to_root . "/sales/sales_order_entry.php",
- _("Enter a New Sales Delivery"), SID . "&NewDelivery=0");
+ display_note(_("Direct delivery entry has been cancelled as requested."), 1);
+ submenu_option(_("Enter a New Sales Delivery"), $_SERVER['PHP_SELF']."?NewDelivery=0");
+
} elseif ($_SESSION['Items']->trans_type == 10) {
- display_note(_("Direct invoice entry has been cancelled as requested."), 1);
- hyperlink_params($path_to_root . "/sales/sales_order_entry.php",
- _("Enter a New Sales Delivery"), SID . "&NewDelivery=0");
+ display_note(_("Direct invoice entry has been cancelled as requested."), 1);
+ submenu_option(_("Enter a New Sales Invoice"), $_SERVER['PHP_SELF']."?NewInvoice=0");
} else {
if ($_SESSION['Items']->trans_no != 0) {
if (sales_order_has_deliveries(key($_SESSION['Items']->trans_no)))
display_error(_("This order cannot be cancelled because some of it has already been invoiced or dispatched. However, the line item quantities may be modified."));
- else
+ else {
delete_sales_order(key($_SESSION['Items']->trans_no));
- }
display_note(_("This sales order has been cancelled as requested."), 1);
- hyperlink_params($path_to_root . "/sales/sales_order_entry.php",
- _("Enter a New Sales Order"), SID . "&NewOrder=Yes");
+ submenu_option(_("Enter a New Sales Order"), $_SERVER['PHP_SELF']."?NewOrder=Yes");
+ }
+ } else {
+ processing_end();
+ meta_forward($path_to_root.'/index.php?application=orders');
}
- processing_end();
- br(1);
- end_page();
- exit;
}
+ $Ajax->activate('_page_body');
+ processing_end();
+ br(1);
+ end_page();
+ exit;
}
//--------------------------------------------------------------------------------
@@ -361,10 +445,18 @@ function create_cart($type, $trans_no)
$doc = new Cart(30, array($trans_no));
$doc->trans_type = $type;
$doc->trans_no = 0;
- if ($type == 10)
+ $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 = Today();
+ $doc->pos = user_pos();
+ $pos = get_sales_point($doc->pos);
+ $doc->cash = $pos['cash_sale'];
+ if (!$pos['cash_sale'] || !$pos['credit_sale'])
+ $doc->pos = -1; // mark not editable payment type
+ else
+ $doc->cash = date_diff($doc->due_date, Today(), 'd')<2;
+ } 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) {
@@ -373,16 +465,11 @@ function create_cart($type, $trans_no)
$_SESSION['Items'] = $doc;
} else
$_SESSION['Items'] = new Cart($type,array($trans_no));
-
copy_from_cart();
}
//--------------------------------------------------------------------------------
-
-//if (isset($_GET['Delete']) || isset($_GET['Edit']))
-// copy_from_cart(); // GET method need form restore
-
if (isset($_POST['CancelOrder']))
handle_cancel_order();
@@ -396,11 +483,11 @@ if (isset($_POST['UpdateItem']))
if (isset($_POST['AddItem']))
handle_new_item();
-if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem']))
- set_focus('StockID2');
+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."));
@@ -425,7 +512,8 @@ if ($_SESSION['Items']->trans_type == 10) {
$porder = _("Place Order");
$corder = _("Commit Order Changes");
}
-start_form(false, true);
+start_form();
+hidden('cart_id');
$customer_error = display_order_header($_SESSION['Items'],
($_SESSION['Items']->any_already_delivered() == 0), $idate);
@@ -441,16 +529,20 @@ if ($customer_error == "") {
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'), 'default');
} else {
- submit_center_first('ProcessOrder', $corder);
+ submit_center_first('ProcessOrder', $corder,
+ _('Validate changes and update document'), 'default');
}
- 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