From 404f497ca4fe475860291541246a2dce5b50b5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 23 Feb 2019 19:27:42 +0100 Subject: [PATCH 01/16] replace html code by html5 in ticket --- htdocs/ticket/card.php | 10 +++++----- htdocs/ticket/list.php | 8 ++++---- htdocs/ticket/stats/index.php | 12 ++++++------ htdocs/ticket/tpl/linkedobjectblock.tpl.php | 12 ++++++------ 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index 631ee0d3c41..e9c73e321be 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -447,7 +447,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd print $langs->trans('Progression') . ''; print ''; if ($action != 'progression' && $object->fk_statut < 8 && !$user->societe_id) { - print '' . img_edit($langs->trans('Modify')) . ''; + print '' . img_edit($langs->trans('Modify')) . ''; } print ''; print ''; @@ -604,7 +604,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
' . $langs->trans("Contacts") . '
' . $langs->trans("ContactType") . '
' . $langs->trans("Phone") . '
-
' . $langs->trans("Status") . '
'; +
' . $langs->trans("Status") . '
'; print ''; // Contact list @@ -620,7 +620,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd $var = !$var; print '
'; - print '
'; + print '
'; if ($tab[$i]['source'] == 'internal') { echo $langs->trans("User"); } @@ -630,7 +630,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd } print '
'; - print '
'; + print '
'; if ($tab[$i]['socid'] > 0) { $companystatic->fetch($tab[$i]['socid']); @@ -672,7 +672,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd } print '
'; - print '
'; + print '
'; if ($object->statut >= 0) { echo ''; } diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index b9bf46ef83a..401645f6dfd 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -553,7 +553,7 @@ $parameters=array('arrayfields'=>$arrayfields); $reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column -print ''; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''; @@ -580,7 +580,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; -print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n"; +print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n"; print ''."\n"; @@ -646,7 +646,7 @@ while ($i < min($num, $limit)) $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column - print ''; + 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; @@ -669,7 +669,7 @@ if (isset($totalarray['pos'])) while ($i < $totalarray['nbfield']) { $i++; - if (! empty($totalarray['pos'][$i])) print ''.price($totalarray['val'][$totalarray['pos'][$i]]).''; + if (! empty($totalarray['pos'][$i])) print ''.price($totalarray['val'][$totalarray['pos'][$i]]).''; else { if ($i == 1) diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php index 2366ac30610..5eb206057c3 100644 --- a/htdocs/ticket/stats/index.php +++ b/htdocs/ticket/stats/index.php @@ -260,16 +260,16 @@ if (! in_array($nowyear, $arrayyears)) $arrayyears[$nowyear]=$nowyear; arsort($arrayyears); print $form->selectarray('year', $arrayyears, $year, 0); print ''; -print ''; +print ''; print ''; print ''; print '

