diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 46a11e363fd..683453023b9 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -241,17 +241,17 @@ if ($action == 'setforcedate')
if ($action == 'setDefaultPDFModulesByType')
{
$invoicetypemodels = GETPOST('invoicetypemodels');
-
+
if(!empty($invoicetypemodels) && is_array($invoicetypemodels))
{
$error = 0;
-
+
foreach ($invoicetypemodels as $type => $value)
{
$res = dolibarr_set_const($db, 'FACTURE_ADDON_PDF_'.intval($type),$value,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
}
-
+
if (! $error)
{
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -621,7 +621,7 @@ if(!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
print '
'.$langs->trans("Name").' | ';
print ' | ';
print "\n";
-
+
$listtype=array(
Facture::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
Facture::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
@@ -632,7 +632,7 @@ if(!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
{
$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
}
-
+
foreach ($listtype as $type => $trans)
{
$thisTypeConfName = 'FACTURE_ADDON_PDF_'.$type;
@@ -642,7 +642,7 @@ if(!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
print ''.$form->selectarray('invoicetypemodels['.$type.']', ModelePDFFactures::liste_modeles($db), $current,0,0, 0).' | ';
print "\n";
}
-
+
print '';
print "";
}
@@ -698,7 +698,7 @@ if (! empty($conf->banque->enabled))
}
else
{
- print "".$langs->trans("NoActiveBankAccountDefined")."";
+ print ''.$langs->trans("NoActiveBankAccountDefined").'';
}
}
}
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 78d76eca5fc..d9ed88fa4f6 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -358,7 +358,7 @@ $thirdpartystatic=new Societe($db);
$sql = 'SELECT';
if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql.= ' f.rowid as id, f.ref as ref, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.total as total_ht, f.tva as total_vat, f.total_ttc,';
+$sql.= ' f.rowid as id, f.ref, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.total as total_ht, f.tva as total_vat, f.total_ttc,';
$sql.= ' f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,';
$sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
$sql.= ' f.paye as paye, f.fk_statut,';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0c43a14b9e7..6349bb56d99 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2058,20 +2058,20 @@ class Form
$selectFields = " p.rowid, p.label, p.ref, p.description, p.barcode, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
(count($warehouseStatusArray)) ? $selectFieldsGrouped = ", sum(ps.reel) as stock" : $selectFieldsGrouped = ", p.stock";
-
+
$sql = "SELECT ";
$sql.= $selectFields . $selectFieldsGrouped;
-
+
if (! empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
{
//Product category
$sql.= ", (SELECT ".MAIN_DB_PREFIX."categorie_product.fk_categorie
FROM ".MAIN_DB_PREFIX."categorie_product
- WHERE ".MAIN_DB_PREFIX."categorie_product.fk_product=p.rowid
+ WHERE ".MAIN_DB_PREFIX."categorie_product.fk_product=p.rowid
LIMIT 1
) AS categorie_product_id ";
}
-
+
//Price by customer
if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid))
{
@@ -2181,7 +2181,7 @@ class Form
{
$sql.= ' GROUP BY'.$selectFields;
}
-
+
//Sort by category
if(! empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
{
@@ -2195,7 +2195,7 @@ class Form
}
$sql.= $db->plimit($limit, 0);
-
+
// Build output string
dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);
$result=$this->db->query($sql);
@@ -3636,8 +3636,8 @@ class Form
}
else
{
- if ($statut == 0) print $langs->trans("NoActiveBankAccountDefined");
- else print $langs->trans("NoBankAccountFound");
+ if ($statut == 0) print ''.$langs->trans("NoActiveBankAccountDefined").'';
+ else print ''.$langs->trans("NoBankAccountFound").'';
}
}
else {