diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index a4e9e4bb210..5c9be79e848 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -420,7 +420,7 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) { print ''; print ''; } -else +else { print '' . "\n"; print '' . img_picto($langs->trans("Disabled"), diff --git a/htdocs/admin/dolistore/css/dolistore.css b/htdocs/admin/dolistore/css/dolistore.css index bba808a21a0..fb4dc2d5bb1 100644 --- a/htdocs/admin/dolistore/css/dolistore.css +++ b/htdocs/admin/dolistore/css/dolistore.css @@ -6,10 +6,10 @@ div.divsearchfield { } .margeCoteGauche,.margeCote{ - padding-right: 20px!important; + padding-right: 20px!important; } .margeCote,.margeCoteDroite{ - padding-left: 20px!important; + padding-left: 20px!important; } .nomargesupinf{ margin-top: 0; @@ -26,13 +26,13 @@ div.divsearchfield { width: 100%; } .tree{ - margin: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; padding:0px; list-style: none; line-height: 2em; font-family: Arial; } .tree li{ font-size: 16px; - position: relative;list-style: none; + position: relative;list-style: none; } .tree li:before{ position: absolute; @@ -65,7 +65,7 @@ div.divsearchfield { .tree li.root:after{ display: none; } -.tree li:last-child:after{ +.tree li:last-child:after{ display: none } .blockUI { @@ -159,7 +159,7 @@ textarea.row4{ .reviewList { max-height: 150px; - overflow-y: scroll; + overflow-y: scroll; } .reviewRow{ diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index 1d1ec548853..d249def1401 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -94,7 +94,7 @@ print "\n"; foreach ($eventstolog as $key => $arr) { if ($arr['id']) - { + { print ''; print ''.$arr['id'].''; print ''; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 437a43bd05b..b647dfdbfb0 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -8,7 +8,7 @@ * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2015 Raphaël Doursenaud * Copyright (C) 2018 Nicolas ZABOURI - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or @@ -672,7 +672,7 @@ if ($mode == 'common') print ''; print $versiontrans; if(!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE)){ - require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; if (!empty($objMod->url_last_version)) { $newversion = getURLContent($objMod->url_last_version); if(isset($newversion['content'])){ diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php index 4465017bdc6..209fd9b3583 100644 --- a/htdocs/admin/receiptprinter.php +++ b/htdocs/admin/receiptprinter.php @@ -243,14 +243,14 @@ if ($mode == 'config' && $user->admin) print "\n"; $ret = $printer->listprinters(); $nbofprinters = count($printer->listprinters); - + if ($ret > 0) { setEventMessages($printer->error, $printer->errors, 'errors'); } else { - for ($line=0; $line < $nbofprinters; $line++) + for ($line=0; $line < $nbofprinters; $line++) { print ''; - if ($action=='editprinter' && $printer->listprinters[$line]['rowid']==$printerid) + if ($action=='editprinter' && $printer->listprinters[$line]['rowid']==$printerid) { print ''; print ''; @@ -285,7 +285,7 @@ if ($mode == 'config' && $user->admin) } } - if ($action!='editprinter') + if ($action!='editprinter') { if ($nbofprinters > 0) { @@ -299,7 +299,7 @@ if ($mode == 'config' && $user->admin) print ''; print "\n"; } - + print ''; print ''; $ret = $printer->selectTypePrinter(); @@ -315,7 +315,7 @@ if ($mode == 'config' && $user->admin) print ''; dol_fiche_end(); - + if ($action!='editprinter') { print '
'; } else { @@ -324,9 +324,9 @@ if ($mode == 'config' && $user->admin) print ''; print '

'; - + dol_fiche_head(); - + print $langs->trans("ReceiptPrinterTypeDesc")."

\n"; print ''."\n"; print ''; @@ -338,7 +338,7 @@ if ($mode == 'config' && $user->admin) dol_fiche_end(); print '

'; - + dol_fiche_head(); print $langs->trans("ReceiptPrinterProfileDesc")."

\n"; print '
'.$langs->trans("CONNECTOR_DUMMY").':'.$langs->trans("CONNECTOR_DUMMY_HELP").'
'."\n"; @@ -378,7 +378,7 @@ if ($mode == 'template' && $user->admin) setEventMessages($printer->error, $printer->errors, 'errors'); } else { $max = count($printer->listprinterstemplates); - for ($line=0; $line < $max; $line++) + for ($line=0; $line < $max; $line++) { print ''; if ($action=='edittemplate' && $printer->listprinterstemplates[$line]['rowid']==$templateid) { @@ -423,7 +423,7 @@ if ($mode == 'template' && $user->admin) print ''; print "\n"; $max = count($printer->tags); - for ($tag=0; $tag < $max; $tag++) + for ($tag=0; $tag < $max; $tag++) { print ''; print ''; @@ -436,14 +436,14 @@ if ($mode == 'template' && $user->admin) } // to remove after test -$object=new stdClass(); -$object->date_time = '2015-11-02 22:30:25'; -$object->id = 1234; -$object->customer_firstname = 'John'; -$object->customer_lastname = 'Deuf'; -$object->vendor_firstname = 'Jim'; -$object->vendor_lastname = 'Big'; -$object->barcode = '3700123862396'; +// $object=new stdClass(); +// $object->date_time = '2015-11-02 22:30:25'; +// $object->id = 1234; +// $object->customer_firstname = 'John'; +// $object->customer_lastname = 'Deuf'; +// $object->vendor_firstname = 'Jim'; +// $object->vendor_lastname = 'Big'; +// $object->barcode = '3700123862396'; //$printer->sendToPrinter($object, 1, 16); //setEventMessages($printer->error, $printer->errors, 'errors'); diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index db1cb20b5e3..64bb04af945 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -169,21 +169,21 @@ if ($action == 'edit') print '
'.$langs->trans("Description").'
<'.$printer->tags[$tag].'>'.$langs->trans(strtoupper($printer->tags[$tag])).'
'; print ''; - // Disable + // Disable print ''; - // Separator + // Separator print ''; - // Method + // Method print ''; - // From + // From print ''; print ''; @@ -213,20 +213,20 @@ else print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("MAIN_DISABLE_ALL_SMS").''; print $form->selectyesno('MAIN_DISABLE_ALL_SMS',$conf->global->MAIN_DISABLE_ALL_SMS,1); print '
 
'.$langs->trans("MAIN_SMS_SENDMODE").''; if (count($listofmethods)) print $form->selectarray('MAIN_SMS_SENDMODE',$listofmethods,$conf->global->MAIN_SMS_SENDMODE,1); else print ''.$langs->trans("None").''; print '
'.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).'
'; print ''; - // Disable + // Disable print ''; - // Separator + // Separator print ''; - // Method + // Method print ''; - // From + // From print ''; print '\n"; } -if($conf->order->enabled) +if($conf->order->enabled) { print ''; print ''; @@ -388,7 +388,7 @@ if($conf->order->enabled) print "\n"; } -if($conf->expedition->enabled) +if($conf->expedition->enabled) { print ''; print ''; diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 4a6967089e2..5027066a37b 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -79,17 +79,17 @@ foreach($modulesdir as $dir) { try { $objMod = new $modName($db); - + $modules[$objMod->numero]=$objMod; $modules_names[$objMod->numero]=$objMod->name; $modules_files[$objMod->numero]=$file; $modules_fullpath[$file]=$dir.$file; $picto[$objMod->numero]=(isset($objMod->picto) && $objMod->picto)?$objMod->picto:'generic'; - } + } catch(Exception $e) { dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR); - } + } } else { diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php index 95af411b813..c9d650f781d 100644 --- a/htdocs/admin/ticket.php +++ b/htdocs/admin/ticket.php @@ -54,11 +54,11 @@ if ($action == 'updateMask') { $error++; } - if (!$error) + if (!$error) { setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); - } - else + } + else { setEventMessages($langs->trans("Error"), null, 'errors'); } diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index d4149619aae..dc579711aa3 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -52,7 +52,7 @@ p { } .logopos { padding-top: 20px; - max-height: 40px; + max-height: 40px; } /* ------------------- Header ------------------- */ diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php index 6984bbff5b4..09252bc0edc 100644 --- a/htdocs/core/ajax/check_notifications.php +++ b/htdocs/core/ajax/check_notifications.php @@ -44,37 +44,37 @@ $eventfound = array(); //dol_syslog('time='.$time.' $_SESSION[auto_ck_events_not_before]='.$_SESSION['auto_check_events_not_before']); // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when several tabs are opened. -if ($time >= $_SESSION['auto_check_events_not_before']) +if ($time >= $_SESSION['auto_check_events_not_before']) { $time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY; // Always defined - if (! empty($_SESSION['auto_check_events_not_before'])) + if (! empty($_SESSION['auto_check_events_not_before'])) { // We start scan from the not before so if two tabs were opend at differents seconds and we close one (so the js timer), - // then we are not losing periods + // then we are not losing periods $starttime = $_SESSION['auto_check_events_not_before']; // Protection to avoid too long sessions - if ($starttime < ($time - (int) $conf->global->MAIN_SESSION_TIMEOUT)) + if ($starttime < ($time - (int) $conf->global->MAIN_SESSION_TIMEOUT)) { dol_syslog("We ask to check browser notification on a too large period. We fix this with current date."); $starttime = $time; } } - else + else { $starttime = $time; } - + $_SESSION['auto_check_events_not_before'] = $time + $time_update; - - // Force save of session change we did. + + // Force save of session change we did. // WARNING: Any change in sessions after that will not be saved ! session_write_close(); - + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; - - + + dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.$_SESSION['auto_check_events_not_before']); - + $sql = 'SELECT id'; $sql .= ' FROM ' . MAIN_DB_PREFIX . 'actioncomm a, ' . MAIN_DB_PREFIX . 'actioncomm_resources ar'; $sql .= ' WHERE a.id = ar.fk_actioncomm'; @@ -91,11 +91,11 @@ if ($time >= $_SESSION['auto_check_events_not_before']) $actionmod = new ActionComm($db); - while ($obj = $db->fetch_object($resql)) + while ($obj = $db->fetch_object($resql)) { $langs->load("agenda"); $langs->load("commercial"); - + $actionmod->fetch($obj->id); // Message must be formated and translated to be used with javascript directly @@ -105,7 +105,7 @@ if ($time >= $_SESSION['auto_check_events_not_before']) $event['tipo'] = $langs->transnoentities('Action' . $actionmod->code); $event['titulo'] = $actionmod->label; $event['location'] = $langs->transnoentities('Location').': '.$actionmod->location; - + $eventfound[] = $event; } } diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php index a3a3696e5f4..7d107298c32 100644 --- a/htdocs/core/class/html.formcontract.class.php +++ b/htdocs/core/class/html.formcontract.class.php @@ -67,14 +67,14 @@ class FormContract if ($socid > 0) { // CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma. - if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) + if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)"; else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all') { $sql.= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") "; $sql.= " OR c.fk_soc IS NULL)"; } - } + } if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)"; $sql.= " ORDER BY c.ref "; @@ -140,14 +140,14 @@ class FormContract } print ''; $db->free($resql); - + if (!empty($conf->use_javascript_ajax)) { // Make select dynamic include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; print ajax_combobox($htmlname); } - + return $num; } else @@ -156,7 +156,7 @@ class FormContract return -1; } } - + /** * Show a form to select a contract * @@ -171,7 +171,7 @@ class FormContract function formSelectContract($page, $socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1) { global $langs; - + print "\n"; print ''; print ''; @@ -179,6 +179,6 @@ class FormContract $this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty); print ''; print ''; - } - + } + } diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 8b258ebbf6e..55236c86d44 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -101,7 +101,7 @@ if ($action == 'add') { $action = "create"; $error++; } - + if (! GETPOST('socid')) { setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Customer")), null, 'errors'); $action = "create"; @@ -144,7 +144,7 @@ if ($action == 'add') { $date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear); $object->date_when = $date_next_execution; - + if ($object->create($user) > 0) { $id = $object->id; $action = ''; @@ -155,10 +155,10 @@ if ($action == 'add') { } } elseif ($action == 'createfrommodel') { $newinter = new fichinter($db); - + // on récupère les enregistrements $object->fetch($id); - + // on transfert les données de l'un vers l'autre if ($object->socid > 0) { @@ -167,14 +167,14 @@ if ($action == 'add') { $newinter->fk_contrat=$object->fk_contrat; } else $newinter->socid=GETPOST("socid"); - + $newinter->entity=$object->entity; $newinter->duree=$object->duree; - + $newinter->description=$object->description; $newinter->note_private=$object->note_private; $newinter->note_public=$object->note_public; - + // on créer un nouvelle intervention $extrafields = new ExtraFields($db); $extralabels = $extrafields->fetch_name_optionals_label($newinter->table_element); @@ -182,7 +182,7 @@ if ($action == 'add') { $newinter->array_options = $array_options; $newfichinterid = $newinter->create($user); - + if ($newfichinterid > 0) { // on ajoute les lignes de détail ensuite foreach ($object->lines as $ficheinterligne) @@ -205,14 +205,14 @@ if ($action == 'add') { header('Location: '.$_SERVER["PHP_SELF"]); exit; } elseif ($action == 'setfrequency' && $user->rights->ficheinter->creer) { - // Set frequency and unit frequency + // Set frequency and unit frequency $object->fetch($id); $object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha')); } elseif ($action == 'setdate_when' && $user->rights->ficheinter->creer) { // Set next date of execution $object->fetch($id); $date = dol_mktime( - GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, + GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear') ); if (!empty($date)) $object->setNextDate($date); @@ -239,7 +239,7 @@ if (! empty($conf->projet->enabled)) $now = dol_now(); $tmparray=dol_getdate($now); $today = dol_mktime( - 23, 59, 59, + 23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year'] ); // Today is last second of current day @@ -265,7 +265,7 @@ if ($action == 'create') { $rowspan=4; if (! empty($conf->projet->enabled) && $object->fk_project > 0) $rowspan++; if (! empty($conf->contrat->enabled) && $object->fk_contrat > 0) $rowspan++; - + print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("MAIN_DISABLE_ALL_SMS").''.yn($conf->global->MAIN_DISABLE_ALL_SMS).'
 
'.$langs->trans("MAIN_SMS_SENDMODE").''; $text=$listofmethods[$conf->global->MAIN_SMS_SENDMODE]; if (empty($text)) $text=$langs->trans("Undefined").' '.img_warning(); print $text; print '
'.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).''.$conf->global->MAIN_MAIL_SMS_FROM; if (!empty($conf->global->MAIN_MAIL_SMS_FROM) && ! isValidPhone($conf->global->MAIN_MAIL_SMS_FROM)) print ' '.img_warning($langs->trans("ErrorBadPhone")); diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index e1098ef262d..74870b69fc3 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -373,7 +373,7 @@ if($conf->invoice->enabled) print "
'.$langs->trans("StockMustBeEnoughForOrder").'
'.$langs->trans("StockMustBeEnoughForShipment").'
'; $object->fetch_thirdparty(); @@ -297,12 +297,12 @@ if ($action == 'create') { // Duration print ''; print ''; print ''; } - + // Project if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); @@ -345,7 +345,7 @@ if ($action == 'create') { print "
'.$langs->trans("TotalDuration").''.convertSecondToTime( - $object->duration, 'all', + $object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY ).'
"; print " "; print $form->selectarray( - 'unit_frequency', + 'unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency')?GETPOST('unit_frequency'):'m') ); @@ -424,7 +424,7 @@ if ($action == 'create') { } $db->free($result); - } else + } else print $db->error(); print "
"; @@ -466,7 +466,7 @@ if ($action == 'create') { } else { /* * View mode - * + * */ if ($id > 0) { if ($object->fetch($id) > 0) { @@ -497,7 +497,7 @@ if ($action == 'create') { $morehtmlref.=img_edit($langs->transnoentitiesnoconv('SetProject')).' : '; } if ($action == 'classify') { - + $morehtmlref.='
'; $morehtmlref.=''; $morehtmlref.=''; @@ -512,7 +512,7 @@ if ($action == 'create') { $object->socid, $object->fk_project, 'none', 0, 0, 0, 1 ); - } + } } else { if (! empty($object->fk_project)) { $proj = new Project($db); @@ -567,7 +567,7 @@ if ($action == 'create') { if ($action == 'contrat') { $formcontract= new Formcontract($db); $formcontract->formSelectContract( - $_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, + $_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1 ); } else { @@ -594,9 +594,9 @@ if ($action == 'create') { $title = $langs->trans("Recurrence"); print load_fiche_titre($title, '', 'calendar'); - + print ''; - + // if "frequency" is empty or = 0, the reccurence is disabled print ''; - + // Date when print ''; print ''; - + // Max period / Rest period print ''; print ''; - + print '
'; print ''; print ''; print '
'; @@ -616,26 +616,26 @@ if ($action == 'create') { print '
'; print " "; print $form->selectarray( - 'unit_frequency', - array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), + 'unit_frequency', + array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency?$object->unit_frequency:'m') ); print '
'; } else { - if ($object->frequency > 0) + if ($object->frequency > 0) print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency); - else + else print $langs->trans("NotARecurringInterventionalTemplate"); } print '
'; if ( $user->rights->ficheinter->creer && ($action == 'date_when' || $object->frequency > 0)) { print $form->editfieldkey( - $langs->trans("NextDateToExecution"), 'date_when', $object->date_when, + $langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day' ); } else { @@ -650,12 +650,12 @@ if ($action == 'create') { } print '
'; if ($user->rights->ficheinter->creer && ($action == 'nb_gen_max' || $object->frequency > 0)) { print $form->editfieldkey( - $langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, + $langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer ); } else @@ -673,29 +673,29 @@ if ($action == 'create') { print '
'; - + // Frequencry/Recurring section if ($object->frequency > 0) { print '
'; if (empty($conf->cron->enabled)) { $txtinfoadmin=$langs->trans( - "EnableAndSetupModuleCron", + "EnableAndSetupModuleCron", $langs->transnoentitiesnoconv("Module2300Name") ); print info_admin($txtinfoadmin); } print '
'; print ''; - + // Nb of generation already done print ''; print ''; print ''; - + // Date last print '
'.$langs->trans("NbOfGenerationDone").''; print $object->nb_gen_done?$object->nb_gen_done:'0'; print '
'; print $langs->trans("DateLastGeneration"); @@ -788,7 +788,7 @@ if ($action == 'create') { $sql = "SELECT f.rowid as fich_rec, s.nom as name, s.rowid as socid, f.rowid as facid, f.titre, "; $sql.= " f.duree, f.fk_contrat, f.fk_projet, f.frequency, f.nb_gen_done, f.nb_gen_max,"; $sql.= " f.date_last_gen, f.date_when, f.datec"; - + $sql.= " FROM ".MAIN_DB_PREFIX."fichinter_rec as f"; $sql.= " , ".MAIN_DB_PREFIX."societe as s "; if (! $user->rights->societe->client->voir && ! $socid) { @@ -813,7 +813,7 @@ if ($action == 'create') { if ($resql) { $num = $db->num_rows($resql); print_barre_liste( - $langs->trans("RepeatableInterventional"), $page, + $langs->trans("RepeatableInterventional"), $page, $_SERVER['PHP_SELF'], "&socid=$socid", $sortfield, $sortorder, '', $num, '', 'title_commercial.png' ); @@ -824,12 +824,12 @@ if ($action == 'create') { print ''; print ''; print_liste_field_titre( - $langs->trans("Ref"), $_SERVER['PHP_SELF'], "f.titre", "", "", + $langs->trans("Ref"), $_SERVER['PHP_SELF'], "f.titre", "", "", 'width="200px" align="left"', $sortfiled, $sortorder ); print_liste_field_titre( - $langs->trans("Company"), $_SERVER['PHP_SELF'], "s.nom", "", "", + $langs->trans("Company"), $_SERVER['PHP_SELF'], "s.nom", "", "", 'width="200px" align="left"', $sortfiled, $sortorder ); if (! empty($conf->contrat->enabled)) @@ -847,7 +847,7 @@ if ($action == 'create') { ); print_liste_field_titre( $langs->trans("Duration"), $_SERVER['PHP_SELF'], - 'f.duree', '', '', + 'f.duree', '', '', 'width="50px" align="right"', $sortfiled, $sortorder ); // Recurring or not @@ -915,7 +915,7 @@ if ($action == 'create') { print ''; print ''; - + print ''; } - + if ($user->rights->ficheinter->creer) { // Action column print ''; print "
'.convertSecondToTime($objp->duree).''.yn($objp->frequency?1:0).''; if ($objp->frequency) { print $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') ; @@ -938,7 +938,7 @@ if ($action == 'create') { print ''.$langs->trans('NA').''; print ''; @@ -958,7 +958,7 @@ if ($action == 'create') { $i++; } } - } else + } else print '
'.$langs->trans("NoneF").'
"; diff --git a/htdocs/fourn/js/lib_dispatch.js b/htdocs/fourn/js/lib_dispatch.js index c2c570643f8..d183aeb4e48 100644 --- a/htdocs/fourn/js/lib_dispatch.js +++ b/htdocs/fourn/js/lib_dispatch.js @@ -23,23 +23,23 @@ /** * addDispatchLine * Adds new table row for dispatching to multiple stock locations - * + * * @param index int index of product line. 0 = first product line * @param type string type of dispatch (batch = batch dispatch, dispatch = non batch dispatch) * @param mode string 'qtymissing' will create new line with qty missing, 'lessone' will keep 1 in old line and the rest in new one */ -function addDispatchLine(index, type, mode) +function addDispatchLine(index, type, mode) { mode = mode || 'qtymissing' - + console.log("fourn/js/lib_dispatch.js Split line type="+type+" index="+index+" mode="+mode); var $row = $("tr[name='"+type+'_0_'+index+"']").clone(true), // clone first batch line to jQuery object nbrTrs = $("tr[name^='"+type+"_'][name$='_"+index+"']").length, // position of line for batch qtyOrdered = parseFloat($("#qty_ordered_0_"+index).val()), // Qty ordered is same for all rows qty = parseFloat($("#qty_"+(nbrTrs - 1)+"_"+index).val()), qtyDispatched; - - if (mode === 'lessone') + + if (mode === 'lessone') { qtyDispatched = parseFloat($("#qty_dispatched_0_"+index).val()) + 1; } @@ -47,7 +47,7 @@ function addDispatchLine(index, type, mode) { qtyDispatched = parseFloat($("#qty_dispatched_0_"+index).val()) + qty; } - + if (qtyDispatched < qtyOrdered) { //replace tr suffix nbr @@ -62,19 +62,19 @@ function addDispatchLine(index, type, mode) $row.attr('name',type+'_'+nbrTrs+'_'+index); //insert new row before last row $("tr[name^='"+type+"_'][name$='_"+index+"']:last").after($row); - + //remove cloned select2 with duplicate id. $("#s2id_entrepot_"+nbrTrs+'_'+index).detach(); // old way to find duplicated select2 component $(".csswarehouse_"+nbrTrs+"_"+index+":first-child").parent("span.selection").parent(".select2").detach(); - + /* Suffix of lines are: _ trs.length _ index */ $("#qty_"+nbrTrs+"_"+index).focus(); $("#qty_dispatched_0_"+index).val(qtyDispatched); - + //hide all buttons then show only the last one $("tr[name^='"+type+"_'][name$='_"+index+"'] .splitbutton").hide(); $("tr[name^='"+type+"_'][name$='_"+index+"']:last .splitbutton").show(); - + if (mode === 'lessone') { qty = 1; // keep 1 in old line @@ -94,11 +94,11 @@ function addDispatchLine(index, type, mode) /** * onChangeDispatchLineQty - * - * Change event handler for dispatch qty input field, + * + * Change event handler for dispatch qty input field, * recalculate qty dispatched when qty input has changed. * If qty is more then qty ordered reset input qty to max qty to dispatch. - * + * * element requires arbitrary data qty (value before change), type (type of dispatch) and index (index of product line) */ @@ -124,4 +124,4 @@ function onChangeDispatchLineQty() { } $(this).data('qty', $(this).val()); } -} \ No newline at end of file +} diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index c8b64790061..213231cf160 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -418,7 +418,7 @@ class Holiday extends CommonObject } else { - // SQL Error + // SQL Error $this->error="Error ".$this->db->lasterror(); return -1; } @@ -542,7 +542,7 @@ class Holiday extends CommonObject } else { - // SQL Error + // SQL Error $this->error="Error ".$this->db->lasterror(); return -1; } diff --git a/htdocs/opensurvey/css/style.css b/htdocs/opensurvey/css/style.css index 7e359bd134e..e790d2d59f8 100644 --- a/htdocs/opensurvey/css/style.css +++ b/htdocs/opensurvey/css/style.css @@ -104,10 +104,10 @@ borghesi@unistra.fr Ce logiciel est régi par la licence CeCILL-B soumise au droit français et respectant les principes de diffusion des logiciels libres. Vous pouvez utiliser, modifier et/ou redistribuer ce programme sous les conditions -de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA sur le site "http://www.cecill.info". -Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +Le fait que vous puissiez accéder à cet en-tête signifie que vous avez pris connaissance de la licence CeCILL-B, et que vous en avez accepté les termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. @@ -120,10 +120,10 @@ Creation : Feb 2008 borghesi@unistra.fr This software is governed by the CeCILL-B license under French law and -abiding by the rules of distribution of free software. You can use, +abiding by the rules of distribution of free software. You can use, modify and/ or redistribute the software under the terms of the CeCILL-B license as circulated by CEA, CNRS and INRIA at the following URL -"http://www.cecill.info". +"http://www.cecill.info". The fact that you are presently reading this means that you have had knowledge of the CeCILL-B license and that you accept its terms. You can @@ -133,12 +133,12 @@ find a copy of this license in the file LICENSE. */ /* -Le fichier style.css est le fichier de style de studs. Il se trouve à la racine +Le fichier style.css est le fichier de style de studs. Il se trouve à la racine du répertoire studs. Il contient toutes les mises en forme des fichiers PHP de Studs. */ /*bandeau de titre*/ -div.bandeau{ +div.bandeau{ line-height:35px; text-align:center; background-color: #0b419b; @@ -146,7 +146,7 @@ div.bandeau{ vertical-align:middle; font-size:35px; font-family:arial, sans-serif; - padding:8px; + padding:8px; height:35px; position:static; top:6px; @@ -154,30 +154,30 @@ div.bandeau{ right:6px; } -div.logo{ +div.logo{ height:64px; float:right; top:8px; right:8px; margin-left: 0; - margin-right:0; + margin-right:0; margin-bottom:auto; } /*Sous bandeau avec bouton de navigation*/ -div.bandeautitre{ +div.bandeautitre{ height:17px; font-size:14px; font-weight:bold; text-align:center; vertical-align:middle; font-family:arial, sans-serif; - padding:3px; + padding:3px; position:static; top:57px; left:6px; right:6px; -} -div.sousbandeau{ +} +div.sousbandeau{ height:17px; background-color: #DDDDDD; font-size:11px; @@ -191,15 +191,15 @@ div.sousbandeau{ right:6px; } /*bandeau de pied*/ -div.surbandeaupied{ +div.surbandeaupied{ background-color: #0077DD; position:absolute; bottom:30px; left:6px; - right:6px; + right:6px; height:6px; } -div.bandeaupied{ +div.bandeaupied{ text-align:center; background-color: #0b419b; color:white; @@ -209,29 +209,29 @@ div.bandeaupied{ position:fixed; bottom:6px; left:6px; - right:6px; + right:6px; margin:2px; } -div.surbandeaupiedmobile{ +div.surbandeaupiedmobile{ background-color: #0077DD; - position:static; + position:static; bottom:32px; left:6px; - right:6px; + right:6px; height:6px; } -div.bandeaupiedmobile{ +div.bandeaupiedmobile{ text-align:center; background-color: #0b419b; color:white; font-size:11px; font-family:arial, sans-serif; - padding:6px; - position:static; + padding:6px; + position:static; } /*les boutons se trouvant dans le sousbandeau*/ div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a { - background-color: #0b419b; + background-color: #0b419b; height:16px; padding: 2px 6px 2px 6px; vertical-align:middle; @@ -249,7 +249,7 @@ span.sousbandeaulangue { float:right; } /*corps de la page index.php*/ -div.corps{ +div.corps{ font-size:12px; font-family:arial, sans-serif; position:static; @@ -257,10 +257,10 @@ div.corps{ } div.corps table{ font-family:arial, sans-serif; - font-size:12px; + font-size:12px; font-weight:bold; } -div.corpscentre{ +div.corpscentre{ font-size:12px; font-family:arial, sans-serif; text-align:center; @@ -285,7 +285,7 @@ div.jourschoisis { div.bodydate { padding:10px; font-family:arial, sans-serif; - font-size:12px; + font-size:12px; text-align:center; position:static; top:330px; @@ -294,7 +294,7 @@ div.bodydate { } div.bodydate table{ font-family:arial, sans-serif; - font-size:12px; + font-size:12px; font-weight:bold; } /*cadre de commentaires*/ @@ -302,7 +302,7 @@ div.presentationdate { width:100%; font-family:arial, sans-serif; text-align:center; - font-size:12px; + font-size:12px; border-top:1px solid; border-bottom:1px solid; border-left: none; @@ -321,14 +321,14 @@ div.presentationdatefin { border: 1px solid; margin-top: 10px; margin-left: 30%; - margin-right: 30%; + margin-right: 30%; position:static; } /*cadre principal de studs.php*/ div.cadre { - padding:10px; + padding:10px; font-family:arial, sans-serif; - font-size:12px; + font-size:12px; position:static; top:235px; text-align:center; @@ -350,54 +350,54 @@ div.cadre td { } /*case de tableau OK dans affichage de sondage*/ div.cadre td.ok { - background-color: #66FF99; - font-size:12px; + background-color: #66FF99; + font-size:12px; text-align:center; } /*Case de tableau NON dans affichage de sondage*/ div.cadre td.non { - background-color: #FF7777; + background-color: #FF7777; min-width: 60px; } /*Case de tableau VIDE dans affichage de sondage*/ div.cadre td.vide { - background-color: #DDDDDD; + background-color: #DDDDDD; text-align:center; } /*Case de tableau contenant les noms dans affichage de sondage*/ div.cadre td.nom { - background-color: #DDDDDD; - font-size:12px; + background-color: #DDDDDD; + font-size:12px; text-align:center; } div.cadre td.casevide { - background-color: white; + background-color: white; text-align:center; } /*les cases contenant les sommes de chaque colonne dans l'affichage de calendrier*/ div.cadre td.somme { font-weight: bold; - font-size:14px; + font-size:14px; } /*Case de tableau SUJET dans affichage de sondage*/ div.cadre td.sujet, div.cadre td.jour, div.cadre td.heure { border: 2px; - background-color: #DDDDDD; + background-color: #DDDDDD; font-size:14px; padding:1px 5px; } div.cadre td.annee { border: 2px; - background-color: #969696; + background-color: #969696; font-weight: bold; font-size:14px; padding:1px 5px; } div.cadre td.mois { border: 2px; - background-color: #C0C0C0; + background-color: #C0C0C0; font-weight: bold; font-size:14px; padding:1px 5px; @@ -421,7 +421,7 @@ div.calendrier td.joursemaine { font-family:arial, sans-serif; font-size:14px; border: 2px; - background-color: white; + background-color: white; } div.calendrier td.jourwe { width:65px; @@ -429,7 +429,7 @@ div.calendrier td.jourwe { font-family:arial, sans-serif; font-size:14px; border: 2px; - background-color: #C0C0C0; + background-color: #C0C0C0; } /*jour avant le premier jour du mois dans calendrier*/ div.calendrier td.avant { @@ -438,21 +438,21 @@ div.calendrier td.avant { border: 2px; font-family:arial, sans-serif; font-size:13px; - background-color: #DDDDDD; + background-color: #DDDDDD; } /*jour libre dans calendrier*/ div.calendrier td.libre { width:65px; text-align: center; border: 2px; - background-color: #66FF99; + background-color: #66FF99; } /*jour deja selectionné dans calendrier*/ div.calendrier td.choisi { width:65px; text-align: center; border: 2px; - background-color: #0077DD; + background-color: #0077DD; } /* Le paragraphe de fin */ p.affichageresultats{ diff --git a/htdocs/support/default.css b/htdocs/support/default.css index 17204387eb4..6737a6ede00 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Rodolphe Quiedeville +/* Copyright (C) 2004 Rodolphe Quiedeville * Copyright (C) 2009 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -147,7 +147,7 @@ padding: 4px 4px 4px 4px; tr.title { -background: #DDDFDD; +background: #DDDFDD; } table { font-size: 12px; }