X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=fd14cc8d8169f4072d63a3ceb905e85c576863ed;hb=21290a4a16ca78fe736f62cf1cb039c06cb53fca;hp=8805dfdac4473fb9d0fe7cb03e894d0ee32b70a7;hpb=de3d898de357e5b7a79f793428461106a916ea80;p=fa-stable.git
diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 8805dfda..fd14cc8d 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -1,4 +1,14 @@
.
+***********************************************************************/
//-----------------------------------------------------------------------------
//
// Entry/Modify Sales Order
@@ -18,18 +28,14 @@ include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
include_once($path_to_root . "/reporting/includes/reporting.inc");
$js = '';
-if ($ret = context_restore()) {
- // return from new customer add
- copy_from_cart();
- if(isset($ret['customer_id']))
- $_POST['customer_id'] = $ret['customer_id'];
- if(isset($ret['branch_id']))
- $_POST['branch_id'] = $ret['branch_id'];
-}
-if (isset($_POST['_customer_id_editor'])) {
- copy_to_cart(); //store context
- context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'], 'Items');
-}
+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);
@@ -66,17 +72,17 @@ page($_SESSION['page_title'], false, false, "", $js);
if (isset($_GET['AddedID'])) {
$order_no = $_GET['AddedID'];
-
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();
@@ -85,15 +91,16 @@ if (isset($_GET['AddedID'])) {
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);
+
+ submenu_print(_("&Print This Order"), 30, $order_no, 'prtopt');
+ set_focus('prtopt');
- hyperlink_params($path_to_root . "/sales/customer_delivery.php",
- _("Confirm Order Quantities and Make Delivery"), "OrderNumber=$order_no");
+ submenu_option(_("Confirm Order Quantities and Make &Delivery"),
+ "/sales/customer_delivery.php?OrderNumber=$order_no");
- hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
- _("Select A Different Order"), "OutstandingOnly=1");
+ submenu_option(_("Select A Different &Order"),
+ "/sales/inquiry/sales_orders_view.php?OutstandingOnly=1");
display_footer_exit();
@@ -102,38 +109,43 @@ if (isset($_GET['AddedID'])) {
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);
- hyperlink_params($path_to_root . "/sales/customer_invoice.php",
- _("Make Invoice Against This Delivery"), "DeliveryNumber=$delivery");
+ submenu_print(_("&Print Delivery Note"), 13, $delivery, 'prtopt');
+ set_focus('prtopt');
+
+ 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'];
- 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();
//-----------------------------------------------------------------------------
@@ -143,19 +155,28 @@ function copy_to_cart()
if ($cart->trans_type!=30) {
$cart->reference = $_POST['ref'];
- }
+ }
$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
@@ -163,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'];
+ }
}
//-----------------------------------------------------------------------------
@@ -190,6 +216,15 @@ function copy_from_cart()
$_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;
+
}
//--------------------------------------------------------------------------------
@@ -217,35 +252,38 @@ function can_process() {
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."));
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'] = 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 ($_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 (!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."));
@@ -262,7 +300,6 @@ 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');
@@ -270,7 +307,7 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
}
$trans_no = key($_SESSION['Items']->trans_no);
$trans_type = $_SESSION['Items']->trans_type;
-
+ new_doc_date($_SESSION['Items']->document_date);
processing_end();
if ($modified) {
meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
@@ -324,9 +361,11 @@ 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('Disc') / 100, $_POST['item_description'] );
}
line_start_focus();
}
@@ -365,13 +404,12 @@ function handle_cancel_order()
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)))
@@ -380,12 +418,11 @@ function handle_cancel_order()
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');
+ meta_forward($path_to_root.'/index.php','application=orders');
}
}
$Ajax->activate('_page_body');
@@ -408,10 +445,17 @@ function create_cart($type, $trans_no)
$doc = new Cart(30, array($trans_no));
$doc->trans_type = $type;
$doc->trans_no = 0;
- $doc->document_date = Today(); // 2006-06-15. Added so Invoices and Deliveries get current day
- if ($type == 10)
+ $doc->document_date = new_doc_date();
+ if ($type == 10) {
$doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date);
- else
+ $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='';
@@ -468,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);
@@ -486,15 +531,14 @@ if ($customer_error == "") {
if ($_SESSION['Items']->trans_no == 0) {
submit_center_first('ProcessOrder', $porder,
- _('Check entered data and save document'), true, 'confirm.png');
+ _('Check entered data and save document'), 'default');
} else {
submit_center_first('ProcessOrder', $corder,
- _('Validate changes and update document'), true, 'confirm.png');
+ _('Validate changes and update document'), 'default');
}
submit_center_last('CancelOrder', $cancelorder,
- _('Cancels document entry or removes sales order when editing an old document'),
- true, 'escape.png');
+ _('Cancels document entry or removes sales order when editing an old document'));
} else {
display_error($customer_error);
}