Utilise maintenant la condition de facturable sur le contrat
This commit is contained in:
parent
35f05b8287
commit
a55d8c4cf4
@ -363,7 +363,6 @@ function facture_contrat($db, $user, $contrat_id, $factel_ids, $datetime, &$fact
|
|||||||
$soca = new Societe($db);
|
$soca = new Societe($db);
|
||||||
$soca->fetch($ligne->client_id);
|
$soca->fetch($ligne->client_id);
|
||||||
|
|
||||||
|
|
||||||
/* Insertion des lignes de factures */
|
/* Insertion des lignes de factures */
|
||||||
$libelle = "";
|
$libelle = "";
|
||||||
|
|
||||||
@ -374,7 +373,6 @@ function facture_contrat($db, $user, $contrat_id, $factel_ids, $datetime, &$fact
|
|||||||
|
|
||||||
$dm = mktime (1,1,1,strftime("%m",$datetime), -1, strftime("%Y",$datetime));
|
$dm = mktime (1,1,1,strftime("%m",$datetime), -1, strftime("%Y",$datetime));
|
||||||
|
|
||||||
|
|
||||||
$libelle .= "Communications téléphoniques de la ligne $ligne->numero";
|
$libelle .= "Communications téléphoniques de la ligne $ligne->numero";
|
||||||
$libelle .= " mois de ".strftime("%B %Y",$dm);
|
$libelle .= " mois de ".strftime("%B %Y",$dm);
|
||||||
|
|
||||||
@ -556,7 +554,7 @@ function facture_contrat($db, $user, $contrat_id, $factel_ids, $datetime, &$fact
|
|||||||
* $ligne
|
* $ligne
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if ($ligne->facturable)
|
if ($contrat->facturable)
|
||||||
{
|
{
|
||||||
array_push($factures_a_mailer, $facid);
|
array_push($factures_a_mailer, $facid);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user