diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 47a386c1a03..1014beba184 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -118,7 +118,7 @@ foreach($sortorder as $numero=>$name) $idperms=""; $var=!$var; // Module - print ""; + print "'; $alt=$name.' - '.$modules_files[$numero]; if (! empty($picto[$numero])) { diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index a1c544f338b..927474a5e44 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -254,7 +254,7 @@ else { $var=!$var; print "\t\n"; - print "\t\t"; + print "\t\t".''; print "".$cat->label.""; print "\n"; print "\t\t".''.$cat->description."\n"; diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 7e842ae3678..a4adb2a74b6 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -986,7 +986,7 @@ if ($id > 0) } // Priority - print ''.$langs->trans("Priority").''; + print ''.$langs->trans("Priority").''; print ''; print ''; @@ -1174,7 +1174,7 @@ if ($id > 0) } // Priority - print ''.$langs->trans("Priority").''; + print ''.$langs->trans("Priority").''; print ($object->priority?$object->priority:''); print ''; diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 39253325716..513e295a913 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -655,12 +655,12 @@ if (($action != 'create' && $action != 'add') || !$error) print ''.$objp->ref_client.''; // Order date - print ''; + print ''; print dol_print_date($db->jdate($objp->date_commande),'day'); print ''; //Delivery date - print ''; + print ''; print dol_print_date($db->jdate($objp->date_livraison),'day'); print ''; diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 536bdc91662..7184f0c71f1 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -776,11 +776,11 @@ if ($id > 0 || ! empty($ref)) { if ($total >= 0) { - print ' '.price($total).''; + print ' '.price($total).''; } else { - print ' '.price($total).''; + print ' '.price($total).''; } } else @@ -791,7 +791,7 @@ if ($id > 0 || ! empty($ref)) // Transaction reconciliated or edit link if ($objp->rappro && $object->canBeConciliated() > 0) // If line not conciliated and account can be conciliated { - print ''; + print ''; print ''; print img_edit(); print ''; @@ -844,7 +844,7 @@ if ($id > 0 || ! empty($ref)) if ($sep > 0) print ' '; // If we had at least one line in future else print $langs->trans("CurrentBalance"); print ' '.$object->currency_code.''; - print ''.price($total, 0, $langs, 0, 0, -1, $object->currency_code).''; + print ''.price($total, 0, $langs, 0, 0, -1, $object->currency_code).''; print ' '; print ''; } diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 1b5549b2c4e..5293f518738 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -489,15 +489,15 @@ else if ($objp->amount < 0) { $totald = $totald + abs($objp->amount); - print ''.price($objp->amount * -1)." \n"; + print ''.price($objp->amount * -1)." \n"; } else { $totalc = $totalc + abs($objp->amount); - print " ".price($objp->amount)."\n"; + print ' '.price($objp->amount)."\n"; } - print "".price($total)."\n"; + print ''.price($total)."\n"; if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 292742315bb..e62c5203ea6 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -134,13 +134,13 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $var=!$var; print ''; print ''.$langs->trans("CurrentBalance").''; - print ''.price($solde).''; + print ''.price($solde).''; print ''; $var=!$var; print ''; print ''.$langs->trans("RemainderToPay").''; - print ' '; + print ' '; print ''; @@ -330,7 +330,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $var=!$var; print ''; print ''.$langs->trans("FutureBalance").' ('.$acct->currency_code.')'; - print ''.price($solde, 0, $langs, 0, 0, -1, $acct->currency_code).''; + print ''.price($solde, 0, $langs, 0, 0, -1, $acct->currency_code).''; print ''; print ""; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 1aaca07b57d..777ed1f3bd6 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3137,28 +3137,28 @@ if ($action == 'create') // Paye partiellement 'escompte' if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'discount_vat') { - print ''; + print ''; print $form->textwithpicto($langs->trans("Discount") . ':', $langs->trans("HelpEscompte"), - 1); print '' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '; $resteapayeraffiche = 0; } // Paye partiellement ou Abandon 'badcustomer' if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'badcustomer') { - print ''; + print ''; print $form->textwithpicto($langs->trans("Abandoned") . ':', $langs->trans("HelpAbandonBadCustomer"), - 1); print '' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '; // $resteapayeraffiche=0; } // Paye partiellement ou Abandon 'product_returned' if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'product_returned') { - print ''; + print ''; print $form->textwithpicto($langs->trans("ProductReturned") . ':', $langs->trans("HelpAbandonProductReturned"), - 1); print '' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '; $resteapayeraffiche = 0; } // Paye partiellement ou Abandon 'abandon' if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'abandon') { - print ''; + print ''; $text = $langs->trans("HelpAbandonOther"); if ($object->close_note) $text .= '

