From a6f21b11007535f169ef869246e5c949e304b1fe Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Mon, 9 May 2005 11:21:18 +0000 Subject: [PATCH] Modification de la ventilation --- .../script/facturation-emission.php | 44 ++++++------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/htdocs/telephonie/script/facturation-emission.php b/htdocs/telephonie/script/facturation-emission.php index b05769d9c51..fb4d89ce7e3 100644 --- a/htdocs/telephonie/script/facturation-emission.php +++ b/htdocs/telephonie/script/facturation-emission.php @@ -385,15 +385,24 @@ function facture_contrat($db, $user, $contrat_id, $factel_ids, $datetime, &$fact if (!$error) { - + $ventil = 0 ; + if (defined("TELEPHONIE_COMPTE_VENTILATION")) + { + + if (is_numeric(TELEPHONIE_COMPTE_VENTILATION)) + { + $ventil = TELEPHONIE_COMPTE_VENTILATION; + } + } + + $result = $fac->addline($facid, $libelle, $factel->cout_vente_remise, 1, '19.6', 0, - 0); - + 0,'','',$ventil); } } @@ -434,6 +443,7 @@ function facture_contrat($db, $user, $contrat_id, $factel_ids, $datetime, &$fact 1, '19.6', 0, + 0, 0); $is++; @@ -471,34 +481,6 @@ function facture_contrat($db, $user, $contrat_id, $factel_ids, $datetime, &$fact } } - /**************************************/ - /* */ - /* Ventilation des lignes de factures */ - /* TELEPHONIE_COMPTE_VENTILATION */ - /* */ - /**************************************/ - - if (!$error && !$cancel_facture) - { - if (defined("TELEPHONIE_COMPTE_VENTILATION")) - { - - if (is_numeric(TELEPHONIE_COMPTE_VENTILATION)) - { - - $sql = " UPDATE ".MAIN_DB_PREFIX."facturedet"; - $sql .= " SET fk_code_ventilation = ".TELEPHONIE_COMPTE_VENTILATION; - $sql .= " WHERE fk_facture = ".$facid; - - if (! $db->query($sql) ) - { - dolibarr_syslog("Erreur de ventilation"); - $error++; - } - } - } - } - /**************************************/ /* */ /* Factures détaillées */