From e3e8e660052a669641b21872ee9185b55e4bb1c9 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 14 Mar 2019 19:00:12 +0100 Subject: [PATCH 01/10] update with html5 compliant code --- htdocs/cron/list.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 11d2b3acd35..ab905f745de 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -394,7 +394,7 @@ print ' '; print ' '; print ''; print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled"), '-2'=>$langs->trans("EnabledAndDisabled"), '2'=>$langs->trans("Archived")), $search_status, 1); -print ''; +print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''; @@ -505,11 +505,11 @@ if ($num > 0) if(!empty($obj->dateend)) {print dol_print_date($db->jdate($obj->dateend), 'dayhour');} print ''; - print ''; + print ''; if (!empty($obj->maxrun)) {print $obj->maxrun;} print ''; - print ''; + print ''; if (!empty($obj->nbrun)) {print $obj->nbrun;} else {print '0';} print ''; @@ -554,11 +554,11 @@ if ($num > 0) print ''; // Status - print ''; + print ''; print $object->getLibStatut(3); print ''; - print ''; + print ''; $backtourl = urlencode($_SERVER["PHP_SELF"].'?'.$param.($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'')); if ($user->rights->cron->create) From c61fbcf190cb14d644bbdee45f55111de2d8c356 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 14 Mar 2019 19:01:47 +0100 Subject: [PATCH 02/10] update with html5 compliant code --- htdocs/ecm/search.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index 951c2586346..a5e296ae1e6 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -137,10 +137,10 @@ print ''; print ''; print ""; print ''; -print "'; -print "'; -print "'; -print "'; +print "'; +print "'; +print "'; +print "'; print "
'.$langs->trans("ECMSearchByKeywords").'
".$langs->trans("Ref").':
".$langs->trans("Title").':
".$langs->trans("Keyword").':
".$langs->trans("Ref").':
".$langs->trans("Title").':
".$langs->trans("Keyword").':
"; //print $langs->trans("ECMSectionManualDesc"); @@ -162,7 +162,7 @@ foreach($sectionauto as $sectioncur) print "".$sectioncur['label'].':'; print ''; print ''; print ''; @@ -173,7 +173,7 @@ foreach($sectionauto as $sectioncur) //if ($butshown % 2 == 1) // print '  '; -print ''; +print ''; print ""; //print $langs->trans("ECMSectionAutoDesc"); From 9f420bdd0817ce04939c85116424ee63686d2d3b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 14 Mar 2019 19:02:37 +0100 Subject: [PATCH 03/10] update with html5 compliant code --- htdocs/expensereport/class/expensereport.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 48902b45ca8..3fd386f4f69 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -856,12 +856,12 @@ class ExpenseReport extends CommonObject print ''; print ''.$objp->ref_num.''; - print ''.dol_print_date($objp->date, 'day').''; + print ''.dol_print_date($objp->date, 'day').''; print ''.$author->getNomUrl(1).''; print ''.$objp->comments.''; - print ''.price($objp->total_ht).''; - print ''.price($objp->total_ttc).''; - print ''; + print ''.price($objp->total_ht).''; + print ''.price($objp->total_ttc).''; + print ''; switch($objp->fk_c_expensereport_status) { case 4: @@ -895,8 +895,8 @@ class ExpenseReport extends CommonObject } print ''.$langs->trans("Number").': '.$i.''; - print ''.$langs->trans("TotalHT").' : '.price($total_HT).''; - print ''.$langs->trans("TotalTTC").' : '.price($total_TTC).''; + print ''.$langs->trans("TotalHT").' : '.price($total_HT).''; + print ''.$langs->trans("TotalTTC").' : '.price($total_TTC).''; print ' '; print ''; } From 309514c15c462aeaf764337cd5db51d0720c9806 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 14 Mar 2019 19:03:58 +0100 Subject: [PATCH 04/10] update with html5 compliant code --- htdocs/expensereport/payment/card.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php index 83de49358bc..73da11f4619 100644 --- a/htdocs/expensereport/payment/card.php +++ b/htdocs/expensereport/payment/card.php @@ -229,10 +229,10 @@ if ($resql) print ''; print ''.$langs->trans('ExpenseReport').''; - print ''.$langs->trans('ExpectedToPay').''; - print ''.$langs->trans('PayedByThisPayment').''; - print ''.$langs->trans('RemainderToPay').''; - print ''.$langs->trans('Status').''; + print ''.$langs->trans('ExpectedToPay').''; + print ''.$langs->trans('PayedByThisPayment').''; + print ''.$langs->trans('RemainderToPay').''; + print ''.$langs->trans('Status').''; print "\n"; if ($num > 0) @@ -252,16 +252,16 @@ if ($resql) print "\n"; // Expected to pay - print ''.price($objp->total_ttc).''; + print ''.price($objp->total_ttc).''; // Amount paid - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; // Remain to pay - print ''.price($remaintopay).''; + print ''.price($remaintopay).''; // Status - print ''.$expensereport->getLibStatut(4, $objp->amount).''; + print ''.$expensereport->getLibStatut(4, $objp->amount).''; print "\n"; From 33aa7fa309fa8cd931e07d7b3665f32f38634d79 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 14 Mar 2019 19:06:30 +0100 Subject: [PATCH 05/10] update with html5 compliant code --- htdocs/expensereport/payment/payment.php | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php index cda372317ab..d95edae6450 100644 --- a/htdocs/expensereport/payment/payment.php +++ b/htdocs/expensereport/payment/payment.php @@ -289,10 +289,10 @@ if ($action == 'create' || empty($action)) print ''; print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print "\n"; $total=0; @@ -304,10 +304,10 @@ if ($action == 'create' || empty($action)) print ''; - print '"; - print '"; - print '"; - print '"; + print '"; + print '"; + print ''; - print ''; - print ""; - print ""; - print ""; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print "\n"; } From 133997b19587615a27f6f33291adb75992330cad Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 14 Mar 2019 19:07:22 +0100 Subject: [PATCH 06/10] update with html5 compliant code --- htdocs/expensereport/stats/index.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php index eb269d4f5f8..8980238c07b 100644 --- a/htdocs/expensereport/stats/index.php +++ b/htdocs/expensereport/stats/index.php @@ -242,7 +242,7 @@ if (! in_array($year, $arrayyears)) $arrayyears[$year]=$year; arsort($arrayyears); print $form->selectarray('year', $arrayyears, $year, 0); print ''; -print ''; +print ''; print '
'.$langs->trans("Amount").''.$langs->trans("AlreadyPaid").''.$langs->trans("RemainderToPay").''.$langs->trans("Amount").''.$langs->trans("Amount").''.$langs->trans("AlreadyPaid").''.$langs->trans("RemainderToPay").''.$langs->trans("Amount").'
'.price($objp->total_ttc)."'.price($sumpaid)."'.price($objp->total_ttc - $sumpaid)."'; + print ''.price($objp->total_ttc)."'.price($sumpaid)."'.price($objp->total_ttc - $sumpaid)."'; if ($sumpaid < $objp->total_ttc) { $namef = "amount_".$objp->id; @@ -335,11 +335,11 @@ if ($action == 'create' || empty($action)) { // Print total print '
'.$langs->trans("Total").':".price($total_ttc)."".price($totalrecu)."".price($total_ttc - $totalrecu)." '.$langs->trans("Total").':'.price($total_ttc).''.price($totalrecu).''.price($total_ttc - $totalrecu).' 
'; print ''; print '

