diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 118b8e12475..f8e4b39aae9 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -22,18 +22,15 @@ /** * \file htdocs/commande/apercu.php * \ingroup commande - * \brief Page de l'onglet apercu d'une commande + * \brief Preview tab of order */ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; -if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; -if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('orders'); -$langs->load('propal'); $langs->load("bills"); $langs->load('compta'); $langs->load('sendings'); @@ -52,7 +49,6 @@ $result=restrictedArea($user,'commande',$id,''); llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes'); -$form = new Form($db); /* *************************************************************************** */ /* */ @@ -89,7 +85,7 @@ if ($id > 0 || ! empty($ref)) print ''; print $object->ref_client; print ''; - $nbrow=6; + $nbrow=8; print ''; /* @@ -110,16 +106,16 @@ if ($id > 0 || ! empty($ref)) $var=true; - // Si fichier PDF existe + // if PDF file exist if (file_exists($file)) { $encfile = urlencode($file); - print_titre($langs->trans("Documents")); - print ''; + print '
'; + print ''; print ""; - print ''; + print ''; print ''; print ''; print ''; @@ -130,7 +126,7 @@ if ($id > 0 || ! empty($ref)) { print ""; - print ''; + print ''; print ''; print ''; print ''; @@ -156,33 +152,41 @@ if ($id > 0 || ! empty($ref)) print ""; // Client - print ""; - print ''; + print ''; + print ''; print ''; // Statut print ''; - print "\n"; + print ''; print ''; // Date print ''; - print "\n"; - print ''; + print ''; + print ''; - // ligne 6 - // partie Gauche - print ''; - print ''; - print ''; + // Discount - left part + print ''; + print ''; + print ''; - // ligne 7 - // partie Gauche - print ''; - print ''; - print '
'.$langs->trans("Documents").'
".$langs->trans("Order")." PDF'.$object->ref.'.pdf'.$object->ref.'.pdf'.dol_print_size(dol_filesize($file)).''.dol_print_date(dol_filemtime($file),'dayhour').'
Commande detaillee'.$object->ref.'-detail.pdf'.$object->ref.'-detail.pdf'.dol_print_size(dol_filesize($filedetail)).''.dol_print_date(dol_filemtime($filedetail),'dayhour').'
".$langs->trans("Customer")."'; - print ''.$soc->getNomUrl(1).''; - print '
'.$langs->trans("Customer").''.$soc->getNomUrl(1).'
'.$langs->trans("Status").'".$object->getLibStatut(4)."'.$object->getLibStatut(4).'
'.$langs->trans("Date").'".dol_print_date($object->date,"daytext")."
'.dol_print_date($object->date,"daytext").'
'.$langs->trans('GlobalDiscount').''.$object->remise_percent.'%
'.$langs->trans('GlobalDiscount').''.$object->remise_percent.'%
'.$langs->trans('AmountHT').'' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '
'; + // Total HT - left part + print ''.$langs->trans('AmountHT').''; + print '' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . ''; + print ''; + + // Total VAT - left part + print ''.$langs->trans('AmountVAT').''; + print '' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . ''; + print ''; + + // Total TTC - left part + print ''.$langs->trans('AmountTTC').''; + print '' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . ''; + print ''; + + print ''; dol_fiche_end(); } @@ -193,10 +197,13 @@ if ($id > 0 || ! empty($ref)) } } +print ''; +print ''; +print '
'; +print '
'; // Si fichier png PDF d'1 page trouve if (file_exists($fileimage)) { - print ''; + print ''; } // Si fichier png PDF de plus d'1 page trouve elseif (file_exists($fileimagebis)) @@ -209,10 +216,13 @@ elseif (file_exists($fileimagebis)) if (file_exists($dir_output.$preview)) { - print '

'; + print '

'; } } } +print '

'; +print '
'; llxFooter();