From 5fafb08f9117679669cf148fc8f9b833b286380c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Jul 2015 04:11:16 +0200 Subject: [PATCH] Uniformize code --- htdocs/comm/askpricesupplier/card.php | 7 +++++-- htdocs/comm/propal.php | 2 +- htdocs/commande/card.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/compta/facture/class/facture.class.php | 10 ++++++++-- htdocs/expedition/card.php | 7 +++++-- htdocs/fichinter/card.php | 7 +++++-- htdocs/fourn/commande/card.php | 6 ++++-- htdocs/fourn/facture/card.php | 7 +++++-- 9 files changed, 35 insertions(+), 15 deletions(-) diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php index bfbcc9d4273..3fe244c7396 100644 --- a/htdocs/comm/askpricesupplier/card.php +++ b/htdocs/comm/askpricesupplier/card.php @@ -1768,8 +1768,11 @@ if ($action == 'create') $file = $fileparams['fullname']; } + print '
'; print '
'; - print_titre($langs->trans('SendAskByMail')); + print_fiche_titre($langs->trans('SendAskByMail')); + + dol_fiche_head(''); // Create form object include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php'; @@ -1816,7 +1819,7 @@ if ($action == 'create') print $formmail->get_form(); - print '
'; + dol_fiche_end(); } } diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index db109ebc1d5..dc0f376234e 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -2370,7 +2370,7 @@ if ($action == 'create') print '
'; print '
'; - print_titre($langs->trans('SendPropalByMail'), '', 'object_email'); + print_fiche_titre($langs->trans('SendPropalByMail')); dol_fiche_head(''); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 1209a6be5df..cbe411b9217 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2365,7 +2365,7 @@ if ($action == 'create' && $user->rights->commande->creer) print '
'; print '
'; - print_fiche_titre($langs->trans('SendOrderByMail'), '', 'object_email'); + print_fiche_titre($langs->trans('SendOrderByMail')); dol_fiche_head(''); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 1043c73456f..434afbea358 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3857,7 +3857,7 @@ else if ($id > 0 || ! empty($ref)) print '
'; print '
'; - print_titre($langs->trans($titreform), '', 'object_email'); + print_fiche_titre($langs->trans($titreform)); // Cree l'objet formulaire mail dol_fiche_head(); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index d91352a4a1a..dbbc1d88212 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2721,7 +2721,10 @@ class Facture extends CommonInvoice $dir = dol_buildpath($reldir."core/modules/facture/"); // Load file with numbering class (if found) - $mybool|=@include_once $dir.$file; + if (is_file($dir.$file) && is_readable($dir.$file)) + { + $mybool |= include_once $dir . $file; + } } // For compatibility @@ -2734,8 +2737,11 @@ class Facture extends CommonInvoice foreach ($conf->file->dol_document_root as $dirroot) { $dir = $dirroot."/core/modules/facture/"; + // Load file with numbering class (if found) - $mybool|=@include_once $dir.$file; + if (is_file($dir.$file) && is_readable($dir.$file)) { + $mybool |= include_once $dir . $file; + } } } diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 47878c7e75f..88661bf090f 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1561,8 +1561,11 @@ else if ($id || $ref) $file=$fileparams['fullname']; } + print '
'; print '
'; - print_titre($langs->trans('SendShippingByEMail')); + print_fiche_titre($langs->trans('SendShippingByEMail')); + + dol_fiche_head(''); // Cree l'objet formulaire mail include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; @@ -1638,7 +1641,7 @@ else if ($id || $ref) // Show form print $formmail->get_form(); - print '
'; + dol_fiche_end(); } if ($action != 'presend' && ! empty($origin) && $object->$origin->id) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 4d43dbad9de..b6505f19e4e 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1795,8 +1795,11 @@ else if ($id > 0 || ! empty($ref)) $file=$fileparams['fullname']; } + print '
'; print '
'; - print_titre($langs->trans('SendInterventionByMail')); + print_fiche_titre($langs->trans('SendInterventionByMail')); + + dol_fiche_head(''); // Create form object include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; @@ -1860,7 +1863,7 @@ else if ($id > 0 || ! empty($ref)) print $formmail->get_form(); - print '
'; + dol_fiche_end(); } } diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 4acf2e8f681..49833b56564 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2296,9 +2296,11 @@ elseif (! empty($object->id)) $file=$fileparams['fullname']; } + print '
'; print '
'; + print_fiche_titre($langs->trans('SendOrderByMail')); - print_titre($langs->trans('SendOrderByMail')); + dol_fiche_head(''); // Cree l'objet formulaire mail include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; @@ -2367,7 +2369,7 @@ elseif (! empty($object->id)) // Show form print $formmail->get_form(); - print '
'; + dol_fiche_end(); } /* * Action webservice diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index cda640f2f38..155ac2288e6 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2474,8 +2474,11 @@ else $file=$fileparams['fullname']; } + print '
'; print '
'; - print_titre($langs->trans('SendBillByMail')); + print_fiche_titre($langs->trans('SendBillByMail')); + + dol_fiche_head(''); // Cree l'objet formulaire mail include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; @@ -2539,7 +2542,7 @@ else // Show form print $formmail->get_form(); - print '
'; + dol_fiche_end(); } } }