' . $langs->trans("Reason") . ':' . $object->close_note; @@ -3319,7 +3319,7 @@ if ($action == 'create') print $object->situation_counter; print ''; - print ''; + print ''; $prevsits_total_amount = 0; foreach ($prevsits as $situation) { @@ -3340,7 +3340,7 @@ if ($action == 'create') print $prevsits[$i]->situation_counter; print ''; - print ''; + print ''; print '- ' . price($prevsits[$i]->total_ht); print ''; print '' . $langs->trans('Currency' . $conf->currency) . ''; @@ -3350,20 +3350,20 @@ if ($action == 'create') // Amount print '' . $langs->trans('AmountHT') . ''; - print '' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . ''; - print '' . $langs->trans('AmountVAT') . '' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . ''; + print '' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . ''; + print '' . $langs->trans('AmountVAT') . '' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . ''; print ''; // Amount Local Taxes if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) // Localtax1 { print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ''; - print '' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . ''; + print '' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . ''; } if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) // Localtax2 { print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ''; - print '' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . ''; + print '' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . ''; } // Revenue stamp diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 9d8b9123b68..6954ad46249 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -399,27 +399,27 @@ if ($object->id > 0) // Montants print ''.$langs->trans('AmountHT').''; - print ''.price($object->total_ht).''; + print ''.price($object->total_ht).''; print ''.$langs->trans('Currency'.$conf->currency).''; - print ''.$langs->trans('AmountVAT').''.price($object->total_tva).''; + print ''.$langs->trans('AmountVAT').''.price($object->total_tva).''; print ''.$langs->trans('Currency'.$conf->currency).''; // Amount Local Taxes if ($mysoc->localtax1_assuj=="1") //Localtax1 { print ''.$langs->transcountry("AmountLT1",$mysoc->country_code).''; - print ''.price($object->total_localtax1).''; + print ''.price($object->total_localtax1).''; print ''.$langs->trans("Currency".$conf->currency).''; } if ($mysoc->localtax2_assuj=="1") //Localtax2 { print ''.$langs->transcountry("AmountLT2",$mysoc->country_code).''; - print ''.price($object->total_localtax2).''; + print ''.price($object->total_localtax2).''; print ''.$langs->trans("Currency".$conf->currency).''; } - print ''.$langs->trans('AmountTTC').''.price($object->total_ttc).''; + print ''.$langs->trans('AmountTTC').''.price($object->total_ttc).''; print ''.$langs->trans('Currency'.$conf->currency).''; // We can also use bcadd to avoid pb with floating points @@ -428,7 +428,7 @@ if ($object->id > 0) //$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT); $resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits,'MT'); - print ''.$langs->trans('RemainderToPay').''.price($resteapayer).''; + print ''.$langs->trans('RemainderToPay').''.price($resteapayer).''; print ''.$langs->trans('Currency'.$conf->currency).''; // Statut diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 33ebfd3b1be..1e8570d7378 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -86,7 +86,7 @@ function pt ($db, $sql, $date) $i++; } - print ''.$langs->trans("Total")." :".price($total)." "; + print ''.$langs->trans("Total")." :".price($total)." "; print ""; $db->free($result); @@ -253,7 +253,7 @@ for ($m = 1 ; $m < 13 ; $m++ ) { $subtotalcoll=0; $subtotalpaye=0; $subtotal=0; } } -print ''.$langs->trans("TotalToPay").':'.price($total).''; +print ''.$langs->trans("TotalToPay").':'.price($total).''; print " \n"; print ''; diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index c0dcff6d5c3..c84c7d2b633 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -93,7 +93,7 @@ function pt ($db, $sql, $date) $i++; } - print ''.$langs->trans("Total")." :".price($total)." "; + print ''.$langs->trans("Total")." :".price($total)." "; print ""; $db->free($result); @@ -216,7 +216,7 @@ for ($m = 1 ; $m < 13 ; $m++ ) $subtotalcoll=0; $subtotalpaye=0; $subtotal=0; } } -print ''.$langs->trans("TotalToPay").':'.price($total).''; +print ''.$langs->trans("TotalToPay").':'.price($total).''; print " \n"; print ''; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 254185cc63d..cc9a394d983 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1021,12 +1021,12 @@ if ($action == 'create') } // Commercial suivi - print ''.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").''; + print ''.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").''; print $form->select_dolusers(GETPOST("commercial_suivi_id")?GETPOST("commercial_suivi_id"):$user->id,'commercial_suivi_id',1,''); print ''; // Commercial signature - print ''.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").''; + print ''.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").''; print $form->select_dolusers(GETPOST("commercial_signature_id")?GETPOST("commercial_signature_id"):$user->id,'commercial_signature_id',1,''); print ''; diff --git a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php index d1dccba42c4..38ee8909216 100644 --- a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php +++ b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php @@ -106,7 +106,7 @@ window.onload = function()   - / + /       diff --git a/htdocs/core/filemanagerdol/browser/default/frmfolders.php b/htdocs/core/filemanagerdol/browser/default/frmfolders.php index 6dce1154dff..5feb1fedf70 100644 --- a/htdocs/core/filemanagerdol/browser/default/frmfolders.php +++ b/htdocs/core/filemanagerdol/browser/default/frmfolders.php @@ -220,7 +220,7 @@ window.onload = function() - +
diff --git a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php index 19d0df5c346..cf6306f9672 100644 --- a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php +++ b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php @@ -77,7 +77,7 @@ oListManager.GetFolderRowHtml = function( folderName, folderPath ) '' + sLink + '<\/a>' + - '<\/td> ' + + '<\/td> ' + sLink + folderName + '<\/a>' + @@ -100,7 +100,7 @@ oListManager.GetFileRowHtml = function( fileName, fileUrl, fileSize ) sLink + fileName + '<\/a>' + - '<\/td> ' + + '<\/td> ' + fileSize + ' KB' + '<\/td><\/tr>' ; diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 222b6eb0ea2..d64ef7a2b3e 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -152,7 +152,7 @@ $coldisplay=-1; // We remove first td } ?> - + info_bits & 2) != 2) { print 'situation_counter > 1) print ' readonly'; @@ -164,7 +164,7 @@ $coldisplay=-1; // We remove first td situation_cycle_ref) { $coldisplay++; - print '%'; + print '%'; } if (! empty($usemargins)) { diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 593421fe527..0ca056cfbb4 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -148,7 +148,7 @@ if (empty($usemargins)) $usemargins=0; global->PRODUCT_USE_UNITS) { - print ''; + print ''; $label = $line->getLabelOfUnit('short'); if ($label !== '') { print $langs->trans($label); @@ -169,7 +169,7 @@ if (empty($usemargins)) $usemargins=0; if ($this->situation_cycle_ref) { $coldisplay++; - print '' . $line->situation_percent . '%'; + print '' . $line->situation_percent . '%'; } if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id)) diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 5ecd563a613..2d5d0e207c6 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -93,7 +93,7 @@ if ($resql) { $var=!$var; $obj = $db->fetch_object($resql); - print ""; + print "'; $shipment->id=$obj->rowid; $shipment->ref=$obj->ref; print $shipment->getNomUrl(1); diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 0dbcc007db1..e6dd2792118 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -464,7 +464,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Icon update et delete - print ''; + print ''; if ($user->rights->projet->creer) { print ' ';