| '.$langs->trans("Parameters").' | '.$langs->trans("Value").' | '; print ''; print ' | ||||||||||||||||
| '.$langs->trans("DisableJavascript").' | '; + print $form->selectyesno('MAIN_DISABLE_JAVASCRIPT', isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0, 1); + print ' | '; + print ''; + print ' | ||||||||||||||||
| '.$langs->trans("DefaultMaxSizeList").' | '; print ' | '; @@ -283,13 +290,6 @@ if ($action == 'edit') // Edit print ' | ||||||||||||||||
| '.$langs->trans("DisableJavascript").' | '; - print $form->selectyesno('main_disable_javascript', isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0, 1); - print ' | '; - print ''; - print ' | ||||||||||||||||
| '.$langs->trans("WeekStartOnDay").' | ';
print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'), 'MAIN_START_WEEK', 0);
@@ -468,17 +468,21 @@ else // Show
print '
| '; - if ($line->fk_projet > 0) + if ($line->fk_project > 0) { - $projecttmp->id=$line->fk_projet; + $projecttmp->id=$line->fk_project; $projecttmp->ref=$line->projet_ref; print $projecttmp->getNomUrl(1); } @@ -2135,7 +2135,7 @@ else if (! empty($conf->projet->enabled)) { print ' | '; - $formproject->select_projects(-1, $line->fk_projet, 'fk_projet', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300'); + $formproject->select_projects(-1, $line->fk_project, 'fk_projet', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300'); print ' | '; } @@ -2202,12 +2202,54 @@ else if (! empty($conf->projet->enabled)) $colspan++; if ($action != 'editline') $colspan++; + $nbFiles = $nbLinks = 0; + $arrayoffiles = array(); + if ($conf->global->MAIN_FEATURES_LEVEL >= 2) + { + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; + $upload_dir = $conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref); + $arrayoffiles=dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png|'.preg_quote(dol_sanitizeFileName($object->ref.'.pdf'), '/').')$'); + $nbFiles = count($arrayoffiles); + $nbLinks=Link::count($db, $object->element, $object->id); + } + + // Add line with link to add new file or attach to an existing file print '|||||||||||||||
| '; - print $langs->trans("UploadANewFileNow"); + print ''.$langs->trans("UploadANewFileNow"); + print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly'); + print ''; + if ($conf->global->MAIN_FEATURES_LEVEL >= 2) + { + print ' - '.''.$langs->trans("AttachTheNewLineToTheDocument"); + print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly'); + print ''; + } + + print ''."\n"; print ' | ||||||||||||||||||
| '; $modulepart = 'expensereport'; @@ -2251,6 +2293,65 @@ else print ' | ||||||||||||||||||
| ';
+ //print ''.$langs->trans("AttachTheNewLineToTheDocument").' '; + $modulepart='expensereport';$maxheightmini=48; + $relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/'; + foreach($arrayoffiles as $file) + { + print ' ';
+ $fileinfo = pathinfo($file['name']);
+ if (image_format_supported($file['name']) > 0)
+ {
+ $minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
+ //if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+ //print $file['path'].'/'.$minifile.' ';
+ }
+ print ''; + $urlforhref=getAdvancedPreviewUrl($modulepart, $fileinfo['relativename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity)); + if (empty($urlforhref)) { + $urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($fileinfo['relativename'].'.'.strtolower($fileinfo['extension'])); + print ''; + } else { + print ''; + } + print ' '; + $checked=''; + //var_dump(GETPOST($file['relativename'])); var_dump($file['relativename']); var_dump($_FILES['userfile']['name']); + foreach($_FILES['userfile']['name'] as $tmpfile) + { + if ($file['relativename'] == (GETPOST('savingdocmask','alpha') ? dol_sanitizeFileName($object->ref.'-') : '').$tmpfile) + { + $checked=' checked'; + break; + } + elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile','array'))) { + $checked=' checked'; + break; + } + } + print ' '.$file['relativename']; + print ' | ||||||||||||||||||
| '; print ' | '.$langs->trans('Date').' | '; @@ -2332,16 +2433,6 @@ else print ''; print ' | ||||||||||||||||
| '; - print $langs->trans("AttachTheNewLineToTheDocument"); - - print '...'; - - print ' |
This may increase performance if you have a large number of third parties, but it is less convenient. diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index 19710e8915d..e34078e8fc2 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -148,3 +148,4 @@ nolimitbyEX_EXP=by line (no limitation) CarCategory=Category of car ExpenseRangeOffset=Offset amount: %s RangeIk=Mileage range +AttachTheNewLineToTheDocument=Attach the new line to an existing document diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index a1211ead4ee..73a6d9d2493 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -704,7 +704,7 @@ class Task extends CommonObject { $this->id=0; - $this->fk_projet=''; + $this->fk_project=''; $this->ref='TK01'; $this->fk_task_parent=null; $this->label='Specimen task TK01'; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index ae557aeb885..510ddce966e 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -57,7 +57,8 @@ input.select2-input { .liste_titre input[name=search_day_lim], .liste_titre input[name=search_day_start], .liste_titre input[name=search_day_end], .liste_titre input[name=search_day_create], .liste_titre input[name=search_day_create], .liste_titre input[name=search_day_start], .liste_titre input[name=search_day_end], .liste_titre input[name=search_day_date_when], .liste_titre input[name=search_month_date_when], .liste_titre input[name=search_year_date_when], -.liste_titre input[name=search_dtstartday], .liste_titre input[name=search_dtendday], .liste_titre input[name=search_dtstartmonth], .liste_titre input[name=search_dtendmonth] +.liste_titre input[name=search_dtstartday], .liste_titre input[name=search_dtendday], .liste_titre input[name=search_dtstartmonth], .liste_titre input[name=search_dtendmonth], +select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth { margin-right: 4px; } @@ -511,6 +512,9 @@ select.flat.selectlimit { .nomarginleft { margin-left: 0px !important; } +.margintoponly { + margin-top: 10px !important; +} .marginbottomonly { margin-bottom: 10px !important; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index cebdaad8164..d4da4f98fba 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -294,7 +294,8 @@ textarea.cke_source:focus .liste_titre input[name=search_day_lim], .liste_titre input[name=search_day_start], .liste_titre input[name=search_day_end], .liste_titre input[name=search_day_create], .liste_titre input[name=search_day_create], .liste_titre input[name=search_day_start], .liste_titre input[name=search_day_end], .liste_titre input[name=search_day_date_when], .liste_titre input[name=search_month_date_when], .liste_titre input[name=search_year_date_when], -.liste_titre input[name=search_dtstartday], .liste_titre input[name=search_dtendday], .liste_titre input[name=search_dtstartmonth], .liste_titre input[name=search_dtendmonth] +.liste_titre input[name=search_dtstartday], .liste_titre input[name=search_dtendday], .liste_titre input[name=search_dtstartmonth], .liste_titre input[name=search_dtendmonth], +select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth { margin-right: 4px; } @@ -744,6 +745,9 @@ select.flat.selectlimit { .nomarginleft { margin-left: 0px !important; } +.margintoponly { + margin-top: 10px !important; +} .marginbottomonly { margin-bottom: 10px !important; }