From 5a04ec0a01ac17893e7b8d6073a075af1833bd20 Mon Sep 17 00:00:00 2001 From: bMancone Date: Wed, 18 Jan 2012 14:27:07 +0000 Subject: [PATCH] // SupplyOrders: the date is now correctly displayed --- controllers/admin/AdminSupplyOrdersController.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index 00ad3d271..197fb5fc0 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -298,7 +298,17 @@ class AdminSupplyOrdersControllerCore extends AdminController } //specific discount display - $this->object->discount_rate = Tools::ps_round($this->object->discount_rate, 4); + if (isset($this->object->discount_rate)) + $this->object->discount_rate = Tools::ps_round($this->object->discount_rate, 4); + + //specific date display + + if (isset($this->object->date_delivery_expected)) + { + $date = explode(' ', $this->object->date_delivery_expected); + if ($date) + $this->object->date_delivery_expected = $date[0]; + } $this->displayInformation( $this->l('Please note that if you wish to order products, they have to be available for the specified Supplier/Warehouse.')