diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index c5cd570c241..856f39c2c58 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1374,7 +1374,7 @@ if ($action == 'create')
$absolute_discount = $soc->getAvailableDiscounts();
print '. ';
if ($absolute_discount)
- print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency" . $conf->currency));
+ print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount, 0, $langs, 1, -1, -1, $conf->currency));
else
print $langs->trans("CompanyHasNoAbsoluteDiscount");
print '.';
@@ -1516,18 +1516,18 @@ if ($action == 'create')
$newclassname = 'Intervention';
print '
| ' . $langs->trans($newclassname) . ' | ' . $objectsrc->getNomUrl(1) . ' |
';
- print '| ' . $langs->trans('TotalHT') . ' | ' . price($objectsrc->total_ht) . ' |
';
- print '| ' . $langs->trans('TotalVAT') . ' | ' . price($objectsrc->total_tva) . " |
";
+ print '| ' . $langs->trans('TotalHT') . ' | ' . price($objectsrc->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . ' |
';
+ print '| ' . $langs->trans('TotalVAT') . ' | ' . price($objectsrc->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . " |
";
if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0 ) // Localtax1
{
- print '| ' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' | ' . price($objectsrc->total_localtax1) . " |
";
+ print '| ' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' | ' . price($objectsrc->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency) . " |
";
}
if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) // Localtax2
{
- print '| ' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' | ' . price($objectsrc->total_localtax2) . " |
";
+ print '| ' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' | ' . price($objectsrc->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency) . " |
";
}
- print '| ' . $langs->trans('TotalTTC') . ' | ' . price($objectsrc->total_ttc) . " |
";
+ print '| ' . $langs->trans('TotalTTC') . ' | ' . price($objectsrc->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . " |
";
}
print "\n";
@@ -1990,7 +1990,7 @@ if ($action == 'create')
print $langs->trans('OutstandingBill');
print '';
print price($soc->get_OutstandingBill()) . ' / ';
- print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
+ print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency);
print ' | ';
print '';
}
@@ -2044,7 +2044,7 @@ if ($action == 'create')
// Amount HT
print '| ' . $langs->trans('AmountHT') . ' | ';
- print '' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . ' | ';
+ print '' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . ' | ';
// Margin Infos
if (! empty($conf->margin->enabled)) {
@@ -2056,26 +2056,26 @@ if ($action == 'create')
// Amount VAT
print '
| ' . $langs->trans('AmountVAT') . ' | ';
- print '' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . ' | ';
+ print '' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . ' | ';
print '
';
// Amount Local Taxes
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) // Localtax1
{
print '| ' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' | ';
- print '' . price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency) . ' | ';
+ print '' . price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency) . ' | ';
print ' |
';
}
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) // Localtax2
{
print '| ' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' | ';
- print '' . price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency) . ' | ';
+ print '' . price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency) . ' | ';
print '
';
}
// Amount TTC
print '| ' . $langs->trans('AmountTTC') . ' | ';
- print '' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . ' | ';
+ print '' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . ' | ';
print '
';
// Statut
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index a5fdcbd24d3..7dfc7ef1e71 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -84,6 +84,8 @@ $result=@include_once $conffile; // Keep @ because with some error reporting thi
if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session
{
+ // Note: If calling page was not into htdocs (index.php, ...), then this redirect will fails.
+ // There is no real solution, because the only way to know the apache url relative path is to have into conf file.
header("Location: install/index.php");
exit;
}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2d9f51bb2aa..8ab891d388d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1796,11 +1796,11 @@ table.nobordernopadding {
}
table.nobordernopadding tr {
border: 0px !important;
- padding: 0px 0px;
+ padding: 0px 0px !important;
}
table.nobordernopadding td {
border: 0px !important;
- padding: 0px 0px;
+ padding: 0px 0px !important;
}
/* For lists */