From f7357591d8dc95238a632a5d77e260057c982553 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Thu, 29 Mar 2012 11:12:19 +0200 Subject: [PATCH] Required Delivery Date was not implemented properly. --- purchasing/includes/ui/po_ui.inc | 4 ++-- sales/includes/ui/sales_order_ui.inc | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index ec5ad432..c91d42fd 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -358,7 +358,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false) function po_item_controls(&$order, &$rowcounter, $line_no=-1) { - global $Ajax; + global $Ajax, $SysPrefs; alt_table_row_color($rowcounter); @@ -415,7 +415,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) //$_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id'])); $_POST['price'] = price_decimal_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']), $dec2); if ($order->trans_type == ST_PURCHORDER) - $_POST['req_del_date'] = add_days(Today(), 10); + $_POST['req_del_date'] = add_days(Today(), $SysPrefs->default_delivery_required_by()); $qty_rcvd = ''; } diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index c9e63a15..9cb6c363 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -72,6 +72,8 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount, $des function get_customer_details_to_order(&$order, $customer_id, $branch_id) { + global $SysPrefs; + $ret_error = ""; $myrow = get_customer_to_order($customer_id); @@ -116,9 +118,11 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"], $address); - if ($order->trans_type == ST_SALESINVOICE || $order->trans_type == ST_SALESORDER) { + if ($order->trans_type == ST_SALESINVOICE) { $order->due_date = get_invoice_duedate($order->payment, $order->document_date); } + elseif ($order->trans_type == ST_SALESORDER) + $order->due_date = add_days($order->document_date, $SysPrefs->default_delivery_required_by()); if($order->payment_terms['cash_sale']) { $order->set_location($order->pos["pos_location"], $order->pos["location_name"]); } else -- 2.30.2