Skip to content

Commit

Permalink
Merge pull request #9203 from grandoc/new_branch_04_08_2018
Browse files Browse the repository at this point in the history 
comment translation
  • Loading branch information
Juanjo Menent committed Aug 8, 2018
2 parents edc67f6 + 68de0ba commit 229a5d3
Show file tree
Hide file tree
Showing 93 changed files with 106 additions and 105 deletions.
2 changes: 1 addition & 1 deletion htdocs/adherents/document.php
View file
Expand Up @@ -91,7 +91,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
4 changes: 2 additions & 2 deletions htdocs/admin/mails.php
View file
Expand Up @@ -366,7 +366,7 @@ function initfields()
{

$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
if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
{
Expand All @@ -386,7 +386,7 @@ function initfields()
{

$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
if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
{
Expand Down
2 changes: 1 addition & 1 deletion htdocs/asset/document.php
View file
Expand Up @@ -100,7 +100,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/comm/action/document.php
View file
Expand Up @@ -239,7 +239,7 @@

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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
8 changes: 2 additions & 6 deletions htdocs/comm/mailing/cibles.php
View file
Expand Up @@ -303,8 +303,6 @@
// Sort $modulenames
sort($modulenames);

$var = true;

// Loop on each submodule
foreach($modulenames as $modulename)
{
Expand All @@ -330,16 +328,14 @@
// Si le module mailing est qualifie
if ($qualified)
{
$var = ! $var;

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'].'">';
}
else
{
print '<div '.$bctag[$var].'>';
print '<div class="oddeven tagtr">';
}

print '<div class="tagtd">';
Expand Down
2 changes: 1 addition & 1 deletion htdocs/comm/propal/document.php
View file
Expand Up @@ -94,7 +94,7 @@
$head = propal_prepare_head($object);
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/commande/document.php
View file
Expand Up @@ -97,7 +97,7 @@
$head = commande_prepare_head($object);
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/bank/document.php
View file
Expand Up @@ -105,7 +105,7 @@
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$',
$sortfield,
(strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/bank/various_payment/document.php
View file
Expand Up @@ -124,7 +124,7 @@
print '<div class="fichecenter">';
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/deplacement/document.php
View file
Expand Up @@ -91,7 +91,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/facture/document.php
View file
Expand Up @@ -104,7 +104,7 @@

$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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/salaries/document.php
View file
Expand Up @@ -90,7 +90,7 @@

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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/sociales/document.php
View file
Expand Up @@ -136,7 +136,7 @@
print '<div class="fichecenter">';
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/tva/document.php
View file
Expand Up @@ -122,7 +122,7 @@
print '<div class="fichecenter">';
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/contact/document.php
View file
Expand Up @@ -97,7 +97,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/contrat/document.php
View file
Expand Up @@ -103,7 +103,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
4 changes: 2 additions & 2 deletions htdocs/core/tpl/objectline_view.tpl.php
View file
Expand Up @@ -66,7 +66,7 @@
?>
<?php $coldisplay=0; ?>
<!-- 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)) { ?>
<td class="linecolnum" align="center"><?php $coldisplay++; ?><?php echo ($i+1); ?></td>
<?php } ?>
Expand Down Expand Up @@ -321,7 +321,7 @@
//Line extrafield
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);
}
?>

Expand Down
2 changes: 1 addition & 1 deletion htdocs/don/document.php
View file
Expand Up @@ -107,7 +107,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/expedition/document.php
View file
Expand Up @@ -96,7 +96,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file){
Expand Down
2 changes: 1 addition & 1 deletion htdocs/expensereport/document.php
View file
Expand Up @@ -103,7 +103,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/fichinter/document.php
View file
Expand Up @@ -94,7 +94,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/fourn/commande/document.php
View file
Expand Up @@ -107,7 +107,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/fourn/facture/document.php
View file
Expand Up @@ -145,7 +145,7 @@
print '<div class="fichecenter">';
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/holiday/document.php
View file
Expand Up @@ -99,7 +99,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/index.php
View file
Expand Up @@ -675,8 +675,8 @@

//print 'mem='.memory_get_usage().' - '.memory_get_peak_usage();

// End of page
llxFooter();

$db->close();


Expand Down
2 changes: 1 addition & 1 deletion htdocs/loan/document.php
View file
Expand Up @@ -134,7 +134,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/modulebuilder/template/myobject_document.php
View file
Expand Up @@ -113,7 +113,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/product/document.php
View file
Expand Up @@ -197,7 +197,7 @@
print $hookmanager->resPrint;
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);

if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) // For backward compatiblity, we scan also old dirs
Expand Down
2 changes: 1 addition & 1 deletion htdocs/product/stock/productlot_document.php
View file
Expand Up @@ -122,7 +122,7 @@
print $hookmanager->resPrint;
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);

$totalsize=0;
Expand Down
1 change: 1 addition & 0 deletions htdocs/public/onlinesign/newonlinesign.php
View file
Expand Up @@ -147,6 +147,7 @@
{
$langs->load("errors");
dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
// End of page
llxFooter();
$db->close();
exit;
Expand Down
5 changes: 3 additions & 2 deletions htdocs/public/payment/newpayment.php
View file
Expand Up @@ -617,8 +617,9 @@
{
$langs->load("errors");
dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
llxFooter();
$db->close();
// End of page
llxFooter();
$db->close();;
exit;
}

Expand Down
2 changes: 1 addition & 1 deletion htdocs/resource/contact.php
View file
Expand Up @@ -162,6 +162,6 @@
include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
}


// End of page
llxFooter();
$db->close();
5 changes: 2 additions & 3 deletions htdocs/resource/document.php
View file
Expand Up @@ -91,7 +91,7 @@
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);
$totalsize=0;
foreach($filearray as $key => $file)
Expand Down Expand Up @@ -142,7 +142,6 @@
print $langs->trans("ErrorUnknown");
}


// End of page
llxFooter();

$db->close();
1 change: 1 addition & 0 deletions htdocs/resource/list.php
View file
Expand Up @@ -289,5 +289,6 @@
print '</table>';
print "</form>\n";

// End of page
llxFooter();
$db->close();
1 change: 1 addition & 0 deletions htdocs/resource/note.php
View file
Expand Up @@ -100,5 +100,6 @@
dol_fiche_end();
}

// End of page
llxFooter();
$db->close();
2 changes: 1 addition & 1 deletion htdocs/societe/admin/contact_extrafields.php
View file
Expand Up @@ -113,6 +113,6 @@
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}

// End of page
llxFooter();

$db->close();
3 changes: 1 addition & 2 deletions htdocs/societe/admin/societe.php
View file
Expand Up @@ -835,7 +835,6 @@

dol_fiche_end();


// End of page
llxFooter();

$db->close();
2 changes: 1 addition & 1 deletion htdocs/societe/admin/societe_extrafields.php
View file
Expand Up @@ -114,6 +114,6 @@
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}

// End of page
llxFooter();

$db->close();
3 changes: 1 addition & 2 deletions htdocs/societe/agenda.php
View file
Expand Up @@ -190,7 +190,6 @@
}
}


// End of page
llxFooter();

$db->close();

0 comments on commit 229a5d3

Please sign in to comment.