Merge pull request #9203 from grandoc/new_branch_04_08_2018

comment translation
This commit is contained in:
Juanjo Menent 2018-08-08 11:07:18 +02:00 committed by GitHub
commit 229a5d3532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
93 changed files with 106 additions and 105 deletions

View File

@ -91,7 +91,7 @@ if ($id > 0)
if ($result > 0) if ($result > 0)
{ {
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -366,7 +366,7 @@ if ($action == 'edit')
{ {
$mainstmpid=(! empty($conf->global->MAIN_MAIL_SMTPS_ID)?$conf->global->MAIN_MAIL_SMTPS_ID:''); $mainstmpid=(! empty($conf->global->MAIN_MAIL_SMTPS_ID)?$conf->global->MAIN_MAIL_SMTPS_ID:'');
print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'; print '<tr class="drag drop oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
// SuperAdministrator access only // SuperAdministrator access only
if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
{ {
@ -386,7 +386,7 @@ if ($action == 'edit')
{ {
$mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:''); $mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:'');
print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'; print '<tr class="drag drop oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
// SuperAdministrator access only // SuperAdministrator access only
if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
{ {

View File

@ -100,7 +100,7 @@ if ($object->id)
dol_fiche_head($head, 'document', $langs->trans("Asset"), -1, 'generic'); dol_fiche_head($head, 'document', $langs->trans("Asset"), -1, 'generic');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -239,7 +239,7 @@ if ($object->id > 0)
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -303,8 +303,6 @@ if ($object->fetch($id) >= 0)
// Sort $modulenames // Sort $modulenames
sort($modulenames); sort($modulenames);
$var = true;
// Loop on each submodule // Loop on each submodule
foreach($modulenames as $modulename) foreach($modulenames as $modulename)
{ {
@ -330,16 +328,14 @@ if ($object->fetch($id) >= 0)
// Si le module mailing est qualifie // Si le module mailing est qualifie
if ($qualified) if ($qualified)
{ {
$var = ! $var;
if ($allowaddtarget) if ($allowaddtarget)
{ {
print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">'; print '<form class="oddeven tagtr" name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
} }
else else
{ {
print '<div '.$bctag[$var].'>'; print '<div class="oddeven tagtr">';
} }
print '<div class="tagtd">'; print '<div class="tagtd">';

View File

@ -94,7 +94,7 @@ if ($object->id > 0)
$head = propal_prepare_head($object); $head = propal_prepare_head($object);
dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal'); dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -97,7 +97,7 @@ if ($id > 0 || ! empty($ref))
$head = commande_prepare_head($object); $head = commande_prepare_head($object);
dol_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order'); dol_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -105,7 +105,7 @@ if ($id > 0 || !empty($ref)) {
dol_fiche_head($head, 'document', $langs->trans("FinancialAccount"), -1, 'account'); dol_fiche_head($head, 'document', $langs->trans("FinancialAccount"), -1, 'account');
// Construit liste des fichiers // Build file list
$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$',
$sortfield, $sortfield,
(strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1); (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);

View File

@ -124,7 +124,7 @@ if ($object->id)
print '<div class="fichecenter">'; print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -91,7 +91,7 @@ if ($object->id)
dol_fiche_head($head, 'documents', $langs->trans("TripCard"), 0, 'trip'); dol_fiche_head($head, 'documents', $langs->trans("TripCard"), 0, 'trip');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -104,7 +104,7 @@ if ($id > 0 || ! empty($ref))
$totalpaye = $object->getSommePaiement(); $totalpaye = $object->getSommePaiement();
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -90,7 +90,7 @@ if ($object->id)
dol_fiche_head($head, 'documents', $langs->trans("SalaryPayment"), -1, 'payment'); dol_fiche_head($head, 'documents', $langs->trans("SalaryPayment"), -1, 'payment');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -136,7 +136,7 @@ if ($object->id)
print '<div class="fichecenter">'; print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -122,7 +122,7 @@ if ($object->id)
print '<div class="fichecenter">'; print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -97,7 +97,7 @@ if ($object->id)
dol_fiche_head($head, 'documents', $title, -1, 'contact'); dol_fiche_head($head, 'documents', $title, -1, 'contact');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -103,7 +103,7 @@ if ($object->id)
dol_fiche_head($head, 'documents', $langs->trans("Contract"), -1, 'contract'); dol_fiche_head($head, 'documents', $langs->trans("Contract"), -1, 'contract');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -66,7 +66,7 @@ $domData .= ' data-product_type="'.$line->product_type.'"';
?> ?>
<?php $coldisplay=0; ?> <?php $coldisplay=0; ?>
<!-- BEGIN PHP TEMPLATE objectline_view.tpl.php --> <!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->
<tr <?php echo 'id="row-'.$line->id.'" '.$bcdd[$var]; echo $domData; ?> > <tr id="row-<?php echo $line->id?> class="drag drop oddeven" <?php echo $domData; ?> >
<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?> <?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
<td class="linecolnum" align="center"><?php $coldisplay++; ?><?php echo ($i+1); ?></td> <td class="linecolnum" align="center"><?php $coldisplay++; ?><?php echo ($i+1); ?></td>
<?php } ?> <?php } ?>
@ -321,7 +321,7 @@ $domData .= ' data-product_type="'.$line->product_type.'"';
//Line extrafield //Line extrafield
if (!empty($extrafieldsline)) if (!empty($extrafieldsline))
{ {
print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bcdd[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1); print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
} }
?> ?>

View File

@ -107,7 +107,7 @@ if ($object->id)
dol_fiche_head($head, 'documents', $langs->trans("Donation"), -1, 'generic'); dol_fiche_head($head, 'documents', $langs->trans("Donation"), -1, 'generic');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref)){
dol_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending'); dol_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file){ foreach($filearray as $key => $file){

View File

@ -103,7 +103,7 @@ if ($object->id)
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref); dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -94,7 +94,7 @@ if ($object->id)
dol_fiche_head($head, 'documents', $langs->trans("InterventionCard"), -1, 'intervention'); dol_fiche_head($head, 'documents', $langs->trans("InterventionCard"), -1, 'intervention');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -107,7 +107,7 @@ if ($object->id > 0)
dol_fiche_head($head, 'documents', $langs->trans('SupplierOrder'), -1, 'order'); dol_fiche_head($head, 'documents', $langs->trans('SupplierOrder'), -1, 'order');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -145,7 +145,7 @@ if ($object->id > 0)
print '<div class="fichecenter">'; print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -99,7 +99,7 @@ if ($object->id)
dol_fiche_head($head, 'documents', $langs->trans("CPTitreMenu"), -1,'holiday'); dol_fiche_head($head, 'documents', $langs->trans("CPTitreMenu"), -1,'holiday');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -675,8 +675,8 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
//print 'mem='.memory_get_usage().' - '.memory_get_peak_usage(); //print 'mem='.memory_get_usage().' - '.memory_get_peak_usage();
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -134,7 +134,7 @@ if ($object->id)
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -113,7 +113,7 @@ if ($object->id)
dol_fiche_head($head, 'document', $langs->trans("MyObject"), -1, 'myobject@mymodule'); dol_fiche_head($head, 'document', $langs->trans("MyObject"), -1, 'myobject@mymodule');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)

View File

@ -197,7 +197,7 @@ if ($object->id)
print $hookmanager->resPrint; print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) // For backward compatiblity, we scan also old dirs if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) // For backward compatiblity, we scan also old dirs

View File

@ -122,7 +122,7 @@ if ($object->id)
print $hookmanager->resPrint; print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;

View File

@ -147,6 +147,7 @@ if (! empty($source) && in_array($ref, array('member_ref', 'contractline_ref', '
{ {
$langs->load("errors"); $langs->load("errors");
dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref)); dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();
exit; exit;

View File

@ -617,8 +617,9 @@ if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_r
{ {
$langs->load("errors"); $langs->load("errors");
dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref)); dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();;
exit; exit;
} }

View File

@ -162,6 +162,6 @@ if ($id > 0 || ! empty($ref))
include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -91,7 +91,7 @@ if ($object->id)
dol_fiche_head($head, 'documents', $langs->trans("ResourceSingular"), -1, 'resource'); dol_fiche_head($head, 'documents', $langs->trans("ResourceSingular"), -1, 'resource');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)
@ -142,7 +142,6 @@ else
print $langs->trans("ErrorUnknown"); print $langs->trans("ErrorUnknown");
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -289,5 +289,6 @@ else
print '</table>'; print '</table>';
print "</form>\n"; print "</form>\n";
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -100,5 +100,6 @@ if ($id > 0 || ! empty($ref))
dol_fiche_end(); dol_fiche_end();
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -113,6 +113,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -835,7 +835,6 @@ print '</form>';
dol_fiche_end(); dol_fiche_end();
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -114,6 +114,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -190,7 +190,6 @@ if ($socid > 0)
} }
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -2650,7 +2650,6 @@ else
} }
} }
// End of page // End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -174,6 +174,6 @@ if ($messagetoshow)
print nl2br($messagetoshow); print nl2br($messagetoshow);
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();;

