lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uniformize code

Browse Source
This commit is contained in:
Laurent Destailleur 2015-07-04 04:11:16 +02:00
parent 9c80735310
commit 5fafb08f91
9 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/comm/askpricesupplier/card.php
View File

@ -1768,8 +1768,11 @@ if ($action == 'create')
$file = $fileparams['fullname']; $file = $fileparams['fullname'];
} }
print '<div class="clearboth"></div>';
print '<br>'; print '<br>';
print_titre($langs->trans('SendAskByMail')); print_fiche_titre($langs->trans('SendAskByMail'));
dol_fiche_head('');
// Create form object // Create form object
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
@ -1816,7 +1819,7 @@ if ($action == 'create')
print $formmail->get_form(); print $formmail->get_form();
print '<br>'; dol_fiche_end();
} }
} }

2
htdocs/comm/propal.php
View File

@ -2370,7 +2370,7 @@ if ($action == 'create')
print '<div class="clearboth"></div>'; print '<div class="clearboth"></div>';
print '<br>'; print '<br>';
print_titre($langs->trans('SendPropalByMail'), '', 'object_email'); print_fiche_titre($langs->trans('SendPropalByMail'));
dol_fiche_head(''); dol_fiche_head('');

2
htdocs/commande/card.php
View File

@ -2365,7 +2365,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<div class="clearboth"></div>'; print '<div class="clearboth"></div>';
print '<br>'; print '<br>';
print_fiche_titre($langs->trans('SendOrderByMail'), '', 'object_email'); print_fiche_titre($langs->trans('SendOrderByMail'));
dol_fiche_head(''); dol_fiche_head('');

2
htdocs/compta/facture.php
View File

@ -3857,7 +3857,7 @@ else if ($id > 0 || ! empty($ref))
print '<div class="clearboth"></div>'; print '<div class="clearboth"></div>';
print '<br>'; print '<br>';
print_titre($langs->trans($titreform), '', 'object_email'); print_fiche_titre($langs->trans($titreform));
// Cree l'objet formulaire mail // Cree l'objet formulaire mail
dol_fiche_head(); dol_fiche_head();

10
htdocs/compta/facture/class/facture.class.php
View File

@ -2721,7 +2721,10 @@ class Facture extends CommonInvoice
$dir = dol_buildpath($reldir."core/modules/facture/"); $dir = dol_buildpath($reldir."core/modules/facture/");
// Load file with numbering class (if found) // 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 // For compatibility
@ -2734,8 +2737,11 @@ class Facture extends CommonInvoice
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot."/core/modules/facture/"; $dir = $dirroot."/core/modules/facture/";
// Load file with numbering class (if found) // 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;
}
} }
} }

7
htdocs/expedition/card.php
View File

@ -1561,8 +1561,11 @@ else if ($id || $ref)
$file=$fileparams['fullname']; $file=$fileparams['fullname'];
} }
print '<div class="clearboth"></div>';
print '<br>'; print '<br>';
print_titre($langs->trans('SendShippingByEMail')); print_fiche_titre($langs->trans('SendShippingByEMail'));
dol_fiche_head('');
// Cree l'objet formulaire mail // Cree l'objet formulaire mail
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@ -1638,7 +1641,7 @@ else if ($id || $ref)
// Show form // Show form
print $formmail->get_form(); print $formmail->get_form();
print '<br>'; dol_fiche_end();
} }
if ($action != 'presend' && ! empty($origin) && $object->$origin->id) if ($action != 'presend' && ! empty($origin) && $object->$origin->id)

7
htdocs/fichinter/card.php
View File

@ -1795,8 +1795,11 @@ else if ($id > 0 || ! empty($ref))
$file=$fileparams['fullname']; $file=$fileparams['fullname'];
} }
print '<div class="clearboth"></div>';
print '<br>'; print '<br>';
print_titre($langs->trans('SendInterventionByMail')); print_fiche_titre($langs->trans('SendInterventionByMail'));
dol_fiche_head('');
// Create form object // Create form object
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; 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 $formmail->get_form();
print '<br>'; dol_fiche_end();
} }
} }

6
htdocs/fourn/commande/card.php
View File

@ -2296,9 +2296,11 @@ elseif (! empty($object->id))
$file=$fileparams['fullname']; $file=$fileparams['fullname'];
} }
print '<div class="clearboth"></div>';
print '<br>'; print '<br>';
print_fiche_titre($langs->trans('SendOrderByMail'));
print_titre($langs->trans('SendOrderByMail')); dol_fiche_head('');
// Cree l'objet formulaire mail // Cree l'objet formulaire mail
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@ -2367,7 +2369,7 @@ elseif (! empty($object->id))
// Show form // Show form
print $formmail->get_form(); print $formmail->get_form();
print '<br>'; dol_fiche_end();
} }
/* /*
* Action webservice * Action webservice

7
htdocs/fourn/facture/card.php
View File

@ -2474,8 +2474,11 @@ else
$file=$fileparams['fullname']; $file=$fileparams['fullname'];
} }
print '<div class="clearboth"></div>';
print '<br>'; print '<br>';
print_titre($langs->trans('SendBillByMail')); print_fiche_titre($langs->trans('SendBillByMail'));
dol_fiche_head('');
// Cree l'objet formulaire mail // Cree l'objet formulaire mail
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@ -2539,7 +2542,7 @@ else
// Show form // Show form
print $formmail->get_form(); print $formmail->get_form();
print '<br>'; dol_fiche_end();
} }
} }
} }