'; print '
'; -print ''; +print '
'; print ''; -print ''; +print ''; print ''; print ''; //print ''; @@ -287,7 +287,7 @@ foreach ($data as $val) $oldyear--; print ''; - print ''; + print ''; print ''; print ''; //print ''; @@ -299,7 +299,7 @@ foreach ($data as $val) print ''; - print ''; + print ''; print ''; print ''; //print ''; @@ -318,7 +318,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("Year").''.$langs->trans("NbOfTickets").'%'.$langs->trans("AmountTotal").'
0?'&userid='.$userid:'').'">'.$oldyear.'0?'&userid='.$userid:'').'">'.$oldyear.'00
0?'&userid='.$userid:'').'">'.$year.'0?'&userid='.$userid:'').'">'.$year.''.$val['nb'].''.round($val['nb_diff']).''.price(price2num($val['total'], 'MT'), 1).'
'; if ($action != 'editdate_livraison' && ! empty($object->brouillon)) - print ''; + print ''; print '
'; +print ''; print ''; print ''; print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print ''; print "\n"; @@ -96,10 +96,10 @@ foreach($extrafields->attribute_type as $key => $value) print "\n"; print "\n"; print "\n"; - print '\n"; - print '\n"; - print '\n"; - print '\n"; + print '\n"; + print '\n"; + print '\n"; print ""; } diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index b742b0379c5..ebc07e0b529 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1468,7 +1468,7 @@ if ($action == 'create') print $langs->trans('PaymentConditionsShort'); print ''; if ($action != 'editconditions' && ! empty($object->brouillon)) - print ''; + print ''; print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); diff --git a/htdocs/ticket/tpl/linkedobjectblock.tpl.php b/htdocs/ticket/tpl/linkedobjectblock.tpl.php index 21fe9aa78d8..3391437dbb1 100644 --- a/htdocs/ticket/tpl/linkedobjectblock.tpl.php +++ b/htdocs/ticket/tpl/linkedobjectblock.tpl.php @@ -37,9 +37,9 @@ print load_fiche_titre($langs->trans('RelatedTickets')); - - - + + + trans("ShowTicket"), "ticket") . ' ' . (! empty($object->subject) ? ' '.$object->subject : ''); ?> - + socid = $object->fk_soc; $object->fetch_thirdparty(); ?> - - + +
trans("Subject"); ?>trans("DateCreation"); ?>trans("Customer"); ?>trans("Status"); ?>trans("DateCreation"); ?>trans("Customer"); ?>trans("Status"); ?>
datec, 'day'); ?>datec, 'day'); ?> thirdparty->getNomUrl(1); ?>getLibstatut(2); ?>thirdparty->getNomUrl(1); ?>getLibstatut(2); ?>
From 452633e877779dd3c610cc59028429d65507f5ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 23 Feb 2019 19:43:28 +0100 Subject: [PATCH 02/16] replace html code by html5 in supplier_proposal --- htdocs/stripe/payment.php | 2 +- .../supplier_proposaldet_extrafields.php | 14 ++-- htdocs/supplier_proposal/card.php | 20 ++--- htdocs/supplier_proposal/index.php | 20 ++--- htdocs/supplier_proposal/list.php | 78 +++++++++---------- .../tpl/linkedobjectblock.tpl.php | 18 ++--- 6 files changed, 76 insertions(+), 76 deletions(-) diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php index 50d64521621..48adfa2b2b3 100644 --- a/htdocs/stripe/payment.php +++ b/htdocs/stripe/payment.php @@ -80,7 +80,7 @@ if ($facid > 0) if (! empty($conf->stripe->enabled)) { - access_forbidden(); + access_forbidden(); } if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')) diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php index 99a00668926..b3b0e482f62 100644 --- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php +++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php @@ -84,9 +84,9 @@ print '
'.$langs->trans("Label").''.$langs->trans("AttributeCode").''.$langs->trans("Type").''.$langs->trans("Size").''.$langs->trans("Unique").''.$langs->trans("Required").''.$langs->trans("Size").''.$langs->trans("Unique").''.$langs->trans("Required").' 
".$extrafields->attribute_label[$key]."".$key."".$type2label[$extrafields->attribute_type[$key]]."'.$extrafields->attribute_size[$key]."'.yn($extrafields->attribute_unique[$key])."'.yn($extrafields->attribute_required[$key])."'.img_edit().''; + print ''.$extrafields->attribute_size[$key]."'.yn($extrafields->attribute_unique[$key])."'.yn($extrafields->attribute_required[$key])."'.img_edit().''; print "  ".img_delete()."
id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '
'; print '		'; if ($action == 'editconditions') { @@ -1486,7 +1486,7 @@ if ($action == 'create') print $langs->trans('DeliveryDate'); print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1) . 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1) . '
'; print ''; if ($action == 'editdate_livraison') { @@ -1509,7 +1509,7 @@ if ($action == 'create') print $langs->trans('PaymentMode'); print ''; if ($action != 'editmode' && ! empty($object->brouillon)) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . ''; print ''; print ''; if ($action == 'editmode') { @@ -1529,7 +1529,7 @@ if ($action == 'create') print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0); print ''; if ($action != 'editmulticurrencycode' && ! empty($object->brouillon)) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; print ''; print ''; if ($action == 'editmulticurrencycode') { @@ -1546,7 +1546,7 @@ if ($action == 'create') print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0); print ''; if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; print ''; print ''; if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') { @@ -1571,7 +1571,7 @@ if ($action == 'create') // Outstanding Bill print ''; print $langs->trans('OutstandingBill'); - print ''; + print ''; print price($soc->get_OutstandingBill()) . ' / '; print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency); print ''; @@ -1586,7 +1586,7 @@ if ($action == 'create') print $langs->trans('BankAccount'); print ''; if ($action != 'editbankaccount' && $user->rights->supplier_proposal->creer) - print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).''; + print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).''; print ''; print ''; if ($action == 'editbankaccount') { @@ -1739,7 +1739,7 @@ if ($action == 'create') if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) $form_close .= '

'.$langs->trans('SupplierProposalRefFournNotice').'

'; // TODO Suggest a permanent checkbox instead of option $form_close .= ''; $form_close .= ''; - $form_close .= ''; - $form_close .= ''; - $form_close .= ''; print ''; - print ''; + print ''; print "\n"; } } if ($conf->use_javascript_ajax) { - print ''; } - print ''; + print ''; print "
' . $langs->trans("CloseAs") . ''; + $form_close .= '
' . $langs->trans("CloseAs") . ''; $form_close .= ''; $form_close .= ''; $form_close .= '
' . $langs->trans('Note') . '
'; + $form_close .= '
'; $form_close .= ''; $form_close .= '   '; $form_close .= ' '; diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php index 38146c95645..5a2e6df2f29 100644 --- a/htdocs/supplier_proposal/index.php +++ b/htdocs/supplier_proposal/index.php @@ -125,13 +125,13 @@ if ($resql) { print '
'.$supplier_proposalstatic->LibStatut($status, 0).''.(isset($vals[$status])?$vals[$status]:0).''.(isset($vals[$status])?$vals[$status]:0).'
'; + print '
'; include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $dolgraph = new DolGraph(); @@ -146,7 +146,7 @@ if ($resql) print '
'.$langs->trans("Total").''.$total.'
'.$langs->trans("Total").''.$total.'

"; } else @@ -256,7 +256,7 @@ if ($resql) print ' '; print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -272,7 +272,7 @@ if ($resql) print ''.$companystatic->getNomUrl(1, 'customer').''; print ''.dol_print_date($db->jdate($obj->datec), 'day').''; - print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 5).''; + print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 5).''; print ''; $i++; } @@ -333,7 +333,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos print ''; if ($db->jdate($obj->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) print img_warning($langs->trans("Late")); print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->supplier_proposalid; @@ -348,10 +348,10 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos $companystatic->canvas=$obj->canvas; print ''.$companystatic->getNomUrl(1, 'customer', 44).''."\n"; - print ''; + print ''; print dol_print_date($db->jdate($obj->dp), 'day').''."\n"; - print ''.price($obj->total_ttc).''; - print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 3).''."\n"; + print ''.price($obj->total_ttc).''; + print ''.$supplier_proposalstatic->LibStatut($obj->fk_statut, 3).''."\n"; print ''."\n"; $i++; $total += $obj->total_ttc; @@ -362,7 +362,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos } elseif ($total>0) { - print ''.$langs->trans("Total")."".price($total)." "; + print ''.$langs->trans("Total").''.price($total)." "; } print "
"; } diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index 38741bfaf5a..2af2c15f66d 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -476,7 +476,7 @@ if ($resql) } if (! empty($arrayfields['s.nom']['checked'])) { - print ''; + print ''; print ''; print ''; } @@ -492,21 +492,21 @@ if ($resql) // Country if (! empty($arrayfields['country.code_iso']['checked'])) { - print ''; + print ''; print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth100'); print ''; } // Company type if (! empty($arrayfields['typent.code']['checked'])) { - 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 ''; } // Date if (! empty($arrayfields['sp.date_valid']['checked'])) { - print ''; + print ''; //print $langs->trans('Month').': '; print ''; //print ' '.$langs->trans('Year').': '; @@ -517,7 +517,7 @@ if ($resql) // Date if (! empty($arrayfields['sp.date_livraison']['checked'])) { - print ''; + print ''; //print $langs->trans('Month').': '; print ''; //print ' '.$langs->trans('Year').': '; @@ -529,28 +529,28 @@ if ($resql) if (! empty($arrayfields['sp.total_ht']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['sp.total_vat']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['sp.total_ttc']['checked'])) { // Amount - print ''; + print ''; print ''; print ''; } if (! empty($arrayfields['u.login']['checked'])) { // Author - print ''; + print ''; print ''; print ''; } @@ -575,12 +575,12 @@ if ($resql) // Status if (! empty($arrayfields['sp.fk_statut']['checked'])) { - print ''; + print ''; $formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status'); print ''; } // Action column - print ''; + print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''; @@ -594,24 +594,24 @@ if ($resql) if (! empty($arrayfields['s.town']['checked'])) print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder); if (! empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder); if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder); - if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder); - if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder); - if (! empty($arrayfields['sp.date_valid']['checked'])) print_liste_field_titre($arrayfields['sp.date_valid']['label'], $_SERVER["PHP_SELF"], 'sp.date_valid', '', $param, 'align="center"', $sortfield, $sortorder); - if (! empty($arrayfields['sp.date_livraison']['checked'])) print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, 'align="center"', $sortfield, $sortorder); - if (! empty($arrayfields['sp.total_ht']['checked'])) print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['sp.total_vat']['checked'])) print_liste_field_titre($arrayfields['sp.total_vat']['label'], $_SERVER["PHP_SELF"], 'sp.total_vat', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['sp.total_ttc']['checked'])) print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder); + if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center '); + if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center '); + if (! empty($arrayfields['sp.date_valid']['checked'])) print_liste_field_titre($arrayfields['sp.date_valid']['label'], $_SERVER["PHP_SELF"], 'sp.date_valid', '', $param, '', $sortfield, $sortorder, 'center '); + if (! empty($arrayfields['sp.date_livraison']['checked'])) print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, '', $sortfield, $sortorder, 'center '); + if (! empty($arrayfields['sp.total_ht']['checked'])) print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, '', $sortfield, $sortorder, 'right '); + if (! empty($arrayfields['sp.total_vat']['checked'])) print_liste_field_titre($arrayfields['sp.total_vat']['label'], $_SERVER["PHP_SELF"], 'sp.total_vat', '', $param, '', $sortfield, $sortorder, 'right '); + if (! empty($arrayfields['sp.total_ttc']['checked'])) print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, '', $sortfield, $sortorder, 'right '; + if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center '); // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; // Hook fields $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; - if (! empty($arrayfields['sp.datec']['checked'])) print_liste_field_titre($arrayfields['sp.datec']['label'], $_SERVER["PHP_SELF"], "sp.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); - if (! empty($arrayfields['sp.tms']['checked'])) print_liste_field_titre($arrayfields['sp.tms']['label'], $_SERVER["PHP_SELF"], "sp.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); - if (! empty($arrayfields['sp.fk_statut']['checked'])) print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); + if (! empty($arrayfields['sp.datec']['checked'])) print_liste_field_titre($arrayfields['sp.datec']['label'], $_SERVER["PHP_SELF"], "sp.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap '); + if (! empty($arrayfields['sp.tms']['checked'])) print_liste_field_titre($arrayfields['sp.tms']['label'], $_SERVER["PHP_SELF"], "sp.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap'); + if (! empty($arrayfields['sp.fk_statut']['checked'])) print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, '', $sortfield, $sortorder, 'right '); + print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); print ''."\n"; $now = dol_now(); @@ -654,7 +654,7 @@ if ($resql) print ''; } // Other picto tool - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->supplier_proposal->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -707,7 +707,7 @@ if ($resql) // Country if (! empty($arrayfields['country.code_iso']['checked'])) { - print ''; + print ''; $tmparray=getCountry($obj->fk_pays, 'all'); print $tmparray['label']; print ''; @@ -716,7 +716,7 @@ if ($resql) // Type ent if (! empty($arrayfields['typent.code']['checked'])) { - print ''; + print ''; if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1); print $typenArray[$obj->typent_code]; print ''; @@ -726,7 +726,7 @@ if ($resql) // Date proposal if (! empty($arrayfields['sp.date_valid']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->date_valid), 'day'); print "\n"; if (! $i) $totalarray['nbfield']++; @@ -735,7 +735,7 @@ if ($resql) // Date delivery if (! empty($arrayfields['sp.date_livraison']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->dp), 'day'); print "\n"; if (! $i) $totalarray['nbfield']++; @@ -744,7 +744,7 @@ if ($resql) // Amount HT if (! empty($arrayfields['sp.total_ht']['checked'])) { - print ''.price($obj->total_ht)."\n"; + print ''.price($obj->total_ht)."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield']; $totalarray['totalht'] += $obj->total_ht; @@ -752,7 +752,7 @@ if ($resql) // Amount VAT if (! empty($arrayfields['sp.total_vat']['checked'])) { - print ''.price($obj->total_vat)."\n"; + print ''.price($obj->total_vat)."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield']; $totalarray['totalvat'] += $obj->total_vat; @@ -760,7 +760,7 @@ if ($resql) // Amount TTC if (! empty($arrayfields['sp.total_ttc']['checked'])) { - print ''.price($obj->total_ttc)."\n"; + print ''.price($obj->total_ttc)."\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield']; $totalarray['totalttc'] += $obj->total_ttc; @@ -772,7 +772,7 @@ if ($resql) // Author if (! empty($arrayfields['u.login']['checked'])) { - print ''; + print ''; if ($userstatic->id) print $userstatic->getLoginUrl(1); else print ' '; print "\n"; @@ -788,7 +788,7 @@ if ($resql) // Date creation if (! empty($arrayfields['sp.datec']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); print ''; if (! $i) $totalarray['nbfield']++; @@ -796,7 +796,7 @@ if ($resql) // Date modification if (! empty($arrayfields['sp.tms']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser'); print ''; if (! $i) $totalarray['nbfield']++; @@ -804,12 +804,12 @@ if ($resql) // Status if (! empty($arrayfields['sp.fk_statut']['checked'])) { - print ''.$objectstatic->LibStatut($obj->fk_statut, 5)."\n"; + print ''.$objectstatic->LibStatut($obj->fk_statut, 5)."\n"; if (! $i) $totalarray['nbfield']++; } // Action column - print ''; + 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; @@ -845,9 +845,9 @@ if ($resql) if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; else print ''.$langs->trans("Totalforthispage").''; } - elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).''; - elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).''; - elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).''; + elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).''; + elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).''; + elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).''; else print ''; } print ''; diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php index 4a2a028777e..bd2a94d1c32 100644 --- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php @@ -47,14 +47,14 @@ foreach($linkedObjectBlock as $key => $objectlink) trans("SupplierProposal"); ?> trans("ShowSupplierProposal"), "supplier_proposal").' '.$objectlink->ref; ?> - datec, 'day'); ?> - datec, 'day'); ?> + rights->supplier_proposal->lire) { $total = $total + $objectlink->total_ht; echo price($objectlink->total_ht); } ?> - getLibStatut(3); ?> - ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?> + getLibStatut(3); ?> + ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?> 1) trans("Total"); ?> - - - - - + + + + + Date: Sat, 23 Feb 2019 19:44:04 +0100 Subject: [PATCH 03/16] replace html code by html5 in supplier_proposal --- .../admin/supplier_proposal_extrafields.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php index 3a0f1eed273..1b5c08119d1 100644 --- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php +++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php @@ -76,13 +76,13 @@ $extrafields->fetch_name_optionals_label($elementtype); print ""; print ''; -print ''; +print ''; print ''; print ''; print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print ''; print "\n"; @@ -93,10 +93,10 @@ foreach($extrafields->attribute_type as $key => $value) print "\n"; print "\n"; print "\n"; - print '\n"; - print '\n"; - print '\n"; - print '\n"; + print '\n"; + print '\n"; + print '\n"; print ""; // $i++; From c000f03e5663885e347df68bf73b73e8d926a655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 23 Feb 2019 19:55:06 +0100 Subject: [PATCH 04/16] replace html code by html5 in stripe --- htdocs/stripe/charge.php | 20 +++--- htdocs/stripe/class/actions_stripe.class.php | 8 +-- htdocs/stripe/payment.php | 66 ++++++++++---------- htdocs/stripe/payout.php | 22 +++---- htdocs/stripe/transaction.php | 33 +++++----- 5 files changed, 75 insertions(+), 74 deletions(-) diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php index 83cbe2755a1..fb122948dd0 100644 --- a/htdocs/stripe/charge.php +++ b/htdocs/stripe/charge.php @@ -101,10 +101,10 @@ if (!$rowid) print_liste_field_titre("StripeCustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder); print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder); print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder); - print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder); - print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder); - print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"'); + print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center '); + print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left '); + print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right '); + print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right '); print "\n"; print "\n"; @@ -149,9 +149,9 @@ if (!$rowid) } print ''; - + if (!empty($stripeacc)) $connect=$stripeacc.'/'; - + // Ref $url='https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id; if ($servicestatus) @@ -169,7 +169,7 @@ if (!$rowid) $url='https://dashboard.stripe.com/'.$connect.'customers/'.$charge->customer; } print ''.img_picto($langs->trans('ShowInStripe'), 'object_globe').' '.$charge->customer.''; - + print "\n"; // Link print "\n"; // Date payment - print '\n"; + print '\n"; // Type print ''; // Amount - print ""; + print '"; // Status - print ''; @@ -114,7 +114,7 @@ class ActionsStripeconnect $this->resprints.= ''; $this->resprints.= ''; $this->resprints.= ''; diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php index 48adfa2b2b3..b909347f007 100644 --- a/htdocs/stripe/payment.php +++ b/htdocs/stripe/payment.php @@ -633,7 +633,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie foreach ($customerstripe->sources->data as $src) { print ''; - print ''; // Default - print ''; - print ''; // Default - print ''; print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; print ''; @@ -459,17 +459,17 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ""; print ""; - print '"; - print '"; - print '"; - print '"; - print ''; - print ''; + print '"; + print '"; + print '"; + print '"; + print ''; + print ''; // User $userstatic = new User($db); $userstatic->fetch($line->fk_user); - print ''; } @@ -529,13 +529,13 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ''; print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; print ''; @@ -545,7 +545,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ''; print ''; // Print the search button - print ''; @@ -564,24 +564,24 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ""; print ""; - print '"; - print '"; - print '"; - print '"; - print ''; - print ''; + print '"; + print '"; + print '"; + print '"; + print ''; + print ''; // User $userstatic = new User($db); $userstatic->fetch($line->fk_user); - print ''; // Action if ($user->rights->produit->creer || $user->rights->service->creer) { - print '\n"; $i=0; @@ -305,7 +305,7 @@ if ($id > 0 || ! empty($ref)) // End of subscription date if ($datefin) { - print ''; @@ -414,7 +414,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; -print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n"; +print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n"; print ''."\n"; @@ -473,7 +473,7 @@ while ($i < min($num, $limit)) $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column - print ''."\n"; print ' '; print ' '; print ' '; -print ' '; -print ' '; +print ' '; +print ' '; print "\n"; foreach ($dirsociete as $dirroot) @@ -395,7 +395,7 @@ foreach ($dirsociete as $dirroot) if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file") { - print '\n"; } @@ -403,14 +403,14 @@ foreach ($dirsociete as $dirroot) { $disabled = false; if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true); - print ''; } - print ''; @@ -437,8 +437,8 @@ print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print "\n"; foreach ($dirsociete as $dirroot) @@ -472,17 +472,17 @@ foreach ($dirsociete as $dirroot) if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file") { - print ''; } else { - print ''; } - print ''; @@ -530,9 +530,9 @@ print '
'.$langs->trans("Position").''.$langs->trans("Position").''.$langs->trans("Label").''.$langs->trans("AttributeCode").''.$langs->trans("Type").''.$langs->trans("Size").''.$langs->trans("Unique").''.$langs->trans("Required").''.$langs->trans("Size").''.$langs->trans("Unique").''.$langs->trans("Required").' 
".$extrafields->attribute_label[$key]."".$key."".$type2label[$extrafields->attribute_type[$key]]."'.$extrafields->attribute_size[$key]."'.yn($extrafields->attribute_unique[$key])."'.yn($extrafields->attribute_required[$key])."'.img_edit().''; + print ''.$extrafields->attribute_size[$key]."'.yn($extrafields->attribute_unique[$key])."'.yn($extrafields->attribute_required[$key])."'.img_edit().''; print "  ".img_delete()."
"; @@ -199,7 +199,7 @@ if (!$rowid) } else print $FULLTAG; print "'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."'; if ($charge->source->object=='card') @@ -213,9 +213,9 @@ if (!$rowid) } print '".price(($charge->amount-$charge->amount_refunded)/100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."'.price(($charge->amount-$charge->amount_refunded)/100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."'; + print ''; if ($charge->refunded=='1'){ print img_picto($langs->trans("refunded"), 'statut6'); } elseif ($charge->paid=='1'){ diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php index 408d47a407c..598cb19dd62 100644 --- a/htdocs/stripe/class/actions_stripe.class.php +++ b/htdocs/stripe/class/actions_stripe.class.php @@ -95,7 +95,7 @@ class ActionsStripeconnect $this->resprints.= '
'; $this->resprints.= '
'; $this->resprints.= $langs->trans('StripeCustomer'); - $this->resprints.= ''; + $this->resprints.= ''; // $this->resprints.= ''.img_edit().''; $this->resprints.= '
'; $this->resprints.= '
'; $this->resprints.= '
'; $this->resprints.= $langs->trans('StripeCustomer'); - $this->resprints.= ''; + $this->resprints.= ''; $this->resprints.= '
'; $this->resprints.= '		'; @@ -132,7 +132,7 @@ class ActionsStripeconnect $this->resprints.= '
'; $this->resprints.= '
'; $this->resprints.= $langs->trans('SubscriptionStripe'); - $this->resprints.= ''; + $this->resprints.= ''; $this->resprints.= '
'; $this->resprints.= '		'; @@ -151,7 +151,7 @@ class ActionsStripeconnect $this->resprints.= '
'; $this->resprints.= '
'; $this->resprints.= $langs->trans('PlanStripe'); - $this->resprints.= ''; + $this->resprints.= ''; // $this->resprints.= ''.img_edit().''; $this->resprints.= '
'; $this->resprints.= '
id!=$source) or ($src->object=='source' && $src->card->three_d_secure=='required')) { print'class="opacitymedium"'; } @@ -697,7 +697,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } print 'id!=$source) or ($src->object=='source' && $src->card->three_d_secure=='required')) { print'class="opacitymedium"'; } @@ -716,7 +716,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie if (($account->type=='custom' or $account->type=='express') && $entity==1) { print '
getStripeCustomerAccount($facture->socid)!=$source) { print'class="opacitymedium"'; } @@ -745,7 +745,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print 'id!=$source) { print'class="opacitymedium"'; } @@ -823,21 +823,21 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; print ''; print ''; - print ''; + print ''; if (!empty($conf->multicurrency->enabled)) { print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; } - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; if (!empty($conf->multicurrency->enabled)) { - print ''; + print ''; } - print ''; + print ''; print "\n"; $total=0; @@ -878,20 +878,20 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print "\n"; // Date - print '\n"; + print '\n"; // Currency - if (!empty($conf->multicurrency->enabled)) print '\n"; + if (!empty($conf->multicurrency->enabled)) print '\n"; // Multicurrency Price if (!empty($conf->multicurrency->enabled)) { - print ''; // Multicurrency Price - print ''; // Multicurrency Price - print ''; } // Price - print ''; + print ''; // Received or paid back - print ''; // Remain to take or to pay back - print ''; + print ''; //$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits)); // Amount - 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"; } @@ -1105,7 +1105,7 @@ if (! GETPOST('action')) print_liste_field_titre('Invoice', $_SERVER["PHP_SELF"], 'ref', '', '', '', $sortfield, $sortorder); print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'dp', '', '', '', $sortfield, $sortorder); print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'libelle', '', '', '', $sortfield, $sortorder); - print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'fa_amount', '', '', 'align="right"', $sortfield, $sortorder); + print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'fa_amount', '', '', '', $sortfield, $sortorder, 'right '); print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch '); print "\n"; @@ -1116,7 +1116,7 @@ if (! GETPOST('action')) print '\n"; print '\n"; print '\n"; - print ''; + print ''; $parameters=array(); $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php index 2fec924c2bf..0149775c360 100644 --- a/htdocs/stripe/payout.php +++ b/htdocs/stripe/payout.php @@ -103,12 +103,12 @@ if (! $rowid) { //print_liste_field_titre("StripeCustomerId",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder); //print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder); //print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder); - print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder); - print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder); - print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder); - print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"'); + print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center '); + print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center '); + print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left '); + print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right '); + print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right '); + print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right '); print "\n"; print "\n"; @@ -198,16 +198,16 @@ if (! $rowid) { //} //print "\n"; // Date payment - print '\n"; + print '\n"; // Date payment - print '\n"; + print '\n"; // Type print ''; // Amount - print ""; - print ""; + print '"; + print '"; // Status - print "\n"; print "\n"; @@ -161,7 +161,7 @@ if (! $rowid) { // Ref if (!empty($stripeacc)) $connect=$stripeacc.'/'; - + // Ref if (preg_match('/po_/i', $txn->source)){ $origin="payouts"; @@ -207,20 +207,21 @@ if (! $rowid) { //} //print "\n"; // Date payment - print '\n"; + print '\n"; // Type print ''; // Amount - print ""; - print ""; + print '"; + print '"; // Status - print "'; print "\n"; } From c1c61031387dc366132124a74de144cbfb8fd664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 23 Feb 2019 21:02:39 +0100 Subject: [PATCH 05/16] replace html code by html5 in societe --- htdocs/societe/list.php | 74 +++++++++++++++---------------- htdocs/societe/paymentmodes.php | 26 +++++------ htdocs/societe/price.php | 62 +++++++++++++------------- htdocs/societe/societecontact.php | 6 +-- htdocs/societe/website.php | 6 +-- htdocs/supplier_proposal/list.php | 2 +- 6 files changed, 88 insertions(+), 88 deletions(-) diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 99a7dbd9a1c..cf42b59f558 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -737,21 +737,21 @@ if (! empty($arrayfields['region.nom']['checked'])) // Country if (! empty($arrayfields['country.code_iso']['checked'])) { - print ''; } // Company type if (! empty($arrayfields['typent.code']['checked'])) { - print ''; } // Staff if (! empty($arrayfields['staff.code']['checked'])) { - print ''; } @@ -836,7 +836,7 @@ if (! empty($arrayfields['s.tva_intra']['checked'])) // Type (customer/prospect/supplier) if (! empty($arrayfields['customerorsupplier']['checked'])) { - print ''; @@ -844,14 +844,14 @@ if (! empty($arrayfields['customerorsupplier']['checked'])) // Prospect level if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) { - print ''; } // Prospect status if (! empty($arrayfields['s.fk_stcomm']['checked'])) { - print ''; } @@ -899,7 +899,7 @@ if (! empty($arrayfields['s.import_key']['checked'])) print ''; } // Action column -print ''; @@ -919,35 +919,35 @@ if (! empty($arrayfields['s.town']['checked'])) print_liste_field_titr if (! empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], "s.zip", "", $param, '', $sortfield, $sortorder); if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder); if (! empty($arrayfields['region.nom']['checked'])) print_liste_field_titre($arrayfields['region.nom']['label'], $_SERVER["PHP_SELF"], "region.nom", "", $param, '', $sortfield, $sortorder); -if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['staff.code']['checked'])) print_liste_field_titre($arrayfields['staff.code']['label'], $_SERVER["PHP_SELF"], "staff.code", "", $param, 'align="center"', $sortfield, $sortorder); +if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['staff.code']['checked'])) print_liste_field_titre($arrayfields['staff.code']['label'], $_SERVER["PHP_SELF"], "staff.code", "", $param, '', $sortfield, $sortorder, 'center '); if (! empty($arrayfields['s.email']['checked'])) print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email", "", $param, '', $sortfield, $sortorder); if (! empty($arrayfields['s.phone']['checked'])) print_liste_field_titre($arrayfields['s.phone']['label'], $_SERVER["PHP_SELF"], "s.phone", "", $param, '', $sortfield, $sortorder); if (! empty($arrayfields['s.fax']['checked'])) print_liste_field_titre($arrayfields['s.fax']['label'], $_SERVER["PHP_SELF"], "s.fax", "", $param, '', $sortfield, $sortorder); if (! empty($arrayfields['s.url']['checked'])) print_liste_field_titre($arrayfields['s.url']['label'], $_SERVER["PHP_SELF"], "s.url", "", $param, '', $sortfield, $sortorder); -if (! empty($arrayfields['s.siren']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"), $textprofid[1], 1, 0), $_SERVER["PHP_SELF"], "s.siren", "", $param, 'class="nowrap"', $sortfield, $sortorder); -if (! empty($arrayfields['s.siret']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"), $textprofid[2], 1, 0), $_SERVER["PHP_SELF"], "s.siret", "", $param, 'class="nowrap"', $sortfield, $sortorder); -if (! empty($arrayfields['s.ape']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"), $textprofid[3], 1, 0), $_SERVER["PHP_SELF"], "s.ape", "", $param, 'class="nowrap"', $sortfield, $sortorder); -if (! empty($arrayfields['s.idprof4']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof4", "", $param, 'class="nowrap"', $sortfield, $sortorder); -if (! empty($arrayfields['s.idprof5']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof5", "", $param, 'class="nowrap"', $sortfield, $sortorder); -if (! empty($arrayfields['s.idprof6']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof6", "", $param, 'class="nowrap"', $sortfield, $sortorder); -if (! empty($arrayfields['s.tva_intra']['checked'])) print_liste_field_titre($arrayfields['s.tva_intra']['label'], $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, 'class="nowrap"', $sortfield, $sortorder); +if (! empty($arrayfields['s.siren']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"), $textprofid[1], 1, 0), $_SERVER["PHP_SELF"], "s.siren", "", $param, '', $sortfield, $sortorder, 'nowrap '); +if (! empty($arrayfields['s.siret']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"), $textprofid[2], 1, 0), $_SERVER["PHP_SELF"], "s.siret", "", $param, '', $sortfield, $sortorder, 'nowrap '); +if (! empty($arrayfields['s.ape']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"), $textprofid[3], 1, 0), $_SERVER["PHP_SELF"], "s.ape", "", $param, '', $sortfield, $sortorder, 'nowrap '); +if (! empty($arrayfields['s.idprof4']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof4", "", $param, '', $sortfield, $sortorder, 'nowrap '); +if (! empty($arrayfields['s.idprof5']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof5", "", $param, '', $sortfield, $sortorder, 'nowrap '); +if (! empty($arrayfields['s.idprof6']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof6", "", $param, '', $sortfield, $sortorder, 'nowrap '); +if (! empty($arrayfields['s.tva_intra']['checked'])) print_liste_field_titre($arrayfields['s.tva_intra']['label'], $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder, 'nowrap '); if (! empty($arrayfields['customerorsupplier']['checked'])) print_liste_field_titre(''); // type of customer -if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'], $_SERVER["PHP_SELF"], "s.fk_prospectlevel", "", $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['s.fk_stcomm']['checked'])) print_liste_field_titre($arrayfields['s.fk_stcomm']['label'], $_SERVER["PHP_SELF"], "s.fk_stcomm", "", $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['s2.nom']['checked'])) print_liste_field_titre($arrayfields['s2.nom']['label'], $_SERVER["PHP_SELF"], "s2.nom", "", $param, 'align="center"', $sortfield, $sortorder); +if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'], $_SERVER["PHP_SELF"], "s.fk_prospectlevel", "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['s.fk_stcomm']['checked'])) print_liste_field_titre($arrayfields['s.fk_stcomm']['label'], $_SERVER["PHP_SELF"], "s.fk_stcomm", "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['s2.nom']['checked'])) print_liste_field_titre($arrayfields['s2.nom']['label'], $_SERVER["PHP_SELF"], "s2.nom", "", $param, '', $sortfield, $sortorder, 'center '); // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; // Hook fields $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; -if (! empty($arrayfields['s.datec']['checked'])) print_liste_field_titre($arrayfields['s.datec']['label'], $_SERVER["PHP_SELF"], "s.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); -if (! empty($arrayfields['s.tms']['checked'])) print_liste_field_titre($arrayfields['s.tms']['label'], $_SERVER["PHP_SELF"], "s.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); -if (! empty($arrayfields['s.status']['checked'])) print_liste_field_titre($arrayfields['s.status']['label'], $_SERVER["PHP_SELF"], "s.status", "", $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['s.import_key']['checked'])) print_liste_field_titre($arrayfields['s.import_key']['label'], $_SERVER["PHP_SELF"], "s.import_key", "", $param, 'align="center"', $sortfield, $sortorder); -print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); +if (! empty($arrayfields['s.datec']['checked'])) print_liste_field_titre($arrayfields['s.datec']['label'], $_SERVER["PHP_SELF"], "s.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap '); +if (! empty($arrayfields['s.tms']['checked'])) print_liste_field_titre($arrayfields['s.tms']['label'], $_SERVER["PHP_SELF"], "s.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap '); +if (! empty($arrayfields['s.status']['checked'])) print_liste_field_titre($arrayfields['s.status']['label'], $_SERVER["PHP_SELF"], "s.status", "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['s.import_key']['checked'])) print_liste_field_titre($arrayfields['s.import_key']['label'], $_SERVER["PHP_SELF"], "s.import_key", "", $param, '', $sortfield, $sortorder, 'center '); +print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); print "\n"; @@ -1057,7 +1057,7 @@ while ($i < min($num, $limit)) // Country if (! empty($arrayfields['country.code_iso']['checked'])) { - print ''; @@ -1066,7 +1066,7 @@ while ($i < min($num, $limit)) // Type ent if (! empty($arrayfields['typent.code']['checked'])) { - print ''; @@ -1075,7 +1075,7 @@ while ($i < min($num, $limit)) // Staff if (! empty($arrayfields['staff.code']['checked'])) { - print ''; @@ -1139,7 +1139,7 @@ while ($i < min($num, $limit)) // Type if (! empty($arrayfields['customerorsupplier']['checked'])) { - print '"; if (! $i) $totalarray['nbfield']++; @@ -1178,7 +1178,7 @@ while ($i < min($num, $limit)) if (! empty($arrayfields['s.fk_stcomm']['checked'])) { // Prospect status - print ''; if (! $i) $totalarray['nbfield']++; @@ -1219,7 +1219,7 @@ while ($i < min($num, $limit)) // Date modification if (! empty($arrayfields['s.tms']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -1227,7 +1227,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'])) @@ -1239,7 +1239,7 @@ while ($i < min($num, $limit)) } // Action column - print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; // Hook fields @@ -905,7 +905,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' else print img_warning().' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).''; print ''; // Default - print ''; // Default - print '\n"; @@ -1177,7 +1177,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' } // Default - print ''; // Generate doc - print ''; // Edit/Delete - print '
'.$arraytitle.''.$langs->trans('Date').''.$langs->trans('Date').''.$langs->trans('Currency').''.$langs->trans('MulticurrencyAmountTTC').''.$multicurrencyalreadypayedlabel.''.$multicurrencyremaindertopay.''.$langs->trans('MulticurrencyAmountTTC').''.$multicurrencyalreadypayedlabel.''.$multicurrencyremaindertopay.''.$langs->trans('AmountTTC').''.$alreadypayedlabel.''.$remaindertopay.''.$langs->trans('PaymentAmount').''.$langs->trans('AmountTTC').''.$alreadypayedlabel.''.$remaindertopay.''.$langs->trans('PaymentAmount').''.$langs->trans('MulticurrencyPaymentAmount').''.$langs->trans('MulticurrencyPaymentAmount').'  
'.dol_print_date($db->jdate($objp->df), 'day')."'.dol_print_date($db->jdate($objp->df), 'day')."'.$objp->multicurrency_code."'.$objp->multicurrency_code."'; + print ''; if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc); print ''; + print ''; if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) { print price($sign * $multicurrency_payment); @@ -901,26 +901,26 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; + print ''; if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay); print ''.price($sign * $objp->total_ttc).''.price($sign * $objp->total_ttc).''.price($sign * $paiement); + print ''.price($sign * $paiement); if ($creditnotes) print '+'.price($creditnotes); if ($deposits) print '+'.price($deposits); print ''.price($sign * $remaintopay).''.price($sign * $remaintopay).''; + print ''; // Add remind amount $namef = 'amount_'.$objp->facid; @@ -943,7 +943,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie // Multicurrency Price if (! empty($conf->multicurrency->enabled)) { - print ''; + print ''; // Add remind multicurrency amount $namef = 'multicurrency_amount_'.$objp->facid; @@ -968,7 +968,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } // Warning - print ''; + print ''; //print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."
"; if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id])) || $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id]))) @@ -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 '
'.$langs->trans('TotalTTC').''.$langs->trans('TotalTTC').''.price($sign * $total_ttc).''.price($sign * $totalrecu); + print ''.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')).'
'.$objp->ref."'.dol_print_date($db->jdate($objp->dp))."'.$objp->paiement_type.' '.$objp->num_paiement."'.price($objp->amount).' '.price($objp->amount).' 
' . dol_print_date($payout->created, '%d/%m/%Y %H:%M') . "' . dol_print_date($payout->created, '%d/%m/%Y %H:%M') . "' . dol_print_date($payout->arrival_date, '%d/%m/%Y %H:%M') . "' . dol_print_date($payout->arrival_date, '%d/%m/%Y %H:%M') . "' . $payout->description . '" . price(($payout->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . "" . price(($payout->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . "' . price(($payout->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . "' . price(($payout->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . ""; + print ""; if ($payout->status=='paid') { print img_picto($langs->trans("".$payout->status.""), 'statut4'); } elseif ($payout->status=='pending') { diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index b0575a53ee4..d1ab2ebe50d 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -102,11 +102,11 @@ if (! $rowid) { //print_liste_field_titre("StripeCustomerId",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder); //print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder); //print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder); - print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder); - print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder); - print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder); - print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"'); + print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center '); + print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left '); + print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right '); + print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right '); + print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right_'); print "
' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . "' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . "' . $txn->type . '" . price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "' . price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "' . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . ""; - if ($txn->status=='available') - {print img_picto($langs->trans("".$txn->status.""), 'statut4');} - elseif ($txn->status=='pending') - {print img_picto($langs->trans("".$txn->status.""), 'statut7');} - elseif ($txn->status=='failed') - {print img_picto($langs->trans("".$txn->status.""), 'statut8');} + print ""; + if ($txn->status=='available') { + print img_picto($langs->trans("".$txn->status.""), 'statut4'); + } elseif ($txn->status=='pending') { + print img_picto($langs->trans("".$txn->status.""), 'statut7'); + } elseif ($txn->status=='failed') { + print img_picto($langs->trans("".$txn->status.""), 'statut8'); + } print '
'; + print ''; print $form->select_country($search_country, 'search_country', '', 0, '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 ''; print $form->selectarray("search_staff", $formcompany->effectif_array(0), $search_staff, 0, 0, 0, '', 0, 0, 0, $sort, 'maxwidth100'); print ''; + print ''; if ($type != '') print ''; print $formcompany->selectProspectCustomerType($search_type, 'search_type', 'search_type', 'list'); print ''; + print ''; print $form->multiselectarray('search_level', $tab_level, $search_level, 0, 0, 'width75', 0, 0, '', '', '', 2); print ''; + print ''; $arraystcomm=array(); foreach($prospectstatic->cacheprospectstatus as $key => $val) { @@ -862,7 +862,7 @@ if (! empty($arrayfields['s.fk_stcomm']['checked'])) } if (! empty($arrayfields['s2.nom']['checked'])) { - print ''; + print ''; print ''; 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 ''; if (! is_array($staffArray) || count($staffArray)==0) $staffArray = $formcompany->effectif_array(1); print $staffArray[$obj->staff_code]; print ''; + print ''; $s=''; if (($obj->client==1 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) { @@ -1169,7 +1169,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) @@ -1193,7 +1193,7 @@ while ($i < min($num, $limit)) // Parent company if (! empty($arrayfields['s2.nom']['checked'])) { - print '
'; + print ''; if ($companystatic->fk_parent > 0) { $companyparent->fetch($companystatic->fk_parent); @@ -1211,7 +1211,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/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php index 20df70fda70..fff105d5985 100644 --- a/htdocs/societe/paymentmodes.php +++ b/htdocs/societe/paymentmodes.php @@ -772,7 +772,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' } print ' '.img_picto($langs->trans('ShowInStripe'), 'object_globe').''; } - print ''; + print ''; if (empty($stripecu)) { print '
'; @@ -829,7 +829,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' print '
'.$langs->trans('Type').''.$langs->trans('Informations').''.$langs->trans('Default').''.$langs->trans('Default').''.$langs->trans('Note').''.$langs->trans('DateModification').''; + print ''; if (empty($companypaymentmodetemp->default_rib)) { print ''; @@ -927,7 +927,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column - print ''; + print ''; if ($user->rights->societe->creer) { if ($stripecu && empty($companypaymentmodetemp->stripe_card_ref)) @@ -1034,7 +1034,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' } print ''; + print ''; if (($customerstripe->default_source != $src->id)) { print ''; @@ -1057,7 +1057,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column - print ''; + print ''; if ($user->rights->societe->creer) { print ''; @@ -1103,8 +1103,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' print print_liste_field_titre("RUM"); print print_liste_field_titre("WithdrawMode"); } - print_liste_field_titre("DefaultRIB", '', '', '', '', 'align="center"'); - print_liste_field_titre('', '', '', '', '', 'align="center"'); + print_liste_field_titre("DefaultRIB", '', '', '', '', '', '', '', 'center '); + print_liste_field_titre('', '', '', '', '', '', '', '', 'center '); print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch '); print "
'; + print ''; if (!$rib->default_rib) { print ''; print img_picto($langs->trans("Disabled"), 'off'); @@ -1188,7 +1188,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' print ''; + print ''; $buttonlabel = $langs->trans("BuildDoc"); $forname='builddocrib'.$rib->id; @@ -1244,7 +1244,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' print ''; + print ''; if ($user->rights->societe->creer) { print ''; @@ -1436,7 +1436,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) dol_fiche_end(); - print '
'; + print '
'; print ''; print '     '; print ''; @@ -1483,7 +1483,7 @@ if ($socid && $action == 'editcard' && $user->rights->societe->creer) dol_fiche_end(); - print '
'; + print '
'; print ''; print '     '; print ''; diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index c9342e2f41e..11930b3e009 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -319,7 +319,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print '
'; - print '
'; + print '
'; print ''; print '     '; print ''; @@ -440,13 +440,13 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print '
' . $langs->trans("Product") . '' . $langs->trans("AppliedPricesFrom") . '' . $langs->trans("PriceBase") . '' . $langs->trans("VAT") . '' . $langs->trans("HT") . '' . $langs->trans("TTC") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '' . $langs->trans("ChangedBy") . '' . $langs->trans("PriceBase") . '' . $langs->trans("VAT") . '' . $langs->trans("HT") . '' . $langs->trans("TTC") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '' . $langs->trans("ChangedBy") . ' 
" . $staticprod->getNomUrl(1) . "" . dol_print_date($line->datec, "dayhour") . "' . $langs->trans($line->price_base_type) . "' . vatrate($line->tva_tx, true, $line->recuperableonly) . "' . price($line->price) . "' . price($line->price_ttc) . "' . price($line->price_min) . '' . price($line->price_min_ttc) . '' . $langs->trans($line->price_base_type) . "' . vatrate($line->tva_tx, true, $line->recuperableonly) . "' . price($line->price) . "' . price($line->price_ttc) . "' . price($line->price_min) . '' . price($line->price_min_ttc) . ''; + print ''; print $userstatic->getLoginUrl(1); print '
' . $langs->trans("Product") . '' . $langs->trans("AppliedPricesFrom") . '' . $langs->trans("PriceBase") . '' . $langs->trans("VAT") . '' . $langs->trans("HT") . '' . $langs->trans("TTC") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '' . $langs->trans("ChangedBy") . '' . $langs->trans("PriceBase") . '' . $langs->trans("VAT") . '' . $langs->trans("HT") . '' . $langs->trans("TTC") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '' . $langs->trans("ChangedBy") . ' 
 '; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print '" . $staticprod->getNomUrl(1) . "" . dol_print_date($line->datec, "dayhour") . "' . $langs->trans($line->price_base_type) . "' . vatrate($line->tva_tx.($line->default_vat_code?' ('.$line->default_vat_code.')':''), true, $line->recuperableonly) . "' . price($line->price) . "' . price($line->price_ttc) . "' . price($line->price_min) . '' . price($line->price_min_ttc) . '' . $langs->trans($line->price_base_type) . "' . vatrate($line->tva_tx.($line->default_vat_code?' ('.$line->default_vat_code.')':''), true, $line->recuperableonly) . "' . price($line->price) . "' . price($line->price_ttc) . "' . price($line->price_min) . '' . price($line->price_min_ttc) . ''; + print ''; print $userstatic->getLoginUrl(1); print ''; + print ''; print 'id . '&prodid=' . $line->fk_product . '">'; print img_info(); print ''; diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php index c86a23c9827..193703a8468 100644 --- a/htdocs/societe/societecontact.php +++ b/htdocs/societe/societecontact.php @@ -249,7 +249,7 @@ if ($id > 0 || ! empty($ref)) print_liste_field_titre("Person", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder); print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder); print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.statut,d.datefin", $param, "", "", $sortfield, $sortorder); - print_liste_field_titre("EndSubscription", $_SERVER["PHP_SELF"], "d.datefin", $param, "", 'align="center"', $sortfield, $sortorder); + print_liste_field_titre("EndSubscription", $_SERVER["PHP_SELF"], "d.datefin", $param, "", '', $sortfield, $sortorder, 'center '); print "
'; + print ''; print dol_print_date($datefin, 'day'); if ($memberstatic->hasDelay()) { print " ".img_warning($langs->trans("SubscriptionLate")); @@ -314,7 +314,7 @@ if ($id > 0 || ! empty($ref)) } else { - print ''; + print ''; if ($objp->subscription == 'yes') { print $langs->trans("SubscriptionNotReceived"); diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index ce25f23694f..d106e42aa3f 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -389,7 +389,7 @@ $parameters=array('arrayfields'=>$arrayfields); $reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column -print ''; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print '
'; + 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/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index 2af2c15f66d..17dc033361e 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -600,7 +600,7 @@ if ($resql) if (! empty($arrayfields['sp.date_livraison']['checked'])) print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, '', $sortfield, $sortorder, 'center '); if (! empty($arrayfields['sp.total_ht']['checked'])) print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, '', $sortfield, $sortorder, 'right '); if (! empty($arrayfields['sp.total_vat']['checked'])) print_liste_field_titre($arrayfields['sp.total_vat']['label'], $_SERVER["PHP_SELF"], 'sp.total_vat', '', $param, '', $sortfield, $sortorder, 'right '); - if (! empty($arrayfields['sp.total_ttc']['checked'])) print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, '', $sortfield, $sortorder, 'right '; + if (! empty($arrayfields['sp.total_ttc']['checked'])) print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, '', $sortfield, $sortorder, 'right '); if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center '); // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; From 8b090c165e0655972a9589704cafc535337d45dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 23 Feb 2019 21:18:44 +0100 Subject: [PATCH 06/16] replace html code by html5 in societe --- htdocs/societe/admin/societe.php | 78 +++++++++---------- .../canvas/company/tpl/card_create.tpl.php | 2 +- .../canvas/company/tpl/card_edit.tpl.php | 4 +- .../canvas/company/tpl/card_view.tpl.php | 8 +- .../canvas/individual/tpl/card_create.tpl.php | 2 +- .../canvas/individual/tpl/card_edit.tpl.php | 4 +- .../canvas/individual/tpl/card_view.tpl.php | 6 +- htdocs/societe/card.php | 6 +- htdocs/societe/consumption.php | 52 ++++++------- htdocs/societe/index.php | 20 ++--- htdocs/societe/notify/card.php | 10 +-- 11 files changed, 96 insertions(+), 96 deletions(-) diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index ba6d8522ccf..4a614c02312 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -356,8 +356,8 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'."\n"; + print ''."\n"; print img_picto($langs->trans("Activated"), 'switch_on'); print "'; + print ''; if (! $disabled) print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); if (! $disabled) print ''; print ''; + print ''; $s=$modCodeTiers->getToolTip($langs, null, -1); print $form->textwithpicto('', $s, 1); print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; + print ''; print img_picto($langs->trans("Activated"), 'switch_on'); print ''; + print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print ''; + print ''; $s=$modCodeCompta->getToolTip($langs, null, -1); print $form->textwithpicto('', $s, 1); print '
'; print ''; print ''; print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print "\n"; foreach ($dirsociete as $dirroot) @@ -577,7 +577,7 @@ foreach ($dirsociete as $dirroot) // Activate / Disable if (in_array($name, $def)) { - print ""; } else { - print ""; } @@ -616,12 +616,12 @@ foreach ($dirsociete as $dirroot) $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='
'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1); - print ''; // Preview - print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
\n"; + print "\n"; //if ($conf->global->COMPANY_ADDON_PDF != "$name") //{ print 'scandir.'&label='.urlencode($module->name).'">'; @@ -594,13 +594,13 @@ foreach ($dirsociete as $dirroot) { if (versioncompare($module->phpmin, versionphparray()) > 0) { - print "\n"; + print "\n"; print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion", join('.', $module->phpmin))), 'switch_off'); print "\n"; + print "\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { $linkspec=''.img_object($langs->trans("Preview"), 'bill').''; @@ -653,9 +653,9 @@ print ''; print ''; print ''; print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print "\n"; $profid['IDPROF1'][0]=$langs->trans("ProfId1"); @@ -693,39 +693,39 @@ foreach($profid as $key => $val) if ($verif) { - print ''; } else { - print ''; } if ($mandatory) { - print ''; } else { - print ''; } if ($invoice_mandatory) { - print ''; } else { - print ''; } @@ -753,7 +753,7 @@ print '
'; print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("MustBeUnique").''.$langs->trans("MustBeMandatory").''.$langs->trans("MustBeInvoiceMandatory").''.$langs->trans("MustBeUnique").''.$langs->trans("MustBeMandatory").''.$langs->trans("MustBeInvoiceMandatory").'
'; + print ''; print img_picto($langs->trans("Activated"), 'switch_on'); print ''; + print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print ''; + print ''; print img_picto($langs->trans("Activated"), 'switch_on'); print ''; + print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print ''; + print ''; print img_picto($langs->trans("Activated"), 'switch_on'); print ''; + print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print '
'; print ''; print "\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; // Utilisation formulaire Ajax sur choix societe @@ -762,20 +762,20 @@ print ''; print ''; if (! $conf->use_javascript_ajax) { - print '"; } else { - print '"; } @@ -786,20 +786,20 @@ print ''; print ''; if (! $conf->use_javascript_ajax) { - print '"; } else { - print '"; } @@ -810,7 +810,7 @@ print ''; print ''; print ''; print ''; -print ''; print ''; print ''; print ''; -print ''; print ''; print ''; print ''; -print ''; print ''; print ''; print ''; -print ''; print ''; -print ''; print ''; diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php index 5007fe32af4..b2921b3108f 100644 --- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php @@ -203,7 +203,7 @@ for ($i=1; $i<=4; $i++) { - +
".$langs->trans("Parameters")."'.$langs->trans("Value").''.$langs->trans("Value").' 
'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectCompany"), $langs->trans('UseSearchToSelectCompanyTooltip'), 1).' '; + print ''; print $langs->trans("NotAvailableWhenAjaxDisabled"); print "'; + print ''; $arrval=array('0'=>$langs->trans("No"), '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')', '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')', '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')', ); print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp'); - print ''; + print ''; print ''; print "
'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectContact"), $langs->trans('UseSearchToSelectContactTooltip'), 1).''; + print ''; print $langs->trans("NotAvailableWhenAjaxDisabled"); print "'; + print ''; $arrval=array('0'=>$langs->trans("No"), '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')', '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')', '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')', ); print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->CONTACT_USE_SEARCH_TO_SELECT, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp'); - print ''; + print ''; print ''; print "
'.$langs->trans("AddRefInList").' '; +print ''; if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) { print ''; @@ -827,7 +827,7 @@ print '
'.$langs->trans("AddAdressInList").' '; +print ''; if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) { print ''; @@ -846,7 +846,7 @@ print '
'.$langs->trans("AskForPreferredShippingMethod").' '; +print ''; if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) { print ''; @@ -864,7 +864,7 @@ print '
'.$langs->trans("DisableProspectCustomerType").' '; +print ''; if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) { print ''; @@ -884,7 +884,7 @@ print ''.$langs->trans("DefaultCustomerType").''; print $formcompany->selectProspectCustomerType($conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT, 'defaultcustomertype', 'defaultcustomertype', 'admin'); print ''; +print ''; print ''; print '
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php index c00264be70c..7cb956e7b8c 100644 --- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php @@ -216,7 +216,7 @@ for ($i=1; $i<=4; $i++) {

-
+
">     "> @@ -224,4 +224,4 @@ for ($i=1; $i<=4; $i++) { - \ No newline at end of file + diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php index d75f4ccb464..46990231339 100644 --- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php @@ -183,7 +183,7 @@ for ($i=1; $i<=4; $i++) { -
trans('RIB'); ?> + rights->societe->creer) { ?> control->tpl['image_edit']; ?> @@ -201,7 +201,7 @@ for ($i=1; $i<=4; $i++) { - @@ -215,7 +215,7 @@ for ($i=1; $i<=4; $i++) {
trans('ParentCompany'); ?> +  
- - +
trans('SalesRepresentatives'); ?> + rights->societe->creer) { ?> control->tpl['image_edit']; ?> @@ -288,4 +288,4 @@ $result=show_contacts($conf, $langs, $db, $soc); $result=show_projects($conf, $langs, $db, $soc); ?> - \ No newline at end of file + diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php index b1d02006f16..9b401cbccb1 100644 --- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php @@ -178,7 +178,7 @@ if (empty($conf) || ! is_object($conf))
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php index a26c834d355..10acd48aca8 100644 --- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php @@ -178,7 +178,7 @@ if ($this->control->tpl['fournisseur']) {

-
+
">     "> @@ -186,4 +186,4 @@ if ($this->control->tpl['fournisseur']) { - \ No newline at end of file + diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php index a5b247029c7..72514734fc1 100644 --- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php @@ -142,7 +142,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company'); - \n"; // Type - print ''; // Last modified date - print '"; - print '"; print "\n"; diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 47f25172e59..59c43551f41 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -260,7 +260,7 @@ if ($result > 0) $type=array('email'=>$langs->trans("EMail")); print $form->selectarray("typeid", $type); print ''; - print ''; + print ''; print ''; } else @@ -348,7 +348,7 @@ if ($result > 0) if ($obj->type == 'email') print $langs->trans("Email"); if ($obj->type == 'sms') print $langs->trans("SMS"); print ''; - print ''; + print ''; print ''; $i++; } @@ -394,7 +394,7 @@ if ($result > 0) print ''; - print ''; + print ''; print ''; }*/ @@ -471,7 +471,7 @@ if ($result > 0) print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder); print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder); //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder); - print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right '); print ''; if ($num > 0) @@ -516,7 +516,7 @@ if ($result > 0) } print '';*/ // print - print''; + print''; print ''; $i++; } From 0ca5e6e275eb420a480bbb182b98bae50d90f64c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 23 Feb 2019 21:47:04 +0100 Subject: [PATCH 07/16] replace html code by html5 in reception --- htdocs/reception/card.php | 54 ++++++++--------- htdocs/reception/index.php | 4 +- htdocs/reception/list.php | 58 +++++++++---------- htdocs/reception/stats/index.php | 34 +++++------ .../reception/tpl/linkedobjectblock.tpl.php | 18 +++--- htdocs/resource/list.php | 10 ++-- 6 files changed, 89 insertions(+), 89 deletions(-) diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index a24f85cecad..18b67fb1e4c 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -989,9 +989,9 @@ if ($action == 'create') { print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; - if ($action != 'editdate_livraison') print ''; + if ($action != 'editdate_livraison') print ''; print '
trans('RIB'); ?> + rights->societe->creer) { ?> control->tpl['image_edit']; ?> @@ -160,7 +160,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company'); - '; - print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; @@ -404,13 +404,13 @@ if ($sql_select) // Titles with sort buttons print ''; - print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, 'align="left"', $sortfield, $sortorder); - print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder); - print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, 'align="center"', $sortfield, $sortorder); - print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, 'align="left"', $sortfield, $sortorder); - print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left '); + print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center '); + print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center '); + print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left '); + print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right '); + print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, '', $sortfield, $sortorder, 'right '); + print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right '); print "\n"; @@ -432,10 +432,10 @@ if ($sql_select) print ''; - print ''; + print ''; // Status - print ''; - print ''; + print ''; $total_qty+=$objp->prod_qty; - print ''; + print ''; $total_ht+=$objp->total_ht; - print ''; + print ''; print "\n"; $i++; @@ -611,9 +611,9 @@ if ($sql_select) print ''; print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print "
trans('SalesRepresentatives'); ?> + rights->societe->creer) { ?> control->tpl['image_edit']; ?> @@ -232,4 +232,4 @@ $result=show_contacts($conf, $langs, $db, $object); $result=show_projects($conf, $langs, $db, $object); ?> - \ No newline at end of file + diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index a8a41527af0..dc3627c4922 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -2160,7 +2160,7 @@ else dol_fiche_end(); - print '
'; + print '
'; print ''; print '     '; print ''; @@ -2506,7 +2506,7 @@ else print '
'; print '
'; print $langs->trans('IncotermLabel'); - print ''; + print ''; if ($user->rights->societe->creer) print ''.img_edit('', 1).''; else print ' '; print '
'; @@ -2545,7 +2545,7 @@ else print ''; - if ($action != 'editparentcompany') print ''; + if ($action != 'editparentcompany') print ''; print '
'; print $langs->trans('ParentCompany'); print 'id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'
'; print '		'; if ($action == 'editparentcompany') diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 225dacd4a38..5d7bd6e70ad 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -380,23 +380,23 @@ if ($sql_select) // Filters print '
'; + print ''; print ''; print ''; // date print $formother->select_month($month?$month:-1, 'month', 1, 0, 'valignmiddle'); $formother->select_year($year?$year:-1, 'year', 1, 20, 1); print ''; + print ''; print ''; + print ''; print ''; print ''; + print ''; print ''; + print ''; print ''; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print '
'; print $documentstatic->getNomUrl(1); print ''.dol_print_date($db->jdate($objp->dateprint), 'day').''.dol_print_date($db->jdate($objp->dateprint), 'day').''; + print ''; if ($type_element == 'contract') { print $documentstaticline->getLibStatut(2); @@ -596,13 +596,13 @@ if ($sql_select) //print ''.$prodreftxt.''.$objp->prod_qty.''.$objp->prod_qty.''.price($objp->total_ht).''.price($objp->total_ht).''.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).''.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).'
' . $langs->trans('Total') . '' . $total_qty . '' . price($total_ht) . '' . price($total_ht/(empty($total_qty)?1:$total_qty)) . '' . $total_qty . '' . price($total_ht) . '' . price($total_ht/(empty($total_qty)?1:$total_qty)) . '
"; print ''; @@ -629,11 +629,11 @@ elseif (empty($type_element) || $type_element == -1) print ''."\n"; // Titles with sort buttons print ''; - print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, 'align="left"', $sortfield, $sortorder); - print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder); - print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, 'align="center"', $sortfield, $sortorder); - print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, 'align="left"', $sortfield, $sortorder); - print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, 'align="right"', $sortfield, $sortorder); + print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left '); + print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center '); + print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center '); + print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left '); + print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right '); print "\n"; print ''; diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index a4ef83cde45..2404c11861e 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -132,7 +132,7 @@ print '
'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'
'."\n"; print ''; if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(round($third['customer'])?1:0)+(round($third['supplier'])?1:0)+(round($third['other'])?1:0) >= 2)) { - print '"; - $statstring.= ''; + $statstring.= ''; $statstring.= ""; } if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) { $statstring.= ""; - $statstring.= ''; + $statstring.= ''; $statstring.= ""; } if (! empty($conf->fournisseur->enabled) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $user->rights->fournisseur->lire) { $statstring2 = ""; - $statstring2.= ''; + $statstring2.= ''; $statstring2.= ""; } print $statstring; print $statstring2; } -print ''; print '
'.$langs->trans("Statistics").'
'; + print '
'; $dataseries=array(); if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array($langs->trans("Prospects"), round($third['prospect'])); if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array($langs->trans("Customers"), round($third['customer'])); @@ -154,25 +154,25 @@ else if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) { $statstring = "
'.$langs->trans("Prospects").''.round($third['prospect']).''.$langs->trans("Prospects").''.round($third['prospect']).'
'.$langs->trans("Customers").''.round($third['customer']).''.$langs->trans("Customers").''.round($third['customer']).'
'.$langs->trans("Suppliers").''.round($third['supplier']).''.$langs->trans("Suppliers").''.round($third['supplier']).'
'.$langs->trans("UniqueThirdParties").''; +print '
'.$langs->trans("UniqueThirdParties").''; print $total; print '
'; @@ -188,7 +188,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS print '
'; print ''; print ''; - print ''; - print ''; print '
'.$langs->trans("Categories").'
'; + print '
'; $sql = "SELECT c.label, count(*) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."categorie_societe as cs"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid"; @@ -249,7 +249,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS } } print '
'.$langs->trans("Total").''; + print '
'.$langs->trans("Total").''; print $total; print '
'; @@ -321,7 +321,7 @@ if ($result) print $thirdparty_static->getNomUrl(1); print "
'; + print ''; if ($thirdparty_static->client==1 || $thirdparty_static->client==3) { $thirdparty_static->name=$langs->trans("Customer"); @@ -341,10 +341,10 @@ if ($result) } print ''; + print ''; print dol_print_date($thirdparty_static->datem, 'day'); print "'; + print ''; print $thirdparty_static->getLibStatut(3); print "
'.img_delete().''.img_delete().'
'; print $langs->trans("Email"); print ''.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).''.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'
'.dol_print_date($db->jdate($obj->daten), 'dayhour').''.dol_print_date($db->jdate($obj->daten), 'dayhour').'
'.$langs->trans("Description").''.$langs->trans("QtyOrdered").''.$langs->trans("QtyReceived").''.$langs->trans("QtyToReceive"); + print ''.$langs->trans("QtyOrdered").''.$langs->trans("QtyReceived").''.$langs->trans("QtyToReceive"); if (empty($conf->productbatch->enabled)) { print '
('.$langs->trans("Fill").''; @@ -1085,7 +1085,7 @@ if ($action == 'create') } // Qty - print '		'.$line->qty; + print ''.$line->qty; print 'id.'\' />'; print ''; print ''; @@ -1093,7 +1093,7 @@ if ($action == 'create') $qtyProdCom=$line->qty; // Qty already received - print ''; + print ''; $quantityDelivered = $object->receptions[$line->id]; @@ -1124,7 +1124,7 @@ if ($action == 'create') // Quantity to send - print ''; + print ''; if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) { if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty=GETPOST('qtyl'.$indiceAsked, 'int'); @@ -1416,7 +1416,7 @@ elseif ($id || $ref) print $langs->trans('DateDeliveryPlanned'); print 'id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'
'; print ''; if ($action == 'editdate_livraison') @@ -1556,7 +1556,7 @@ elseif ($id || $ref) print $langs->trans('ReceptionMethod'); print ''; - if ($action != 'editshipping_method_id') print 'id.'">'.img_edit($langs->trans('SetReceptionMethod'), 1).''; + if ($action != 'editshipping_method_id') print 'id.'">'.img_edit($langs->trans('SetReceptionMethod'), 1).''; print ''; print ''; if ($action == 'editshipping_method_id') @@ -1594,7 +1594,7 @@ elseif ($id || $ref) print ''; print '
'; print $langs->trans('IncotermLabel'); - print ''; + print ''; if ($user->rights->reception->creer) print ''.img_edit().''; else print ' '; print '
'; @@ -1637,24 +1637,24 @@ elseif ($id || $ref) // # if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { - print ' '; + print ' '; } // Product/Service print ''.$langs->trans("Products").''; // Comment print ''.$langs->trans("Description").''; // Qty - print ''.$langs->trans("QtyOrdered").''; + print ''.$langs->trans("QtyOrdered").''; if ($origin && $origin_id > 0) { - print ''.$langs->trans("QtyInOtherReceptions").''; + print ''.$langs->trans("QtyInOtherReceptions").''; } if ($action == 'editline') { $editColspan = 3; if (empty($conf->stock->enabled)) $editColspan--; if (empty($conf->productbatch->enabled)) $editColspan--; - print ''; + print ''; if ($object->statut <= 1) { print $langs->trans("QtyToReceive").' - '; @@ -1677,11 +1677,11 @@ elseif ($id || $ref) { if ($object->statut <= 1) { - print ''.$langs->trans("QtyToReceive").''; + print ''.$langs->trans("QtyToReceive").''; } else { - print ''.$langs->trans("QtyReceived").''; + print ''.$langs->trans("QtyReceived").''; } if (! empty($conf->stock->enabled)) { @@ -1693,9 +1693,9 @@ elseif ($id || $ref) print ''.$langs->trans("Batch").''; } } - print ''.$langs->trans("CalculatedWeight").''; - print ''.$langs->trans("CalculatedVolume").''; - //print ''.$langs->trans("Size").''; + print ''.$langs->trans("CalculatedWeight").''; + print ''.$langs->trans("CalculatedVolume").''; + //print ''.$langs->trans("Size").''; if ($object->statut == 0) { print ''; @@ -1775,7 +1775,7 @@ elseif ($id || $ref) // # if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { - print ''.($i+1).''; + print ''.($i+1).''; } // Predefined product or service @@ -1834,12 +1834,12 @@ elseif ($id || $ref) // Qty ordered - print ''.$lines[$i]->qty_asked.''; + print ''.$lines[$i]->qty_asked.''; // Qty in other receptions (with reception and warehouse used) if ($origin && $origin_id > 0) { - print ''; + print ''; foreach ($alreadysent as $key => $val) { if ($lines[$i]->fk_commandefourndet == $key) @@ -1871,7 +1871,7 @@ elseif ($id || $ref) if ($action == 'editline' && $lines[$i]->id == $line_id) { // edit mode - print ''; + print '
'; if (! empty($conf->stock->enabled)) { if ($lines[$i]->fk_product > 0) @@ -1912,7 +1912,7 @@ elseif ($id || $ref) else { // Qty to receive or received - print ''; + print ''; // Warehouse source if (! empty($conf->stock->enabled)) @@ -1959,13 +1959,13 @@ elseif ($id || $ref) } // Weight - print ''; // Volume - print ''; @@ -1973,14 +1973,14 @@ elseif ($id || $ref) if ($action == 'editline' && $lines[$i]->id == $line_id) { - print ''; print ''; - print ''; print ''; @@ -219,7 +219,7 @@ if ( $resql ) print ''; - print ''; print ''; diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php index 5cb3a100e71..3340a192081 100644 --- a/htdocs/reception/list.php +++ b/htdocs/reception/list.php @@ -647,7 +647,7 @@ if ($resql) // Thirdparty if (! empty($arrayfields['s.nom']['checked'])) { - print ''; } @@ -665,14 +665,14 @@ if ($resql) // Country if (! empty($arrayfields['country.code_iso']['checked'])) { - print ''; } // Company type if (! empty($arrayfields['typent.code']['checked'])) { - print ''; } @@ -735,19 +735,19 @@ if ($resql) // Status if (! empty($arrayfields['e.fk_statut']['checked'])) { - print ''; } // Status billed if (! empty($arrayfields['e.billed']['checked'])) { - print ''; } // Action column - print ''; @@ -756,15 +756,15 @@ if ($resql) print ''; if (! empty($arrayfields['e.ref']['checked'])) print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, '', $sortfield, $sortorder); if (! empty($arrayfields['e.ref_supplier']['checked'])) print_liste_field_titre($arrayfields['e.ref_supplier']['label'], $_SERVER["PHP_SELF"], "e.ref_supplier", "", $param, '', $sortfield, $sortorder); - if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, 'align="left"', $sortfield, $sortorder); + if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder, 'left '); if (! empty($arrayfields['s.town']['checked'])) print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder); if (! empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder); if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder); - if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder); - if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder); - if (! empty($arrayfields['e.date_delivery']['checked'])) print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, 'align="center"', $sortfield, $sortorder); + if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center '); + if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center '); + if (! empty($arrayfields['e.date_delivery']['checked'])) print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, '', $sortfield, $sortorder, 'center '); if (! empty($arrayfields['l.ref']['checked'])) print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder); - if (! empty($arrayfields['l.date_delivery']['checked'])) print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, 'align="center"', $sortfield, $sortorder); + if (! empty($arrayfields['l.date_delivery']['checked'])) print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, '', $sortfield, $sortorder, 'center '); // Extra fields if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) { @@ -775,7 +775,7 @@ if ($resql) $align=$extrafields->getAlignFlag($key); $sortonfield = "ef.".$key; if (! empty($extrafields->attribute_computed[$key])) $sortonfield=''; - print_liste_field_titre($extralabels[$key], $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder); + print_liste_field_titre($extralabels[$key], $_SERVER["PHP_SELF"], $sortonfield, "", $param, '', $sortfield, $sortorder, ($align?'"'.$align.' "':'')); } } } @@ -783,11 +783,11 @@ if ($resql) $parameters=array('arrayfields'=>$arrayfields); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; - if (! empty($arrayfields['e.datec']['checked'])) print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); - if (! empty($arrayfields['e.tms']['checked'])) print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); - if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, 'align="center"', $sortfield, $sortorder); - print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); + if (! empty($arrayfields['e.datec']['checked'])) print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap '); + if (! empty($arrayfields['e.tms']['checked'])) print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap '); + if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, '', $sortfield, $sortorder, 'right '); + if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, '', $sortfield, $sortorder, 'center '); + print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); print "\n"; $i=0; @@ -862,7 +862,7 @@ if ($resql) // Country if (! empty($arrayfields['country.code_iso']['checked'])) { - print ''; @@ -871,7 +871,7 @@ if ($resql) // Type ent if (! empty($arrayfields['typent.code']['checked'])) { - print ''; @@ -881,7 +881,7 @@ if ($resql) // Date delivery planed if (! empty($arrayfields['e.date_delivery']['checked'])) { - print ''."\n"; } @@ -920,10 +920,10 @@ if ($resql) { if (! empty($arrayfields["ef.".$key]['checked'])) { - print ''; @@ -938,7 +938,7 @@ if ($resql) // Date creation if (! empty($arrayfields['e.datec']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -946,7 +946,7 @@ if ($resql) // Date modification if (! empty($arrayfields['e.tms']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -954,18 +954,18 @@ if ($resql) // Status if (! empty($arrayfields['e.fk_statut']['checked'])) { - print ''; + print ''; if (! $i) $totalarray['nbfield']++; } // Billed if (! empty($arrayfields['e.billed']['checked'])) { - print ''; + print ''; if (! $i) $totalarray['nbfield']++; } // Action column - print ''; - print ''; + print ''; print '
'.$lines[$i]->qty.''.$lines[$i]->qty.''; + print ''; if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->weight*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->weight_units, "weight"); else print ' '; print ''; + print ''; if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->product->volume*$lines[$i]->qty.' '.measuring_units_string($lines[$i]->product->volume_units, "volume"); else print ' '; print ''; + print ''; print '
'; print '
'; } elseif ($object->statut == 0) { // edit-delete buttons - print '		'; + print ''; print 'id . '">' . img_edit() . ''; print ''; diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php index 74cc86f26a5..3b0bb7a05e0 100644 --- a/htdocs/reception/index.php +++ b/htdocs/reception/index.php @@ -160,7 +160,7 @@ if ($resql) print ''; print $companystatic->getNomUrl(1, 'customer', 32); print ''; + print ''; print $orderstatic->getLibStatut(3); print '
'; print $companystatic->getNomUrl(1, 'customer'); print ''; + print ''; print $orderstatic->getLibStatut(3); print '
'; + print ''; print ''; print ''; + print ''; print $form->select_country($search_country, 'search_country', '', 0, '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 ''; print $form->selectarray('viewstatut', array('0'=>$langs->trans('StatusReceptionDraftShort'),'1'=>$langs->trans('StatusReceptionValidatedShort'),'2'=>$langs->trans('StatusReceptionProcessedShort')), $viewstatut, 1); print ''; + print ''; print $form->selectyesno('search_billed', $search_billed, 1, 0, 1); print ''; + print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print '
'; + print ''; $tmparray=getCountry($obj->fk_pays, 'all'); print $tmparray['label']; print ''; + print ''; if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1); print $typenArray[$obj->typent_code]; print ''; + print ''; print dol_print_date($db->jdate($obj->date_livraison), "day"); /*$now = time(); if ( ($now - $db->jdate($obj->date_reception)) > $conf->warnings->lim && $obj->statutid == 1 ) @@ -907,7 +907,7 @@ if ($resql) if (! empty($arrayfields['l.date_delivery']['checked'])) { // Date received - print ''; + print ''; print dol_print_date($db->jdate($obj->date_reception), "day"); print ''; + if ($align) print ' '.$align; + print '">'; $tmpkey='options_'.$key; print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1); print ''; + print ''; print dol_print_date($db->jdate($obj->date_creation), 'dayhour'); print ''; + print ''; print dol_print_date($db->jdate($obj->date_update), 'dayhour'); print ''.$reception->LibStatut($obj->fk_statut, 5).''.$reception->LibStatut($obj->fk_statut, 5).''.yn($obj->billed).''.yn($obj->billed).''; + 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/reception/stats/index.php b/htdocs/reception/stats/index.php index b4034588218..94e77c3c4b5 100644 --- a/htdocs/reception/stats/index.php +++ b/htdocs/reception/stats/index.php @@ -255,7 +255,7 @@ print '
'; arsort($arrayyears); print $form->selectarray('year', $arrayyears, $year, 0); print '
'; print ''; print '

'; @@ -263,10 +263,10 @@ print '
'; print ''; print ''; -print ''; -print ''; -/*print ''; -print '';*/ +print ''; +print ''; +/*print ''; +print '';*/ print ''; $oldyear=0; @@ -279,22 +279,22 @@ foreach ($data as $val) print ''; - print ''; + print ''; - print ''; - /*print ''; - print '';*/ + print ''; + /*print ''; + print '';*/ print ''; } print ''; - print ''; - print ''; - /*print ''; - print '';*/ + print ''; + /*print ''; + print '';*/ print ''; $oldyear=$year; } @@ -306,7 +306,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("NbOfReceptions").''.$langs->trans("AmountTotal").''.$langs->trans("AmountAverage").''.$langs->trans("Year").''.$langs->trans("NbOfReceptions").''.$langs->trans("AmountTotal").''.$langs->trans("AmountAverage").'
'.$oldyear.''.$oldyear.'000000
'; + print ''; if ($year) print ''.$year.''; else print $langs->trans("ValidationDateNotDefinedEvenIfReceptionValidated"); print ''.$val['nb'].''.price(price2num($val['total'],'MT'),1).''.price(price2num($val['avg'],'MT'),1).''.$val['nb'].''.price(price2num($val['total'],'MT'),1).''.price(price2num($val['avg'],'MT'),1).'
'; +print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); @@ -328,8 +328,8 @@ dol_fiche_end(); // TODO USe code similar to commande/stats/index.php instead of this one. /* print ''; -print ''; -print ''; +print ''; +print ''; $sql = "SELECT count(*) as nb, date_format(date_reception,'%Y') as dm"; $sql.= " FROM ".MAIN_DB_PREFIX."reception"; @@ -348,7 +348,7 @@ if ($resql) $nbproduct = $row[0]; $year = $row[1]; print ""; - print ''; + print ''; $i++; } } diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php index bd12cbd2902..9601c661c70 100644 --- a/htdocs/reception/tpl/linkedobjectblock.tpl.php +++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php @@ -41,14 +41,14 @@ foreach($linkedObjectBlock as $key => $objectlink) - - + - - + - - - - - + + + + + '; +print ''; print "\n"; print ''; -if (! empty($arrayfields['t.ref']['checked'])) print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder); -if (! empty($arrayfields['ty.label']['checked'])) print_liste_field_titre($arrayfields['ty.label']['label'], $_SERVER["PHP_SELF"], "ty.label", "", $param, "", $sortfield, $sortorder); +if (! empty($arrayfields['t.ref']['checked'])) print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder); +if (! empty($arrayfields['ty.label']['checked'])) print_liste_field_titre($arrayfields['ty.label']['label'], $_SERVER["PHP_SELF"], "ty.label", "", $param, "", $sortfield, $sortorder); // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; -print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); +print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); print "\n"; @@ -266,7 +266,7 @@ if ($ret) $obj = (Object) $resource->array_options; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php'; - print '
'.$langs->trans("Year").''.$langs->trans("NbOfReceptions").'
'.$langs->trans("Year").''.$langs->trans("NbOfReceptions").'
'.$year.''.$nbproduct.'
'.$year.''.$nbproduct.'
trans("Reception"); ?> getNomUrl(1); ?> date_delivery, 'day'); ?>date_delivery, 'day'); ?>rights->reception->lire) { $total = $total + $objectlink->total_ht; echo price($objectlink->total_ht); } ?>getLibStatut(3); ?> + getLibStatut(3); ?> element != 'order_supplier') { @@ -66,11 +66,11 @@ if (count($linkedObjectBlock) > 1)
trans("Total"); ?>
'; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print '
'; + print ''; print ''; print img_edit(); print ''; From 48de805bce29b6f1f2958d64b96cc76b78eb4d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 23 Feb 2019 21:57:35 +0100 Subject: [PATCH 08/16] replace html code by html5 in admin --- htdocs/admin/agenda_extsites.php | 6 ++--- htdocs/admin/agenda_other.php | 34 +++++++++++------------ htdocs/admin/agenda_reminder.php | 8 +++--- htdocs/admin/bank.php | 32 +++++++++++----------- htdocs/admin/barcode.php | 22 +++++++-------- htdocs/admin/boxes.php | 16 +++++------ htdocs/admin/chequereceipts.php | 10 +++---- htdocs/admin/commande.php | 40 ++++++++++++++-------------- htdocs/admin/const.php | 10 +++---- htdocs/admin/contract.php | 28 +++++++++---------- htdocs/admin/defaultvalues.php | 6 ++--- htdocs/admin/dict.php | 2 +- htdocs/admin/ecm.php | 8 +++--- htdocs/admin/emailcollector_list.php | 8 +++--- htdocs/reception/stats/month.php | 4 +-- 15 files changed, 117 insertions(+), 117 deletions(-) diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index c9ba17d2461..4a2d22e176d 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -151,14 +151,14 @@ print ""; print ""; print '"; -print '"; +print '"; print ""; // Show external agenda print ''; print ""; -print '"; print ''; print ""; -print '"; print ""; diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index f78cd42034c..ce9db532f21 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -225,10 +225,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''; - print ''; + print ''."\n"; + print ''."\n"; + print ''; + print ''; print ''."\n"; clearstatcache(); @@ -269,7 +269,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) if (in_array($name, $def)) { - print '"; } // Default - print ''; - print ''; @@ -330,7 +330,7 @@ print ''; print '
'.$langs->trans("Parameter")."'.$langs->trans("Value")."'.$langs->trans("Value")."
".$langs->trans("ExtSitesEnableThisTool")."'; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled'=>array(0=>'.hideifnotset')), null, 1); @@ -181,7 +181,7 @@ print "
".$langs->trans("ExtSitesNbOfAgenda")."'; +print ''; print ''; print "
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status").''.$langs->trans("Default").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Status").''.$langs->trans("Default").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'."\n"; + print ''."\n"; if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name") { print 'scandir.'&label='.urlencode($module->name).'&type=action">'; @@ -284,13 +284,13 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'&type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name") { print img_picto($langs->trans("Default"), 'on'); @@ -307,10 +307,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) $htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; print ''.img_object($langs->trans("Preview"), 'order').''; print '
'."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; @@ -338,7 +338,7 @@ print ''."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; $htmltext=$langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoentitiesnoconv("UserGUISetup")); print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; } @@ -376,8 +376,8 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) // AGENDA_DEFAULT_FILTER_TYPE print ''."\n"; print ''."\n"; -print ''."\n"; -print ''."\n"; +print ''."\n"; @@ -385,7 +385,7 @@ print ''."\n"; // TODO Remove to use the default generic feature print ''."\n"; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php index 6624cc52dc5..3af179ba2e7 100644 --- a/htdocs/admin/agenda_reminder.php +++ b/htdocs/admin/agenda_reminder.php @@ -185,7 +185,7 @@ print ''; print '
'.$langs->trans("Parameters").'  '.$langs->trans("Value").'
'.$langs->trans("AGENDA_USE_EVENT_TYPE").'  '."\n"; //print ajax_constantonoff('AGENDA_USE_EVENT_TYPE'); Do not use ajax here, we need to reload page to change other combo list if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) @@ -355,7 +355,7 @@ print '
'.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltext).'  '."\n"; $tmplist=array(''=>' ', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser")); print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW); @@ -367,8 +367,8 @@ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) print ''; print '
'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").' '."\n"; + print ' '."\n"; $formactions->select_type_actions($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT, "AGENDA_USE_EVENT_TYPE_DEFAULT", 'systemauto', 0, 1); print '
'.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").' '."\n"; +print ' '."\n"; $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1); print '
'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").'  '."\n"; $formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2, 'minwidth100'); print '
'."\n"; print ''."\n"; print ''."\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''."\n"; @@ -195,7 +195,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2) { print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print "\n"; $bankorder[0][0] = $langs->trans("BankOrderGlobal"); @@ -213,12 +213,12 @@ while ($i < $nbofbank) { print "\n"; if ($conf->global->BANK_SHOW_ORDER_OPTION == $i) { - print ''; } else { - print ''; } @@ -263,10 +263,10 @@ print "
'.$langs->trans("Parameters").'  '.$langs->trans("Value").'
'.$langs->trans('AGENDA_REMINDER_EMAIL', $langs->transnoentities("Module2300Name")).'  '."\n"; if (empty($conf->global->AGENDA_REMINDER_EMAIL)) { @@ -212,7 +212,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2) { print '
'.$langs->trans('AGENDA_REMINDER_BROWSER').'  '."\n"; if (empty($conf->global->AGENDA_REMINDER_BROWSER)) { @@ -224,7 +224,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '
'.$langs->trans('AGENDA_REMINDER_BROWSER_SOUND').'  '."\n"; if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) { diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 34becb49ada..9fc256540a2 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -183,8 +183,8 @@ print '
' . $langs->trans("Name") . '' . $langs->trans("Description") . '' . $langs->trans("Example") . '' . $langs->trans("Status") . ' ' . $langs->trans("Status") . ' 
'; + print ''; print img_picto($langs->trans("Activated"), 'on'); print ''; + print ''; print img_picto($langs->trans("Disabled"), 'off'); print '
\n"; print "\n"; print ''; print ''; -print '\n"; -print '\n"; -print ''; -print ''; +print '\n"; +print '\n"; +print ''; +print ''; print "\n"; clearstatcache(); @@ -315,7 +315,7 @@ foreach ($dirmodels as $reldir) { // Active if (in_array($name, $def)) { - print ''; } else { - print '"; } // Default - print ''; // Preview - print '
' . $langs->trans("Name") . '' . $langs->trans("Description") . '' . $langs->trans("Status") . "' . $langs->trans("Default") . "' . $langs->trans("ShortInfo") . '' . $langs->trans("Preview") . '' . $langs->trans("Status") . "' . $langs->trans("Default") . "' . $langs->trans("ShortInfo") . '' . $langs->trans("Preview") . '
' . "\n"; + print '' . "\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); @@ -323,14 +323,14 @@ foreach ($dirmodels as $reldir) { print '' . "\n"; + print '' . "\n"; print '' . img_picto($langs->trans("Disabled"), 'switch_off') . ''; print "'; + print ''; if ($conf->global->BANKADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -358,13 +358,13 @@ foreach ($dirmodels as $reldir) { // $htmltooltip.='
'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1); //$htmltooltip .= '
' . $langs->trans("WatermarkOnDraftOrders") . ': ' . yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print '' . img_object($langs->trans("Preview"), 'bill') . ''; @@ -404,7 +404,7 @@ print "\n"; print "\n"; print ''; print ''; -print '\n"; +print '\n"; print "\n"; print ''; // Active if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) { - print '"; diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 92b1c73060d..e811eaff261 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -199,8 +199,8 @@ print '
' . $langs->trans("Name") . '' . $langs->trans("Description") . '' . $langs->trans("Status") . "' . $langs->trans("Status") . "
'; @@ -414,7 +414,7 @@ print $langs->trans('AutoReportLastAccountStatement'); print '' . "\n"; + print '' . "\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -422,7 +422,7 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) { } else { - print '' . "\n"; + print '' . "\n"; print '' . img_picto($langs->trans("Disabled"), 'switch_off') . ''; print "
'; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print "\n"; $sql = "SELECT rowid, code as encoding, libelle, coder, example"; @@ -229,7 +229,7 @@ if ($resql) print ''; // Show example - print ''; - print '\n"; @@ -307,7 +307,7 @@ print ""; print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("CodeBarGenerator").''.$langs->trans("Example").''.$langs->trans("CodeBarGenerator").'
'; + print ''; if ($obj->coder && $obj->coder != -1) { $result=0; @@ -277,7 +277,7 @@ if ($resql) } print ''; + print ''; print $formbarcode->setBarcodeEncoder($obj->coder, $barcodelist, $obj->rowid, 'form'.$i); print "
'; print ''; print ''; -print ''; +print ''; print ''; print ''; @@ -317,7 +317,7 @@ if (! isset($_SERVER['WINDIR'])) print ''; print ''; - print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print "\n"; $dirbarcodenum=array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']); @@ -406,17 +406,17 @@ if ($conf->produit->enabled) if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file") { - print ''; } else { - print ''; } - print ''; diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 3cee6aa27f4..70672f9b6fb 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -337,7 +337,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; foreach($boxtoadd as $box) @@ -398,9 +398,9 @@ print '
'.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("Value").' 
'.$langs->trans("GenbarcodeLocation").''; + print ''; print ''; if (! empty($conf->global->GENBARCODE_LOCATION) && ! @file_exists($conf->global->GENBARCODE_LOCATION)) { @@ -369,8 +369,8 @@ if ($conf->produit->enabled) print ''.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; + print ''; print img_picto($langs->trans("Activated"), 'switch_on'); print ''; + print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print ''; + print ''; $s=$modBarCode->getToolTip($langs, null, -1); print $form->textwithpicto('', $s, 1); print '
'.$langs->trans("Box").''.$langs->trans("Note").'/'.$langs->trans("Parameters").''.$langs->trans("SourceFile").''.$langs->trans("ActivateOn").''.$langs->trans("ActivateOn").'
'."\n"; print ''; print ''; print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print ''."\n"; $box_order=1; @@ -429,15 +429,15 @@ foreach($boxactivated as $key => $box) } else print ($box->note?$box->note:' '); print ''; - print ''; + print ''; $hasnext=($key < (count($boxactivated)-1)); $hasprevious=($key != 0); - print ''; - print ''; + print ''; - print ''; diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php index 4efa3bc487b..e8e035f8b49 100644 --- a/htdocs/admin/chequereceipts.php +++ b/htdocs/admin/chequereceipts.php @@ -116,8 +116,8 @@ print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''."\n"; clearstatcache(); @@ -177,7 +177,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; print ''; -print ''; +print ''; print ''; print "\n"; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 3dc59b1b247..1f3e23e05d6 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -267,8 +267,8 @@ print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''."\n"; clearstatcache(); @@ -312,7 +312,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; @@ -393,10 +393,10 @@ print "
'.$langs->trans("Box").''.$langs->trans("Note").'/'.$langs->trans("Parameters").''.$langs->trans("ActiveOn").''.$langs->trans("PositionByDefault").''.$langs->trans("Disable").''.$langs->trans("ActiveOn").''.$langs->trans("PositionByDefault").''.$langs->trans("Disable").'
' . (empty($pos_name[$box->position])?'':$langs->trans($pos_name[$box->position])) . '' . (empty($pos_name[$box->position])?'':$langs->trans($pos_name[$box->position])) . ''.($key+1).''; + print ''.($key+1).''; print ($hasnext?''.img_down().' ':''); print ($hasprevious?''.img_up().'':''); print ''; + print ''; print ''.img_delete().''; print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; + print ''; if ($conf->global->CHEQUERECEIPTS_ADDON == $file || $conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file) { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -206,7 +206,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); if ($conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file) // If module is the one used, we show existing errors @@ -244,7 +244,7 @@ print ''; print '
'.$langs->trans("Parameters").'   
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; + print ''; if ($conf->global->COMMANDE_ADDON == $file) { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -344,7 +344,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print '
\n"; print "\n"; print ''; print ''; -print '\n"; -print '\n"; -print ''; -print ''; +print '\n"; +print '\n"; +print ''; +print ''; print "\n"; clearstatcache(); @@ -449,7 +449,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print '"; } // Default - print ''; // Preview - print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -457,13 +457,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->COMMANDE_ADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -491,12 +491,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'bill').''; @@ -528,7 +528,7 @@ print load_fiche_titre($langs->trans("OtherOptions"), '', ''); print ''; print ''; print ''; -print ''; +print ''; print "\n"; print "\n"; @@ -580,7 +580,7 @@ Whet is definition of "shippable" according to all different STOCK_CALCULATE_... print ''; print ''; print ''; -print ''; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").''; } // Ask for warehouse during order @@ -628,7 +628,7 @@ if ($conf->stock->enabled) { print ''; + print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").''; } */ @@ -666,7 +666,7 @@ print load_fiche_titre($langs->trans("Notifications"), '', ''); print '
'.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("Value").' 
'.$langs->trans("ShippableOrderIconInList").' '; +print ''; if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) { print ''; print img_picto($langs->trans("Activated"),'switch_on'); @@ -598,7 +598,7 @@ if ($conf->banque->enabled) { print '
'; - print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' '; + print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' '; if (! empty($conf->use_javascript_ajax)) { print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ORDER'); @@ -620,7 +620,7 @@ else { print '
'; - print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").' '.$langs->trans('NotAvailable').'
 '.$langs->trans('NotAvailable').'
'; - print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' '; + print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' '; if (! empty($conf->use_javascript_ajax)) { print ajax_constantonoff('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER'); @@ -650,7 +650,7 @@ else { print '
'; - print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").' '.$langs->trans('NotAvailable').'
 '.$langs->trans('NotAvailable').'
'; print ''; print ''; -print ''; +print ''; print ''; print "\n"; diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 720b43a2275..062fcb1d998 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -190,7 +190,7 @@ print ''; print ''; print ''; if (! empty($conf->multicompany->enabled) && !$user->entity) print ''; -print ''; +print ''; print "\n"; @@ -210,11 +210,11 @@ if (! empty($conf->multicompany->enabled) && !$user->entity) print ''; - print ''; - print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print "\n"; clearstatcache(); @@ -249,7 +249,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; @@ -329,10 +329,10 @@ print '
'.$langs->trans("Parameter").' 
'.$langs->trans("Name").''.$langs->trans("Value").''.$langs->trans("Comment").''.$langs->trans("Entity").''.$langs->trans("Action").''.$langs->trans("Action").'
'; print ''; print ''; + print ''; } else { - print ''; + print ''; print ''; } print ''; @@ -273,11 +273,11 @@ if ($result) print ''; print ''; print ''; + print ''; } else { - print ''; + print ''; print ''; } diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 7cad76585e2..bf02df80b5b 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -204,8 +204,8 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; + print ''; if ($conf->global->CONTRACT_ADDON == "$file") { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -280,7 +280,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print '
'; print ''; print ''; print ''; -print '\n"; -print '\n"; -print ''; -print ''; +print '\n"; +print '\n"; +print ''; +print ''; print "\n"; clearstatcache(); @@ -384,7 +384,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print '"; } // Defaut - print ''; // Preview - print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -392,13 +392,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->CONTRACT_ADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -424,12 +424,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'contract').''; @@ -466,7 +466,7 @@ print load_fiche_titre($langs->trans("OtherOptions"), '', ''); print ''; print ''; print ''; -print ''; +print ''; print "\n"; $substitutionarray=pdf_getSubstitutionArray($langs, array('objectamount'), null, 2); diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index a946aeeacfd..c2559e0e2bf 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -322,11 +322,11 @@ if (! empty($conf->multicompany->enabled) && !$user->entity) } else { - print ''; } -print ''; // Actions - print ''; - print ''; - print ''; print ''; - print ''; + print ''; print ''; $i++; } @@ -252,7 +252,7 @@ print '
'; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("Value").'
'; + print ''; print ''; print ''; +print ''; $disabled=''; if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled=' disabled="disabled"'; print ''; @@ -385,7 +385,7 @@ if ($result) print ''; + print ''; if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) { print ''.img_edit().''; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 788f600a549..6d46876586a 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1180,7 +1180,7 @@ if ($id) } if ($id == 4) print ''; + print ''; if ($action != 'edit') { print ''; diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php index 205f7e7cb1a..1cb165552f1 100644 --- a/htdocs/admin/ecm.php +++ b/htdocs/admin/ecm.php @@ -77,8 +77,8 @@ print '
'; print ''; print ''; print ''; -print ''; -print ''."\n"; +print ''; +print ''."\n"; print ''; $form = new Form($db); @@ -87,9 +87,9 @@ $form = new Form($db); print ''; print ''; -print ''; +print ''; -print ''."\n"; @@ -450,10 +450,10 @@ while ($i < min($num, $limit)) $cssforfield=''; if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center'; elseif ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center'; - + if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap'; elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap'; - + if (! empty($arrayfields['t.'.$key]['checked'])) { print 'executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column - print ''; if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; while ($i < $num && $i < $max) @@ -522,18 +522,18 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S $taskstatic->fk_statut = $obj->status; $taskstatic->dateo = $db->jdate($obj->dateo); $taskstatic->datee = $db->jdate($obj->datee); - print ''; - print ''; + print ''; - print ''; - print ''; - print ''; - print ''; print "\n"; diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index a7c9aaf329d..7fe2d0af8a6 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -485,7 +485,7 @@ print ''; print ''; print ''; // Action column -print ''; @@ -495,13 +495,13 @@ print ''; if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''; if (! empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print ''; print ''; -print ''; -print ''; -/*print ''; -if ($usertoprocess->id == $user->id) print ''; -else print '';*/ -print ''; -print ''; +print ''; +print ''; +/*print ''; +if ($usertoprocess->id == $user->id) print ''; +else print '';*/ +print ''; +print ''; print ''; // By default, we can edit only tasks we are assigned to diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index a293c8ee451..ca4663bd43e 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -309,17 +309,17 @@ print ''; print '
'.$langs->trans("Description").' '.$langs->trans("Value").' '.$langs->trans("Value").'
'.$langs->trans("ECMAutoTree").'  '; +print ''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('ECM_AUTO_TREE_ENABLED'); diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php index 755d44d42ba..e8dbc07654c 100644 --- a/htdocs/admin/emailcollector_list.php +++ b/htdocs/admin/emailcollector_list.php @@ -412,7 +412,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; -print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n"; +print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n"; print '
'; + 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/reception/stats/month.php b/htdocs/reception/stats/month.php index e67768e6ceb..84eb9126464 100644 --- a/htdocs/reception/stats/month.php +++ b/htdocs/reception/stats/month.php @@ -65,8 +65,8 @@ if (! $mesg) } print ''; -print ''; -print ''; +print ''; print '
Nombre d reception par mois'; +print '
Nombre d reception par mois'; print $px->show(); print '
'; From ec956e1c72bbaee45df03c46d5347b90ed214e7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 23 Feb 2019 22:24:26 +0100 Subject: [PATCH 09/16] replace html code by html5 in project --- htdocs/projet/activity/index.php | 54 ++++++++--------- htdocs/projet/activity/perday.php | 16 ++--- htdocs/projet/admin/project.php | 72 +++++++++++------------ htdocs/projet/card.php | 4 +- htdocs/projet/comment.php | 2 +- htdocs/projet/contact.php | 2 +- htdocs/projet/element.php | 66 ++++++++++----------- htdocs/projet/ganttview.php | 2 +- htdocs/projet/graph_opportunities.inc.php | 10 ++-- htdocs/projet/index.php | 8 +-- htdocs/projet/list.php | 50 ++++++++-------- htdocs/projet/stats/index.php | 34 +++++------ htdocs/projet/tasks.php | 32 +++++----- htdocs/projet/tasks/comment.php | 2 +- htdocs/projet/tasks/contact.php | 12 ++-- htdocs/projet/tasks/document.php | 2 +- htdocs/projet/tasks/list.php | 38 ++++++------ htdocs/projet/tasks/note.php | 2 +- htdocs/projet/tasks/task.php | 4 +- htdocs/projet/tasks/time.php | 38 ++++++------ 20 files changed, 225 insertions(+), 225 deletions(-) diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 4c2d03b796e..6f5a63129de 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -127,7 +127,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele print ''; print ''; print ''; -print ''; +print ''; print "\n"; $sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb"; @@ -157,7 +157,7 @@ if ( $resql ) $projectstatic->public=$row->public; print $projectstatic->getNomUrl(1, '', 1); print ''; - print ''; + print ''; print "\n"; $total += $row->nb; } @@ -170,7 +170,7 @@ else } print ''; print ''; -print ''; +print ''; print "\n"; print "
'.$langs->trans('ActivityOnProjectToday').''.$langs->trans("Time").''.$langs->trans("Time").'
'.convertSecondToTime($row->nb, 'allhourmin').''.convertSecondToTime($row->nb, 'allhourmin').'
'.$langs->trans('Total').''.convertSecondToTime($total, 'allhourmin').''.convertSecondToTime($total, 'allhourmin').'
"; @@ -182,7 +182,7 @@ print '
'; print ''; print ''; print ''; -print ''; +print ''; print "\n"; $sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb"; @@ -212,7 +212,7 @@ if ( $resql ) $projectstatic->public=$row->public; print $projectstatic->getNomUrl(1, '', 1); print ''; - print ''; + print ''; print "\n"; $total += $row->nb; } @@ -225,7 +225,7 @@ else } print ''; print ''; -print ''; +print ''; print "\n"; print "
'.$langs->trans('ActivityOnProjectYesterday').''.$langs->trans("Time").''.$langs->trans("Time").'
'.convertSecondToTime($row->nb, 'allhourmin').''.convertSecondToTime($row->nb, 'allhourmin').'
'.$langs->trans('Total').''.convertSecondToTime($total, 'allhourmin').''.convertSecondToTime($total, 'allhourmin').'
"; @@ -240,7 +240,7 @@ if ($db->type != 'pgsql') print ''; print ''; print ''; - print ''; + print ''; print "\n"; $sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb"; @@ -270,7 +270,7 @@ if ($db->type != 'pgsql') $projectstatic->public=$row->public; print $projectstatic->getNomUrl(1, '', 1); print ''; - print ''; + print ''; print "\n"; $total += $row->nb; } @@ -283,7 +283,7 @@ if ($db->type != 'pgsql') } print ''; print ''; - print ''; + print ''; print "\n"; print "
'.$langs->trans("ActivityOnProjectThisWeek").''.$langs->trans("Time").''.$langs->trans("Time").'
'.convertSecondToTime($row->nb, 'allhourmin').''.convertSecondToTime($row->nb, 'allhourmin').'
'.$langs->trans('Total').''.convertSecondToTime($total, 'allhourmin').''.convertSecondToTime($total, 'allhourmin').'

