diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index fdfb84d9133..2c595519bed 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -432,12 +432,12 @@ if ($_GET['propalid'])
$sql.= ' WHERE p.fk_soc = s.idp AND p.fk_soc_contact = x.idp AND p.rowid = '.$propal->id;
if ($socidp) $sql .= ' AND s.idp = '.$socidp;
- $result = $db->query($sql);
- if ($result)
+ $resql = $db->query($sql);
+ if ($resql)
{
- if ($db->num_rows($result))
+ if ($db->num_rows($resql))
{
- $obj = $db->fetch_object($result);
+ $obj = $db->fetch_object($resql);
$societe = new Societe($db);
$societe->fetch($obj->idp);
@@ -468,7 +468,8 @@ if ($_GET['propalid'])
print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y');
if ($propal->statut == 1 && $propal->fin_validite < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
}
- else {
+ else
+ {
print $langs->trans("Unknown");
}
print '';
@@ -626,11 +627,11 @@ if ($_GET['propalid'])
{
print '';
print '| '.$langs->trans('Description').' | ';
- print ''.$langs->trans('VAT').' | ';
- print ''.$langs->trans('PriceUHT').' | ';
- print ''.$langs->trans('Qty').' | ';
- print ''.$langs->trans('Discount').' | ';
- print ''.$langs->trans('AmountHT').' | ';
+ print ''.$langs->trans('VAT').' | ';
+ print ''.$langs->trans('PriceUHT').' | ';
+ print ''.$langs->trans('Qty').' | ';
+ print ''.$langs->trans('Discount').' | ';
+ print ''.$langs->trans('AmountHT').' | ';
print ' | | ';
print "
\n";
}
@@ -763,9 +764,9 @@ if ($_GET['propalid'])
print ' | ';
print ' ';
print $html->select_tva('np_tva_tx', $conf->defaulttx) . " | \n";
- print ' | ';
- print ' | ';
- print ' % | ';
+ print ' | ';
+ print ' | ';
+ print ' % | ';
print ' | ';
print '';
@@ -784,8 +785,8 @@ if ($_GET['propalid'])
print '';
print '';
print ' | ';
- print ' | ';
- print '% | ';
+ print ' | ';
+ print '% | ';
print ' | ';
print "\n";
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 26c111ce93e..032297c601d 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -170,17 +170,19 @@ if ($_GET["propalid"])
if ($propal->fin_validite)
{
print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y');
- if ($propal->statut == 1 && $propal->$propal->fin_validite < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+ if ($propal->statut == 1 && $propal->fin_validite < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
}
else
{
print $langs->trans("Unknown");
}
- print '';
+ print '';
+ print '';
- // Receiver
+ // Destinataire
$langs->load('mails');
- print '| '.$langs->trans('MailTo').' | ';
+ print '
';
+ print '| '.$langs->trans('MailTo').' | ';
$dests=$societe->contact_array($societe->id);
$numdest = count($dests);
@@ -293,7 +295,7 @@ if ($_GET["propalid"])
print '
';
print '| '.$langs->trans('AmountHT').' | ';
- print ''.price($obj->price).' | ';
+ print ''.price($propal->price).' | ';
print ''.$langs->trans("Currency".$conf->monnaie).' |
';
print '| '.$langs->trans('VAT').' | '.price($propal->total_tva).' | ';
@@ -329,11 +331,11 @@ if ($_GET["propalid"])
{
print '
';
print '| '.$langs->trans('Description').' | ';
- print ''.$langs->trans('VAT').' | ';
- print ''.$langs->trans('PriceUHT').' | ';
- print ''.$langs->trans('Qty').' | ';
- print ''.$langs->trans('Discount').' | ';
- print ''.$langs->trans('AmountHT').' | ';
+ print ''.$langs->trans('VAT').' | ';
+ print ''.$langs->trans('PriceUHT').' | ';
+ print ''.$langs->trans('Qty').' | ';
+ print ''.$langs->trans('Discount').' | ';
+ print ''.$langs->trans('AmountHT').' | ';
print ' | | ';
print "
\n";
}
@@ -385,12 +387,12 @@ if ($_GET["propalid"])
}
print "\n";
}
- print ''.$objp->tva_tx.' % | ';
+ print ''.$objp->tva_tx.'% | ';
print ''.price($objp->subprice)." | \n";
print ''.$objp->qty.' | ';
if ($objp->remise_percent > 0)
{
- print ''.$objp->remise_percent." % | \n";
+ print ''.$objp->remise_percent."% | \n";
}
else
{