From b7328caa9a5263fc00b8eee7208e7f2fa04fff4d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 22 Jan 2015 20:40:53 +0100 Subject: [PATCH] Fixed: Bad date for supplier orders --- htdocs/projet/element.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index df420f159d735..10b540f9e5038 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -356,18 +356,22 @@ print "\n"; // Date - $date=$element->date; - if (empty($date)) $date=$element->datep; - if (empty($date)) $date=$element->date_contrat; - if (empty($date)) $date=$element->datev; //Fiche inter + if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order') $date=$element->date_commande; + else + { + $date=$element->date; + if (empty($date)) $date=$element->datep; + if (empty($date)) $date=$element->date_contrat; + if (empty($date)) $date=$element->datev; //Fiche inter + } print ''.dol_print_date($date,'day').''; // Third party print ''; - if (is_object($element->client)) print $element->client->getNomUrl(1,'',48); + if (is_object($element->thirdparty)) print $element->thirdparty->getNomUrl(1,'',48); print ''; - // Amount + // Amount without tax if (empty($value['disableamount'])) { print ''; @@ -378,7 +382,7 @@ } else print ''; - // Amount + // Amount inc tax if (empty($value['disableamount'])) { print '';