'.$langs->trans("Year").' ';
if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
arsort($arrayyears);
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 578f08b7af3..6fc778fb064 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -263,16 +263,16 @@ print ' ';
print '';
print ''.$langs->trans("Filter").' ';
// Company
-print ''.$langs->trans("ThirdParty").' ';
+print ' '.$langs->trans("ThirdParty").' ';
if ($mode == 'customer') $filter='s.client in (1,2,3)';
if ($mode == 'supplier') $filter='s.fournisseur = 1';
print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
print ' ';
// User
-print ''.$langs->trans("CreatedBy").' ';
+print ' '.$langs->trans("CreatedBy").' ';
print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
// Status
-print ' '.$langs->trans("Status").' ';
+print ' '.$langs->trans("Status").' ';
if ($mode == 'customer')
{
$liststatus=array(
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 1a911ca4355..491ead83b6e 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1625,7 +1625,7 @@ else
// Quantite
print ' '.$objp->qty.' ';
// Unit
- if($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).' ';
+ if($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).' ';
// Remise
if ($objp->remise_percent > 0)
{
@@ -1752,7 +1752,7 @@ else
print ' ';
if ($conf->global->PRODUCT_USE_UNITS)
{
- print '';
+ print ' ';
print $form->selectUnits($objp->fk_unit, "unit");
print ' ';
}
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 69e2b0d0ca8..098a1737955 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -353,7 +353,7 @@ if ($result)
print $staticcompany->getNomUrl(1,'',20);
print '';
print ''.dol_print_date($db->jdate($obj->tms),'dayhour').' ';
- //print ''.$staticcontrat->LibStatut($obj->statut,2).' ';
+ //print ''.$staticcontrat->LibStatut($obj->statut,2).' ';
print ''.($obj->nb_initial>0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0,3):'').' ';
print ''.($obj->nb_running>0 ? $obj->nb_running.$staticcontratligne->LibStatut(4,3,0):'').' ';
print ''.($obj->nb_expired>0 ? $obj->nb_expired.$staticcontratligne->LibStatut(4,3,1):'').' ';
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 806bff48605..2e4fa4ce3da 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -732,8 +732,8 @@ if (isset($totalarray['displaytotalline'])) {
while ($i < $totalarray['nbfield']) {
$i++;
if ($i == 1) {
- if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").' ';
- else print ''.$langs->trans("Totalforthispage").' ';
+ if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").' ';
+ else print ''.$langs->trans("Totalforthispage").' ';
}
elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index b44b8fd835f..d90a3f5f316 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -274,7 +274,7 @@ if (empty($conf->use_javascript_ajax) || ! empty($conf->global->MAIN_ECM_DISABLE
print '';
print $val['cachenbofdoc'];
print ' ';
- print '';
+ print ' ';
if ($nbofsubdir && $nboffilesinsubdir) print '+'.$nboffilesinsubdir.' ';
print ' ';
@@ -420,7 +420,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
print '';
- /*print '';
+ /*print ' ';
print dol_escape_htmltag($file);
print ' ';*/
@@ -428,7 +428,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
print '';
print (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0)?$val['cachenbofdoc']:' ';
print ' ';
- print '';
+ print ' ';
if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) print '+'.$nboffilesinsubdir.' ';
print ' ';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fd5deb31c36..627e67a38b7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3,7 +3,7 @@
* Copyright (C) 2005-2013 Regis Houssin
* Copyright (C) 2010-2015 Juanjo Menent
* Copyright (C) 2012-2013 Christophe Battarel
- * Copyright (C) 2011-2018 Philippe Grand
+ * Copyright (C) 2011-2019 Philippe Grand
* Copyright (C) 2012-2015 Marcos García
* Copyright (C) 2012-2015 Raphaël Doursenaud
* Copyright (C) 2012 Cedric Salvador
@@ -4126,7 +4126,7 @@ abstract class CommonObject
print ''.$langs->trans('Qty').' ';
if($conf->global->PRODUCT_USE_UNITS)
{
- print ''.$langs->trans('Unit').' ';
+ print ''.$langs->trans('Unit').' ';
}
print ''.$langs->trans('ReductionShort').' ';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 035d922e0c1..5cafb86cdc6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -10,7 +10,7 @@
* Copyright (C) 2007 Franky Van Liedekerke
* Copyright (C) 2007 Patrick Raguin
* Copyright (C) 2010 Juanjo Menent
- * Copyright (C) 2010-2014 Philippe Grand
+ * Copyright (C) 2010-2019 Philippe Grand
* Copyright (C) 2011 Herve Prot
* Copyright (C) 2012-2016 Marcos García
* Copyright (C) 2012 Cedric Salvador
@@ -244,7 +244,7 @@ class Form
}
if (empty($notabletag)) $ret.='';
- if (empty($notabletag)) $ret.='';
+ if (empty($notabletag)) $ret.=' ';
//else $ret.='
';
$ret.=' ';
if (preg_match('/ckeditor|textarea/',$typeofdata) && empty($notabletag)) $ret.=' '."\n";
@@ -3861,11 +3861,11 @@ class Form
if ($input['type'] == 'text')
{
- $more.=' '.$input['label'].' '."\n";
+ $more.=''.$input['label'].' '."\n";
}
elseif ($input['type'] == 'password')
{
- $more.=''.$input['label'].' '."\n";
+ $more.=''.$input['label'].' '."\n";
}
elseif ($input['type'] == 'select')
{
@@ -3877,7 +3877,7 @@ class Form
elseif ($input['type'] == 'checkbox')
{
$more.='';
- $more.=''.$input['label'].' ';
+ $more.=' '.$input['label'].' ';
$more.=' '.$input['label'].' ';
- $more.='';
+ $more.=' ';
$more.=$this->selectDate($input['value'],$input['name'],0,0,0,'',1,0);
$more.=' '."\n";
$formquestion[] = array('name'=>$input['name'].'day');
@@ -3916,14 +3916,14 @@ class Form
elseif ($input['type'] == 'other')
{
$more.='';
- if (! empty($input['label'])) $more.=$input['label'].' ';
+ if (! empty($input['label'])) $more.=$input['label'].' ';
$more.=$input['value'];
$more.=' '."\n";
}
elseif ($input['type'] == 'onecolumn')
{
- $more.='';
+ $more.=' ';
$more.=$input['value'];
$more.=' '."\n";
}
@@ -4286,7 +4286,7 @@ class Form
$ret.='';
$ret.=$this->selectDate($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname,1,0);
$ret.=' ';
- $ret.=' ';
+ $ret.=' ';
$ret.='
';
}
else
@@ -4575,7 +4575,7 @@ class Form
print ''.$addcontact.' ';
}
print '';
- print ' ';
+ print ' ';
print '
';
}
else
@@ -6543,9 +6543,9 @@ class Form
print '';
print ' ';
print '' . $langs->trans("Ref") . ' ';
- print '' . $langs->trans("RefCustomer") . ' ';
+ print '' . $langs->trans("RefCustomer") . ' ';
print '' . $langs->trans("AmountHTShort") . ' ';
- print '' . $langs->trans("Company") . ' ';
+ print '' . $langs->trans("Company") . ' ';
print ' ';
while ($i < $num)
{
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 5a005e7de04..65a3213bad8 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -219,7 +219,7 @@ class FormBarCode
$out .= '';
$out .= $this->selectBarcodeType($selected, $htmlname, 1);
$out .= ' ';
- $out .= ' ';
+ $out .= ' ';
$out .= '
';
}
return $out;
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 1cafb6dc3d4..be8aeb890fc 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -217,9 +217,9 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
print '';
print '';
- //print ''.$langs->trans("QtyOrdered").' ';
- print ''.$langs->trans("SendingSheet").' ';
- print ''.$langs->trans("Description").' ';
+ //print ''.$langs->trans("QtyOrdered").' ';
+ print ''.$langs->trans("SendingSheet").' ';
+ print ''.$langs->trans("Description").' ';
print ''.$langs->trans("DateCreation").' ';
print ''.$langs->trans("DateDeliveryPlanned").' ';
print ''.$langs->trans("QtyPreparedOrShipped").' ';
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 42f62d03ff7..79f5a0bad5c 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -49,7 +49,7 @@ print '';
print '
';
print '';
-print ''.$langs->trans("Position");
+print ' '.$langs->trans("Position");
print '';
print img_picto('A-Z', '1downarrow.png');
print ' ';
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index ebb2863dbfa..c26298d65e5 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -178,7 +178,7 @@ $coldisplay=-1; // We remove first td
global->PRODUCT_USE_UNITS)
{
- print ' ';
+ print ' ';
print $form->selectUnits($line->fk_unit, "units");
print ' ';
}
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index 9274359eada..ed16cec17f1 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -37,7 +37,7 @@ if (!empty($conf->multicurrency->enabled))
print ''.$this->tpl['qty'].' ';
if($conf->global->PRODUCT_USE_UNITS)
- print ''.$langs->trans($this->tpl['unit']).' ';
+ print ''.$langs->trans($this->tpl['unit']).' ';
print ''.$this->tpl['remise_percent'].' ';
print ' '."\n";
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 5e7e08c0ee2..56657694f80 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -237,17 +237,17 @@ print '';
print '
';
print ''.$langs->trans("Filter").' ';
// Company
- print ''.$langs->trans("ThirdParty").' ';
+ print ' '.$langs->trans("ThirdParty").' ';
if ($mode == 'customer') $filter='s.client in (1,2,3)';
if ($mode == 'supplier') $filter='s.fournisseur = 1';
print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
print ' ';
// User
- print ''.$langs->trans("CreatedBy").' ';
+ print ' '.$langs->trans("CreatedBy").' ';
print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
print ' ';
// Year
- print ''.$langs->trans("Year").' ';
+ print ' '.$langs->trans("Year").' ';
if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
arsort($arrayyears);
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index ed2eb5239b3..e99f04415b3 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1122,11 +1122,11 @@ if ($action == 'create')
{
if (empty($conf->productbatch->enabled))
{
- print ' '.$langs->trans("Warehouse").' ('.$langs->trans("Stock").') ';
+ print ''.$langs->trans("Warehouse").' ('.$langs->trans("Stock").') ';
}
else
{
- print ''.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").') ';
+ print ''.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").') ';
}
}
print " \n";
@@ -1248,7 +1248,7 @@ if ($action == 'create')
// Stock
if (! empty($conf->stock->enabled))
{
- print '';
+ print ' ';
if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) // Type of product need stock change ?
{
// Show warehouse combo list
@@ -1334,7 +1334,7 @@ if ($action == 'create')
print ' ';
print '';
- print '';
+ print ' ';
print $staticwarehouse->getNomUrl(0).' / ';
@@ -1364,7 +1364,7 @@ if ($action == 'create')
print ' ';
print ' ';
- print '';
+ print ' ';
print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->libelle);
print ' ';
}
@@ -1412,7 +1412,7 @@ if ($action == 'create')
// Stock
if (! empty($conf->stock->enabled))
{
- print '';
+ print ' ';
if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
{
print $tmpwarehouseObject->getNomUrl(0).' ';
@@ -1495,7 +1495,7 @@ if ($action == 'create')
print ' ';
print ' ';
- print '';
+ print ' ';
print $tmpwarehouseObject->getNomUrl(0).' / ';
@@ -1539,7 +1539,7 @@ if ($action == 'create')
}
print ' ';
- print '';
+ print ' ';
if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
{
$warehouse_selected_id = GETPOST('entrepot_id','int');
@@ -2052,12 +2052,12 @@ else if ($id || $ref)
}
if (! empty($conf->stock->enabled))
{
- print ' '.$langs->trans("WarehouseSource").' ';
+ print ''.$langs->trans("WarehouseSource").' ';
}
if (! empty($conf->productbatch->enabled))
{
- print ''.$langs->trans("Batch").' ';
+ print ''.$langs->trans("Batch").' ';
}
}
print ''.$langs->trans("CalculatedWeight").' ';
@@ -2313,7 +2313,7 @@ else if ($id || $ref)
// Warehouse source
if (! empty($conf->stock->enabled))
{
- print '';
+ print ' ';
if ($lines[$i]->entrepot_id > 0)
{
$entrepot = new Entrepot($db);
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index e0b750e9797..95f93904c5f 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -237,17 +237,17 @@ print '';
print '
';
print ''.$langs->trans("Filter").' ';
// Company
- print ''.$langs->trans("ThirdParty").' ';
+ print ' '.$langs->trans("ThirdParty").' ';
if ($mode == 'customer') $filter='s.client in (1,2,3)';
if ($mode == 'supplier') $filter='s.fournisseur = 1';
print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
print ' ';
// User
- print ''.$langs->trans("CreatedBy").' ';
+ print ' '.$langs->trans("CreatedBy").' ';
print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
print ' ';
// Year
- print ''.$langs->trans("Year").' ';
+ print ' '.$langs->trans("Year").' ';
if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
arsort($arrayyears);
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 34a28442e45..7e94a10418a 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -3,9 +3,9 @@
* Copyright (C) 2004-2017 Laurent Destailleur
* Copyright (C) 2004 Eric Seigne
* Copyright (C) 2005-2009 Regis Houssin
- * Copyright (C) 2015 Alexandre Spangaro
- * Copyright (C) 2018 Ferran Marcet
- * Copyright (C) 2018 Charlene Benke
+ * Copyright (C) 2015 Alexandre Spangaro
+ * Copyright (C) 2018 Ferran Marcet
+ * Copyright (C) 2018 Charlene Benke
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -682,7 +682,7 @@ if ($resql)
}
// User
if (! empty($arrayfields['user']['checked'])) {
- print '';
+ print ' ';
$usertmp->id=$obj->id_user;
$usertmp->lastname=$obj->lastname;
$usertmp->firstname=$obj->firstname;
@@ -805,8 +805,8 @@ if ($resql)
$i++;
if ($i == 1)
{
- if ($num < $limit && empty($offset)) print ' '.$langs->trans("Total").' ';
- else print ''.$langs->trans("Totalforthispage").' ';
+ if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").' ';
+ else print ''.$langs->trans("Totalforthispage").' ';
}
elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index c192fb83447..08af170f5e7 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2003-2006 Rodolphe Quiedeville
* Copyright (c) 2004-2012 Laurent Destailleur
* Copyright (C) 2012 Marcos García
- * Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2018 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -232,7 +232,7 @@ if (empty($user->rights->expensereport->readall) && empty($user->rights->expense
print $form->select_dolusers($userid, 'userid', 1, '', 0, $include, '', 0, 0, 0, '', 0, '', 'maxwidth300');
print ' ';
// Status
-print ''.$langs->trans("Status").' ';
+print ' '.$langs->trans("Status").' ';
$liststatus=$tmpexpensereport->statuts;
print $form->selectarray('object_status', $liststatus, GETPOST('object_status'), -4, 0, 0, '', 1);
print ' ';
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 187b6fbc3da..e896c9682e4 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -8,7 +8,7 @@
* Copyright (C) 2012 Cedric Salvador
* Copyright (C) 2015 Alexandre Spangaro
* Copyright (C) 2016-2018 Charlie Benke
- * Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2018 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -613,7 +613,7 @@ if ($action == 'create') {
($object->unit_frequency?$object->unit_frequency:'m')
);
print '';
- print ' ';
+ print ' ';
print '
';
} else {
if ($object->frequency > 0)
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 85f92f55f85..14622e39397 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -557,8 +557,8 @@ if ($resql)
$i++;
if ($i == 1)
{
- if ($num < $limit && empty($offset)) print '
'.$langs->trans("Total").' ';
- else print '
'.$langs->trans("Totalforthispage").' ';
+ if ($num < $limit && empty($offset)) print '
'.$langs->trans("Total").' ';
+ else print '
'.$langs->trans("Totalforthispage").' ';
}
elseif ($totalarray['totaldurationfield'] == $i) print '
'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').' ';
else print '
';
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 7ebf701d3d5..cbc7c3424bc 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -233,22 +233,22 @@ print '
';
print '
';
print ''.$langs->trans("Filter").' ';
// Company
- print ''.$langs->trans("ThirdParty").' ';
+ print ' '.$langs->trans("ThirdParty").' ';
$filter = 's.client in (1,2,3)';
print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
print ' ';
// User
- print ''.$langs->trans("CreatedBy").' ';
+ print ' '.$langs->trans("CreatedBy").' ';
print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
// Status
- print ' '.$langs->trans("Status").' ';
+ print ' '.$langs->trans("Status").' ';
$tmp = $objectstatic->LibStatut(0); // To load $this->statuts_short
$liststatus=$objectstatic->statuts_short;
if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
print $form->selectarray('object_status', $liststatus, $object_status, 1, 0, 0, '', 1);
print ' ';
// Year
- print ''.$langs->trans("Year").' ';
+ print ' '.$langs->trans("Year").' ';
if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
arsort($arrayyears);
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index b4892d3d89f..4aa18b6d40e 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2001-2006 Rodolphe Quiedeville
* Copyright (C) 2004-2016 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2013 Cédric Salvador
@@ -1147,8 +1147,8 @@ if ($resql)
$i++;
if ($i == 1)
{
- if ($num < $limit) print ''.$langs->trans("Total").' ';
- else print ''.$langs->trans("Totalforthispage").' ';
+ if ($num < $limit) print ''.$langs->trans("Total").' ';
+ else print ''.$langs->trans("Totalforthispage").' ';
}
elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 9286c038507..4fab329142c 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1,8 +1,8 @@
+/* Copyright (C) 2002-2006 Rodolphe Quiedeville
* Copyright (C) 2004-2016 Laurent Destailleur
* Copyright (C) 2005-2013 Regis Houssin
- * Copyright (C) 2013-2018 Philippe Grand
+ * Copyright (C) 2013-2019 Philippe Grand
* Copyright (C) 2013 Florian Henry
* Copyright (C) 2013 Cédric Salvador
* Copyright (C) 2015 Marcos García
@@ -1108,8 +1108,8 @@ if ($resql)
$i++;
if ($i == 1)
{
- if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").' ';
- else print ''.$langs->trans("Totalforthispage").' ';
+ if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").' ';
+ else print ''.$langs->trans("Totalforthispage").' ';
}
elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' ';
elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' ';
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 5812553db5c..d60519dda04 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -203,7 +203,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
$i++;
}
- print ''.$langs->trans("Total").' ';
+ print ''.$langs->trans("Total").' ';
print ''.price($tot_ttc).' ';
print ' ';
@@ -258,7 +258,7 @@ if ($resql)
print '';
print ''.img_object($langs->trans("ShowSupplier"),"company").' ';
print " socid."\">".$obj->name." \n";
- print ''.$obj->code_fournisseur.' ';
+ print ''.$obj->code_fournisseur.' ';
print ''.dol_print_date($db->jdate($obj->tms),'day').' ';
print " \n";
}
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 5b15c1fb8bc..98221ce6594 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -113,9 +113,9 @@ if ($result)
print '';
print ''.$establishmentstatic->getNomUrl(1).' ';
- print ''.$obj->address.' ';
- print ''.$obj->zip.' ';
- print ''.$obj->town.' ';
+ print ''.$obj->address.' ';
+ print ''.$obj->zip.' ';
+ print ''.$obj->town.' ';
print '';
print $establishmentstatic->getLibStatut(5);
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 07425ea1942..2ca310a1689 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -278,7 +278,7 @@ if ($action == 'create')
print '';
print '';
- print ''.$langs->trans("DateDue").' ';
+ print ''.$langs->trans("DateDue").' ';
print ''.$langs->trans("LoanCapital").' ';
print ''.$langs->trans("AlreadyPaid").' ';
print ''.$langs->trans("RemainderToPay").' ';
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index b2c74506990..3d8d5ec2ab9 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -123,7 +123,7 @@ print '';
print '';
print ''.$langs->trans("Description").' ';
print ''.$langs->trans("Value").' '."\n";
-print ''.$langs->trans("Description").' '."\n";
+print ''.$langs->trans("Description").' '."\n";
print ' ';
$form = new Form($db);
@@ -241,7 +241,7 @@ print ' ';
print " ";
print '';
print ''.$langs->trans("MARGIN_METHODE_FOR_DISCOUNT").' ';
-print '';
+print ' ';
print Form::selectarray('MARGIN_METHODE_FOR_DISCOUNT', $methods, $conf->global->MARGIN_METHODE_FOR_DISCOUNT);
print ' ';
print '';
@@ -257,7 +257,7 @@ print ' ';
print " ";
print ' ';
print ''.$langs->trans("AgentContactType").' ';
-print '';
+print ' ';
$formcompany = new FormCompany($db);
$facture = new Facture($db);
print $formcompany->selectTypeContact($facture, $conf->global->AGENT_CONTACT_TYPE, "AGENT_CONTACT_TYPE","internal","code",1);
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a1738474459..eeabbb11b1e 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -542,8 +542,8 @@ if (isset($totalarray['pos']))
{
if ($i == 1)
{
- if ($num < $limit) print ' '.$langs->trans("Total").' ';
- else print ''.$langs->trans("Totalforthispage").' ';
+ if ($num < $limit) print ''.$langs->trans("Total").' ';
+ else print ''.$langs->trans("Totalforthispage").' ';
}
else print ' ';
}
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index cf52d83c680..93086de389f 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -442,8 +442,8 @@ if (isset($totalarray['pos']))
{
if ($i == 1)
{
- if ($num < $limit) print ''.$langs->trans("Total").' ';
- else print ''.$langs->trans("Totalforthispage").' ';
+ if ($num < $limit) print ''.$langs->trans("Total").' ';
+ else print ''.$langs->trans("Totalforthispage").' ';
}
else print ' ';
}