diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 5356d212c38..9a22c93d042 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -40,8 +40,8 @@ class FormProduct
public $error='';
// Cache arrays
- var $cache_warehouses=array();
- var $cache_lot=array();
+ public $cache_warehouses=array();
+ public $cache_lot=array();
/**
@@ -266,7 +266,7 @@ class FormProduct
print '| ';
print $this->selectWarehouses($selected, $htmlname, '', $addempty);
print ' | ';
- print ' | ';
+ print ' | ';
print '
';
} else {
if ($selected) {
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 08459729e87..9605137b838 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -796,14 +796,14 @@ SCRIPT;
print ''.$productfourn->getSocNomUrl(1,'supplier').' | ';
// Supplier ref
- print ''.$productfourn->fourn_ref.' | ';
+ print ''.$productfourn->fourn_ref.' | ';
// Availability
if(!empty($conf->global->FOURN_PRODUCT_AVAILABILITY))
{
$form->load_cache_availability();
$availability= $form->cache_availability[$productfourn->fk_availability]['label'];
- print ''.$availability.' | ';
+ print ''.$availability.' | ';
}
// Quantity
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 95bb82aea50..4e56e16c2de 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -491,8 +491,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/product/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php
index 0b89ac8a647..37d6fa5c670 100644
--- a/htdocs/product/inventory/tpl/inventory.tpl.php
+++ b/htdocs/product/inventory/tpl/inventory.tpl.php
@@ -123,7 +123,7 @@ if (empty($conf) || ! is_object($conf))
} // Fin IF principal
?>
- | |
+ |
|
barcode->enabled)) { ?>
|
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 92975883cbb..c77037abe51 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1,12 +1,12 @@
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville
* Copyright (C) 2004-2014 Laurent Destailleur
* Copyright (C) 2005 Eric Seigne
* Copyright (C) 2005-2017 Regis Houssin
- * Copyright (C) 2006 Andre Cianfarani
+ * Copyright (C) 2006 Andre Cianfarani
* Copyright (C) 2014 Florian Henry
* Copyright (C) 2014-2018 Juanjo Menent
- * Copyright (C) 2014-2018 Philippe Grand
+ * Copyright (C) 2014-2019 Philippe Grand
* Copyright (C) 2014 Ion agorria
* Copyright (C) 2015 Alexandre Spangaro
* Copyright (C) 2015 Marcos García
@@ -1395,7 +1395,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
}
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
- print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().' | ';
+ print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().' | ';
}
print '';
@@ -1710,7 +1710,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
}
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
- print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().' | ';
+ print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().' | ';
}
print '
';
@@ -1801,7 +1801,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print '';
if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
{
- print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().' | ';
+ print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().' | ';
}
print '';
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 083dcd6ea52..1155ca518e9 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -238,8 +238,8 @@ if ($id > 0 || ! empty($ref))
}
}
print '';
- if ($num < $limit) print '| '.$langs->trans("Total").' | ';
- else print ''.$langs->trans("Totalforthispage").' | ';
+ if ($num < $limit) print ''.$langs->trans("Total").' | ';
+ else print ''.$langs->trans("Totalforthispage").' | ';
print ' | ';
print ''.$total_qty.' | ';
print ''.price($total_ht).' | ';
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 21bb3f6fd9a..eb3bd095065 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -246,8 +246,8 @@ if ($id > 0 || ! empty($ref)) {
}
}
print '
';
- if ($num < $limit) print '| '.$langs->trans("Total").' | ';
- else print ''.$langs->trans("Totalforthispage").' | ';
+ if ($num < $limit) print ''.$langs->trans("Total").' | ';
+ else print ''.$langs->trans("Totalforthispage").' | ';
print ' | ';
print '' . $total_qty . ' | ';
print '' . price($total_ht) . ' | ';
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 6cf8c13208a..cd7454cac15 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -259,8 +259,8 @@ if ($id > 0 || ! empty($ref))
}
}
print '
';
- if ($num < $limit) print '| '.$langs->trans("Total").' | ';
- else print ''.$langs->trans("Totalforthispage").' | ';
+ if ($num < $limit) print ''.$langs->trans("Total").' | ';
+ else print ''.$langs->trans("Totalforthispage").' | ';
print ' | ';
print ''.$total_qty.' | ';
print ''.price($total_ht).' | ';
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 95bea4650c4..19fa57d50c9 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -244,8 +244,8 @@ if ($id > 0 || ! empty($ref))
}
}
print '
';
- if ($num < $limit) print '| '.$langs->trans("Total").' | ';
- else print ''.$langs->trans("Totalforthispage").' | ';
+ if ($num < $limit) print ''.$langs->trans("Total").' | ';
+ else print ''.$langs->trans("Totalforthispage").' | ';
print ' | ';
print '' . $total_qty . ' | ';
print '' . price($total_ht) . ' | ';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 1c2d0f56e3c..9d832f4d336 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -242,8 +242,8 @@ if ($id > 0 || ! empty($ref))
}
print '
';
- if ($num < $limit) print '| '.$langs->trans("Total").' | ';
- else print ''.$langs->trans("Totalforthispage").' | ';
+ if ($num < $limit) print ''.$langs->trans("Total").' | ';
+ else print ''.$langs->trans("Totalforthispage").' | ';
print ' | ';
print '' . $total_qty . ' | ';
print '' . price($total_ht) . ' | ';
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 55cafd034cf..a67420a57ea 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -241,8 +241,8 @@ if ($id > 0 || ! empty($ref))
}
print '
';
- if ($num < $limit) print '| '.$langs->trans("Total").' | ';
- else print ''.$langs->trans("Totalforthispage").' | ';
+ if ($num < $limit) print ''.$langs->trans("Total").' | ';
+ else print ''.$langs->trans("Totalforthispage").' | ';
print ' | ';
print '' . $total_qty . ' | ';
print '' . price($total_ht) . ' | ';
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 6de8be264a9..7f0b5dc7210 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -511,8 +511,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']).' | ';