diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 5029192cc00..71f469ae0be 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -28,7 +28,7 @@ if (!$user->rights->facture->lire)
require("../../facture.class.php");
require("../../project.class.php");
-llxHeader();
+llxHeader('','Nouvelle facture récurrente','ch-facture.html#s-fac-facture-rec');
/*
* Sécurité accés client
@@ -191,12 +191,20 @@ if ($action == 'create')
print '
Quantité | ';
print 'Remise | ';
print 'P.U. | ';
+ print 'N.P. | ';
print "\n";
}
$var=True;
while ($i < $num)
{
$objp = $db->fetch_object( $i);
+
+ if ($objp->fk_product > 0)
+ {
+ $product = New Product($db);
+ $product->fetch($objp->fk_product);
+ }
+
$var=!$var;
print "";
if ($objp->fk_product)
@@ -217,7 +225,18 @@ if ($action == 'create')
{
print '| | ';
}
+
print ''.price($objp->subprice)." | \n";
+
+ if ($objp->fk_product > 0 && $objp->subprice <> $product->price)
+ {
+ print ''.price($product->price)." | \n";
+ $flag_different_price++;
+ }
+ else
+ {
+ print ' | ';
+ }
print "
";
@@ -233,7 +252,25 @@ if ($action == 'create')
}
print "";
- print ' |
';
+ print '';
+ if ($flag_different_price)
+ {
+ print '| ';
+ print '';
+ print ' |
';
+ }
+ print ' |
';
print "\n";
print "\n";