From 91d06c257cd8ed005dff01ca85f75b3211039107 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Tue, 25 Nov 2008 15:11:24 +0000 Subject: [PATCH] Fixed [0000087] (price always updated after order date change) --- sales/includes/ui/sales_credit_ui.inc | 5 ++++- sales/includes/ui/sales_order_ui.inc | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc index be4adbf3..5af7227b 100644 --- a/sales/includes/ui/sales_credit_ui.inc +++ b/sales/includes/ui/sales_credit_ui.inc @@ -113,7 +113,10 @@ function display_credit_header(&$order) date_row(_("Date:"), 'OrderDate', '', null, 0, 0, 0, null, true); if (isset($_POST['_OrderDate_changed'])) { - $change_prices = 1; + if (!is_company_currency($order->customer_currency) + && (get_base_sales_type()>0)) { + $change_prices = 1; + } $Ajax->activate('currency'); } shippers_list_row(_("Shipping Company:"), 'ShipperID', $order->ship_via); diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index 2b2b0284..e9fd0a8f 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -281,7 +281,10 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group date_row($date_text, 'OrderDate', _('Date of order receive'), null, 0, 0, 0, null, true); if (isset($_POST['_OrderDate_changed'])) { - $change_prices = 1; + if (!is_company_currency($order->customer_currency) + && (get_base_sales_type()>0)) { + $change_prices = 1; + } $Ajax->activate('currency'); if ($order->trans_type == 10) { $_POST['delivery_date'] = get_invoice_duedate(get_post('customer_id'), get_post('OrderDate')); -- 2.30.2