diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index 16f937f5253..b1b6fbf352f 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -522,7 +522,7 @@ for ($idw=0;$idw<7;$idw++) print ''; } // Action column -print ''; +print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print ''; @@ -532,13 +532,13 @@ print ''; if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("Project").''; if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''.$langs->trans("ThirdParty").''; print ''.$langs->trans("Task").''; -print ''.$langs->trans("PlannedWorkload").''; -print ''.$langs->trans("ProgressDeclared").''; -/*print ''.$langs->trans("TimeSpent").''; - if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").''; - else print ''.$langs->trans("TimeSpentByUser").'';*/ -print ''.$langs->trans("TimeSpent").'
('.$langs->trans("Everybody").')'; -print ''.$langs->trans("TimeSpent").($usertoprocess->firstname?'
('.$usertoprocess->firstname.')':'').''; +print ''.$langs->trans("PlannedWorkload").''; +print ''.$langs->trans("ProgressDeclared").''; +/*print ''.$langs->trans("TimeSpent").''; + if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").''; + else print ''.$langs->trans("TimeSpentByUser").'';*/ +print ''.$langs->trans("TimeSpent").'
('.$langs->trans("Everybody").')'; +print ''.$langs->trans("TimeSpent").($usertoprocess->firstname?'
('.$usertoprocess->firstname.')':'').''; for ($idw=0; $idw<7; $idw++) { diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php index 2ce01d3f487..6a715f5030e 100644 --- a/htdocs/projet/tasks/stats/index.php +++ b/htdocs/projet/tasks/stats/index.php @@ -162,7 +162,7 @@ if (! in_array($nowyear, $arrayyears)) $arrayyears[$nowyear]=$nowyear; arsort($arrayyears); print $form->selectarray('year', $arrayyears, $year, 0); print ''; -print ''; +print ''; print ''; print ''; print '

'; @@ -171,8 +171,8 @@ print '

'; print '
'; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''; $oldyear=0; @@ -184,14 +184,14 @@ foreach ($data_all_year as $val) $oldyear--; print ''; - print ''; - print ''; + print ''; + print ''; print ''; } print ''; - print ''; - print ''; + print ''; + print ''; print ''; $oldyear=$year; } @@ -201,7 +201,7 @@ print ''; print '
'; -$stringtoshow.= '
'.$langs->trans("Year").''.$langs->trans("NbOfTasks").''.$langs->trans("Year").''.$langs->trans("NbOfTasks").'
0?'&userid='.$userid:'').'">'.$oldyear.'00?'&userid='.$userid:'').'">'.$oldyear.'0
0?'&userid='.$userid:'').'">'.$year.''.$val['nb'].'0?'&userid='.$userid:'').'">'.$year.''.$val['nb'].'
'; @@ -664,7 +664,7 @@ if ($action == "view_ticketlist") print '
Not Allowed
' . $langs->trans('Back') . '
'; } } else { - print '

' . $langs->trans("TicketPublicMsgViewLogIn") . '

'; + print '

' . $langs->trans("TicketPublicMsgViewLogIn") . '

