diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 59bb28949b5..38a0d90c7f7 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -113,7 +113,9 @@ if ($resql) print "$obj->df\n"; print ''.$obj->cc.''; - print ''.img_file_new().''; + print ''; + print ''.img_file_new().''; + print ''; $name = "actions-".$obj->month."-".$obj->year.".pdf"; $relativepath= $name; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 8d8391126f4..211ed76ff22 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1589,19 +1589,6 @@ if ($_GET['propalid'] > 0) print ''.$langs->trans('Edit').''; } - // Build PDF - if ($user->rights->propale->creer) - { - if ($propal->statut < 2) - { - print ''.$langs->trans("BuildPDF").''; - } - else - { - print ''.$langs->trans("RebuildPDF").''; - } - } - // Send if ($propal->statut == 1 && $user->rights->propale->envoyer) { diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 30063947cef..a2d01abddfc 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1691,18 +1691,6 @@ else } } - // Build PDF - if ($user->rights->commande->creer && $commande->statut < 3) - { - print ''.$langs->trans("BuildPDF").''; - } - - // ReBuild PDF - if ($user->rights->commande->creer && $commande->statut >= 3) - { - print ''.$langs->trans("RebuildPDF").''; - } - // Send if ($commande->statut > 0) { diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index ed65cf7099a..4e736e85ca3 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -410,11 +410,6 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') print "id&action=set_payed\">".$langs->trans("ClassifyPayed").""; } - if ($don->statut == 2 || $don->statut == 3) - { - print ' '.$langs->trans('BuildDonationReceipt').''; - } - if ($don->statut == 0) { print "id&action=delete\">".$langs->trans("Delete").""; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index fc223552ea2..b04de783fab 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2002,7 +2002,7 @@ else $sql.= ' c.libelle as paiement_type, p.num_paiement, p.rowid'; $sql.= ' FROM '.MAIN_DB_PREFIX.'paiement as p, '.MAIN_DB_PREFIX.'c_paiement as c, '.MAIN_DB_PREFIX.'paiement_facture as pf'; $sql.= ' WHERE pf.fk_facture = '.$fac->id.' AND p.fk_paiement = c.id AND pf.fk_paiement = p.rowid'; - $sql.= ' ORDER BY dp DESC'; + $sql.= ' ORDER BY dp, tms'; $result = $db->query($sql); if ($result) @@ -2648,21 +2648,6 @@ else print ''.$langs->trans('Validate').''; } } - else - { - // Générer - if ($fac->statut >= 1 && $user->rights->facture->creer) - { - if ($fac->paye == 0) - { - print ''.$langs->trans('BuildPDF').''; - } - else - { - print ''.$langs->trans('RebuildPDF').''; - } - } - } // Envoyer if (($fac->statut == 1 || $fac->statut == 2) && $user->rights->facture->envoyer) diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index cfef8dff7f5..5efec0a6d11 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -636,11 +636,6 @@ else print ''.$langs->trans("DeliveryOrder").''; } - if ($user->rights->expedition->lire && ($expedition->statut > 0)) - { - print ''.$langs->trans('BuildPDF').''; - } - if ($expedition->brouillon && $user->rights->expedition->supprimer) { print ''.$langs->trans("Delete").''; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 67c2bec31c2..b4c417df113 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -796,15 +796,6 @@ else } } - - // Build PDF - if ($commande->statut > 0) - { - if ($user->rights->fournisseur->commande->creer) - { - print ''.$langs->trans("BuildPDF").''; - } - } print ""; } diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 8b15fc0e92b..f27e4890ca8 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -536,8 +536,6 @@ else print ''.$langs->trans("Validate").''; } - print ''.$langs->trans('BuildPDF').''; - if ($livraison->brouillon && $user->rights->expedition->livraison->supprimer) { if ($conf->expedition_bon->enabled)