'; @@ -250,10 +250,10 @@ print '

'; print '
'; print ''; print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; print ''; $oldyear=0; @@ -265,19 +265,19 @@ foreach ($data as $val) $oldyear--; print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; } print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; $oldyear=$year; } @@ -289,7 +289,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("Number").''.$langs->trans("AmountTotal").''.$langs->trans("AmountAverage").''.$langs->trans("Year").''.$langs->trans("Number").''.$langs->trans("AmountTotal").''.$langs->trans("AmountAverage").'
'.$oldyear.'000'.$oldyear.'000
'.$year.''.$val['nb'].''.price(price2num($val['total'], 'MT'), 1).''.price(price2num($val['avg'], 'MT'), 1).''.$year.''.$val['nb'].''.price(price2num($val['total'], 'MT'), 1).''.price(price2num($val['avg'], 'MT'), 1).'
'; +print ' - - + - - + + Date: Thu, 14 Mar 2019 19:17:00 +0100 Subject: [PATCH 08/10] update with html5 compliant code --- htdocs/expensereport/card.php | 104 +++++++++++++++++----------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index c6d87acef4d..922d493864a 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1892,9 +1892,9 @@ else print ''; print ''; if (! empty($conf->banque->enabled)) { - print ''; + print ''; } - print ''; + print ''; print ''; print ''; @@ -1948,12 +1948,12 @@ else $bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1); } - print ''; } - print '"; + print '"; print ''; print ""; $totalpaid += $objp->amount; @@ -1975,10 +1975,10 @@ else { $cssforamountpaymentcomplete = 'amountpaymentneutral'; } - print ''; - print ''; + print ''; + print ''; - print ''; + print ''; print ''; $db->free($resql); @@ -2014,26 +2014,26 @@ else $i = 0;$total = 0; print ''; - print ''; - //print ''; - print ''; + print ''; + //print ''; + print ''; if (! empty($conf->projet->enabled)) print ''; if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; if ($action != 'editline') { - print ''; - print ''; + print ''; + print ''; } // Ajout des boutons de modification/suppression if (($object->fk_statut < 2 || $object->fk_statut == 99) && $user->rights->expensereport->creer) { - print ''; + print ''; } print ''; @@ -2045,16 +2045,16 @@ else { print ''; - print ''; - /*print '';*/ - print ''; + print ''; if (! empty($conf->projet->enabled)) { print ''; - print ''; - print ''; + print ''; + print ''; // Unit price HT - print ''; - print ''; + print ''; - print ''; + print ''; if ($action != 'editline') { - print ''; - print ''; + print ''; + print ''; } // Ajout des boutons de modification/suppression if (($object->fk_statut < ExpenseReport::STATUS_VALIDATED || $object->fk_statut == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer) { - print ''; // VAT - print ''; // Unit price - print ''; // Unit price with tax - print ''; // Quantity - print ''; if ($action != 'editline') { - print ''; - print ''; + print ''; + print ''; } - print ''; print ''; - print ''; + print ''; if (! empty($conf->projet->enabled)) print ''; if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print ''; - print ''; + print ''; print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; print ''; @@ -2271,7 +2271,7 @@ else print ''; // Select date - print ''; @@ -2292,7 +2292,7 @@ else } // Select type - print ''; @@ -2302,34 +2302,34 @@ else print ''; // Select VAT - print ''; // Unit price net - print ''; // Unit price with tax - print ''; // Quantity - print ''; if ($action != 'editline') { - print ''; - print ''; + print ''; + print ''; } - print ''; + print ''; print ''; From 3f0bd793243d3a43d20828ab1568fadded560ee9 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 14 Mar 2019 19:17:59 +0100 Subject: [PATCH 09/10] update with html5 compliant code --- htdocs/expensereport/index.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php index bfe5bc59126..f7d4e2a8405 100644 --- a/htdocs/expensereport/index.php +++ b/htdocs/expensereport/index.php @@ -122,7 +122,7 @@ foreach ($listoftype as $code => $label) if ($conf->use_javascript_ajax) { - print ''; print ''; -print ''; +print ''; print ''; print '
'; if ($mesg) { print $mesg; } else { print $px1->show(); From 6fb85c093060620ef7443dde900c178ecb973051 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 14 Mar 2019 19:09:02 +0100 Subject: [PATCH 07/10] update with html5 compliant code --- htdocs/expensereport/tpl/linkedobjectblock.tpl.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php index f206a4b4424..9c7a418a6cc 100644 --- a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php +++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php @@ -45,14 +45,14 @@ foreach($linkedObjectBlock as $key => $objectlink) trans("ExpenseReport"); ?> getNomUrl(1); ?> date_debut, 'day'); ?>date_debut, 'day'); ?>rights->expensereport->lire) { $total = $total + $objectlink->total_ht; echo price($objectlink->total_ht); } ?>getLibStatut(3); ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>getLibStatut(3); ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
' . $langs->trans('Date') . '' . $langs->trans('Type') . '' . $langs->trans('BankAccount') . '' . $langs->trans('BankAccount') . '' . $langs->trans('Amount') . '' . $langs->trans('Amount') . ' 
'; + print ''; if ($bankaccountstatic->id) print $bankaccountstatic->getNomUrl(1, 'transactions'); print ''.price($objp->amount)."'.price($objp->amount)."
'.$langs->trans("AlreadyPaid").':'.price($totalpaid).'
'.$langs->trans("AmountExpected").':'.price($object->total_ttc).'
'.$langs->trans("AlreadyPaid").':'.price($totalpaid).'
'.$langs->trans("AmountExpected").':'.price($object->total_ttc).'
'.$langs->trans("RemainderToPay").':
'.$langs->trans("RemainderToPay").':'.price($resteapayeraffiche).'
'.$langs->trans('LineNb').''.$langs->trans('Piece').''.$langs->trans('Date').''.$langs->trans('LineNb').''.$langs->trans('Piece').''.$langs->trans('Date').''.$langs->trans('Project').''.$langs->trans('CarCategory').''.$langs->trans('Type').''.$langs->trans('Description').''.$langs->trans('VAT').''.$langs->trans('PriceUHT').''.$langs->trans('PriceUTTC').''.$langs->trans('Qty').''.$langs->trans('Type').''.$langs->trans('Description').''.$langs->trans('VAT').''.$langs->trans('PriceUHT').''.$langs->trans('PriceUTTC').''.$langs->trans('Qty').''.$langs->trans('AmountHT').''.$langs->trans('AmountTTC').''.$langs->trans('AmountHT').''.$langs->trans('AmountTTC').'
'; + print ''; print $numline; print ''; + /*print ''; print img_picto($langs->trans("Document"), "object_generic"); print ' '.$piece_comptable.''; print ''.dol_print_date($db->jdate($line->date), 'day').''.dol_print_date($db->jdate($line->date), 'day').''; @@ -2076,10 +2076,10 @@ else $labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code)); print $labeltype; print ''.dol_escape_htmltag($line->comments).''.vatrate($line->vatrate, true).''.dol_escape_htmltag($line->comments).''.vatrate($line->vatrate, true).''; + print ''; if (! empty($line->value_unit_ht)) { print price($line->value_unit_ht); @@ -2092,20 +2092,20 @@ else } print ''.price($line->value_unit).''.price($line->value_unit).''.dol_escape_htmltag($line->qty).''.dol_escape_htmltag($line->qty).''.price($line->total_ht).''.price($line->total_ttc).''.price($line->total_ht).''.price($line->total_ttc).''; + print ''; print 'rowid.'#'.$line->rowid.'">'; print img_edit(); @@ -2158,32 +2158,32 @@ else print ''; + print ''; print $form->load_tva('vatrate', (isset($_POST["vatrate"])?$_POST["vatrate"]:$line->vatrate), $mysoc, '', 0, 0, '', false, 1); print ''; + print ''; print ''; print ''; + print ''; print ''; print ''; + print ''; print ''; print ''.$langs->trans('AmountHT').''.$langs->trans('AmountTTC').''.$langs->trans('AmountHT').''.$langs->trans('AmountTTC').''; + print ''; print ''; print ''; print '
'; @@ -2253,15 +2253,15 @@ else print '
'.$langs->trans('Date').''.$langs->trans('Date').''.$langs->trans('Project').''.$langs->trans('CarCategory').''.$langs->trans('Type').''.$langs->trans('Type').''.$langs->trans('Description').''.$langs->trans('VAT').''.$langs->trans('PriceUHT').''.$langs->trans('PriceUTTC').''.$langs->trans('Qty').''.$langs->trans('VAT').''.$langs->trans('PriceUHT').''.$langs->trans('PriceUTTC').''.$langs->trans('Qty').'
'; + print ''; print $form->selectDate($date?$date:-1, 'date', 0, 0, 0, '', 1, 1); print ''; + print ''; select_type_fees_id($fk_c_type_fees, 'fk_c_type_fees', 1); print ''; + print ''; $defaultvat=-1; if (! empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none'; print $form->load_tva('vatrate', ($vatrate!=''?$vatrate:$defaultvat), $mysoc, '', 0, 0, '', false, 1); print ''; + print ''; print ''; print ''; + print ''; print ''; print ''; + print ''; print ''; // We must be able to enter decimal qty print '
'; + print '
'; include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $dolgraph = new DolGraph(); @@ -139,7 +139,7 @@ if ($conf->use_javascript_ajax) print '
'.$langs->trans("Total").''.price($totalsum, 1, $langs, 0, 0, 0, $conf->currency).''.price($totalsum, 1, $langs, 0, 0, 0, $conf->currency).'
'; @@ -183,9 +183,9 @@ if ($result) print ''; print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; if ($num) @@ -208,10 +208,10 @@ if ($result) print ''; print ''; print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; From dc8de23c1acf38ded47d35546e40d5c8069d0a7c Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 14 Mar 2019 19:21:27 +0100 Subject: [PATCH 10/10] update with html5 compliant code --- htdocs/expensereport/list.php | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index c59b6d70e0f..c221baf7d65 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -556,16 +556,16 @@ if ($resql) // Amount with no tax if (! empty($arrayfields['d.total_ht']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['d.total_vat']['checked'])) { - print ''; + print ''; } // Amount with all taxes if (! empty($arrayfields['d.total_ttc']['checked'])) { - print ''; + print ''; } // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php'; @@ -589,12 +589,12 @@ if ($resql) // Status if (! empty($arrayfields['d.fk_statut']['checked'])) { - print ''; } // Action column - print ''; @@ -670,7 +670,7 @@ if ($resql) print ''; } print ''; - print ''; + print ''; if (! $i) $totalarray['nbfield']++; } // End date if (! empty($arrayfields['d.date_fin']['checked'])) { - print ''; + print ''; if (! $i) $totalarray['nbfield']++; } // Date validation if (! empty($arrayfields['d.date_valid']['checked'])) { - print ''; + print ''; if (! $i) $totalarray['nbfield']++; } // Date approval if (! empty($arrayfields['d.date_approve']['checked'])) { - print ''; + print ''; if (! $i) $totalarray['nbfield']++; } // Amount HT if (! empty($arrayfields['d.total_ht']['checked'])) { - print '\n"; + print '\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield']; $totalarray['totalht'] += $obj->total_ht; @@ -725,7 +725,7 @@ if ($resql) // Amount VAT if (! empty($arrayfields['d.total_vat']['checked'])) { - print '\n"; + print '\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield']; $totalarray['totalvat'] += $obj->total_tva; @@ -733,7 +733,7 @@ if ($resql) // Amount TTC if (! empty($arrayfields['d.total_ttc']['checked'])) { - print '\n"; + print '\n"; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield']; $totalarray['totalttc'] += $obj->total_ttc; @@ -748,7 +748,7 @@ if ($resql) // Date creation if (! empty($arrayfields['d.date_create']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -756,7 +756,7 @@ if ($resql) // Date modification if (! empty($arrayfields['d.tms']['checked'])) { - print ''; if (! $i) $totalarray['nbfield']++; @@ -764,11 +764,11 @@ if ($resql) // Status if (! empty($arrayfields['d.fk_statut']['checked'])) { - print ''; + print ''; if (! $i) $totalarray['nbfield']++; } // Action column - print ''; else print ''; } - elseif ($totalarray['totalhtfield'] == $i) print ''; - elseif ($totalarray['totalvatfield'] == $i) print ''; - elseif ($totalarray['totalttcfield'] == $i) print ''; + elseif ($totalarray['totalhtfield'] == $i) print ''; + elseif ($totalarray['totalvatfield'] == $i) print ''; + elseif ($totalarray['totalttcfield'] == $i) print ''; else print ''; } print '';
'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").''.$langs->trans("DateModificationShort").''.$langs->trans("AmountHT").''.$langs->trans("AmountTTC").''.$langs->trans("DateModificationShort").' 
'.$expensereportstatic->getNomUrl(1).''.$userstatic->getNomUrl(-1).''.price($obj->total_ht).''.price($obj->total_ttc).''.dol_print_date($db->jdate($obj->dm), 'day').''; + print ''.price($obj->total_ht).''.price($obj->total_ttc).''.dol_print_date($db->jdate($obj->dm), 'day').''; //print $obj->libelle; print $expensereportstatic->LibStatut($obj->fk_status, 3); print ''; + print ''; select_expensereport_statut($search_status, 'search_status', 1, 1); print ''; + print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->expensereport->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -696,28 +696,28 @@ if ($resql) } // Start date if (! empty($arrayfields['d.date_debut']['checked'])) { - print ''.($obj->date_debut > 0 ? dol_print_date($db->jdate($obj->date_debut), 'day') : '').''.($obj->date_debut > 0 ? dol_print_date($db->jdate($obj->date_debut), 'day') : '').''.($obj->date_fin > 0 ? dol_print_date($db->jdate($obj->date_fin), 'day') : '').''.($obj->date_fin > 0 ? dol_print_date($db->jdate($obj->date_fin), 'day') : '').''.($obj->date_valid > 0 ? dol_print_date($db->jdate($obj->date_valid), 'day') : '').''.($obj->date_valid > 0 ? dol_print_date($db->jdate($obj->date_valid), 'day') : '').''.($obj->date_approve > 0 ? dol_print_date($db->jdate($obj->date_approve), 'day') : '').''.($obj->date_approve > 0 ? dol_print_date($db->jdate($obj->date_approve), 'day') : '').''.price($obj->total_ht)."'.price($obj->total_ht)."'.price($obj->total_tva)."'.price($obj->total_tva)."'.price($obj->total_ttc)."'.price($obj->total_ttc)."'; + print ''; print dol_print_date($db->jdate($obj->date_create), 'dayhour'); print ''; + print ''; print dol_print_date($db->jdate($obj->date_modif), 'dayhour'); print ''.$expensereportstatic->getLibStatut(5).''.$expensereportstatic->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; @@ -808,9 +808,9 @@ if ($resql) if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totalht']).''.price($totalarray['totalvat']).''.price($totalarray['totalttc']).''.price($totalarray['totalht']).''.price($totalarray['totalvat']).''.price($totalarray['totalttc']).'