'; print '
'; print '
'; diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index d106e42aa3f..609cb8d4b90 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -496,7 +496,7 @@ if (isset($totalarray['pos'])) while ($i < $totalarray['nbfield']) { $i++; - if (! empty($totalarray['pos'][$i])) print '
'; + if (! empty($totalarray['pos'][$i])) print ''; else { if ($i == 1) diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php index cf2fa221e85..be9f74b7bd7 100644 --- a/htdocs/stripe/payment.php +++ b/htdocs/stripe/payment.php @@ -994,21 +994,21 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $amount=round(price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT'))*100); // Print total print ''; - print ''; + print ''; if (!empty($conf->multicurrency->enabled)) { print ''; print ''; print ''; } - print ''; + print ''; print ''; - print ''; - print ''; + print ''; + print ''; if (!empty($conf->multicurrency->enabled)) { - print ''; + print ''; } print "\n"; } diff --git a/htdocs/takepos/customers.php b/htdocs/takepos/customers.php index 16884e48f1d..6c526a97ea3 100644 --- a/htdocs/takepos/customers.php +++ b/htdocs/takepos/customers.php @@ -764,14 +764,14 @@ if (! empty($arrayfields['region.nom']['checked'])) // Country if (! empty($arrayfields['country.code_iso']['checked'])) { - print ''; } // Company type if (! empty($arrayfields['typent.code']['checked'])) { - print ''; } @@ -849,7 +849,7 @@ if (! empty($arrayfields['s.tva_intra']['checked'])) // Type (customer/prospect/supplier) if (! empty($arrayfields['customerorsupplier']['checked'])) { - print ''; } // Action column -print ''; @@ -1086,7 +1086,7 @@ while ($i < min($num, $limit)) // Country if (! empty($arrayfields['country.code_iso']['checked'])) { - print ''; @@ -1095,7 +1095,7 @@ while ($i < min($num, $limit)) // Type ent if (! empty($arrayfields['typent.code']['checked'])) { - print ''; @@ -1154,7 +1154,7 @@ while ($i < min($num, $limit)) // Type if (! empty($arrayfields['customerorsupplier']['checked'])) { - print '"; if (! $i) $totalarray['nbfield']++; @@ -1193,7 +1193,7 @@ while ($i < min($num, $limit)) if (! empty($arrayfields['s.fk_stcomm']['checked'])) { // Prospect status - print ''; if (! $i) $totalarray['nbfield']++; @@ -1222,7 +1222,7 @@ while ($i < min($num, $limit)) // Date modification if (! empty($arrayfields['s.tms']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -1230,7 +1230,7 @@ while ($i < min($num, $limit)) // Status if (! empty($arrayfields['s.status']['checked'])) { - print ''; + print ''; if (! $i) $totalarray['nbfield']++; } if (! empty($arrayfields['s.import_key']['checked'])) @@ -1242,7 +1242,7 @@ while ($i < min($num, $limit)) } // Action column - print '' . $line->product_label . '' . $line->product_label . ''; } @@ -218,7 +218,7 @@ if ($action == "order" and $placeid != 0) { if ($count > 0) { $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid"; $db->query($sql); - $order_receipt_printer2.= '' . $line->product_label . '' . $line->product_label . ''; } @@ -333,8 +333,8 @@ print '
'; print '
'; +$stringtoshow.= ''; print ""; print ""; - print ""; + print ''; print "\n"; while ($i < $num) @@ -94,7 +94,7 @@ if ($resql) print "\n"; } print "\n"; - print ''; + print ''; print ""; $i++; } diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index 943dc588bb2..71befc802ae 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -227,9 +227,9 @@ if (! empty($moreforfilter)) - - - + + +
'; if ($mesg) { print $mesg; } else { $stringtoshow.= $px1->show(); diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php index 2f49ab1f4cc..9637a0051f6 100644 --- a/htdocs/public/donations/donateurs_code.php +++ b/htdocs/public/donations/donateurs_code.php @@ -77,7 +77,7 @@ if ($resql) print '
".$langs->trans("Name")." / ".$langs->trans("Company")."Date".$langs->trans("Amount")."'.$langs->trans("Amount").'
Anonyme Anonyme".dol_print_date($db->jdate($objp->datedon))."'.number_format($objp->amount, 2, '.', ' ').' '.$langs->trans("Currency".$conf->currency).''.number_format($objp->amount, 2, '.', ' ').' '.$langs->trans("Currency".$conf->currency).'
getNomUrl(1); ?>b1c1
a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2b2c2
a3b3c3
getNomUrl(1); ?>b1c1
a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2 a2b2c2
a3b3c3
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php index f34c88ad5ce..108bd5db11a 100644 --- a/htdocs/public/ticket/list.php +++ b/htdocs/public/ticket/list.php @@ -506,7 +506,7 @@ if ($action == "view_ticketlist") } } - print '
'; + print ''; print ''; print ''; print ''.price($totalarray['val'][$totalarray['pos'][$i]]).''.price($totalarray['val'][$totalarray['pos'][$i]]).'
'.$langs->trans('TotalTTC').''.$langs->trans('TotalTTC').''.price($sign * $total_ttc).''.price($sign * $total_ttc).''.price($sign * $totalrecu); if ($totalrecucreditnote) print '+'.price($totalrecucreditnote); if ($totalrecudeposits) print '+'.price($totalrecudeposits); print ''.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).''.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'
'; + print ''; print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100'); print ''; + print ''; print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT)); print ''; + print ''; if ($type != '') print ''; print ''; + print ''; $options_from = ''; // Generate in $options_from the list of each option sorted foreach ($tab_level as $tab_level_sortorder => $tab_level_label) { @@ -891,7 +891,7 @@ if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) if (! empty($arrayfields['s.fk_stcomm']['checked'])) { // Prospect status - print ''; + print ''; $arraystcomm=array(); foreach($prospectstatic->cacheprospectstatus as $key => $val) { @@ -933,7 +933,7 @@ if (! empty($arrayfields['s.import_key']['checked'])) print ''; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''; + print ''; $tmparray=getCountry($obj->fk_pays, 'all'); print $tmparray['label']; print ''; + print ''; if (! is_array($typenArray) || count($typenArray)==0) $typenArray = $formcompany->typent_array(1); print $typenArray[$obj->typent_code]; print ''; + print ''; $s=''; if (($obj->client==1 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) { @@ -1184,7 +1184,7 @@ while ($i < min($num, $limit)) if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) { // Prospect level - print ''; + print ''; print $companystatic->getLibProspLevel(); print "
'; + print '
'; print '
'.$companystatic->LibProspCommStatut($obj->stcomm_id, 2, $prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']); print '
-
'; foreach($prospectstatic->cacheprospectstatus as $key => $val) @@ -1214,7 +1214,7 @@ while ($i < min($num, $limit)) // Date creation if (! empty($arrayfields['s.datec']['checked'])) { - print '
'; + print ''; print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); print ''; + print ''; print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser'); print ''.$companystatic->getLibStatut(3).''.$companystatic->getLibStatut(3).''; + print ''; if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined { $selected=0; diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 35509165732..98a40884497 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -184,7 +184,7 @@ if ($action == "updatereduction") { if ($action == "order" and $placeid != 0) { include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; - $headerorder = '
' . $langs->trans('Place') . ' ' . $place . '
'; + $headerorder = '
' . $langs->trans('Place') . ' ' . $place . '
' . $langs->trans("Label") . '' . $langs->trans("Qty") . '
'; $footerorder = '
' . $langs->trans("Label") . '' . $langs->trans("Qty") . '
' . dol_print_date(dol_now(), 'dayhour') . '
'; $order_receipt_printer1 = ""; $order_receipt_printer2 = ""; @@ -201,7 +201,7 @@ if ($action == "order" and $placeid != 0) { if ($count > 0) { $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid"; $db->query($sql); - $order_receipt_printer1.= '
' . $line->qty; + $order_receipt_printer1.= '
' . $line->qty; if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer1.="
(".$line->array_options['options_order_notes'].")"; $order_receipt_printer1.='
' . $line->qty; + $order_receipt_printer2.= '
' . $line->qty; if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer2.="
(".$line->array_options['options_order_notes'].")"; $order_receipt_printer2.='
'; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print "\n"; if ($placeid > 0) { @@ -345,18 +345,18 @@ if ($placeid > 0) { print ' order'; } print '" id="' . $line->rowid . '">'; - print ''; - print ''; - print ''; + print ''; + print ''; print ''; } } print '
' . $langs->trans('Description') . '' . $langs->trans('Qty') . '' . $langs->trans('TotalHTShort') . '' . $langs->trans('Qty') . '' . $langs->trans('TotalHTShort') . '
' . $line->product_label . $line->desc; + print '' . $line->product_label . $line->desc; if (!empty($line->array_options['options_order_notes'])) echo "
(".$line->array_options['options_order_notes'].")"; print '
' . $line->qty . '' . price($line->total_ttc) . '' . $line->qty . '' . price($line->total_ttc) . '
'; -print '

'.$langs->trans('TotalTTC'); +print '

'.$langs->trans('TotalTTC'); if($conf->global->TAKEPOS_BAR_RESTAURANT) print " ".$langs->trans('Place')." ".$place; @@ -367,13 +367,13 @@ if ($invoice->socid != $conf->global->CASHDESK_ID_THIRDPARTY) $soc = new Societe($db); if ($invoice->socid > 0) $soc->fetch($invoice->socid); else $soc->fetch($conf->global->CASHDESK_ID_THIRDPARTY); - print '

'; + print '

'; print $langs->trans("Customer").': '.$soc->name; print '

'; } if ($action=="valid") { - print '

'.$invoice->ref." ".$langs->trans('BillShortStatusValidated').'

'; + print '

'.$invoice->ref." ".$langs->trans('BillShortStatusValidated').'

'; if ($conf->global->TAKEPOSCONNECTOR) print '
'; else print '
'; } diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php index ec1474828b9..1610dbb8c59 100644 --- a/htdocs/takepos/receipt.php +++ b/htdocs/takepos/receipt.php @@ -51,7 +51,7 @@ $object->fetch($facid);

-

+

global->TAKEPOS_HEADER)) @@ -61,7 +61,7 @@ if (! empty($conf->global->TAKEPOS_HEADER)) } ?>