View File

@ -650,6 +650,6 @@ else {
print "</form>"; print "</form>";
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -171,8 +171,6 @@ if ($action != 'presend')
} }
} }
// End of page // End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -105,7 +105,7 @@ if ($object->id)
dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company'); dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)
@ -169,6 +169,6 @@ else
accessforbidden('',0,0); accessforbidden('',0,0);
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -365,6 +365,6 @@ else
//print '</td></tr></table>'; //print '</td></tr></table>';
print '</div></div></div>'; print '</div></div></div>';
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -1301,5 +1301,6 @@ print "</div>";
print '</form>'; print '</form>';
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -129,6 +129,7 @@ else
print $langs->trans("ErrorRecordNotFound"); print $langs->trans("ErrorRecordNotFound");
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -532,7 +532,6 @@ if ($result > 0)
} }
else dol_print_error('','RecordNotFound'); else dol_print_error('','RecordNotFound');
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -105,6 +105,6 @@ else
dol_print_error($db); dol_print_error($db);
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -1610,7 +1610,6 @@ if ($socid && ($action == 'create' || $action == 'createcard') && $user->rights-
print '</form>'; print '</form>';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -615,6 +615,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
} }
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -147,7 +147,6 @@ if ($socid)
$result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton); $result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -343,5 +343,6 @@ if ($id > 0 || ! empty($ref))
} }
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -549,8 +549,6 @@ if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nb
print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty); print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -354,7 +354,7 @@ if (! empty($conf->use_javascript_ajax))
print '</script>'; print '</script>';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -207,5 +207,6 @@ if (!$rowid)
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -203,5 +203,6 @@ if (! $rowid) {
print '</FORM>'; print '</FORM>';
} else {} } else {}
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -143,6 +143,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -145,6 +145,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -202,6 +202,6 @@ if ($id > 0 || ! empty($ref))
} }
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -87,7 +87,7 @@ if ($object->id > 0)
$head = supplier_proposal_prepare_head($object); $head = supplier_proposal_prepare_head($object);
dol_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal'); dol_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal');
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)
@ -170,5 +170,6 @@ else
print $langs->trans("ErrorUnknown"); print $langs->trans("ErrorUnknown");
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -375,6 +375,6 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
print '</div></div></div>'; print '</div></div></div>';
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -123,5 +123,6 @@ print '</div>';
dol_fiche_end(); dol_fiche_end();
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -143,6 +143,6 @@ if ($id > 0 || ! empty($ref))
} }
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -138,7 +138,7 @@ if ($object->id)
dol_fiche_end(); dol_fiche_end();
// Construit liste des fichiers // Build file list
$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1); $filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
$totalsize = 0; $totalsize = 0;
foreach ($filearray as $key => $file) { foreach ($filearray as $key => $file) {
@ -158,5 +158,6 @@ else
accessforbidden('', 0, 0); accessforbidden('', 0, 0);
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -114,6 +114,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -113,6 +113,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -218,7 +218,6 @@ print "</div>";
print "</form>\n"; print "</form>\n";
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -559,6 +559,6 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>
if ($id && $action == 'create' && $user->rights->user->user->creer) print '</form>'; if ($id && $action == 'create' && $user->rights->user->user->creer) print '</form>';
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -2538,5 +2538,6 @@ if (! empty($conf->api->enabled) && ! empty($conf->use_javascript_ajax))
print '</script>'; print '</script>';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -216,7 +216,6 @@ if ($id > 0)
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -141,7 +141,7 @@ if ($object->id)
print '<div class="fichecenter">'; print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
// Construit liste des fichiers // Build file list
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0; $totalsize=0;
foreach($filearray as $key => $file) foreach($filearray as $key => $file)
@ -178,6 +178,6 @@ else
accessforbidden('',0,0); accessforbidden('',0,0);
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -586,5 +586,6 @@ else
} }
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -212,5 +212,6 @@ else
print '</table>'; print '</table>';
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -227,6 +227,6 @@ else
dol_print_error($db); dol_print_error($db);
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -349,5 +349,6 @@ if ($object->id > 0)
dol_fiche_end(); dol_fiche_end();
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -204,6 +204,6 @@ jQuery(document).ready(function() {
</script>'; </script>';
*/ */
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -286,6 +286,6 @@ if ($canreadperms)
//print '</td></tr></table>'; //print '</td></tr></table>';
print '</div></div></div>'; print '</div></div></div>';
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -93,6 +93,6 @@ print '</div>';
dol_fiche_end(); dol_fiche_end();
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -218,5 +218,6 @@ else
print '</table>'; print '</table>';
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -628,5 +628,6 @@ print "</form>\n";
$db->free($result); $db->free($result);
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -158,6 +158,6 @@ if ($id)
print "</form>\n"; print "</form>\n";
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -507,7 +507,6 @@ if ($result > 0)
} }
else dol_print_error('','RecordNotFound'); else dol_print_error('','RecordNotFound');
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -374,5 +374,6 @@ if ($action == 'edit')
print '</form>'; print '</form>';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -400,6 +400,6 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
dol_fiche_end(); dol_fiche_end();
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -71,7 +71,7 @@ print '</table>';
print '<br><div style="text-align: center"><input type="submit" value="'.$langs->trans('Save').'" class="button"></div>'; print '<br><div style="text-align: center"><input type="submit" value="'.$langs->trans('Save').'" class="button"></div>';
print '</form>'; print '</form>';
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -299,5 +299,6 @@ if ($action == 'edit') { ?>
<?php <?php
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();;

View File

@ -773,7 +773,6 @@ if (! empty($id) || ! empty($ref))
// not found // not found
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -97,5 +97,6 @@ print '<div class="center"><input type="submit" class="button" value="'.$langs->
print '</form>'; print '</form>';
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -144,5 +144,6 @@ print '</div>';
print '</form>'; print '</form>';
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -50,7 +50,6 @@ if ($action == 'up') {
$langs->load('products'); $langs->load('products');
$var = false;
$title = $langs->trans($langs->trans('ProductAttributes')); $title = $langs->trans($langs->trans('ProductAttributes'));
$variants = $object->fetchAll(); $variants = $object->fetchAll();
@ -122,7 +121,7 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
<th class="liste_titre" colspan="2"></th> <th class="liste_titre" colspan="2"></th>
</tr> </tr>
<?php foreach ($variants as $key => $attribute): ?> <?php foreach ($variants as $key => $attribute): ?>
<tr id="row-<?php echo $attribute->id ?>" <?php echo $bcdd[$var] ?>> <tr id="row-<?php echo $attribute->id ?>" class="drag drop oddeven">
<td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->ref) ?></a></td> <td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->ref) ?></a></td>
<td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->label) ?></a></td> <td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->label) ?></a></td>
<td align="right"><?php echo $attribute->countChildValues() ?></td> <td align="right"><?php echo $attribute->countChildValues() ?></td>
@ -143,7 +142,6 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
</td> </td>
</tr> </tr>
<?php <?php
$var = !$var;
endforeach endforeach
?> ?>
@ -151,4 +149,6 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
<?php <?php
// End of page
llxFooter(); llxFooter();
$db->close();

View File

@ -156,6 +156,6 @@ if (! empty($conf->use_javascript_ajax))
print '</script>'; print '</script>';
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

View File

@ -2439,8 +2439,6 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
} }
} }
// End of page
llxFooter(); llxFooter();
$db->close(); $db->close();