diff --git a/htdocs/telephonie/distributeurs/remconso.php b/htdocs/telephonie/distributeurs/remconso.php index 0f97099879f..45a1ae6cf45 100644 --- a/htdocs/telephonie/distributeurs/remconso.php +++ b/htdocs/telephonie/distributeurs/remconso.php @@ -106,7 +106,7 @@ if ($_GET["id"]) $sql = "SELECT s.idp, s.nom, a.fk_contrat, sum(a.montant) as montant"; - $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission_avance as a"; + $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission_conso as a"; $sql .= " , ".MAIN_DB_PREFIX."telephonie_contrat as c"; $sql .= " , ".MAIN_DB_PREFIX."societe as s"; @@ -114,6 +114,7 @@ if ($_GET["id"]) $sql .= " AND a.fk_contrat = c.rowid"; $sql .= " AND c.fk_soc = s.idp"; $sql .= " AND a.date ='".$year.$month."'"; + $sql .= " AND a.avance = 0"; $sql .= " GROUP BY s.idp"; $sql .= " ORDER BY s.nom ASC"; @@ -123,7 +124,7 @@ if ($_GET["id"]) $num = $db->num_rows($resql); $i = 0; - print_barre_liste("Rémunération sur avance pour $mois", $page, "po.php", "", $sortfield, $sortorder, '', $num); + print_barre_liste("Rémunération sur consommations pour $mois", $page, "po.php", "", $sortfield, $sortorder, '', $num); print ''; print ''; @@ -160,7 +161,8 @@ if ($_GET["id"]) $sql = "SELECT distinct(a.date)"; - $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission_avance as a"; + $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission_conso as a"; + $sql .= " WHERE a.avance = 0"; $sql .= " ORDER BY a.date DESC"; $resql = $db->query($sql); @@ -179,7 +181,7 @@ if ($_GET["id"]) $var=!$var; print "\n"; print "\n"; } diff --git a/htdocs/telephonie/sql/llx_telephonie_commission_conso.sql b/htdocs/telephonie/sql/llx_telephonie_commission_conso.sql index dabe790230a..a4ed377e332 100644 --- a/htdocs/telephonie/sql/llx_telephonie_commission_conso.sql +++ b/htdocs/telephonie/sql/llx_telephonie_commission_conso.sql @@ -28,7 +28,8 @@ create table llx_telephonie_commission_conso ( fk_ligne integer NOT NULL, pourcentage real, montant real, - annul tinyint DEFAULT 0 -- indique si les comm sont annulées + annul tinyint DEFAULT 0, -- indique si les comm sont annulées + avance tinyint DEFAULT 1, -- indique si les comm sont dans la période de l'avance UNIQUE (date, fk_ligne)
Client
"; - print ''.$obj->date."