"; @@ -296,7 +296,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_MONTH)) print ''; print ''; print ''; - print ''; + print ''; print "\n"; $sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb"; @@ -323,7 +323,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_MONTH)) $projectstatic->title=$row->title; print $projectstatic->getNomUrl(1, '', 1); print ''; - print ''; + print ''; print "\n"; } $db->free($resql); @@ -334,7 +334,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_MONTH)) } print ''; print ''; - print ''; + print ''; print "\n"; print "
'.$langs->trans("ActivityOnProjectThisMonth").': '.dol_print_date($now, "%B %Y").''.$langs->trans("Time").''.$langs->trans("Time").'
'.convertSecondToTime($row->nb, 'allhourmin').''.convertSecondToTime($row->nb, 'allhourmin').'
'.$langs->trans('Total').''.convertSecondToTime($total, 'allhourmin').''.convertSecondToTime($total, 'allhourmin').'
"; } @@ -345,7 +345,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR)) print '
'; print ''; print ''; - print ''; + print ''; print "\n"; $sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb"; @@ -373,7 +373,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR)) $projectstatic->public=$row->public; print $projectstatic->getNomUrl(1, '', 1); print ''; - print ''; + print ''; print "\n"; } $db->free($resql); @@ -384,7 +384,7 @@ if (! empty($conf->global->PROJECT_TASK_TIME_YEAR)) } print ''; print ''; - print ''; + print ''; print "\n"; print "
'.$langs->trans("ActivityOnProjectThisYear").': '.strftime("%Y", $now).''.$langs->trans("Time").''.$langs->trans("Time").'
'.convertSecondToTime($row->nb, 'allhourmin').''.convertSecondToTime($row->nb, 'allhourmin').'
'.$langs->trans('Total').''.convertSecondToTime($total, 'allhourmin').''.convertSecondToTime($total, 'allhourmin').'
"; } @@ -467,12 +467,12 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S print '
'.$langs->trans('OpenedProjects').''.$langs->trans('OpportunityStatus').''.$langs->trans('Task').''.$langs->trans('DateStart').''.$langs->trans('DateEnd').''.$langs->trans('PlannedWorkload').''.$langs->trans('TimeSpent').''.$langs->trans("ProgressCalculated").''; - print ''.$langs->trans("ProgressDeclared").''; + print ''.$langs->trans('DateStart').''.$langs->trans('DateEnd').''.$langs->trans('PlannedWorkload').''.$langs->trans('TimeSpent').''.$langs->trans("ProgressCalculated").''; + print ''.$langs->trans("ProgressDeclared").''; print '
'.dol_print_date($db->jdate($obj->dateo), 'day').''.dol_print_date($db->jdate($obj->datee), 'day'); + print ''.dol_print_date($db->jdate($obj->dateo), 'day').''.dol_print_date($db->jdate($obj->datee), 'day'); print dol_print_date($obj->date_end, 'dayhour'); if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late")); print ''; + print ''; print convertSecondToTime($obj->planned_workload, 'allhourmin'); print ''; + print ''; print convertSecondToTime($obj->timespent, 'allhourmin'); print ''; + print ''; if (! empty($obj->taskid)) { if (empty($obj->planned_workload) > 0) { @@ -544,7 +544,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S } print $percentcompletion; print ''; + print ''; print ($obj->taskid>0)?$obj->progress.'%':''; print '
'; +print ''; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; print '
'.$langs->trans("Project").''.$langs->trans("ThirdParty").''.$langs->trans("Task").''.$langs->trans("PlannedWorkload").''.$langs->trans("ProgressDeclared").''.$langs->trans("TimeSpent").''.$langs->trans("TimeSpentByYou").''.$langs->trans("TimeSpentByUser").''.$langs->trans("TimeSpent").'
('.$langs->trans("Everybody").')		'.$langs->trans("TimeSpent").($usertoprocess->firstname?'
('.$usertoprocess->firstname.')':'').'		'.$langs->trans("PlannedWorkload").''.$langs->trans("ProgressDeclared").''.$langs->trans("TimeSpent").''.$langs->trans("TimeSpentByYou").''.$langs->trans("TimeSpentByUser").''.$langs->trans("TimeSpent").'
('.$langs->trans("Everybody").')		'.$langs->trans("TimeSpent").($usertoprocess->firstname?'
('.$usertoprocess->firstname.')':'').'		'.$langs->trans("HourStart").'
'; print ''; print "\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''; print ''; -print '"; print ''; @@ -327,12 +327,12 @@ print ''; print ''; print ''; -print '"; print ''; @@ -354,8 +354,8 @@ print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print "\n"; clearstatcache(); @@ -398,7 +398,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; @@ -455,8 +455,8 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print "\n"; clearstatcache(); @@ -499,7 +499,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) else print $tmp; print ''."\n"; - print ''; @@ -583,10 +583,10 @@ print "
".$langs->trans("Parameters")."'.$langs->trans("Value").''.$langs->trans("Value").' 
'.$langs->trans("ManageOpportunitiesStatus").''; +print ''; $arrval=array('0'=>$langs->trans("No"), '1'=>$langs->trans("Yes"), ); print $form->selectyesno('PROJECT_USE_OPPORTUNITIES', $conf->global->PROJECT_USE_OPPORTUNITIES, 1); -print ''; +print ''; print ''; print "
'.$langs->trans("ManageTasks").''; +print ''; $arrval=array('0'=>$langs->trans("No"), '1'=>$langs->trans("Yes"), ); print $form->selectyesno('PROJECT_USE_TASKS', empty($conf->global->PROJECT_HIDE_TASKS)?1:0, 1); -print ''; +print ''; print ''; print "
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Activated").''.$langs->trans("ShortInfo").''.$langs->trans("Activated").''.$langs->trans("ShortInfo").'
'; + print ''; if ($conf->global->PROJECT_ADDON == 'mod_'.$classname) { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -429,7 +429,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Activated").''.$langs->trans("ShortInfo").''.$langs->trans("Activated").''.$langs->trans("ShortInfo").'
'; + print ''; if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname) { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -530,7 +530,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print '
\n"; print "\n"; print ' \n"; print " \n"; -print '\n"; -print '\n"; -print ''; -print ''; +print '\n"; +print '\n"; +print ''; +print ''; print "\n"; clearstatcache(); @@ -637,7 +637,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print ""; } // Default - print "'; // Preview - print '\n"; print ' \n"; print " \n"; - print '\n"; - print '\n"; - print ''; - print ''; + print '\n"; + print '\n"; + print ''; + print ''; print "\n"; clearstatcache(); @@ -794,7 +794,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) // Active if (in_array($name, $def)) { - print ""; } // Defaut - print "'; // Preview - print ''; // Date - print ''; + print ''; if (in_array($tablename, array('projet_task'))) print $langs->trans("TimeSpent"); if (! in_array($tablename, array('projet_task'))) print $langs->trans("Date"); print ''; @@ -799,17 +799,17 @@ foreach ($listofreferent as $key => $value) else print $langs->trans("ThirdParty"); print ''; // Amount HT - //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''; - //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''; - if (empty($value['disableamount'])) print ''; + //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''; + //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''; + if (empty($value['disableamount'])) print ''; else print ''; // Amount TTC - //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''; - if (empty($value['disableamount'])) print ''; + //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''; + if (empty($value['disableamount'])) print ''; else print ''; // Status - if (in_array($tablename, array('projet_task'))) print ''; - else print ''; + if (in_array($tablename, array('projet_task'))) print ''; + else print ''; print ''; $elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field)?$project_field:'fk_projet'); @@ -888,7 +888,7 @@ foreach ($listofreferent as $key => $value) print "\n"; // Ref - print ''; // Status - print ''; - $breakline.=''; - $breakline.=''; + $breakline.=''; + $breakline.=''; $breakline.=''; $breakline.=''; } @@ -1146,23 +1146,23 @@ foreach ($listofreferent as $key => $value) print ''; if (in_array($tablename, array('projet_task'))) { - print ''; print ''; } - //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''; - //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''; - print ''; + //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''; + print ''; - //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''; - //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''; - print ''; + //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''; + print '"; } diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php index 95b766ea405..618170607bd 100644 --- a/htdocs/projet/graph_opportunities.inc.php +++ b/htdocs/projet/graph_opportunities.inc.php @@ -70,13 +70,13 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) print ''; print ''; - print ''; + print ''; print "\n"; } } if ($conf->use_javascript_ajax) { - print ''; } //if ($totalinprocess != $total) - //print ''; - print ''; + //print ''; + print ''; print ''; + print ''; print "
'.$langs->trans("Name")."".$langs->trans("Description")."'.$langs->trans("Activated")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Activated")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
\n"; + print "\n"; print 'scandir.'&label='.urlencode($module->name).'">'; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -645,13 +645,13 @@ foreach ($dirmodels as $reldir) } else { - print "\n"; + print "\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print ""; + print ""; if ($conf->global->PROJECT_ADDON_PDF == "$name") { print img_picto($langs->trans("Default"), 'on'); @@ -672,12 +672,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'bill').''; @@ -740,10 +740,10 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) print "
'.$langs->trans("Name")."".$langs->trans("Description")."'.$langs->trans("Activated")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Activated")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
\n"; + print "\n"; print 'scandir.'&label='.urlencode($module->name).'">'; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -802,13 +802,13 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) } else { - print "\n"; + print "\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print ""; + print ""; if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name") { print img_picto($langs->trans("Default"), 'on'); @@ -829,12 +829,12 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'bill').''; @@ -870,27 +870,27 @@ print ''; print ''; print ''; print "\n"; -print ''."\n"; +print ''."\n"; print ''."\n"; print ''; print ''; if (! $conf->use_javascript_ajax) { - print '"; } else { - print '"; } @@ -899,7 +899,7 @@ print ''; print ''; print ''; -print '"; } @@ -1021,7 +1021,7 @@ elseif ($object->id > 0) if ($action == 'edit' && $userWrite > 0) { - print '
'; + print '
'; print '     '; print ''; print '
'; diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php index 580107c66f9..5ee207033cf 100644 --- a/htdocs/projet/comment.php +++ b/htdocs/projet/comment.php @@ -159,7 +159,7 @@ print ''; // Categories if ($conf->categorie->enabled) { - print '
"; } diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index a5372a7426e..95d5e3dd229 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -250,7 +250,7 @@ if ($id > 0 || ! empty($ref)) // Categories if ($conf->categorie->enabled) { - print '"; } diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index d9d1ac4a603..9b393f8a1bf 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -227,7 +227,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_B // Categories if($conf->categorie->enabled) { - print '"; } @@ -563,10 +563,10 @@ print load_fiche_titre($langs->trans("Profit"), '', 'title_accountancy'); print '
".$langs->trans("Parameters")."'.$langs->trans("Value").''.$langs->trans("Value").' 
'.$langs->trans("UseSearchToSelectProject").''; + print ''; print $langs->trans("NotAvailableWhenAjaxDisabled"); print "'; + print ''; $arrval=array('0'=>$langs->trans("No"), '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')', '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')', '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')', ); print $form->selectarray("activate_PROJECT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->PROJECT_USE_SEARCH_TO_SELECT); - print ''; + print ''; print ''; print "
'.$langs->trans("AllowToSelectProjectFromOtherCompany").''; +print ''; print ' '; print $form->textwithpicto('', $langs->trans('AllowToLinkFromOtherCompany')); print ''; diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 2e42ce18095..282af6d3208 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -1003,7 +1003,7 @@ elseif ($object->id > 0) // Categories if($conf->categorie->enabled) { - print '
'.$langs->trans("Categories").''; + print '
'.$langs->trans("Categories").''; print $form->showCategories($object->id, 'project', 1); print "
' . $langs->trans("Categories") . ''; + print '
' . $langs->trans("Categories") . ''; print $form->showCategories($object->id, 'project', 1); print "
'.$langs->trans("Categories").''; + print '
'.$langs->trans("Categories").''; print $form->showCategories($object->id, 'project', 1); print "
'.$langs->trans("Categories").''; + print '
'.$langs->trans("Categories").''; print $form->showCategories($object->id, 'project', 1); print "
'; print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; print ''; foreach ($listofreferent as $key => $value) @@ -676,14 +676,14 @@ foreach ($listofreferent as $key => $value) // Module print ''; // Nb - print ''; + print ''; // Amount HT - print ''; // Amount TTC - print ''; @@ -693,9 +693,9 @@ foreach ($listofreferent as $key => $value) } // and the final balance print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print ''; print "
'.$langs->trans("Element").''.$langs->trans("Number").''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").''.$langs->trans("Element").''.$langs->trans("Number").''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").'
'.$name.''.$i.''.$i.''; + print ''; if (! $qualifiedforfinalprofit) print ''.$form->textwithpicto($langs->trans("NA"), $langs->trans("AmountOfInteventionNotIncludedByDefault")).''; else print price($total_ht); print ''; + print ''; if (! $qualifiedforfinalprofit) print ''.$form->textwithpicto($langs->trans("NA"), $langs->trans("AmountOfInteventionNotIncludedByDefault")).''; else print price($total_ttc); print '
'.$langs->trans("Profit").''.price(price2num($balance_ht, 'MT')).''.price(price2num($balance_ttc, 'MT')).''.$langs->trans("Profit").''.price(price2num($balance_ht, 'MT')).''.price(price2num($balance_ttc, 'MT')).'
"; @@ -787,7 +787,7 @@ foreach ($listofreferent as $key => $value) // Ref print ''.$langs->trans("Ref").'		'.$langs->trans("AmountHT").''.$langs->trans("Amount").''.$langs->trans("AmountHT").''.$langs->trans("AmountHT").''.$langs->trans("Amount").''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").''.$langs->trans("AmountTTC").''.$langs->trans("AmountTTC").''.$langs->trans("AmountTTC").''.$langs->trans("ProgressDeclared").''.$langs->trans("Status").''.$langs->trans("ProgressDeclared").''.$langs->trans("Status").'
'; + print ''; if ($tablename == 'expensereport_det') { print $expensereport->getNomUrl(1); @@ -950,7 +950,7 @@ foreach ($listofreferent as $key => $value) if (empty($date)) $date=$element->datev; } } - print ''; + print ''; if ($tablename == 'actioncomm') { print dol_print_date($element->datep, 'dayhour'); @@ -1027,7 +1027,7 @@ foreach ($listofreferent as $key => $value) { $total_ht_by_line=$element->total_ht; } - print ''; + print ''; if ($othermessage) print $othermessage; if (isset($total_ht_by_line)) { @@ -1064,7 +1064,7 @@ foreach ($listofreferent as $key => $value) { $total_ttc_by_line=$element->total_ttc; } - print ''; + print ''; if ($othermessage) print $othermessage; if (isset($total_ttc_by_line)) { @@ -1078,7 +1078,7 @@ foreach ($listofreferent as $key => $value) else print ''; + print ''; if ($tablename == 'expensereport_det') { print $expensereport->getLibStatut(5); @@ -1129,8 +1129,8 @@ foreach ($listofreferent as $key => $value) $breakline.=$langs->trans('SubTotal').' : '; if (is_object($element->thirdparty)) $breakline.=$element->thirdparty->getNomUrl(0, '', 48); $breakline.=''.price($total_ht_by_third).''.price($total_ttc_by_third).''.price($total_ht_by_third).''.price($total_ttc_by_third).'
'.$langs->trans("Number").': '.$i.''; + print ''; print convertSecondToTime($total_time, 'allhourmin'); print ''; print ''.$langs->trans("TotalHT").' : '.price($total_ht).''.$langs->trans("Total").' : '.price($total_ht).''; + //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("TotalHT").' : '.price($total_ht).''.$langs->trans("Total").' : '.price($total_ht).''; if (empty($value['disableamount'])) { if ($tablename != 'projet_task' || ! empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht); } print ''.$langs->trans("TotalTTC").' : '.price($total_ttc).''; + //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("TotalTTC").' : '.price($total_ttc).''; if (empty($value['disableamount'])) { if ($tablename != 'projet_task' || ! empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc); diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 083a3be46c0..d9a9cc37ed8 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -175,7 +175,7 @@ if (($id > 0 && is_numeric($id)) || ! empty($ref)) // Categories if($conf->categorie->enabled) { - print '
'.$langs->trans("Categories").''; + print '
'.$langs->trans("Categories").''; print $form->showCategories($object->id, 'project', 1); print "
'.$labelstatus.''.price((isset($valsamount[$status])?(float) $valsamount[$status]:0), 0, '', 1, -1, -1, $conf->currency).''.price((isset($valsamount[$status])?(float) $valsamount[$status]:0), 0, '', 1, -1, -1, $conf->currency).'
'; + print '
'; include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $dolgraph = new DolGraph(); @@ -92,12 +92,12 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) print '
'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')'.$totalinprocess.'
'.$langs->trans("OpportunityTotalAmount").' ('.$langs->trans("WonLostExcluded").')'.price($totalamount, 0, '', 1, -1, -1, $conf->currency).'
'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')'.$totalinprocess.'
'.$langs->trans("OpportunityTotalAmount").' ('.$langs->trans("WonLostExcluded").')'.price($totalamount, 0, '', 1, -1, -1, $conf->currency).'
'; //print $langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')'; print $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1); - print ''.price(price2num($ponderated_opp_amount, 'MT'), 0, '', 1, -1, -1, $conf->currency).'
'.price(price2num($ponderated_opp_amount, 'MT'), 0, '', 1, -1, -1, $conf->currency).'
"; print ""; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 14cbaf1da1d..a4389339e46 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -221,7 +221,7 @@ if ($resql) print ' '; print '		'; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -237,7 +237,7 @@ if ($resql) } print ''.dol_print_date($db->jdate($obj->datem), 'day').''.$projectstatic->LibStatut($obj->fk_statut, 5).''.$projectstatic->LibStatut($obj->fk_statut, 5).'
'; print ''; print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "s.nom", "", "", '', $sortfield, $sortorder); -print_liste_field_titre("NbOfProjects", "", "", "", "", 'align="right"', $sortfield, $sortorder); +print_liste_field_titre("NbOfProjects", "", "", "", "", '', $sortfield, $sortorder, 'right '); print "\n"; $sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)"; @@ -289,7 +289,7 @@ if ( $resql ) print $langs->trans("OthersNotLinkedToThirdParty"); } print ''; - print ''; diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index dc4183bc6e0..06d41e8031f 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -618,13 +618,13 @@ if (! empty($arrayfields['p.opp_percent']['checked'])) } if (! empty($arrayfields['p.budget_amount']['checked'])) { - print ''; } if (! empty($arrayfields['p.bill_time']['checked'])) { - print ''; } @@ -649,7 +649,7 @@ if (! empty($arrayfields['p.tms']['checked'])) } if (! empty($arrayfields['p.fk_statut']['checked'])) { - print ''; } // Action column -print ''; @@ -670,24 +670,24 @@ if (! empty($arrayfields['p.ref']['checked'])) print_liste_field_titre if (! empty($arrayfields['p.title']['checked'])) print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, "", $sortfield, $sortorder); if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder); if (! empty($arrayfields['commercial']['checked'])) print_liste_field_titre($arrayfields['commercial']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder); -if (! empty($arrayfields['p.dateo']['checked'])) print_liste_field_titre($arrayfields['p.dateo']['label'], $_SERVER["PHP_SELF"], "p.dateo", "", $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['p.datee']['checked'])) print_liste_field_titre($arrayfields['p.datee']['label'], $_SERVER["PHP_SELF"], "p.datee", "", $param, 'align="center"', $sortfield, $sortorder); +if (! empty($arrayfields['p.dateo']['checked'])) print_liste_field_titre($arrayfields['p.dateo']['label'], $_SERVER["PHP_SELF"], "p.dateo", "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['p.datee']['checked'])) print_liste_field_titre($arrayfields['p.datee']['label'], $_SERVER["PHP_SELF"], "p.datee", "", $param, '', $sortfield, $sortorder, 'center '); if (! empty($arrayfields['p.public']['checked'])) print_liste_field_titre($arrayfields['p.public']['label'], $_SERVER["PHP_SELF"], "p.public", "", $param, "", $sortfield, $sortorder); -if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['p.opp_amount']['checked'])) print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, 'align="right"', $sortfield, $sortorder); -if (! empty($arrayfields['p.opp_percent']['checked'])) print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, 'align="right"', $sortfield, $sortorder); -if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, 'align="right"', $sortfield, $sortorder); -if (! empty($arrayfields['p.bill_time']['checked'])) print_liste_field_titre($arrayfields['p.bill_time']['label'], $_SERVER["PHP_SELF"], 'p.bill_time', "", $param, 'align="right"', $sortfield, $sortorder); +if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['p.opp_amount']['checked'])) print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right '); +if (! empty($arrayfields['p.opp_percent']['checked'])) print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right '); +if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right '); +if (! empty($arrayfields['p.bill_time']['checked'])) print_liste_field_titre($arrayfields['p.bill_time']['label'], $_SERVER["PHP_SELF"], 'p.bill_time', "", $param, '', $sortfield, $sortorder, 'right '); // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; // Hook fields $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; -if (! empty($arrayfields['p.datec']['checked'])) print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); -if (! empty($arrayfields['p.tms']['checked'])) print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); -if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder); -print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); +if (! empty($arrayfields['p.datec']['checked'])) print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap '); +if (! empty($arrayfields['p.tms']['checked'])) print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap '); +if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'right '); +print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); print "\n"; $i=0; @@ -824,7 +824,7 @@ while ($i < min($num, $limit)) // Opp Amount if (! empty($arrayfields['p.opp_amount']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -846,7 +846,7 @@ while ($i < min($num, $limit)) // Budget if (! empty($arrayfields['p.budget_amount']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -884,7 +884,7 @@ while ($i < min($num, $limit)) // Date modification if (! empty($arrayfields['p.tms']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -892,11 +892,11 @@ while ($i < min($num, $limit)) // Status if (! empty($arrayfields['p.fk_statut']['checked'])) { - print ''; + print ''; if (! $i) $totalarray['nbfield']++; } // Action column - print ''; else print ''; } - elseif ($totalarray['totaloppfield'] == $i) print ''; - elseif ($totalarray['totalbudgetfield'] == $i) print ''; + elseif ($totalarray['totaloppfield'] == $i) print ''; + elseif ($totalarray['totalbudgetfield'] == $i) print ''; else print ''; } print ''; diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php index 57e3648e208..e7e06e93352 100644 --- a/htdocs/projet/stats/index.php +++ b/htdocs/projet/stats/index.php @@ -297,7 +297,7 @@ if (! in_array($nowyear, $arrayyears)) $arrayyears[$nowyear]=$nowyear; arsort($arrayyears); print $form->selectarray('year', $arrayyears, $year, 0); print ''; -print ''; +print ''; print '
'; + print ''; if ($obj->socid) print ''.$obj->nb.''; else print ''.$obj->nb.''; print ''; + print ''; print ''; print ''; + print ''; print ''; print ''; + print ''; $arrayofstatus = array(); foreach($object->statuts_short as $key => $val) $arrayofstatus[$key]=$langs->trans($val); $arrayofstatus['99']=$langs->trans("NotClosed").' ('.$langs->trans('Draft').' + '.$langs->trans('Opened').')'; @@ -658,7 +658,7 @@ if (! empty($arrayfields['p.fk_statut']['checked'])) print ''; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print '
'; + print ''; //if ($obj->opp_status_code) if (strcmp($obj->opp_amount, '')) { @@ -838,7 +838,7 @@ while ($i < min($num, $limit)) // Opp percent if (! empty($arrayfields['p.opp_percent']['checked'])) { - print ''; + print ''; if ($obj->opp_percent) print price($obj->opp_percent, 1, $langs, 1, 0).'%'; print ''; + print ''; if ($obj->budget_amount != '') { print price($obj->budget_amount, 1, $langs, 1, -1, -1); @@ -859,7 +859,7 @@ while ($i < min($num, $limit)) // Bill time if (! empty($arrayfields['p.bill_time']['checked'])) { - print ''; + print ''; if ($obj->bill_time) { print yn($obj->bill_time); @@ -876,7 +876,7 @@ while ($i < min($num, $limit)) // Date creation if (! empty($arrayfields['p.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 ''.$object->getLibStatut(5).''.$object->getLibStatut(5).''; + 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; @@ -925,8 +925,8 @@ if (isset($totalarray['totaloppfield']) || isset($totalarray['totalbudgetfield'] if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totalopp'], 1, $langs, 1, -1, -1).''.price($totalarray['totalbudget'], 1, $langs, 1, -1, -1).''.price($totalarray['totalopp'], 1, $langs, 1, -1, -1).''.price($totalarray['totalbudget'], 1, $langs, 1, -1, -1).'
'; print ''; print '

'; @@ -305,13 +305,13 @@ print '

'; print '
'; print ''; print ''; -print ''; -print ''; +print ''; +print ''; if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) { - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; } print ''; @@ -324,25 +324,25 @@ foreach ($data_all_year as $val) $oldyear--; print ''; - print ''; + print ''; if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) { - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; } - print ''; + print ''; print ''; } print ''; - print ''; - print ''; + print ''; + print ''; if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) { - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; } print ''; $oldyear=$year; @@ -353,7 +353,7 @@ print ''; print '
'; -$stringtoshow.= '
'.$langs->trans("Year").''.$langs->trans("NbOfProjects").''.$langs->trans("Year").''.$langs->trans("NbOfProjects").''.$langs->trans("OpportunityAmountShort").''.$langs->trans("OpportunityAmountAverageShort").''.$langs->trans("OpportunityAmountWeigthedShort").''.$langs->trans("OpportunityAmountShort").''.$langs->trans("OpportunityAmountAverageShort").''.$langs->trans("OpportunityAmountWeigthedShort").'
0?'&userid='.$userid:'').'">'.$oldyear.'0?'&userid='.$userid:'').'">'.$oldyear.'00000000
0?'&userid='.$userid:'').'">'.$year.''.$val['nb'].'0?'&userid='.$userid:'').'">'.$year.''.$val['nb'].''.($val['total']?price(price2num($val['total'], 'MT'), 1):'0').''.($val['avg']?price(price2num($val['avg'], 'MT'), 1):'0').''.($val['weighted']?price(price2num($val['weighted'], 'MT'), 1):'0').''.($val['total']?price(price2num($val['total'], 'MT'), 1):'0').''.($val['avg']?price(price2num($val['avg'], 'MT'), 1):'0').''.($val['weighted']?price(price2num($val['weighted'], 'MT'), 1):'0').'
'; +$stringtoshow.= ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) print ''; // Action column - print ''; @@ -712,14 +712,14 @@ elseif ($id > 0 || ! empty($ref)) // print ''; print_liste_field_titre("RefTask", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, ''); print_liste_field_titre("LabelTask", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, ''); - print_liste_field_titre("DateStart", $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, ''); - print_liste_field_titre("DateEnd", $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, ''); - print_liste_field_titre("PlannedWorkload", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, ''); - print_liste_field_titre("TimeSpent", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, ''); - print_liste_field_titre("ProgressCalculated", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, ''); - print_liste_field_titre("ProgressDeclared", $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, ''); - if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) print_liste_field_titre("TaskRessourceLinks", $_SERVER["PHP_SELF"], '', '', '', $sortfield, $sortorder, ''); - print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'align="center" width="80"', $sortfield, $sortorder, 'maxwidthsearch '); + print_liste_field_titre("DateStart", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center '); + print_liste_field_titre("DateEnd", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center '); + print_liste_field_titre("PlannedWorkload", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right '); + print_liste_field_titre("TimeSpent", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right '); + print_liste_field_titre("ProgressCalculated", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right '); + print_liste_field_titre("ProgressDeclared", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right '); + if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) print_liste_field_titre("TaskRessourceLinks", $_SERVER["PHP_SELF"], '', '', '', $sortfield, $sortorder); + print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'width="80"', $sortfield, $sortorder, 'center maxwidthsearch '); print "\n"; if (count($tasksarray) > 0) diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php index a817f1df4f0..679f6a29dc2 100644 --- a/htdocs/projet/tasks/comment.php +++ b/htdocs/projet/tasks/comment.php @@ -191,7 +191,7 @@ if ($id > 0 || ! empty($ref)) // Categories if($conf->categorie->enabled) { - print '"; } diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index ab1806ea461..af8dc9d39cf 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -263,7 +263,7 @@ if ($id > 0 || ! empty($ref)) // Categories if($conf->categorie->enabled) { - print '"; } @@ -380,7 +380,7 @@ if ($id > 0 || ! empty($ref)) print ''; - print ''; + print ''; print ''; print ''; @@ -415,7 +415,7 @@ if ($id > 0 || ! empty($ref)) print ''; - print ''; print ''; @@ -430,7 +430,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; - print ''; + print ''; print ''; print "\n"; @@ -493,7 +493,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Statut - print ''; // Icon update et delete - print '"; } diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index be44923ea8b..a63b858e488 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -565,7 +565,7 @@ if (! empty($arrayfields['t.tms']['checked'])) print ''; } // Action column -print ''; @@ -574,25 +574,25 @@ print "\n"; print ''; if (! empty($arrayfields['t.ref']['checked'])) print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder); if (! empty($arrayfields['t.label']['checked'])) print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER["PHP_SELF"], "t.label", "", $param, "", $sortfield, $sortorder); -if (! empty($arrayfields['t.dateo']['checked'])) print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "t.dateo", "", $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['t.datee']['checked'])) print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", "", $param, 'align="center"', $sortfield, $sortorder); +if (! empty($arrayfields['t.dateo']['checked'])) print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "t.dateo", "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['t.datee']['checked'])) print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", "", $param, '', $sortfield, $sortorder, 'center '); if (! empty($arrayfields['p.ref']['checked'])) print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder); if (! empty($arrayfields['p.title']['checked'])) print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, "", $sortfield, $sortorder); if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder); -if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['t.planned_workload']['checked'])) print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "t.planned_workload", "", $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['t.duration_effective']['checked'])) print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "t.duration_effective", "", $param, 'align="center"', $sortfield, $sortorder); -if (! empty($arrayfields['t.progress_calculated']['checked'])) print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", "", $param, 'align="center"'); -if (! empty($arrayfields['t.progress']['checked'])) print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, 'align="center"', $sortfield, $sortorder); +if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['t.planned_workload']['checked'])) print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "t.planned_workload", "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['t.duration_effective']['checked'])) print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "t.duration_effective", "", $param, '', $sortfield, $sortorder, 'center '); +if (! empty($arrayfields['t.progress_calculated']['checked'])) print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', '', '', 'center '); +if (! empty($arrayfields['t.progress']['checked'])) print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center '); // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; // Hook fields $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; -if (! empty($arrayfields['t.datec']['checked'])) print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); -if (! empty($arrayfields['t.tms']['checked'])) print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); -print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); +if (! empty($arrayfields['t.datec']['checked'])) print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap '); +if (! empty($arrayfields['t.tms']['checked'])) print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap '); +print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); print "\n"; @@ -697,7 +697,7 @@ while ($i < min($num, $limit)) // Project status if (! empty($arrayfields['p.fk_statut']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -770,7 +770,7 @@ while ($i < min($num, $limit)) // Date creation if (! empty($arrayfields['t.datec']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -778,7 +778,7 @@ while ($i < min($num, $limit)) // Date modification if (! empty($arrayfields['t.tms']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -787,10 +787,10 @@ while ($i < min($num, $limit)) /*if (! empty($arrayfields['p.fk_statut']['checked'])) { $projectstatic->statut = $obj->fk_statut; - print ''; + print ''; }*/ // Action column - print ''; else print ''; } - elseif ($totalarray['totalplannedworkloadfield'] == $i) print ''; - elseif ($totalarray['totaldurationeffectivefield'] == $i) print ''; - elseif ($totalarray['totalprogress_calculated'] == $i) print ''; + elseif ($totalarray['totalplannedworkloadfield'] == $i) print ''; + elseif ($totalarray['totaldurationeffectivefield'] == $i) print ''; + elseif ($totalarray['totalprogress_calculated'] == $i) print ''; else print ''; } print ''; diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index a0c3b517769..02925f1092f 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -186,7 +186,7 @@ if ($object->id > 0) // Categories if($conf->categorie->enabled) { - print '"; } diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 8472c4d54ce..b3c3e151af8 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -302,7 +302,7 @@ if ($id > 0 || ! empty($ref)) // Categories if($conf->categorie->enabled) { - print '"; } @@ -428,7 +428,7 @@ if ($id > 0 || ! empty($ref)) dol_fiche_end(); - print '
'; + print '
'; print '   '; print ''; print '
'; diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 1258027d615..37934aa0957 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -539,7 +539,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Categories if ($conf->categorie->enabled) { - print '
"; } @@ -758,7 +758,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress, 'progress', 0, 5, 0, 100, 1); print ''; - print ''; } - print '\n"; $tasktmp = new Task($db); @@ -1296,7 +1296,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Time spent if (! empty($arrayfields['t.task_duration']['checked'])) { - print ''; @@ -1327,7 +1327,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Invoiced - Value billed if (! empty($arrayfields['valuebilled']['checked'])) { - print ''; @@ -1538,7 +1538,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Value billed if (! empty($arrayfields['valuebilled']['checked'])) { - print ''; @@ -1661,7 +1661,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Time spent if (! empty($arrayfields['t.task_duration']['checked'])) { - print ''; @@ -1686,7 +1686,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Value billed if (! empty($arrayfields['valuebilled']['checked'])) { - print ''; @@ -1725,9 +1725,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) if ($num < $limit && empty($offset)) print ''; else print ''; } - elseif ($totalarray['totaldurationfield'] == $i) print ''; - elseif ($totalarray['totalvaluefield'] == $i) print ''; - //elseif ($totalarray['totalvaluebilledfield'] == $i) print ''; + elseif ($totalarray['totaldurationfield'] == $i) print ''; + elseif ($totalarray['totalvaluefield'] == $i) print ''; + //elseif ($totalarray['totalvaluebilledfield'] == $i) print ''; else print ''; } print ''; From c7df326a915a9fb563b3dd84bfdb0c6b3c52fcc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 23 Feb 2019 22:31:57 +0100 Subject: [PATCH 10/16] replace html code by html5 --- .../boxes/box_graph_orders_supplier_permonth.php | 14 +++++++------- htdocs/core/class/dolgraph.class.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php index 9f7a457e238..c3cdbcef412 100644 --- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php +++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php @@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; */ class box_graph_orders_supplier_permonth extends ModeleBoxes { - var $boxcode="orderssupplierpermonth"; - var $boximg="object_order"; - var $boxlabel="BoxSuppliersOrdersPerMonth"; - var $depends = array("fournisseur"); + public $boxcode="orderssupplierpermonth"; + public $boximg="object_order"; + public $boxlabel="BoxSuppliersOrdersPerMonth"; + public $depends = array("fournisseur"); - /** + /** * @var DoliDB Database handler. */ public $db; - var $info_box_head = array(); - var $info_box_contents = array(); + public $info_box_head = array(); + public $info_box_contents = array(); /** diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index 2a92d14c7b9..7fd9258ddd7 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -936,7 +936,7 @@ class DolGraph $tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-','.')))); $this->stringtoshow =''."\n"; - if (! empty($this->title)) $this->stringtoshow.='
'.$this->title.'
'; + if (! empty($this->title)) $this->stringtoshow.='
'.$this->title.'
'; if (! empty($this->shownographyet)) { $this->stringtoshow.='
'; From 51b29f2ed504d5987eeb9757f6ae5dee5dbcf13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 23 Feb 2019 22:43:53 +0100 Subject: [PATCH 11/16] replace html code by html5 in tpl --- htdocs/core/tpl/advtarget.tpl.php | 2 +- htdocs/core/tpl/bloc_comment.tpl.php | 2 +- htdocs/core/tpl/contacts.tpl.php | 4 ++-- .../tpl/extrafields_list_print_fields.tpl.php | 2 +- .../tpl/extrafields_list_search_param.tpl.php | 12 +++++------ htdocs/core/tpl/extrafields_view.tpl.php | 2 +- htdocs/core/tpl/filemanager.tpl.php | 2 +- htdocs/core/tpl/objectline_edit.tpl.php | 2 +- htdocs/core/tpl/originproductline.tpl.php | 10 +++++----- htdocs/core/tpl/passwordforgotten.tpl.php | 2 +- htdocs/core/tpl/resource_add.tpl.php | 2 +- htdocs/core/tpl/resource_view.tpl.php | 20 +++++++++---------- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php index dadfff3e62e..2c351996632 100644 --- a/htdocs/core/tpl/advtarget.tpl.php +++ b/htdocs/core/tpl/advtarget.tpl.php @@ -541,7 +541,7 @@ print ''; - echo $dialog; - if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) { - echo '
' . $langs->trans("DATAPOLICIES_PORTABILITE") . '
'; - } elseif ($parameters['currentcontext'] == 'membercard') { - echo '
' . $langs->trans("DATAPOLICIES_PORTABILITE") . '
'; - } elseif ($parameters['currentcontext'] == 'contactcard') { - echo '
' . $langs->trans("DATAPOLICIES_PORTABILITE") . '
'; - } - if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) { - echo '
' . $langs->trans("DATAPOLICIES_SEND") . '
'; - } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'membercard') { - echo '
' . $langs->trans("DATAPOLICIES_SEND") . '
'; - } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'contactcard') { - echo '
' . $langs->trans("DATAPOLICIES_SEND") . '
'; - } + return false; + }); + } ); + '; + echo $dialog; + if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) { + echo '
' . $langs->trans("DATAPOLICIES_PORTABILITE") . '
'; + } elseif ($parameters['currentcontext'] == 'membercard') { + echo '
' . $langs->trans("DATAPOLICIES_PORTABILITE") . '
'; + } elseif ($parameters['currentcontext'] == 'contactcard') { + echo '
' . $langs->trans("DATAPOLICIES_PORTABILITE") . '
'; + } + if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) { + echo '
' . $langs->trans("DATAPOLICIES_SEND") . '
'; + } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'membercard') { + echo '
' . $langs->trans("DATAPOLICIES_SEND") . '
'; + } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'contactcard') { + echo '
' . $langs->trans("DATAPOLICIES_SEND") . '
'; + } } } diff --git a/htdocs/datapolicy/class/datapolicy.class.php b/htdocs/datapolicy/class/datapolicy.class.php index 4b89b79e273..b3cb0ce3cd9 100644 --- a/htdocs/datapolicy/class/datapolicy.class.php +++ b/htdocs/datapolicy/class/datapolicy.class.php @@ -30,11 +30,11 @@ include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php'; */ Class DataPolicy { - /** - * getAllContactNotInformed - * - * @return number - */ + /** + * getAllContactNotInformed + * + * @return number + */ function getAllContactNotInformed() { global $langs, $conf, $db, $user; @@ -144,71 +144,71 @@ Class DataPolicy */ function sendMailDataPolicyContact($contact) { - global $langs, $conf, $db, $user; + global $langs, $conf, $db, $user; - $error = 0; + $error = 0; - $from = $user->getFullName($langs) . ' <' . $user->email . '>'; + $from = $user->getFullName($langs) . ' <' . $user->email . '>'; - $sendto = $contact->email; - $code= md5($contact->email); - if (!empty($contact->default_lang)) { - $l = $contact->default_lang; - } else { - $l = $langs->defaultlang; - } - $s = "DATAPOLICIESSUBJECT_" . $l; - $ma = "DATAPOLICIESCONTENT_" . $l; - $la = 'TXTLINKDATAPOLICIESACCEPT_' . $l; - $lr = 'TXTLINKDATAPOLICIESREFUSE_' . $l; + $sendto = $contact->email; + $code= md5($contact->email); + if (!empty($contact->default_lang)) { + $l = $contact->default_lang; + } else { + $l = $langs->defaultlang; + } + $s = "DATAPOLICIESSUBJECT_" . $l; + $ma = "DATAPOLICIESCONTENT_" . $l; + $la = 'TXTLINKDATAPOLICIESACCEPT_' . $l; + $lr = 'TXTLINKDATAPOLICIESREFUSE_' . $l; - $subject = $conf->global->$s; - $message = $conf->global->$ma; - $linka = $conf->global->$la; - $linkr = $conf->global->$lr; - $sendtocc = $sendtobcc = ''; - $filepath = $mimetype = $filename = array(); - $deliveryreceipt = 0; + $subject = $conf->global->$s; + $message = $conf->global->$ma; + $linka = $conf->global->$la; + $linkr = $conf->global->$lr; + $sendtocc = $sendtobcc = ''; + $filepath = $mimetype = $filename = array(); + $deliveryreceipt = 0; - $substitutionarray = array( - '__LINKACCEPT__' => ''.$linka.'', - '__LINKREFUSED__' => ''.$linkr.'', - '__FIRSTNAME__' => $contact->firstname, - '__NAME__' => $contact->lastname, - '__CIVILITY__' => $contact->civility, - ); - $subject = make_substitutions($subject, $substitutionarray); - $message = make_substitutions($message, $substitutionarray); + $substitutionarray = array( + '__LINKACCEPT__' => ''.$linka.'', + '__LINKREFUSED__' => ''.$linkr.'', + '__FIRSTNAME__' => $contact->firstname, + '__NAME__' => $contact->lastname, + '__CIVILITY__' => $contact->civility, + ); + $subject = make_substitutions($subject, $substitutionarray); + $message = make_substitutions($message, $substitutionarray); - $actiontypecode = 'AC_EMAIL'; - $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto; - if ($message) { - if ($sendtocc) - $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); - $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); - $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); - $actionmsg = dol_concatdesc($actionmsg, $message); - } + $actiontypecode = 'AC_EMAIL'; + $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto; + if ($message) { + if ($sendtocc) + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); + } - // Send mail - require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php'; - $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1); + // Send mail + require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php'; + $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1); - if ($mailfile->error) { - $resultmasssend .= '
' . $mailfile->error . '
'; - } else { - $result4 = $mailfile->sendfile(); - if (!$error) { + if ($mailfile->error) { + $resultmasssend .= '
' . $mailfile->error . '
'; + } else { + $result4 = $mailfile->sendfile(); + if (!$error) { - $resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "
"; - $contact->array_options['options_datapolicy_send'] = date('Y-m-d', time()); - $contact->update($contact->id); - } else { - dol_print_error($db); - } - } - setEventMessage($resultmasssend); + $resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "
"; + $contact->array_options['options_datapolicy_send'] = date('Y-m-d', time()); + $contact->update($contact->id); + } else { + dol_print_error($db); + } + } + setEventMessage($resultmasssend); } /** @@ -219,44 +219,44 @@ Class DataPolicy */ function sendMailDataPolicyCompany($societe) { - global $langs, $conf, $db, $user; + global $langs, $conf, $db, $user; - $error = 0; + $error = 0; - $from = $user->getFullName($langs) . ' <' . $user->email . '>'; + $from = $user->getFullName($langs) . ' <' . $user->email . '>'; - $sendto = $societe->email; + $sendto = $societe->email; - $code= md5($societe->email); - if (!empty($societe->default_lang)) { - $l = $societe->default_lang; - } else { - $l = $langs->defaultlang; - } - $s = "DATAPOLICIESSUBJECT_" . $l; - $ma = "DATAPOLICIESCONTENT_" . $l; - $la = 'TXTLINKDATAPOLICIESACCEPT_' . $l; - $lr = 'TXTLINKDATAPOLICIESREFUSE_' . $l; + $code= md5($societe->email); + if (!empty($societe->default_lang)) { + $l = $societe->default_lang; + } else { + $l = $langs->defaultlang; + } + $s = "DATAPOLICIESSUBJECT_" . $l; + $ma = "DATAPOLICIESCONTENT_" . $l; + $la = 'TXTLINKDATAPOLICIESACCEPT_' . $l; + $lr = 'TXTLINKDATAPOLICIESREFUSE_' . $l; - $subject = $conf->global->$s; - $message = $conf->global->$ma; - $linka = $conf->global->$la; - $linkr = $conf->global->$lr; - $sendtocc = $sendtobcc = ''; - $filepath = $mimetype = $filename = array(); - $deliveryreceipt = 0; + $subject = $conf->global->$s; + $message = $conf->global->$ma; + $linka = $conf->global->$la; + $linkr = $conf->global->$lr; + $sendtocc = $sendtobcc = ''; + $filepath = $mimetype = $filename = array(); + $deliveryreceipt = 0; - $substitutionarray = array( + $substitutionarray = array( '__LINKACCEPT__' => ''.$linka.'', '__LINKREFUSED__' => ''.$linkr.'', - ); - $subject = make_substitutions($subject, $substitutionarray); - $message = make_substitutions($message, $substitutionarray); + ); + $subject = make_substitutions($subject, $substitutionarray); + $message = make_substitutions($message, $substitutionarray); - $actiontypecode = 'AC_EMAIL'; - $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto; - if ($message) { - if ($sendtocc) { + $actiontypecode = 'AC_EMAIL'; + $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto; + if ($message) { + if ($sendtocc) { $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); } $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); @@ -264,23 +264,23 @@ Class DataPolicy $actionmsg .= dol_concatdesc($actionmsg, $message); } - // Send mail - require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php'; - $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1); - if ($mailfile->error) { - $resultmasssend .= '
' . $mailfile->error . '
'; - } else { - $result4 = $mailfile->sendfile(); + // Send mail + require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php'; + $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1); + if ($mailfile->error) { + $resultmasssend .= '
' . $mailfile->error . '
'; + } else { + $result4 = $mailfile->sendfile(); - if (!$error) { - $resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "
"; - $societe->array_options['options_datapolicy_send'] = date('Y-m-d', time()); - $societe->update($societe->id); - } else { - dol_print_error($db); - } - } - setEventMessage($resultmasssend); + if (!$error) { + $resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "
"; + $societe->array_options['options_datapolicy_send'] = date('Y-m-d', time()); + $societe->update($societe->id); + } else { + dol_print_error($db); + } + } + setEventMessage($resultmasssend); } /** @@ -291,66 +291,66 @@ Class DataPolicy */ function sendMailDataPolicyAdherent($adherent) { - global $langs, $conf, $db, $user; + global $langs, $conf, $db, $user; - $error = 0; + $error = 0; - $from = $user->getFullName($langs) . ' <' . $user->email . '>'; + $from = $user->getFullName($langs) . ' <' . $user->email . '>'; - $sendto = $adherent->email; + $sendto = $adherent->email; - $code= md5($adherent->email); - if (!empty($adherent->default_lang)) { - $l = $adherent->default_lang; - } else { - $l = $langs->defaultlang; - } - $la = 'TXTLINKDATAPOLICIESACCEPT_' . $l; - $lr = 'TXTLINKDATAPOLICIESREFUSE_' . $l; + $code= md5($adherent->email); + if (!empty($adherent->default_lang)) { + $l = $adherent->default_lang; + } else { + $l = $langs->defaultlang; + } + $la = 'TXTLINKDATAPOLICIESACCEPT_' . $l; + $lr = 'TXTLINKDATAPOLICIESREFUSE_' . $l; - $subject = $conf->global->$s; - $message = $conf->global->$ma; - $linka = $conf->global->$la; - $linkr = $conf->global->$lr; - $sendtocc = $sendtobcc = ''; - $filepath = $mimetype = $filename = array(); - $deliveryreceipt = 0; + $subject = $conf->global->$s; + $message = $conf->global->$ma; + $linka = $conf->global->$la; + $linkr = $conf->global->$lr; + $sendtocc = $sendtobcc = ''; + $filepath = $mimetype = $filename = array(); + $deliveryreceipt = 0; - $substitutionarray = array( + $substitutionarray = array( '__LINKACCEPT__' => ''.$linka.'', '__LINKREFUSED__' => ''.$linkr.'', - ); - $subject = make_substitutions($subject, $substitutionarray); - $message = make_substitutions($message, $substitutionarray); + ); + $subject = make_substitutions($subject, $substitutionarray); + $message = make_substitutions($message, $substitutionarray); - $actiontypecode = 'AC_EMAIL'; - $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto; - if ($message) { - if ($sendtocc) { + $actiontypecode = 'AC_EMAIL'; + $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto; + if ($message) { + if ($sendtocc) { $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); } $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); $actionmsg .= dol_concatdesc($actionmsg, $message); - } + } - // Send mail - require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php'; - $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1); - if ($mailfile->error) { - $resultmasssend .= '
' . $mailfile->error . '
'; - } else { - $result4 = $mailfile->sendfile(); + // Send mail + require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php'; + $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1); + if ($mailfile->error) { + $resultmasssend .= '
' . $mailfile->error . '
'; + } else { + $result4 = $mailfile->sendfile(); - if (!$error) { - $resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "
"; - $adherent->array_options['options_datapolicy_send'] = date('Y-m-d', time()); - $adherent->update($user); - } else { - dol_print_error($db); - } - } - setEventMessage($resultmasssend); + if (!$error) { + $resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "
"; + $adherent->array_options['options_datapolicy_send'] = date('Y-m-d', time()); + $adherent->update($user); + } else { + dol_print_error($db); + } + } + setEventMessage($resultmasssend); } } diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php index 01478580a3a..656831eed2f 100644 --- a/htdocs/datapolicy/class/datapolicycron.class.php +++ b/htdocs/datapolicy/class/datapolicycron.class.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2018 Nicolas ZABOURI * Copyright (C) 2018 Frédéric France * * This program is free software: you can redistribute it and/or modify @@ -17,7 +17,7 @@ */ /** - * \file datapolicy/class/datapolicycron.class.php + * \file htdocs/datapolicy/class/datapolicycron.class.php * \ingroup datapolicy * \brief Example hook overload. */ @@ -27,11 +27,11 @@ */ class DataPolicyCron { - /** - * Function exec - * - * @return boolean - */ + /** + * Function exec + * + * @return boolean + */ public function exec() { global $conf, $db, $langs, $user; diff --git a/htdocs/datapolicy/lib/datapolicy.lib.php b/htdocs/datapolicy/lib/datapolicy.lib.php index 41c92299989..b72417d7ff9 100644 --- a/htdocs/datapolicy/lib/datapolicy.lib.php +++ b/htdocs/datapolicy/lib/datapolicy.lib.php @@ -1,5 +1,6 @@ + * Copyright (C) 2019 Frédéric France * * 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 @@ -16,7 +17,7 @@ */ /** - * \file datapolicy/lib/datapolicy.lib.php + * \file htdocs/datapolicy/lib/datapolicy.lib.php * \ingroup datapolicy * \brief Library files with common functions for datapolicy */ @@ -28,27 +29,26 @@ */ function datapolicyAdminPrepareHead() { - global $langs, $conf; + global $langs, $conf; - $langs->load("datapolicy@datapolicy"); + $langs->load("datapolicy@datapolicy"); - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = dol_buildpath("/datapolicy/admin/setup.php", 1); - $head[$h][1] = $langs->trans("Deletion"); - $head[$h][2] = 'settings'; - $h++; + $head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setup.php"; + $head[$h][1] = $langs->trans("Deletion"); + $head[$h][2] = 'settings'; + $h++; - if (! empty($conf->global->DATAPOLICIES_ENABLE_EMAILS)) - { - $head[$h][0] = dol_buildpath("/datapolicy/admin/setupmail.php", 1); - $head[$h][1] = $langs->trans("DATAPOLICIESMail"); - $head[$h][2] = 'settings'; - $h++; - } + if (! empty($conf->global->DATAPOLICIES_ENABLE_EMAILS)) { + $head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setupmail.php"; + $head[$h][1] = $langs->trans("DATAPOLICIESMail"); + $head[$h][2] = 'settings'; + $h++; + } - complete_head_from_modules($conf, $langs, $object, $head, $h, 'datapolicy'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'datapolicy'); - return $head; + return $head; } diff --git a/htdocs/datapolicy/mailing.php b/htdocs/datapolicy/mailing.php index e3f38b269be..69da78e00ac 100644 --- a/htdocs/datapolicy/mailing.php +++ b/htdocs/datapolicy/mailing.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2018 Nicolas ZABOURI + * Copyright (C) 2019 Frédéric France * * 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 @@ -16,22 +17,22 @@ */ /** - * \file datapolicy/mailing.php + * \file htdocs/datapolicy/mailing.php * \ingroup datapolicy * \brief datapolicy mailing page. */ require '../../main.inc.php'; -dol_include_once('/contact/class/contact.class.php'); -dol_include_once('/datapolicy/class/datapolicy.class.php'); +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php'; $idcontact = GETPOST('idc'); -if(!empty($idcontact)){ +if (!empty($idcontact)) { $contact = new Contact($db); $contact->fetch($idcontact); DataPolicy::sendMailDataPolicyContact($contact); -}else{ +} else { $contacts = new DataPolicy($db); $contacts->getAllContactNotInformed(); diff --git a/htdocs/datapolicy/public/index.php b/htdocs/datapolicy/public/index.php index f819fb079f5..6c78f380b93 100644 --- a/htdocs/datapolicy/public/index.php +++ b/htdocs/datapolicy/public/index.php @@ -17,7 +17,7 @@ */ /** - * \file datapolicy/admin/setup.php + * \file htdocs/datapolicy/admin/setup.php * \ingroup datapolicy * \brief datapolicy setup page. */ @@ -30,11 +30,11 @@ if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); require '../../main.inc.php'; -dol_include_once('/contact/class/contact.class.php'); -dol_include_once('/societe/class/societe.class.php'); -dol_include_once('/adherents/class/adherent.class.php'); -dol_include_once('/user/class/user.class.php'); -dol_include_once('/datapolicy/class/datapolicy.class.php'); +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; +require_once DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php'; $idc = GETPOST('c', 'int'); $ids = GETPOST('s', 'int'); diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php index b326c6f4959..6fae048c3db 100644 --- a/htdocs/don/class/api_donations.class.php +++ b/htdocs/don/class/api_donations.class.php @@ -48,7 +48,7 @@ class Donations extends DolibarrApi { global $db, $conf; $this->db = $db; - $this->don = new Don($this->db); + $this->don = new Don($this->db); } /** diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index 4daa8b6498f..d37271f6480 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -933,7 +933,7 @@ if ($resql) if (! empty($arrayfields['e.ref']['checked'])) { // We are on a specific warehouse card, no filter on other should be possible print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder); - + } if (! empty($arrayfields['m.fk_user_author']['checked'])) { print_liste_field_titre($arrayfields['m.fk_user_author']['label'], $_SERVER["PHP_SELF"], "m.fk_user_author", "", $param, "", $sortfield, $sortorder); } diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php index 5d8f0fe11ce..43abb1f9e75 100644 --- a/htdocs/variants/combinations.php +++ b/htdocs/variants/combinations.php @@ -763,7 +763,7 @@ if (! empty($id) || ! empty($ref)) '; + print ''; @@ -802,7 +802,7 @@ if (! empty($id) || ! empty($ref)) '; + print '
'; if ($mesg) { print $mesg; } else { $stringtoshow.= $px1->show(); diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index e7b99993ef1..068a26b5fe2 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -554,7 +554,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third dol_fiche_end(); - print '
'; + print '
'; print ''; print '     '; print ''; @@ -671,38 +671,38 @@ elseif ($id > 0 || ! empty($ref)) print ''; print '
'; + print ''; print ''; print ''; $formother->select_year($search_dtstartyear?$search_dtstartyear:-1, 'search_dtstartyear', 1, 20, 5); print ''; + print ''; print ''; print ''; $formother->select_year($search_dtendyear?$search_dtendyear:-1, 'search_dtendyear', 1, 20, 5); print ''; + print ''; print ''; print ''; + print ''; print ''; print ''; + print ''; print ''; print ''; + print ''; print ''; print ''; + print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''.$langs->trans("Project").'
'.$langs->trans("Categories").''; + print '
'.$langs->trans("Categories").''; print $form->showCategories($projectstatic->id, 'project', 1); print "
'.$langs->trans("Categories").''; + print '
'.$langs->trans("Categories").''; print $form->showCategories($projectstatic->id, 'project', 1); print "
'; $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid'); print '
'; $formcompany->selectTypeContact($object, '', 'type', 'external', 'rowid'); print '
'.$langs->trans("ThirdParty").''.$langs->trans("TaskContact").''.$langs->trans("ContactType").''.$langs->trans("Status").''.$langs->trans("Status").' 
'.$tab[$i]['libelle'].''; + print ''; // Activation desativation du contact if ($object->statut >= 0) print ''; print $contactstatic->LibStatut($tab[$i]['status'], 3); @@ -501,7 +501,7 @@ if ($id > 0 || ! empty($ref)) print ''; + print ''; if ($user->rights->projet->creer) { print ' '; diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index d9832dbf1a9..49bf3d02ad8 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -206,7 +206,7 @@ if ($object->id > 0) // Categories if($conf->categorie->enabled) { - print '
'.$langs->trans("Categories").''; + print '
'.$langs->trans("Categories").''; print $form->showCategories($projectstatic->id, 'project', 1); print "
'; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print '
'; + print ''; print $projectstatic->getLibStatut(1); 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 ''.$projectstatic->getLibStatut(5).''.$projectstatic->getLibStatut(5).''; + 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; @@ -821,9 +821,9 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).''.convertSecondToTime($totalarray['totaldurationeffective'], $timespentoutputformat).''.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').''.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).''.convertSecondToTime($totalarray['totaldurationeffective'], $timespentoutputformat).''.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').'
'.$langs->trans("Categories").''; + print '
'.$langs->trans("Categories").''; print $form->showCategories($projectstatic->id, 'project', 1); print "
'.$langs->trans("Categories").''; + print '
'.$langs->trans("Categories").''; print $form->showCategories($projectstatic->id, 'project', 1); print "
'.$langs->trans("Categories").''; + print '
'.$langs->trans("Categories").''; print $form->showCategories($projectstatic->id, 'project', 1); print "
'; + print ''; print ''; print '   '; print ''; @@ -1079,7 +1079,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) print ''; + print ''; print ''; print '   '; print ''; @@ -1162,9 +1162,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) } if (! empty($arrayfields['author']['checked'])) print_liste_field_titre($arrayfields['author']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder); if (! empty($arrayfields['t.note']['checked'])) print_liste_field_titre($arrayfields['t.note']['label'], $_SERVER['PHP_SELF'], 't.note', '', $param, '', $sortfield, $sortorder); - if (! empty($arrayfields['t.task_duration']['checked'])) print_liste_field_titre($arrayfields['t.task_duration']['label'], $_SERVER['PHP_SELF'], 't.task_duration', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['value']['checked'])) print_liste_field_titre($arrayfields['value']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder); - if (! empty($arrayfields['valuebilled']['checked'])) print_liste_field_titre($arrayfields['valuebilled']['label'], $_SERVER['PHP_SELF'], 'il.total_ht', '', $param, 'align="center"', $sortfield, $sortorder); + if (! empty($arrayfields['t.task_duration']['checked'])) print_liste_field_titre($arrayfields['t.task_duration']['label'], $_SERVER['PHP_SELF'], 't.task_duration', '', $param, '', $sortfield, $sortorder, 'right '); + if (! empty($arrayfields['value']['checked'])) print_liste_field_titre($arrayfields['value']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right '); + if (! empty($arrayfields['valuebilled']['checked'])) print_liste_field_titre($arrayfields['valuebilled']['label'], $_SERVER['PHP_SELF'], 'il.total_ht', '', $param, '', $sortfield, $sortorder, 'center '); /* // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; @@ -1173,7 +1173,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; - print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center" width="80"', $sortfield, $sortorder, 'maxwidthsearch '); + print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'width="80"', $sortfield, $sortorder, 'center maxwidthsearch '); print "
'; + print ''; if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) { print ''; @@ -1315,7 +1315,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Value spent if (! empty($arrayfields['value']['checked'])) { - print ''; + print ''; $value = price2num($task_time->thm * $task_time->task_duration / 3600); print price($value, 1, $langs, 1, -1, -1, $conf->currency); print ''; // invoice_id and invoice_line_id + print ''; // invoice_id and invoice_line_id if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT)) { if ($projectstatic->bill_time) @@ -1513,7 +1513,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Time spent if (! empty($arrayfields['t.task_duration']['checked'])) { - print ''; + print ''; if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { print ''; @@ -1529,7 +1529,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Value spent if (! empty($arrayfields['value']['checked'])) { - print ''; + print ''; $value = price2num($task_time->thm * $task_time->task_duration / 3600); print price($value, 1, $langs, 1, -1, -1, $conf->currency); print ''; + print ''; $valuebilled = price2num($task_time->total_ht); if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency); print ''; + print ''; if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { print ''; @@ -1677,7 +1677,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Value spent if (! empty($arrayfields['value']['checked'])) { - print ''; + print ''; $value = 0; print price($value, 1, $langs, 1, -1, -1, $conf->currency); print ''; + print ''; $valuebilled = price2num($task_time->total_ht); if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency); print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.convertSecondToTime($totalarray['totalduration'], 'allhourmin').''.price($totalarray['totalvalue']).''.price($totalarray['totalvaluebilled']).''.convertSecondToTime($totalarray['totalduration'], 'allhourmin').''.price($totalarray['totalvalue']).''.price($totalarray['totalvaluebilled']).'
trans('OnBuy') ?> '; $searchpicto=$form->showCheckAddButtons('checkforselect', 1); print $searchpicto; print ' '; if ($productCombinations || $massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined { $selected=0;