X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fcustomer_delivery.php;h=605df69188fd200ccc48b3635975c51a4477d648;hb=1b9351ae81a67726e757eba55895a4f059c7f128;hp=f92538020e8cf61c06d3a928a24af7877f657bcf;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index f9253802..605df691 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -29,7 +29,7 @@ $js = "";
 if ($use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
-if ($use_date_picker) {
+if (user_use_date_picker()) {
 	$js .= get_js_date_picker();
 }
 
@@ -138,7 +138,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 	exit;
 
 } else {
-	check_edit_conflicts();
+	check_edit_conflicts(get_post('cart_id'));
 
 	if (!check_quantities()) {
 		display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity	not dispatched on sales order."));