diff --git a/dev/test/testdiv.php b/dev/test/testdiv.php
index 78917a8d940..8700be5b2ab 100644
--- a/dev/test/testdiv.php
+++ b/dev/test/testdiv.php
@@ -33,14 +33,14 @@
";
// Nb
- print ''.$langs->trans("AgendaExtNb",$key)." ";
+ print ''.$langs->trans("AgendaExtNb",$key)." ";
// Name
print ' ';
// URL
print ' ';
// Color (Possible colors are limited by Google)
- print '';
+ print ' ';
//print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist);
print $formother->selectColor((GETPOST("agenda_ext_color".$key)?GETPOST("agenda_ext_color".$key):$conf->global->$color), "agenda_ext_color".$key, 'extsitesconfig', 1, '', 'hideifnotset');
print ' ';
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 6ba81a5cbee..9fc80d8b3f7 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -165,7 +165,7 @@ while ($i < $nbofbank)
print ''.$bankorder[$i][0]." \n";
print $bankorder[$i][1];
print ' ';
- print '';
+ print ' ';
$tmparray=explode(' ',$bankorder[$i][2]);
foreach($tmparray as $key => $val)
{
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 861a15bfebc..898d20648ec 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -234,7 +234,7 @@ print '';
print '';
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
-print ''.$langs->trans("Example").' ';
+print ''.$langs->trans("Example").' ';
print ''.$langs->trans("Status").' ';
print ''.$langs->trans("Infos").' ';
print ' '."\n";
@@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir)
print '';
// Show example of numbering model
- print '';
+ print ' ';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) print ''.$langs->trans($tmp).'
';
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 5e32dd097d0..24a4ba180c2 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -146,7 +146,7 @@ if (is_resource($handle))
print ' ';
// Show example of numbering model
- print '';
+ print ' ';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print ''.$langs->trans($tmp).'
'; }
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ef64ad34527..d82169b7be3 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1111,7 +1111,7 @@ if ($id)
$url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?$obj->code:'').'&id='.$id.'&';
// Active
- print ' ';
+ print ' ';
if ($iserasable) print ''.$actl[$obj->active].' ';
else
{
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 28e5b912de2..1ac15bed9ed 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -266,7 +266,7 @@ foreach ($dirmodels as $reldir)
print ' ';
// Show example of numbering module
- print '';
+ print ' ';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) {
$langs->load("errors"); print ''.$langs->trans($tmp).'
';
@@ -361,7 +361,7 @@ print ' '.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
print ''.$langs->trans("Status").' ';
print ''.$langs->trans("Default").' ';
-print ''.$langs->trans("Infos").' ';
+print ''.$langs->trans("Infos").' ';
print "\n";
clearstatcache();
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 35768104e39..ac2d89c1169 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -319,7 +319,7 @@ print '';
print '';
print ''.$langs->trans("Name").' ';
print ''.$langs->trans("Description").' ';
-print ''.$langs->trans("Example").' ';
+print ''.$langs->trans("Example").' ';
print ''.$langs->trans("Status").' ';
print ''.$langs->trans("Infos").' ';
print ' '."\n";
@@ -371,7 +371,7 @@ foreach ($dirmodels as $reldir)
print '';
// Show example of numbering module
- print '';
+ print ' ';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) print ''.$langs->trans($tmp).'
';
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 023593ea2a7..95b2bffffb5 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -263,7 +263,7 @@ foreach ($dirmodels as $reldir)
print ' ';
// Show example of numbering model
- print '';
+ print ' ';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) print ''.$langs->trans($tmp).'
';
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 677e2b3773b..9bee4befa03 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -253,7 +253,7 @@ foreach ($dirmodels as $reldir)
print ' ';
// Show example of numbering module
- print '';
+ print ' ';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) {
$langs->load("errors"); print ''.$langs->trans($tmp).'
';
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index f7bd7ad95d7..67388dbb330 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -305,7 +305,7 @@ if ($action == 'create')
print ' '.$langs->trans('DetailMenuHandler').' ';
//User
- print ''.$langs->trans('MenuForUsers').' ';
+ print ''.$langs->trans('MenuForUsers').' ';
print '';
print ''.$langs->trans("AllMenus").' ';
print ''.$langs->trans('Internal').' ';
@@ -406,7 +406,7 @@ elseif ($action == 'edit')
print ''.$langs->trans('MenuHandler').' '.$handler.' '.$langs->trans('DetailMenuHandler').' ';
// User
- print ''.$langs->trans('MenuForUsers').' ';
+ print ''.$langs->trans('MenuForUsers').' ';
print 'user==2?' selected="true"':'').'>'.$langs->trans("AllMenus").' ';
print 'user==0?' selected="true"':'').'>'.$langs->trans('Internal').' ';
print 'user==1?' selected="true"':'').'>'.$langs->trans('External').' ';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index d7cfcc0b67f..13f9eb32f46 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -302,7 +302,7 @@ foreach ($dirmodels as $reldir)
print ' ';
// Show example of numbering module
- print '';
+ print ' ';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) print ''.$langs->trans($tmp).'
';
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index ac3c911577b..5fe56bafaea 100755
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -132,7 +132,7 @@ $var=!$var;
print ' ';
print ''.$langs->trans("ConnectionTimeout").' ';
print ' ';
-print '';
+print ' ';
print ' global->MAIN_USE_CONNECT_TIMEOUT).'">';
print ' '.strtolower($langs->trans("Seconds"));
print ' ';
@@ -142,7 +142,7 @@ $var=!$var;
print ' ';
print ''.$langs->trans("ResponseTimeout").' ';
print ' ';
-print '';
+print ' ';
print ' ';
print ' '.strtolower($langs->trans("Seconds"));
print ' ';
@@ -152,7 +152,7 @@ $var=!$var;
print ' ';
print ''.$langs->trans("MAIN_PROXY_USE").' ';
print ' ';
-print '';
+print ' ';
print $form->selectyesno('MAIN_PROXY_USE',$conf->global->MAIN_PROXY_USE,1);
print ' ';
print ' ';
@@ -161,7 +161,7 @@ $var=!$var;
print '';
print ''.$langs->trans("MAIN_PROXY_HOST").' ';
print ' ';
-print '';
+print ' ';
print ' ';
print ' ';
print ' ';
@@ -170,7 +170,7 @@ $var=!$var;
print '';
print ''.$langs->trans("MAIN_PROXY_PORT").' ';
print ' ';
-print '';
+print ' ';
print ' ';
print ' ';
print ' ';
@@ -179,7 +179,7 @@ $var=!$var;
print '';
print ''.$langs->trans("MAIN_PROXY_USER").' ';
print ' ';
-print '';
+print ' ';
print ' ';
print ' ';
print ' ';
@@ -188,7 +188,7 @@ $var=!$var;
print '';
print ''.$langs->trans("MAIN_PROXY_PASS").' ';
print ' ';
-print '';
+print ' ';
print ' ';
print ' ';
print ' ';
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 9c4bfc67af4..83d2d5f8947 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -247,7 +247,7 @@ foreach ($arrayhandler as $key => $module)
print ' ';
// Show example of numbering module
- print '';
+ print ' ';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print ''.$langs->trans($tmp).'
'; }
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index f24a63ba76e..b78a201b9d1 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -154,7 +154,7 @@ print ' ';
print ''.$langs->trans("SessionTimeOut").' ';
print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
print ' ';
-print '';
+print ' ';
print ' '.strtolower($langs->trans("Seconds"));
print ' ';
print '';
@@ -250,7 +250,7 @@ $max=@ini_get('upload_max_filesize');
if ($max) print ' '.$langs->trans("MustBeLowerThanPHPLimit",$max*1024,$langs->trans("Kb")).'.';
else print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.';
print ' ';
-print '';
+print ' ';
print ' '.$langs->trans("Kb");
print ' ';
print '';
@@ -265,7 +265,7 @@ print ' ';
print ''.$langs->trans("UMask").' ';
print $form->textwithpicto('',$langs->trans("UMaskExplanation"));
print ' ';
-print '';
+print ' ';
print ' ';
print ' ';
print '';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index d99698473a4..b724774237c 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -251,7 +251,7 @@ foreach ($dirmodels as $reldir)
print ' ';
// Show example of numbering model
- print '';
+ print ' ';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) {
$langs->load("errors"); print ''.$langs->trans($tmp).'
';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index f80e6c3b28b..2b4feda1b8d 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -251,7 +251,7 @@ foreach ($dirmodels as $reldir)
print ' ';
// Show example of numbering module
- print '';
+ print ' ';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) {
$langs->load("errors"); print ''.$langs->trans($tmp).'
';
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 075f975adb2..f42f846e9d6 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -192,7 +192,7 @@ foreach ($syslogModules as $moduleName)
print $module->getName();
print ' ';
- print '';
+ print ' ';
$setuparray=$module->configure();
if ($setuparray)
{
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index fec29ea5fd0..a3f046f4510 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -165,11 +165,11 @@ function create_script_table($list)
foreach($list as $script) { ?>
>
-
-
+
+
KB
- ()
-
+ ()
+
@@ -199,10 +199,10 @@ function create_key_table($list)
?>
>
-
-
+
+
KB
- ';
// Date
- print ' '.dol_print_date($db->jdate($obj->dateevent),'%Y-%m-%d %H:%M:%S').' ';
+ print ''.dol_print_date($db->jdate($obj->dateevent),'%Y-%m-%d %H:%M:%S').' ';
// Code
print ''.$obj->type.' ';
// IP
- print '';
+ print ' ';
print dol_print_ip($obj->ip);
print ' ';
// Login
- print '';
+ print ' ';
if ($obj->fk_user)
{
$userstatic->id=$obj->fk_user;
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 0193ed9d833..780e4427078 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -151,16 +151,16 @@ if ($savehandler == 'files')
print ' '.$sessionentry['login'].' ';
// ID
- print '';
+ print ' ';
if ("$key" == session_id()) print $form->textwithpicto($key,$langs->trans("YourSession"));
else print $key;
print ' ';
// Date creation
- print ''.dol_print_date($sessionentry['creation'],'%Y-%m-%d %H:%M:%S').' ';
+ print ''.dol_print_date($sessionentry['creation'],'%Y-%m-%d %H:%M:%S').' ';
// Date modification
- print ''.dol_print_date($sessionentry['modification'],'%Y-%m-%d %H:%M:%S').' ';
+ print ''.dol_print_date($sessionentry['modification'],'%Y-%m-%d %H:%M:%S').' ';
// Age
print ''.$sessionentry['age'].' ';
diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php
index 371870047d9..c3634b6c726 100644
--- a/htdocs/bookmarks/liste.php
+++ b/htdocs/bookmarks/liste.php
@@ -170,7 +170,7 @@ if ($resql)
print ''.$obj->position." ";
// Actions
- print '';
+ print ' ';
if ($user->rights->bookmark->creer)
{
print "bid."&backtopage=".urlencode($_SERVER["PHP_SELF"])."\">".img_edit()." ";
diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
index ddce4bf1e83..cae461fe7fc 100644
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ b/htdocs/cashdesk/tpl/ticket.tpl.php
@@ -140,9 +140,9 @@ print $object->ref;
'.$langs->trans("TotalHT").' '.price2num($obj_facturation->prixTotalHt(),'MT')." ".$conf->currency." \n";
-echo ''.$langs->trans("TotalVAT").' '.price2num($obj_facturation->montantTva(),'MT')." ".$conf->currency." \n";
-echo ''.$langs->trans("TotalTTC").' '.price2num($obj_facturation->prixTotalTtc(),'MT')." ".$conf->currency." \n";
+echo ''.$langs->trans("TotalHT").' '.price2num($obj_facturation->prixTotalHt(),'MT')." ".$conf->currency." \n";
+echo ''.$langs->trans("TotalVAT").' '.price2num($obj_facturation->montantTva(),'MT')." ".$conf->currency." \n";
+echo ''.$langs->trans("TotalTTC").' '.price2num($obj_facturation->prixTotalTtc(),'MT')." ".$conf->currency." \n";
?>
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index ec2a2b49d63..a930637f627 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -277,7 +277,7 @@ if ($socid)
// Assujeti a TVA ou pas
print ' ';
- print ''.$langs->trans('VATIsUsed').' ';
+ print ' '.$langs->trans('VATIsUsed').' ';
print yn($soc->tva_assuj);
print ' ';
print ' ';
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 57cffd387de..36ed1bd4ded 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -258,7 +258,7 @@ if ($object->type == 0)
{
$var=!$var;
print "\t\n";
- print '';
+ print ' ';
print $prod->getNomUrl(1,'category');
print " \n";
print ''.$prod->libelle." \n";
@@ -309,7 +309,7 @@ if ($object->type == 1)
$var=!$var;
print "\t \n";
- print '';
+ print ' ';
print $soc->getNomUrl(1,'category_supplier');
print " \n";
// Link to delete from category
@@ -361,7 +361,7 @@ if($object->type == 2)
$i++;
$var=!$var;
print "\t \n";
- print '';
+ print ' ';
print $soc->getNomUrl(1,'category');
print " \n";
// Link to delete from category
@@ -413,7 +413,7 @@ if ($object->type == 3)
{
$var=!$var;
print "\t \n";
- print '';
+ print ' ';
$member->ref=$member->login;
print $member->getNomUrl(1,0,'category');
print " \n";
diff --git a/htdocs/comm/action/contact.php b/htdocs/comm/action/contact.php
index b3819ce3a04..87a13f28c55 100644
--- a/htdocs/comm/action/contact.php
+++ b/htdocs/comm/action/contact.php
@@ -266,7 +266,7 @@ if ($id > 0 || ! empty($ref))
// Ligne ajout pour contact interne
print " ";
- print '';
+ print ' ';
print img_object('','user').' '.$langs->trans("Users");
print ' ';
@@ -298,7 +298,7 @@ if ($id > 0 || ! empty($ref))
$var=!$var;
print " ";
- print '';
+ print ' ';
print img_object('','contact').' '.$langs->trans("ThirdPartyContacts");
print ' ';
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 4b4917715b5..618a6e4fa3e 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -473,7 +473,7 @@ if ($action == 'create')
// Date start
$datep=$actioncomm->datep;
if (GETPOST('datep','int',1)) $datep=dol_stringtotime(GETPOST('datep','int',1),0);
- print ' '.$langs->trans("DateActionStart").' ';
+ print ' '.$langs->trans("DateActionStart").' ';
if (GETPOST("afaire") == 1) $form->select_date($datep,'ap',1,1,0,"action",1,1,0,0,'fulldayend');
else if (GETPOST("afaire") == 2) $form->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldayend');
else $form->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
@@ -514,12 +514,12 @@ if ($action == 'create')
// Assigned to
$var=false;
- print ' '.$langs->trans("ActionAffectedTo").' ';
+ print ' '.$langs->trans("ActionAffectedTo").' ';
$form->select_users(GETPOST("affectedto")?GETPOST("affectedto"):(! empty($actioncomm->usertodo->id) && $actioncomm->usertodo->id > 0 ? $actioncomm->usertodo->id : $user->id),'affectedto',1);
print ' ';
// Busy
- print ''.$langs->trans("Busy").' ';
+ print ' '.$langs->trans("Busy").' ';
print ' ';
print ' ';
@@ -536,7 +536,7 @@ if ($action == 'create')
print '';
// Societe, contact
- print ''.$langs->trans("ActionOnCompany").' ';
+ print ' '.$langs->trans("ActionOnCompany").' ';
if (GETPOST('socid','int') > 0)
{
$societe = new Societe($db);
@@ -711,7 +711,7 @@ if ($id > 0)
if ($backtopage) print ' ';
dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
-
+
print '';
// Ref
@@ -732,7 +732,7 @@ if ($id > 0)
print ''.$langs->trans("EventOnFullDay").' fulldayevent?' checked="checked"':'').'> ';
// Date start
- print ''.$langs->trans("DateActionStart").' ';
+ print ' '.$langs->trans("DateActionStart").' ';
if (GETPOST("afaire") == 1) $form->select_date($act->datep,'ap',1,1,0,"action",1,1,0,0,'fulldaystart');
else if (GETPOST("afaire") == 2) $form->select_date($act->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
else $form->select_date($act->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
@@ -745,7 +745,7 @@ if ($id > 0)
print ' ';
// Status
- print ''.$langs->trans("Status").' / '.$langs->trans("Percentage").' ';
+ print ' '.$langs->trans("Status").' / '.$langs->trans("Percentage").' ';
$percent=GETPOST("percentage")?GETPOST("percentage"):$act->percentage;
print $htmlactions->form_select_status_action('formaction',$percent,1);
print ' ';
@@ -756,19 +756,19 @@ if ($id > 0)
print '
';
dol_fiche_end();
-
+
print ' ';
print ' ';
print ' ';
@@ -848,7 +848,7 @@ if ($id > 0)
else
{
dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
-
+
// Affichage fiche action en mode visu
print '';
@@ -916,7 +916,7 @@ if ($id > 0)
print '';
// Status
- print ''.$langs->trans("Status").' / '.$langs->trans("Percentage").' ';
+ print ' '.$langs->trans("Status").' / '.$langs->trans("Percentage").' ';
print $act->getLibStatut(4);
print ' ';
@@ -926,19 +926,19 @@ if ($id > 0)
print '
';
// Assigned to
- print ''.$langs->trans("ActionAffectedTo").' ';
+ print ' '.$langs->trans("ActionAffectedTo").' ';
if ($act->usertodo->id > 0) print $act->usertodo->getNomUrl(1);
print ' ';
// Busy
- print ''.$langs->trans("Busy").' ';
+ print ' '.$langs->trans("Busy").' ';
print yn(($act->transparency > 0)?1:0);
print ' ';
// Done by
if ($conf->global->AGENDA_ENABLE_DONEBY)
{
- print ''.$langs->trans("ActionDoneBy").' ';
+ print ' '.$langs->trans("ActionDoneBy").' ';
if ($act->userdone->id > 0) print $act->userdone->getNomUrl(1);
print ' ';
}
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 813c2578374..fd9df1ea848 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -780,7 +780,7 @@ if (empty($action) || $action == 'show_month') // View by month
{
$style='cal_other_month cal_past';
if ($iter_day == 6) $style.=' cal_other_month_right';
- echo ' ';
+ echo ' ';
show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
echo " \n";
}
@@ -796,7 +796,7 @@ if (empty($action) || $action == 'show_month') // View by month
if ($today) $style='cal_today';
if ($curtime < $todaytms) $style.=' cal_past';
- echo ' ';
+ echo ' ';
show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
echo " \n";
}
@@ -805,7 +805,7 @@ if (empty($action) || $action == 'show_month') // View by month
{
$style='cal_other_month';
if ($iter_day == 6) $style.=' cal_other_month_right';
- echo ' ';
+ echo ' ';
show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
echo " \n";
}
@@ -855,7 +855,7 @@ elseif ($action == 'show_week') // View by week
if ($todayarray['mday']==$tmpday && $todayarray['mon']==$month && $todayarray['year']==$year) $today=1;
if ($today) $style='cal_today';
- echo ' ';
+ echo ' ';
show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300);
echo " \n";
}
@@ -863,7 +863,7 @@ elseif ($action == 'show_week') // View by week
{
$style='cal_current_month';
if ($iter_day == 6) $style.=' cal_other_month_right';
- echo ' ';
+ echo ' ';
show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300);
echo " \n";
}
@@ -892,7 +892,7 @@ else // View by day
echo ' '.$langs->trans("Day".$arraytimestamp['wday'])." \n";
echo " \n";
echo " \n";
- echo ' ';
+ echo ' ';
$maxnbofchar=80;
show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300);
echo " \n";
@@ -947,7 +947,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print ''."\n";
$curtime = dol_mktime(0, 0, 0, $month, $day, $year);
print '
';
- print '';
+ print ' ';
print '';
- print ' ';
+ print ' ';
if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
{
//$param='month='.$monthshown.'&year='.$year;
@@ -966,7 +966,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '';
}
print ' ';
- print '';
+ print ' ';
//$curtime = dol_mktime (0, 0, 0, $month, $day, $year);
$i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
@@ -1034,7 +1034,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '';
print '
';
print '';
- print '';
+ print ' ';
if ($event->type_code == 'BIRTHDAY') // It's a birthday
{
print $event->getNomUrl(1,$maxnbofchar,'cal_event','birthday','contact');
@@ -1155,7 +1155,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print ' ';
// Status - Percent
- print '';
+ print ' ';
if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT') print $event->getLibStatut(3,1);
else print ' ';
print '
';
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 9e7a7a959bb..c0b8430b75e 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -276,7 +276,7 @@ if ($resql)
//print dol_trunc($obj->label,12);
//print ' ';
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->dp),"day");
$late=0;
if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
@@ -286,7 +286,7 @@ if ($resql)
if ($late) print img_warning($langs->trans("Late")).' ';
print ' ';
- print '';
+ print ' ';
print dol_print_date($db->jdate($obj->dp2),"day");
print ' ';
@@ -354,7 +354,7 @@ if ($resql)
print '';
// Status/Percent
- print ''.$actionstatic->LibStatut($obj->percent,6).' ';
+ print ''.$actionstatic->LibStatut($obj->percent,6).' ';
print " \n";
$i++;
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index ae8026d2b68..88b136b8167 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -236,7 +236,7 @@ if ($id > 0)
print "";
// Zip / Town
- print ''.$langs->trans('Zip').' / '.$langs->trans('Town').' ';
+ print ''.$langs->trans('Zip').' / '.$langs->trans('Town').' ';
print ''.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town." ";
print ' ';
@@ -261,7 +261,7 @@ if ($id > 0)
// Assujeti a TVA ou pas
print '';
- print ''.$langs->trans('VATIsUsed').' ';
+ print ' '.$langs->trans('VATIsUsed').' ';
print yn($object->tva_assuj);
print ' ';
print ' ';
@@ -271,10 +271,10 @@ if ($id > 0)
{
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
{
- print ''.$langs->trans('LocalTax1IsUsedES').' ';
+ print ' '.$langs->trans('LocalTax1IsUsedES').' ';
print yn($object->localtax1_assuj);
print ' ';
- print ''.$langs->trans('LocalTax2IsUsedES').' ';
+ print ' '.$langs->trans('LocalTax2IsUsedES').' ';
print yn($object->localtax2_assuj);
print ' ';
}
@@ -503,14 +503,14 @@ if ($id > 0)
{
$objp = $db->fetch_object($resql);
print "";
- print ''.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.' '."\n";
+ print ''.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.' '."\n";
if ( ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 )
{
print " ".img_warning();
}
print ''.dol_print_date($db->jdate($objp->dp),'day')." \n";
print ''.price($objp->total_ht).' ';
- print ''.$propal_static->LibStatut($objp->fk_statut,5).' ';
+ print ''.$propal_static->LibStatut($objp->fk_statut,5).' ';
$var=!$var;
$i++;
}
@@ -579,10 +579,10 @@ if ($id > 0)
$objp = $db->fetch_object($resql);
$var=!$var;
print "";
- print ''.img_object($langs->trans("ShowOrder"),"order").' '.$objp->ref." \n";
+ print ''.img_object($langs->trans("ShowOrder"),"order").' '.$objp->ref." \n";
print ''.dol_print_date($db->jdate($objp->dc),'day')." \n";
print ''.price($objp->total_ht).' ';
- print ''.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).' ';
+ print ''.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).' ';
$i++;
}
$db->free($resql);
@@ -631,14 +631,14 @@ if ($id > 0)
$objp = $db->fetch_object($resql);
$var=!$var;
print "";
- print '';
+ print ' ';
$contrat->id=$objp->id;
$contrat->ref=$objp->ref?$objp->ref:$objp->id;
print $contrat->getNomUrl(1,12);
print " \n";
print ''.dol_print_date($db->jdate($objp->dc),'day')." \n";
print ' ';
- print '';
+ print ' ';
$contrat->fetch_lines();
print $contrat->getLibStatut(4);
print " \n";
@@ -692,7 +692,7 @@ if ($id > 0)
$fichinter_static->statut=$objp->fk_statut;
print " ";
- print ''.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.' '."\n";
+ print ''.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.' '."\n";
//print ''.dol_print_date($db->jdate($objp->startdate)).' '."\n";
print ''.convertSecondToTime($objp->duration).' '."\n";
print ''.$fichinter_static->getLibStatut(5).' '."\n";
@@ -753,7 +753,7 @@ if ($id > 0)
$objp = $db->fetch_object($resql);
$var=!$var;
print " ";
- print '';
+ print ' ';
$facturestatic->id=$objp->facid;
$facturestatic->ref=$objp->facnumber;
$facturestatic->type=$objp->type;
@@ -769,7 +769,7 @@ if ($id > 0)
}
print ' '.price($objp->total_ttc).' ';
- print ''.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).' ';
+ print ''.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).' ';
print " \n";
$i++;
}
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index de442152c14..367ab558194 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -157,19 +157,19 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
{
$obj = $db->fetch_object($resql);
$var=!$var;
- print '';
+ print ' ';
$propalstatic->id=$obj->rowid;
$propalstatic->ref=$obj->ref;
print $propalstatic->getNomUrl(1);
print ' ';
- print '';
+ print ' ';
$companystatic->id=$obj->socid;
$companystatic->name=$obj->name;
$companystatic->client=$obj->client;
$companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1,'customer',16);
print ' ';
- print ''.price($obj->total_ht).' ';
+ print ''.price($obj->total_ht).' ';
$i++;
$total += $obj->total_ht;
}
@@ -224,15 +224,15 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
{
$var=!$var;
$obj = $db->fetch_object($resql);
- print ''.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.' ';
- print '';
+ print ' '.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.' ';
+ print '';
$companystatic->id=$obj->socid;
$companystatic->name=$obj->name;
$companystatic->client=$obj->client;
$companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1,'customer',16);
print ' ';
- print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->total_ttc).' ';
$i++;
$total += $obj->total_ttc;
}
@@ -295,7 +295,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
$companystatic->client=$objp->client;
$companystatic->canvas=$objp->canvas;
print '';
- print ''.$companystatic->getNomUrl(1,'customer',48).' ';
+ print ''.$companystatic->getNomUrl(1,'customer',48).' ';
print '';
print $companystatic->getLibCustProspStatut();
print " ";
@@ -351,7 +351,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
$companystatic->name=$objp->name;
$companystatic->canvas=$objp->canvas;
print ' ';
- print ''.$companystatic->getNomUrl(1,'supplier',44).' ';
+ print ''.$companystatic->getNomUrl(1,'supplier',44).' ';
print ''.dol_print_date($db->jdate($objp->dm),'day').' ';
print ' ';
$var=!$var;
@@ -481,16 +481,16 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
print '';
// Ref
- print '';
+ print ' ';
$propalstatic->id=$obj->propalid;
$propalstatic->ref=$obj->ref;
print '';
- print '';
+ print ' ';
print $propalstatic->getNomUrl(1);
print ' ';
- print '';
+ print ' ';
if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
print ' ';
print '';
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 22c7de7c5f2..c533a01c5c5 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -483,7 +483,7 @@ if ($object->fetch($id) >= 0)
if ($obj->statut == 0)
{
print ' ';
- print ''.$langs->trans("MailingStatusNotSent");
+ print ' '.$langs->trans("MailingStatusNotSent");
if ($user->rights->mailing->creer) {
print ''.img_delete($langs->trans("RemoveRecipient"));
}
@@ -492,7 +492,7 @@ if ($object->fetch($id) >= 0)
else
{
print ' '.$obj->date_envoi.' ';
- print '';
+ print ' ';
if ($obj->statut==-1) print $langs->trans("MailingStatusError").' '.img_error();
if ($obj->statut==1) print $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut4');
if ($obj->statut==2) print $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut6');
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 8c1be3b3926..088ee43a02a 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -176,7 +176,7 @@ if ($result)
$var=!$var;
print " ";
- print ''.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.' ';
+ print ''.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.' ';
print ''.dol_trunc($obj->titre,38).' ';
print ''.dol_print_date($db->jdate($obj->date_creat),'day').' ';
print ''.($obj->nbemail?$obj->nbemail:"0").' ';
diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php
index 1a09441b499..b05f859f54e 100644
--- a/htdocs/comm/mailing/liste.php
+++ b/htdocs/comm/mailing/liste.php
@@ -161,10 +161,10 @@ if ($result)
print '';
}
// Last send
- print ''.dol_print_date($db->jdate($obj->date_envoi),'day').' ';
+ print ''.dol_print_date($db->jdate($obj->date_envoi),'day').' ';
print '';
// Status
- print '';
+ print ' ';
if ($filteremail)
{
if ($obj->sendstatut==-1) print $langs->trans("MailingStatusError").' '.img_error();
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 2a7c92dce56..ab536ddee63 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1290,7 +1290,7 @@ if ($action == 'create')
print ' '.$langs->trans("ValidityDuration").' '.$langs->trans("days").' ';
// Terms of payment
- print ''.$langs->trans('PaymentConditionsShort').' ';
+ print ' '.$langs->trans('PaymentConditionsShort').' ';
$form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id');
print ' ';
@@ -1561,7 +1561,7 @@ else
// Ref client
print '';
- print '';
+ print '';
print $langs->trans('RefCustomer').' ';
print ' ';
if ($action != 'refclient' && ! empty($object->brouillon)) print ''.img_edit($langs->trans('Modify')).' ';
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 971f6d10a86..2a31d4a48b7 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -184,7 +184,7 @@ if (! empty($conf->propal->enabled))
$propalstatic->id=$obj->rowid;
$propalstatic->ref=$obj->ref;
- print ''.$propalstatic->getNomUrl(1).' ';
+ print ''.$propalstatic->getNomUrl(1).' ';
$companystatic->id=$obj->socid;
$companystatic->name=$obj->socname;
@@ -242,17 +242,17 @@ if ($resql)
$obj = $db->fetch_object($resql);
print "";
- print '';
+ print ' ';
$propalstatic->id=$obj->rowid;
$propalstatic->ref=$obj->ref;
print '';
- print '';
+ print ' ';
print $propalstatic->getNomUrl(1);
print ' ';
- print '';
+ print ' ';
print ' ';
print ' ';
@@ -321,16 +321,16 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
print ' ';
// Ref
- print '';
+ print ' ';
$propalstatic->id=$obj->propalid;
$propalstatic->ref=$obj->ref;
print '';
- print '';
+ print ' ';
print $propalstatic->getNomUrl(1);
print ' ';
- print '';
+ print ' ';
if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
print ' ';
print '';
@@ -403,17 +403,17 @@ if (! empty($conf->propal->enabled))
$var=!$var;
$obj = $db->fetch_object($resql);
print " ";
- print '';
+ print ' ';
$propalstatic->id=$obj->rowid;
$propalstatic->ref=$obj->ref;
print '';
- print '';
+ print ' ';
print $propalstatic->getNomUrl(1);
print ' ';
- print '';
+ print ' ';
print ' ';
print ' ';
@@ -475,17 +475,17 @@ if (! empty($conf->propal->enabled))
$var=!$var;
$obj = $db->fetch_object($resql);
print " ";
- print '';
+ print ' ';
$propalstatic->id=$obj->rowid;
$propalstatic->ref=$obj->ref;
print '';
- print '';
+ print ' ';
print $propalstatic->getNomUrl(1);
print ' ';
- print '';
+ print ' ';
print ' ';
print ' ';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 1d4d5b82c24..4787cb3ae3e 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -301,17 +301,17 @@ if ($result)
$now = dol_now();
$var=!$var;
print ' ';
- print '';
+ print ' ';
$objectstatic->id=$objp->propalid;
$objectstatic->ref=$objp->ref;
print '';
- print '';
+ print ' ';
print $objectstatic->getNomUrl(1);
print ' ';
- print '';
+ print ' ';
if ($objp->fk_statut == 1 && $db->jdate($objp->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
print ' ';
@@ -333,7 +333,7 @@ if ($result)
print '';
// Customer ref
- print '';
+ print ' ';
print $objp->ref_client;
print ' ';
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index bd0f6376f1f..873ef051612 100755
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -402,12 +402,12 @@ if ($resql)
print $prospectstatic->getLibProspLevel();
print "";
// Statut
- print '';
+ print ' ';
print $prospectstatic->LibProspStatut($obj->fk_stcomm,2);
print " ";
//$sts = array(-1,0,1,2,3);
- print '';
+ print ' ';
foreach ($sts as $key => $value)
{
if ($value <> $obj->fk_stcomm)
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 7f92b7e65c0..56dec89394d 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -323,7 +323,7 @@ if ($socid > 0)
print ' ';
print ''.$langs->trans("Date").' '; // Need 120+ for format with AM/PM
print ''.$langs->trans("ReasonDiscount").' ';
- print ''.$langs->trans("ConsumedBy").' ';
+ print ''.$langs->trans("ConsumedBy").' ';
print ''.$langs->trans("AmountHT").' ';
print ''.$langs->trans("VATRate").' ';
print ''.$langs->trans("AmountTTC").' ';
@@ -342,7 +342,7 @@ if ($socid > 0)
print ''.dol_print_date($db->jdate($obj->dc),'dayhour').' ';
if ($obj->description == '(CREDIT_NOTE)')
{
- print '';
+ print ' ';
$facturestatic->id=$obj->fk_facture_source;
$facturestatic->ref=$obj->ref;
$facturestatic->type=$obj->type;
@@ -351,7 +351,7 @@ if ($socid > 0)
}
elseif ($obj->description == '(DEPOSIT)')
{
- print ' ';
+ print ' ';
$facturestatic->id=$obj->fk_facture_source;
$facturestatic->ref=$obj->ref;
$facturestatic->type=$obj->type;
@@ -364,7 +364,7 @@ if ($socid > 0)
print $obj->description;
print ' ';
}
- print ''.$langs->trans("NotConsumed").' ';
+ print ''.$langs->trans("NotConsumed").' ';
print ''.price($obj->amount_ht).' ';
print ''.price2num($obj->tva_tx,'MU').'% ';
print ''.price($obj->amount_ttc).' ';
@@ -373,7 +373,7 @@ if ($socid > 0)
print '';
if ($user->rights->societe->creer || $user->rights->facture->creer)
{
- print '';
+ print ' ';
print 'id.'&action=split&remid='.$obj->rowid.'">'.img_picto($langs->trans("SplitDiscount"),'split').' ';
print ' ';
print 'id.'&action=remove&remid='.$obj->rowid.'">'.img_delete($langs->trans("RemoveDiscount")).' ';
@@ -459,7 +459,7 @@ if ($socid > 0)
print ' ';
print ''.$langs->trans("Date").' '; // Need 120+ for format with AM/PM
print ''.$langs->trans("ReasonDiscount").' ';
- print ''.$langs->trans("ConsumedBy").' ';
+ print ''.$langs->trans("ConsumedBy").' ';
print ''.$langs->trans("AmountHT").' ';
print ''.$langs->trans("VATRate").' ';
print ''.$langs->trans("AmountTTC").' ';
@@ -499,7 +499,7 @@ if ($socid > 0)
print ''.dol_print_date($db->jdate($obj->dc),'dayhour').' ';
if ($obj->description == '(CREDIT_NOTE)')
{
- print '';
+ print ' ';
$facturestatic->id=$obj->fk_facture_source;
$facturestatic->ref=$obj->ref;
$facturestatic->type=$obj->type;
@@ -508,7 +508,7 @@ if ($socid > 0)
}
elseif ($obj->description == '(DEPOSIT)')
{
- print ' ';
+ print ' ';
$facturestatic->id=$obj->fk_facture_source;
$facturestatic->ref=$obj->ref;
$facturestatic->type=$obj->type;
@@ -521,7 +521,7 @@ if ($socid > 0)
print $obj->description;
print ' ';
}
- print ''.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.' ';
+ print ''.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.' ';
print ''.price($obj->amount_ht).' ';
print ''.price2num($obj->tva_tx,'MU').'% ';
print ''.price($obj->amount_ttc).' ';
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 4801305a091..1166dcbd8e1 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1565,7 +1565,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print " ";
// Conditions de reglement
- print ''.$langs->trans('PaymentConditionsShort').' ';
+ print ' '.$langs->trans('PaymentConditionsShort').' ';
$form->select_conditions_paiements($cond_reglement_id,'cond_reglement_id',-1,1);
print ' ';
@@ -1907,7 +1907,7 @@ else
// Ref commande client
print '';
- print '';
+ print '';
print $langs->trans('RefCustomer').' ';
print ' ';
if ($action != 'refcustomer' && $object->brouillon) print ''.img_edit($langs->trans('Modify')).' ';
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index e0e2e09df73..d8b45e1b9af 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -195,7 +195,7 @@ if (! empty($conf->commande->enabled))
$var=!$var;
$obj = $db->fetch_object($resql);
print "";
- print '';
+ print ' ';
print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref." ";
print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).' ';
$i++;
@@ -247,17 +247,17 @@ if ($resql)
$obj = $db->fetch_object($resql);
print "";
- print '';
+ print ' ';
$commandestatic->id=$obj->rowid;
$commandestatic->ref=$obj->ref;
print '';
- print '';
+ print ' ';
print $commandestatic->getNomUrl(1);
print ' ';
- print '';
+ print ' ';
print ' ';
print ' ';
@@ -316,17 +316,17 @@ if (! empty($conf->commande->enabled))
$var=!$var;
$obj = $db->fetch_object($resql);
print " ";
- print '';
+ print ' ';
$commandestatic->id=$obj->rowid;
$commandestatic->ref=$obj->ref;
print '';
- print '';
+ print ' ';
print $commandestatic->getNomUrl(1);
print ' ';
- print '';
+ print ' ';
print ' ';
print ' ';
@@ -387,17 +387,17 @@ if (! empty($conf->commande->enabled))
$var=!$var;
$obj = $db->fetch_object($resql);
print " ";
- print '';
+ print ' ';
$commandestatic->id=$obj->rowid;
$commandestatic->ref=$obj->ref;
print '';
- print '';
+ print ' ';
print $commandestatic->getNomUrl(1);
print ' ';
- print '';
+ print ' ';
print ' ';
print ' ';
diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index b628dc2d5db..7ba7ddc82bd 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -304,17 +304,17 @@ if ($resql)
$objp = $db->fetch_object($resql);
$var=!$var;
print ' ';
- print '';
+ print ' ';
$generic_commande->id=$objp->rowid;
$generic_commande->ref=$objp->ref;
print '';
- print '';
+ print ' ';
print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut));
print ' ';
- print '';
+ print ' ';
if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && $db->jdate($objp->date_valid) < ($now - $conf->commande->client->warning_delay)) print img_picto($langs->trans("Late"),"warning");
print ' ';
@@ -375,10 +375,10 @@ if ($resql)
print '';
// Amount HT
- print ''.price($objp->total_ht).' ';
+ print ''.price($objp->total_ht).' ';
// Statut
- print ''.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).' ';
+ print ''.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).' ';
print ' ';
@@ -391,10 +391,10 @@ if ($resql)
{
$var=!$var;
print '';
- print ''.$langs->trans('TotalHT').' ';
+ print ''.$langs->trans('TotalHT').' ';
// Total HT
- print ''.price($total).' ';
- print ' ';
+ print ''.price($total).' ';
+ print ' ';
print ' ';
}
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 42a39dd9fa8..664f9ce0f1b 100755
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -607,17 +607,17 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs))
$objp = $db->fetch_object($resql);
$var=!$var;
print '';
- print '';
+ print ' ';
$generic_commande->id=$objp->rowid;
$generic_commande->ref=$objp->ref;
print '';
- print '';
+ print ' ';
print $generic_commande->getNomUrl(1,$objp->fk_statut);
print ' ';
- print '';
+ print ' ';
if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && $db->jdate($objp->date_valid) < ($now - $conf->commande->client->warning_delay)) print img_picto($langs->trans("Late"),"warning");
print ' ';
@@ -642,7 +642,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs))
print '';
// Statut
- print ''.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).' ';
+ print ''.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).' ';
// Checkbox
print '';
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 7830abef655..2aad34cd229 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -351,10 +351,10 @@ if ($id > 0 || ! empty($ref))
print ' ';
print '';
- print '';
+ print ' ';
$form->select_date($dateop,'op',0,0,0,'transaction');
print ' ';
- print '';
+ print ' ';
$form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == 2 ? 'LIQ' : '')),'operation','1,2',2,1);
print ' ';
print ' ';
@@ -505,9 +505,9 @@ if ($id > 0 || ! empty($ref))
print ' ';
- print ''.dol_print_date($db->jdate($objp->do),"day")." \n";
+ print ''.dol_print_date($db->jdate($objp->do),"day")." \n";
- print ''.dol_print_date($db->jdate($objp->dv),"day");
+ print ' '.dol_print_date($db->jdate($objp->dv),"day");
print " \n";
// Payment type
@@ -636,11 +636,11 @@ if ($id > 0 || ! empty($ref))
// Amount
if ($objp->amount < 0)
{
- print ''.price($objp->amount * -1).' '."\n";
+ print ''.price($objp->amount * -1).' '."\n";
}
else
{
- print ' '.price($objp->amount).' '."\n";
+ print ' '.price($objp->amount).' '."\n";
}
// Balance
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index e38ce88633a..da28602314a 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -238,10 +238,10 @@ if ($resql)
print ''.$langs->trans("DateValueShort").' ';
print ''.$langs->trans("Type").' ';
print ''.$langs->trans("Description").' ';
- print ''.$langs->trans("Debit").' ';
- print ''.$langs->trans("Credit").' ';
+ print ''.$langs->trans("Debit").' ';
+ print ''.$langs->trans("Credit").' ';
print ''.$langs->trans("Action").' ';
- print ''.$langs->trans("ToConciliate").' ';
+ print ''.$langs->trans("ToConciliate").' ';
print " \n";
@@ -258,12 +258,12 @@ if ($resql)
// print " rowid."\">";
// Date op
- print ''.dol_print_date($db->jdate($objp->do),"day").' ';
+ print ''.dol_print_date($db->jdate($objp->do),"day").' ';
// Date value
if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate))
{
- print '';
+ print ' ';
print ''.dol_print_date($db->jdate($objp->dv),"day")." ";
print ' ';
print '';
@@ -282,7 +282,7 @@ if ($resql)
// Type + Number
$label=($langs->trans("PaymentType".$objp->type)!="PaymentType".$objp->type)?$langs->trans("PaymentType".$objp->type):$objp->type; // $objp->type is a code
if ($label=='SOLD') $label='';
- print ' '.$label.($objp->num_chq?' '.$objp->num_chq:'').' ';
+ print ''.$label.($objp->num_chq?' '.$objp->num_chq:'').' ';
// Description
print '';
@@ -390,7 +390,7 @@ if ($resql)
// If not already reconciliated
if ($user->rights->banque->modifier)
{
- print ' ';
+ print ' ';
print '';
print img_edit();
@@ -418,7 +418,7 @@ if ($resql)
if ($db->jdate($objp->do) <= $now)
{
- print ' ';
+ print ' ';
print ' rowid])?' checked="checked"':'').'>';
// print ' ';
// print ' ';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 044b4b70ebc..2a6ddd762d3 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -281,10 +281,10 @@ else
print " ";
// Date operation
- print ''.dol_print_date($db->jdate($objp->do),"day").' ';
+ print ''.dol_print_date($db->jdate($objp->do),"day").' ';
// Date de valeur
- print '';
+ print ' ';
print '';
print img_previous().' ';
print dol_print_date($db->jdate($objp->dv),"day") .' ';
@@ -293,7 +293,7 @@ else
print " \n";
// Num cheque
- print ''.$objp->fk_type.' '.($objp->num_chq?$objp->num_chq:'').' ';
+ print ''.$objp->fk_type.' '.($objp->num_chq?$objp->num_chq:'').' ';
// Libelle
print '';
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index 9117a099fb5..bdfda680d6d 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -209,15 +209,15 @@ if ($resql)
print "";
// Ref
- print '';
+ print ' ';
print "rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid." ";
print ' ';
// Date ope
- print ''.dol_print_date($db->jdate($objp->do),"day")." \n";
+ print ''.dol_print_date($db->jdate($objp->do),"day")." \n";
// Date value
- print ''.dol_print_date($db->jdate($objp->dv),"day")." \n";
+ print ''.dol_print_date($db->jdate($objp->dv),"day")." \n";
// Payment type
print "";
@@ -266,7 +266,7 @@ if ($resql)
}
// Bank account
- print ' ';
+ print ' ';
$bankaccountstatic->id=$objp->bankid;
$bankaccountstatic->label=$objp->bankref;
print $bankaccountstatic->getNomUrl(1);
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 05c60f59294..2c26a5d6361 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -205,7 +205,7 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
$total = 0 ;
print '';
print '';
- print ''.$langs->trans("PeriodEndDate").' ';
+ print ''.$langs->trans("PeriodEndDate").' ';
print "".$langs->trans("Label")." ";
print ''.$langs->trans("ExpectedToPay")." ";
print ''.$langs->trans("RefPayment")." ";
diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php
index 13c4301dad5..36c1e897c44 100644
--- a/htdocs/compta/dons/index.php
+++ b/htdocs/compta/dons/index.php
@@ -175,7 +175,7 @@ if ($resql)
$donation_static->id=$obj->rowid;
$donation_static->ref=$obj->ref?$obj->ref:$obj->rowid;
- print '';
+ print ' ';
print $donation_static->getNomUrl(1);
print ' ';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 6c190bac20b..f9d8aefda2f 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -49,6 +49,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$langs->load('bills');
$langs->load('companies');
$langs->load('products');
+$langs->load('banks');
$langs->load('main');
if (! empty($conf->margin->enabled)) $langs->load('margins');
@@ -878,17 +879,17 @@ else if ($action == 'add' && $user->rights->facture->creer)
if ($_POST['type'] == 3) {
$typeamount=GETPOST('typedeposit','alpha');
$valuedeposit=GETPOST('valuedeposit','int');
-
+
if ($typeamount=='amount') {
$amountdeposit=$valuedeposit;
}else {
$amountdeposit=0;
-
+
dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
-
+
$classname = ucfirst($subelement);
$srcobject = new $classname($db);
-
+
dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add deposit line");
$result=$srcobject->fetch($object->origin_id);
if ($result > 0)
@@ -900,7 +901,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
{
$totalamount=+$lines[$i]->subprice;
}
-
+
if ($totalamount!=0) {
$amountdeposit=($totalamount*$valuedeposit)/100;
}
@@ -910,9 +911,9 @@ else if ($action == 'add' && $user->rights->facture->creer)
$mesgs[]=$srcobject->error;
$error++;
}
-
+
}
-
+
$result = $object->addline(
$id,
$langs->trans('Deposit'),
@@ -940,7 +941,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
0,
$langs->trans('Deposit')
);
-
+
}else {
@@ -2117,7 +2118,7 @@ if ($action == 'create')
// Deposit
print ' ';
print ' ';
- print ' ';
+ print ' ';
$desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
print ''.$desc.' ';
if (($origin=='propal') ) {
@@ -2340,21 +2341,21 @@ if ($action == 'create')
$form->select_produits('','idprod'.$i,'',$conf->product->limit_size);
print '';
print ' ';
- print ' % ';
+ print ' % ';
print ' ';
// Si le module service est actif, on propose des dates de debut et fin a la ligne
if (! empty($conf->service->enabled))
{
- print '';
+ print ' ';
print '';
- print '';
+ print ' ';
print $langs->trans('From').' ';
- print ' ';
+ print ' ';
print $form->select_date('','date_start'.$i,$usehm,$usehm,1,"add");
print ' ';
- print '';
+ print ' ';
print $langs->trans('to').' ';
- print ' ';
+ print ' ';
print $form->select_date('','date_end'.$i,$usehm,$usehm,1,"add");
print '
';
print ' ';
@@ -3090,7 +3091,7 @@ else if ($id > 0 || ! empty($ref))
else print $langs->trans('ExcessReceived');
print ' :';
print ''.price($resteapayeraffiche).' ';
- print ' ';
+ print ' ';
}
else // Credit note
{
@@ -3108,7 +3109,7 @@ else if ($id > 0 || ! empty($ref))
else print $langs->trans('ExcessPaydBack');
print ' :';
print ''.price($sign * $resteapayeraffiche).' ';
- print ' ';
+ print ' ';
// Sold credit note
//print ''.$langs->trans('TotalTTC').' : ';
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 240ad867358..441da8c959e 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -332,7 +332,7 @@ if ($resql)
print "";
$classname = "impayee";
- print '';
+ print ' ';
$facturestatic->id=$objp->facid;
$facturestatic->ref=$objp->facnumber;
@@ -341,12 +341,12 @@ if ($resql)
print '';
// Ref
- print '';
+ print ' ';
print $facturestatic->getNomUrl(1);
print ' ';
// Warning picto
- print '';
+ print ' ';
if ($date_limit < ($now - $conf->facture->client->warning_delay) && ! $objp->paye && $objp->fk_statut == 1) print img_warning($langs->trans("Late"));
print ' ';
@@ -385,7 +385,7 @@ if ($resql)
//print ''.((! empty($objp->am) || ! empty($cn))?price($objp->total_ttc-$objp->am-$cn):' ').' ';
// Status of invoice
- print '';
+ print ' ';
print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$objp->am);
print ' ';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 952fc760af5..ca2a94d35e2 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -322,7 +322,7 @@ if ($resql)
$datelimit=$db->jdate($objp->datelimite);
print ' ';
- print '';
+ print ' ';
$facturestatic->id=$objp->facid;
$facturestatic->ref=$objp->facnumber;
@@ -332,7 +332,7 @@ if ($resql)
print '';
- print '';
+ print ' ';
print $facturestatic->getNomUrl(1,'',200,0,$notetoshow);
print $objp->increment;
print ' ';
@@ -377,7 +377,7 @@ if ($resql)
print ''.(! empty($paiement)?price($paiement).' '.$langs->getCurrencySymbol($conf->currency):' ').' ';
// Affiche statut de la facture
- print '';
+ print ' ';
print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$paiement,$objp->type);
print " ";
//print " ";
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index bfc50b11ae8..0b4a341e1c2 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -54,7 +54,8 @@ $endyear=$year;
* View
*/
-$langs->load("bills");
+$langs->load("bills");
+$langs->load("companies");
$form=new Form($db);
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index ad4d032d5a9..5889d50e069 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -217,19 +217,19 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
while ($i < $num && $i < 20)
{
$obj = $db->fetch_object($resql);
- print ' ';
+ print ' ';
$facturestatic->ref=$obj->facnumber;
$facturestatic->id=$obj->rowid;
$facturestatic->type=$obj->type;
print $facturestatic->getNomUrl(1,'');
print ' ';
- print '';
+ print ' ';
$companystatic->id=$obj->socid;
$companystatic->nom=$obj->nom;
$companystatic->client=1;
print $companystatic->getNomUrl(1,'',16);
print ' ';
- print ''.price($obj->total_ttc).' ';
+ print ''.price($obj->total_ttc).' ';
print ' ';
$tot_ttc+=$obj->total_ttc;
$i++;
@@ -369,16 +369,16 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
$obj = $db->fetch_object($resql);
print '';
- print '';
+ print ' ';
print '';
- print '';
+ print ' ';
$facturestatic->ref=$obj->facnumber;
$facturestatic->id=$obj->rowid;
$facturestatic->type=$obj->type;
print $facturestatic->getNomUrl(1,'');
print ' ';
- print '';
+ print ' ';
if ($obj->fk_statut == 1 && ! $obj->paye && $db->jdate($obj->datelimite) < ($now - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late"));
print ' ';
print '';
@@ -761,16 +761,16 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
$obj = $db->fetch_object($resql);
print " ";
- print '';
+ print ' ';
$commandestatic->id=$obj->rowid;
$commandestatic->ref=$obj->ref;
print '';
- print '';
+ print ' ';
print $commandestatic->getNomUrl(1);
print ' ';
- print '';
+ print ' ';
print ' ';
print ' ';
print '';
@@ -861,16 +861,16 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
$obj = $db->fetch_object($resql);
print ' ';
- print '';
+ print ' ';
print '';
- print '';
+ print ' ';
$facturestatic->ref=$obj->facnumber;
$facturestatic->id=$obj->rowid;
$facturestatic->type=$obj->type;
print $facturestatic->getNomUrl(1,'');
print ' ';
- print '';
+ print ' ';
if ($db->jdate($obj->datelimite) < ($now - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late"));
print ' ';
print '';
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 2676dc78e94..d82e7fabad9 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -275,7 +275,7 @@ if (is_array($coll_list))
$diff = $x_paye_sum;
print ' ';
print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').' ';
- print ''.price(price2num($diff,'MT'))." \n";
+ print ''.price(price2num($diff,'MT'))." \n";
print " \n";
}
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 2d5e77a4065..0d46cd7ae11 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -59,7 +59,7 @@ function pt ($db, $sql, $date)
$total = 0;
print '';
print '';
- print ''.$date.' ';
+ print ''.$date.' ';
print ''.$langs->trans("Amount").' ';
print ' '."\n";
print " \n";
@@ -69,10 +69,10 @@ function pt ($db, $sql, $date)
$obj = $db->fetch_object($result);
$var=!$var;
print '';
- print ''.$obj->dm." \n";
+ print ''.$obj->dm." \n";
$total = $total + $obj->mm;
- print ''.price($obj->mm)." \n";
+ print ''.price($obj->mm)." \n";
print " \n";
$i++;
@@ -179,9 +179,9 @@ for ($m = 1 ; $m < 13 ; $m++ )
if ($i > 2) {
print '';
print ''.$langs->trans("SubTotal").': ';
- print ''.price($subtotalcoll).' ';
- print ''.price($subtotalpaye).' ';
- print ''.price($subtotalpaye).' ';
+ print ''.price($subtotalcoll).' ';
+ print ''.price($subtotalpaye).' ';
+ print ''.price($subtotalpaye).' ';
print ' ';
$i = 0;
$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 0cc7e2008e6..78c81f9ab9c 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -151,7 +151,7 @@ if ($socid > 0)
// Author
$userstatic->id=$objf->userid;
$userstatic->login=$objf->login;
- print '';
+ print ' ';
print $userstatic->getLoginUrl(1);
print ' ';
@@ -191,7 +191,7 @@ if ($socid > 0)
// Author
$userstatic->id=$objp->userid;
$userstatic->login=$objp->login;
- print '';
+ print ' ';
print $userstatic->getLoginUrl(1);
print ' ';
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 516f1bb9326..2c5f1736d1b 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -204,7 +204,7 @@ if ($resql)
// Due date
print ''.dol_print_date($db->jdate($obj->date_ech), 'day').' ';
- print ''.$chargesociale_static->LibStatut($obj->paye,5).' ';
+ print ''.$chargesociale_static->LibStatut($obj->paye,5).' ';
print '';
$i++;
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 64abd53ae15..2d90767cffb 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -352,7 +352,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
// Montant total
if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear,$maxyear)))
{
- print ''.($total[$annee]?price($total[$annee]):"0")." ";
+ print ''.($total[$annee]?price($total[$annee]):"0")." ";
}
else
{
@@ -364,7 +364,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
if ($total[$annee-1] && $total[$annee]) {
$percent=(round(($total[$annee]-$total[$annee-1])/$total[$annee-1],4)*100);
- print ''.($percent>=0?"+$percent":"$percent").'% ';
+ print ''.($percent>=0?"+$percent":"$percent").'% ';
}
if ($total[$annee-1] && ! $total[$annee])
{
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 956edd92ff7..a5e0e7fdbb9 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -316,7 +316,7 @@ if (is_array($coll_list))
$diff = $x_coll_sum - $x_paye_sum;
print '';
print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').' ';
- print ''.price(price2num($diff,'MT'))." \n";
+ print ''.price(price2num($diff,'MT'))." \n";
print " \n";
}
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 53473ed68ff..354d8c86535 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -64,7 +64,7 @@ function pt ($db, $sql, $date)
$total = 0;
print '';
print '';
- print ''.$date.' ';
+ print ''.$date.' ';
print ''.$langs->trans("Amount").' ';
print ' '."\n";
print " \n";
@@ -74,10 +74,10 @@ function pt ($db, $sql, $date)
$obj = $db->fetch_object($result);
$var=!$var;
print '';
- print ''.$obj->dm." \n";
+ print ''.$obj->dm." \n";
$total = $total + $obj->mm;
- print ''.price($obj->mm)." \n";
+ print ''.price($obj->mm)." \n";
print " \n";
$i++;
@@ -188,9 +188,9 @@ for ($m = 1 ; $m < 13 ; $m++ )
if ($i > 2) {
print '';
print ''.$langs->trans("SubTotal").' : ';
- print ''.price($subtotalcoll).' ';
- print ''.price($subtotalpaye).' ';
- print ''.price($subtotal).' ';
+ print ''.price($subtotalcoll).' ';
+ print ''.price($subtotalpaye).' ';
+ print ''.price($subtotal).' ';
print ' ';
$i = 0;
$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php
index e5aa35a1c05..393a9ee4efc 100644
--- a/htdocs/compta/tva/quadri.php
+++ b/htdocs/compta/tva/quadri.php
@@ -293,13 +293,13 @@ if ($conf->global->COMPTA_MODE == "CREANCES-DETTES")
}
print '';
print ''.$langs->trans("Total").': ';
- print ''.price($subtot_coll_total).' ';
- print ''.price($subtot_coll_vat).' ';
+ print ''.price($subtot_coll_total).' ';
+ print ''.price($subtot_coll_vat).' ';
print ' ';
- print ''.price($subtot_paye_total).' ';
- print ''.price($subtot_paye_vat).' ';
+ print ''.price($subtot_paye_total).' ';
+ print ''.price($subtot_paye_vat).' ';
print ' ';
- print ''.price($total).' ';
+ print ''.price($total).' ';
print ' ';
print ' ';
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index cf03b860ba6..88c1be06409 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -617,7 +617,7 @@ else
$diff = $x_coll_sum - $x_paye_sum;
print '';
print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').' ';
- print ''.price(price2num($diff,'MT'))." \n";
+ print ''.price(price2num($diff,'MT'))." \n";
print " \n";
$i++;
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index d3ef925158b..ae5a1190c49 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -1171,10 +1171,10 @@ else
}
if ($conf->margin->enabled)
- print ''.price($objp->pa_ht).' ';
+ print ''.price($objp->pa_ht).' ';
// Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
- print '';
+ print ' ';
if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0))
{
print '';
@@ -1272,7 +1272,7 @@ else
print ' ';
print ' ';
print ' ';
- print ' % ';
+ print ' % ';
if ($conf->margin->enabled) {
print '';
if ($objp->fk_product)
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 2e9ab1b1cb6..845eaad86bb 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -334,7 +334,7 @@ if ($result)
$var=!$var;
print ' ';
- print '';
+ print ' ';
$staticcontrat->ref=($obj->ref?$obj->ref:$obj->cid);
$staticcontrat->id=$obj->cid;
print $staticcontrat->getNomUrl(1,16);
@@ -400,7 +400,7 @@ if ($resql)
$obj = $db->fetch_object($resql);
$var=!$var;
print ' ';
- print '';
+ print ' ';
$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
$staticcontrat->id=$obj->fk_contrat;
print $staticcontrat->getNomUrl(1,16);
@@ -426,7 +426,7 @@ if ($resql)
$staticcompany->nom=$obj->nom;
print $staticcompany->getNomUrl(1,'',20);
print ' ';
- print '';
+ print ' ';
$dateend=$db->jdate($obj->date_fin_validite);
print $staticcontratligne->LibStatut($obj->statut, 3, ($dateend && $dateend < $now)?1:0);
print ' ';
@@ -481,12 +481,12 @@ if ($resql)
$var=!$var;
print ' ';
- print '';
+ print ' ';
$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
$staticcontrat->id=$obj->fk_contrat;
print $staticcontrat->getNomUrl(1,16);
print ' ';
- print '';
+ print ' ';
if ($obj->fk_product > 0)
{
$productstatic->id=$obj->fk_product;
@@ -561,12 +561,12 @@ if ($resql)
$var=!$var;
print ' ';
- print '';
+ print ' ';
$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
$staticcontrat->id=$obj->fk_contrat;
print $staticcontrat->getNomUrl(1,16);
print ' ';
- print '';
+ print ' ';
if ($obj->fk_product > 0)
{
$productstatic->id=$obj->fk_product;
diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php
index 2155b3d9720..2042b5c45f7 100644
--- a/htdocs/contrat/liste.php
+++ b/htdocs/contrat/liste.php
@@ -133,7 +133,7 @@ if ($resql)
$obj = $db->fetch_object($resql);
$var=!$var;
print ' ';
- print '';
+ print ' ';
print img_object($langs->trans("ShowContract"),"contract").' '.(isset($obj->ref) ? $obj->ref : $obj->cid) .' ';
if ($obj->nb_late) print img_warning($langs->trans("Late"));
print ' ';
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 868b8cc1a0d..ea42df9e01d 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -247,7 +247,7 @@ if ($resql)
if ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < ($now - $conf->contrat->services->expires->warning_delay) && $obj->statut < 5) print img_warning($langs->trans("Late"));
else print ' ';
print '';
- print '';
+ print ' ';
if ($obj->cstatut == 0) // If contract is draft, we say line is also draft
{
print $contractstatic->LibStatut(0,5,($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now));
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 6c6a6d8d036..cbc8e7ee5b7 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -114,7 +114,7 @@ class box_actions extends ModeleBoxes
'text' => dol_trunc($objp->nom,24),
'url' => DOL_URL_ROOT."/societe/soc.php?socid=".$objp->socid);
- $this->info_box_contents[$i][4] = array('td' => 'align="left" nowrap="nowrap"',
+ $this->info_box_contents[$i][4] = array('td' => 'align="left" class="nowrap"',
'text' => dol_print_date($datelimite, "dayhour"));
$this->info_box_contents[$i][5] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index cf2ee151ebe..7dea6ed7f04 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -114,7 +114,7 @@ class box_contracts extends ModeleBoxes
$this->info_box_contents[$i][4] = array('td' => 'align="right"',
'text' => dol_print_date($datec,'day'));
- $this->info_box_contents[$i][5] = array('td' => 'align="right" nowrap="nowrap"',
+ $this->info_box_contents[$i][5] = array('td' => 'align="right" class="nowrap"',
'text' => $contractstatic->getLibStatut(6),
'asis'=>1
);
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 78a81139654..765224baccc 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -112,7 +112,7 @@ class box_ficheinter extends ModeleBoxes
$this->info_box_contents[$i][4] = array('td' => 'align="right"',
'text' => dol_print_date($datec,'day'));
- $this->info_box_contents[$i][5] = array('td' => 'align="right" nowrap="nowrap"',
+ $this->info_box_contents[$i][5] = array('td' => 'align="right" class="nowrap"',
'text' => $ficheinterstatic->getLibStatut(6),
'asis'=>1
);
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 7eda1bc04b3..c9e668b271e 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -120,7 +120,7 @@ class box_produits extends ModeleBoxes
$this->info_box_contents[$i][2] = array('td' => 'align="right"',
'text' => $price);
- $this->info_box_contents[$i][3] = array('td' => 'align="left" nowrap="nowrap"',
+ $this->info_box_contents[$i][3] = array('td' => 'align="left" class="nowrap"',
'text' => $price_base_type);
$this->info_box_contents[$i][4] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 57c2cc4de4c..a003451d8e9 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -127,7 +127,7 @@ class box_produits_alerte_stock extends ModeleBoxes
$this->info_box_contents[$i][2] = array('td' => 'align="right"',
'text' => $price);
- $this->info_box_contents[$i][3] = array('td' => 'align="left" nowrap="nowrap"',
+ $this->info_box_contents[$i][3] = array('td' => 'align="left" class="nowrap"',
'text' => $price_base_type);
$this->info_box_contents[$i][4] = array('td' => 'align="center"',
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index c930fece2e5..cf9e7f6fd32 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -164,7 +164,7 @@ class ModeleBoxes // Can't be abtract as it is instanciated to build "empty"
}
if ($conf->use_javascript_ajax)
{
- print ' ';
+ print ' ';
// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
print img_picto($langs->trans("MoveBox",$this->box_id),'grip','class="boxhandle hideonsmartphone" style="cursor:move;"');
print img_picto($langs->trans("Close",$this->box_id),'close','class="boxclose" rel="x:y" style="cursor:pointer;" id="imgclose'.$this->box_id.'"');
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 01165bb466a..5b47b3811fb 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2744,7 +2744,7 @@ abstract class CommonObject
print ' ';
- print ' '; // No width to allow autodim
+ print ' '; // No width to allow autodim
print " \n";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 49f7268b875..003045d737f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -103,7 +103,7 @@ class Form
}
else
{
- $ret.='';
+ $ret.='';
$ret.=$langs->trans($text);
$ret.=' ';
if (GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='id.$moreparam.'">'.img_edit($langs->trans('Edit'),1).' ';
@@ -2878,7 +2878,7 @@ class Form
print ' ';
print ' ';
print '';
- print '';
+ print ' ';
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
{
if (! $filter || $filter=="fk_facture_source IS NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->currency)).': '; // If we want deposit to be substracted to payments only and not to total of final invoice
@@ -2893,7 +2893,7 @@ class Form
if ($filter) $newfilter.=' AND ('.$filter.')';
$nbqualifiedlines=$this->select_remises($selected,$htmlname,$newfilter,$socid,$maxvalue);
print ' ';
- print '';
+ print ' ';
if ($nbqualifiedlines > 0)
{
print ' '.$options.' ';
- print '';
+ print ' ';
$max=$conf->global->MAIN_UPLOAD_DOC; // En Kb
$maxphp=@ini_get('upload_max_filesize'); // En inconnu
@@ -479,7 +479,7 @@ class FormFile
$out.= " ";
// Show file name with link to download
- $out.= '';
+ $out.= ' ';
$out.= ''.dol_print_size($size).' ';
+ $out.= ''.dol_print_size($size).' ';
// Show file date
$date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"]));
- $out.= ''.dol_print_date($date, 'dayhour').' ';
+ $out.= ''.dol_print_date($date, 'dayhour').' ';
if ($delallowed)
{
diff --git a/htdocs/core/filemanagerdol/browser/default/frmupload.php b/htdocs/core/filemanagerdol/browser/default/frmupload.php
index 18496585bd2..dd58eded713 100755
--- a/htdocs/core/filemanagerdol/browser/default/frmupload.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmupload.php
@@ -124,12 +124,12 @@ window.onload = function()