';
+
/*
* Documents générés
- *
* Le fichier de facture détaillée est de la forme
- *
* REFFACTURE-XXXXXX-detail.pdf ou XXXXX est une forme diverse
- *
*/
$forbidden_chars=array("/","\\",":","*","?","\"","<",">","|","[","]",",",";","=");
$facref = str_replace($forbidden_chars,"_",$fac->ref);
$file = $conf->facture->dir_output . "/" . $facref . "/" . $facref . ".pdf";
-
$relativepath = "${facref}/${facref}.pdf";
$var=true;
- print '';
-
if (file_exists($file))
{
print "
\n";
@@ -1363,6 +1359,53 @@ else
print " |
\n";
}
+
+ /*
+ * Propales
+ */
+ $sql = "SELECT ".$db->pdate("p.datep")." as dp, p.price, p.ref, p.rowid as propalid";
+ $sql .= " FROM ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."fa_pr as fp WHERE fp.fk_propal = p.rowid AND fp.fk_facture = $fac->id";
+
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $num = $db->num_rows($resql);
+ if ($num)
+ {
+ $i = 0; $total = 0;
+ print "
";
+ print_titre($langs->trans("RelatedCommercialProposals"));
+
+ print '';
+ print '';
+ print '| '.$langs->trans("Ref").' | ';
+ print ''.$langs->trans("Date").' | ';
+ print ''.$langs->trans("Price").' | ';
+ print " \n";
+
+ $var=True;
+ while ($i < $num)
+ {
+ $objp = $db->fetch_object($resql);
+ $var=!$var;
+ print "";
+ print '| '.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.' | ';
+ print "".dolibarr_print_date($objp->dp)." | \n";
+ print ''.price($objp->price).' | ';
+ print " ";
+ $total = $total + $objp->price;
+ $i++;
+ }
+ print "| | ".$langs->trans("TotalHT")." | ".price($total)." | \n";
+ print " ";
+ }
+ }
+ else
+ {
+ dolibarr_print_error($db);
+ }
+
+
print ' | ';
/*
@@ -1506,51 +1549,6 @@ else
print '
';
}
- /*
- * Propales
- */
-
- $sql = "SELECT ".$db->pdate("p.datep")." as dp, p.price, p.ref, p.rowid as propalid";
- $sql .= " FROM ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."fa_pr as fp WHERE fp.fk_propal = p.rowid AND fp.fk_facture = $fac->id";
-
- $resql = $db->query($sql);
- if ($resql)
- {
- $num = $db->num_rows($resql);
- if ($num)
- {
- $i = 0; $total = 0;
- print "
";
- print_titre($langs->trans("RelatedCommercialProposals"));
-
- print '';
- print '';
- print '| '.$langs->trans("Ref").' | ';
- print ''.$langs->trans("Date").' | ';
- print ''.$langs->trans("Price").' | ';
- print " \n";
-
- $var=True;
- while ($i < $num)
- {
- $objp = $db->fetch_object($resql);
- $var=!$var;
- print "";
- print '| '.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.' | ';
- print "".dolibarr_print_date($objp->dp)." | \n";
- print ''.price($objp->price).' | ';
- print " ";
- $total = $total + $objp->price;
- $i++;
- }
- print "| | ".$langs->trans("TotalHT")." | ".price($total)." | \n";
- print " ";
- }
- }
- else
- {
- dolibarr_print_error($db);
- }
}
else
{
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 32828a9ba3a..7a99a62601d 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -32,9 +32,9 @@ require("./pre.inc.php");
$user->getrights('facture');
$user->getrights('propale');
if (!$user->rights->propale->lire)
-accessforbidden();
-
+ accessforbidden();
+if ($conf->commande->enabled) require_once '../commande/commande.class.php';
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
require_once("../project.class.php");
require_once("../propal.class.php");
@@ -486,6 +486,37 @@ if ($_GET["propalid"])
print '';
}
+
+ /*
+ * Commandes rattachées
+ */
+ if($conf->commande->enabled)
+ {
+ $coms = $propal->associated_orders();
+ if (sizeof($coms) > 0)
+ {
+ print '
';
+ print_titre($langs->trans('RelatedOrders'));
+ print '';
+ print '';
+ print '| '.$langs->trans("Ref").' | ';
+ print ''.$langs->trans("Date").' | ';
+ print ''.$langs->trans("Price").' | ';
+ print ' ';
+ $var=true;
+ for ($i = 0 ; $i < sizeof($coms) ; $i++)
+ {
+ $var=!$var;
+ print '| ';
+ print ''.img_object($langs->trans("ShowOrder"),"order").' '.$coms[$i]->ref." | \n";
+ print ''.dolibarr_print_date($coms[$i]->date).' | ';
+ print ''.$coms[$i]->total_ttc.' | ';
+ print " \n";
+ }
+ print ' ';
+ }
+ }
+
/*
* Factures associees
@@ -504,8 +535,7 @@ if ($_GET["propalid"])
print '';
print "";
print '| '.$langs->trans("Ref").' | ';
- print ''.$langs->trans("Date").' | ';
- print ''.$langs->trans("Author").' | ';
+ print ''.$langs->trans("Date").' | ';
print ''.$langs->trans("Price").' | ';
print " \n";
@@ -521,68 +551,65 @@ if ($_GET["propalid"])
print " (payée)";
}
print "\n";
- print "".dolibarr_print_date($objp->df)." | \n";
- if ($objp->fk_user_author <> $user->id)
- {
- $fuser = new User($db, $objp->fk_user_author);
- $fuser->fetch();
- print "".$fuser->fullname." | \n";
- }
- else
- {
- print "".$user->fullname." | \n";
- }
+ print ''.dolibarr_print_date($objp->df).' | ';
print ''.price($objp->total).' | ';
print "";
$total = $total + $objp->total;
$i++;
}
- print "| ".$langs->trans("TotalHT")." | ".price($total)." | \n";
+ print "| ".$langs->trans("TotalHT")." | ".price($total)." | \n";
print " ";
$db->free();
}
- /*
- * Commandes associées
- */
- if($conf->commande->enabled)
- {
- $nb_commande = sizeof($propal->commande_liste_array());
- if ($nb_commande > 0)
- {
- $coms = $propal->commande_liste_array();
- print '
';
-
- if ($nb_commande == 1)
- {
- print "| Commande rattachée : ";
- print '';
- print img_file();
- print ' '.$coms[$i]."";
- print " | \n";
- }
- else
- {
- print "| Commandes rattachées | \n";
-
- for ($i = 0 ; $i < $nb_commande ; $i++)
- {
- print '| '.$coms[$i]." | \n";
- print " \n";
- }
- }
- print " ";
- }
- }
-
print ' | ';
- // \todo Mettre ici les traces des envois par mail
-
-
-
-
+
+ /*
+ * Liste des actions propres à la propal
+ */
+ $sql = 'SELECT id, '.$db->pdate('a.datea'). ' as da, label, note, fk_user_author' ;
+ $sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
+ $sql .= ' WHERE a.fk_soc = '.$obj->idp.' AND a.propalrowid = '.$propal->id ;
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ if ($num)
+ {
+ print_titre($langs->trans('ActionsOnPropal'));
+ $i = 0;
+ $total = 0;
+ $var=true;
+
+ print '';
+ print '| '.$langs->trans('Ref').' | '.$langs->trans('Date').' | '.$langs->trans('Action').' | '.$langs->trans('By').' | ';
+ print "\n";
+
+ while ($i < $num)
+ {
+ $objp = $db->fetch_object($result);
+ $var=!$var;
+ print '';
+ print '| '.img_object($langs->trans('ShowTask'),'task').' '.$objp->id.' | ';
+ print ''.dolibarr_print_date($objp->da)." | \n";
+ print ''.stripslashes($objp->label).' | ';
+ $authoract = new User($db);
+ $authoract->id = $objp->fk_user_author;
+ $authoract->fetch('');
+ print ''.$authoract->code.' | ';
+ print " \n";
+ $i++;
+ }
+ print ' ';
+ }
+ }
+ else
+ {
+ dolibarr_print_error($db);
+ }
+
print ' |