X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=3017f0221a9b502a6769bf5292a4d0155e46f66a;hb=e39d77850382a1184502c596aae74f353de38774;hp=8805dfdac4473fb9d0fe7cb03e894d0ee32b70a7;hpb=de3d898de357e5b7a79f793428461106a916ea80;p=fa-stable.git
diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 8805dfda..3017f022 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -69,14 +69,14 @@ if (isset($_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")));
+ 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));
+ display_note(print_document_link($order_no, _("&Print This Order"), true, 30));
hyperlink_params($path_to_root . "/sales/customer_delivery.php",
- _("Make Delivery Against This Order"), "OrderNumber=$order_no");
+ _("Make &Delivery Against This Order"), "OrderNumber=$order_no");
- hyperlink_params($_SERVER['PHP_SELF'], _("Enter a New Order"), "NewOrder=0");
+ hyperlink_params($_SERVER['PHP_SELF'], _("Enter a &New Order"), "NewOrder=0");
display_footer_exit();
@@ -85,15 +85,15 @@ 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")));
+ 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));
+ display_note(print_document_link($order_no, _("&Print This Order"), true, 30));
hyperlink_params($path_to_root . "/sales/customer_delivery.php",
- _("Confirm Order Quantities and Make Delivery"), "OrderNumber=$order_no");
+ _("Confirm Order Quantities and Make &Delivery"), "OrderNumber=$order_no");
hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
- _("Select A Different Order"), "OutstandingOnly=1");
+ _("Select A Different &Order"), "OutstandingOnly=1");
display_footer_exit();
@@ -102,18 +102,18 @@ 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")));
+ display_note(get_trans_view_str(13, $delivery, _("&View This Delivery")));
echo '
';
- display_note(print_document_link($delivery, _("Print Delivery Note"), true, 13));
+ display_note(print_document_link($delivery, _("&Print Delivery Note"), true, 13));
hyperlink_params($path_to_root . "/sales/customer_invoice.php",
- _("Make Invoice Against This Delivery"), "DeliveryNumber=$delivery");
+ _("Make &Invoice Against This Delivery"), "DeliveryNumber=$delivery");
if ((isset($_GET['Type']) && $_GET['Type'] == 1))
hyperlink_params("inquiry/sales_orders_view.php",
- _("Enter a New Template Delivery"), "DeliveryTemplates=Yes");
+ _("Enter a New Template &Delivery"), "DeliveryTemplates=Yes");
else
- hyperlink_params($_SERVER['PHP_SELF'], _("Enter a New Delivery"), "NewDelivery=0");
+ hyperlink_params($_SERVER['PHP_SELF'], _("Enter a &New Delivery"), "NewDelivery=0");
display_footer_exit();
@@ -122,15 +122,15 @@ if (isset($_GET['AddedID'])) {
display_notification_centered(sprintf(_("Invoice # %d has been entered."),$invoice));
- display_note(get_trans_view_str(10, $invoice, _("View This Invoice")));
+ display_note(get_trans_view_str(10, $invoice, _("&View This Invoice")));
echo '
';
- display_note(print_document_link($invoice, _("Print Sales Invoice"), true, 10));
+ display_note(print_document_link($invoice, _("&Print Sales Invoice"), true, 10));
if ((isset($_GET['Type']) && $_GET['Type'] == 1))
hyperlink_params("inquiry/sales_orders_view.php",
- _("Enter a New Template Invoice"), "InvoiceTemplates=Yes");
+ _("Enter a &New Template Invoice"), "InvoiceTemplates=Yes");
else
- hyperlink_params($_SERVER['PHP_SELF'], _("Enter a New Direct Invoice"), "NewInvoice=0");
+ hyperlink_params($_SERVER['PHP_SELF'], _("Enter a &New Direct Invoice"), "NewInvoice=0");
display_footer_exit();
}
@@ -143,19 +143,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 +172,7 @@ function copy_to_cart()
$cart->customer_id = $_POST['customer_id'];
$cart->Branch = $_POST['branch_id'];
$cart->sales_type = $_POST['sales_type'];
+ // POS
}
//-----------------------------------------------------------------------------
@@ -190,6 +200,9 @@ 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;
}
//--------------------------------------------------------------------------------
@@ -217,35 +230,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 (!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 ($_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."));
@@ -409,9 +425,16 @@ function create_cart($type, $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)
+ 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='';