-

+

trans('Date')." ".dol_print_date($object->date, 'day').'
'; if ($mysoc->country_code == 'ES') print "Factura simplificada "; @@ -73,10 +73,10 @@ print $object->ref; - - - - + + + + @@ -88,9 +88,9 @@ print $object->ref; - - - + + + ref;
trans("Label"); ?>trans("Qty"); ?>trans("Price"); ?>trans("TotalTTC"); ?>trans("Label"); ?>trans("Qty"); ?>trans("Price"); ?>trans("TotalTTC"); ?>
product_label)) echo $line->product_label; else echo $line->description;?> qty;?>total_ttc/$line->qty;?>total_ttc);?>qty;?>total_ttc/$line->qty;?>total_ttc);?>

- +
- - + + - + - +
trans("TotalHT");?>total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n";?>trans("TotalHT");?>total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n";?>
trans("TotalVAT").''.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n";?>trans("TotalVAT").''.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n";?>
trans("TotalTTC").''.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n";?>trans("TotalTTC").''.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n";?>

diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php index 5a821340f02..a4836a49a89 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -202,7 +202,7 @@ while ($i <= $MAXAGENDA) // Offset TZ print ''; // Color (Possible colors are limited by Google) - print ''; + print ''; //print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist); print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR_".$id.'_'.$key)?GETPOST("AGENDA_EXT_COLOR_".$id.'_'.$key):$object->conf->$color), "AGENDA_EXT_COLOR_".$id.'_'.$key, 'extsitesconfig', 1, '', 'hideifnotset'); print ''; diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index 7097c5d3473..196819f1a4a 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -307,7 +307,7 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco print ''; print ''; - print '
'; + print ''; print ''; @@ -322,9 +322,9 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco $salary->ref = $objp->rowid; print $salary->getNomUrl(1); - print '\n"; - print '\n"; - print ''; + print '\n"; + print '\n"; + print ''; $i++; } $db->free($resql); @@ -361,7 +361,7 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco print '
'.$langs->trans("LastSalaries", ($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllSalaries").' '.$num.''; print '
'.$langs->trans("LastSalaries", ($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllSalaries").' '.$num.'
'.dol_print_date($db->jdate($objp->datesp), 'day')."'.dol_print_date($db->jdate($objp->dateep), 'day')."'.price($objp->amount).'
'.dol_print_date($db->jdate($objp->datesp), 'day')."'.dol_print_date($db->jdate($objp->dateep), 'day')."'.price($objp->amount).'
'; print ''; - print '
'; + print ''; print ''; @@ -417,7 +417,7 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco print '
'.$langs->trans("LastHolidays", ($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllHolidays").' '.$num.''; print '
'.$langs->trans("LastHolidays", ($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllHolidays").' '.$num.'
'; print ''; - print '
'; + print ''; print ''; diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php index e032b872d10..5bdb2de2472 100644 --- a/htdocs/user/notify/card.php +++ b/htdocs/user/notify/card.php @@ -373,7 +373,7 @@ if ($result > 0) print ''; - print ''; + print ''; print ''; }*/ /*if ($user->admin)
'.$langs->trans("LastExpenseReports", ($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllExpenseReports").' '.$num.''; print '
'.$langs->trans("LastExpenseReports", ($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllExpenseReports").' '.$num.'
'; print $langs->trans("Email"); print ''.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).''.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'