FreeXP

CVS daily diff

FreeXP CVS-Server cvs-list at freexp.de
Sam Feb 19 00:00:18 CET 2005


Index: freexp/xp10p.inc
===================================================================
RCS file: /server/cvs/freexp/xp10p.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freexp/xp10p.inc	1 Jan 2005 11:16:27 -0000	1.9
+++ freexp/xp10p.inc	18 Feb 2005 11:08:51 -0000	1.10
@@ -8,7 +8,7 @@
 { Die Nutzungsbedingungen fuer diesen Quelltext finden Sie in der }
 { Datei SLIZENZ.TXT oder auf www.crosspoint.de/oldlicense.html.   }
 { --------------------------------------------------------------- }
-{ $Id: xp10p.inc,v 1.9 2005/01/01 11:16:27 mw Exp $ }
+{ $Id: xp10p.inc,v 1.10 2005/02/18 11:08:51 mw Exp $ }
 
 procedure SavePhonezones;
 var t     : text;
@@ -212,10 +212,10 @@
     end
 
   else begin   { not exist(GebuehrDat) }
-    AddP('T-Com Fern (T-Net)',0);
+    AddP('T-Com Fern',0);
     AddP('T-Com Welt 4',0);
-    AddP('T-Com Ort (T-Net)',0);
-    AddP('T-Com Nah (T-Net)',0);
+    AddP('T-Com Ort',0);
+    AddP('T-Com Nah',0);
     AddP('T-Com VoIP',1);
     xs('032');
     AddP('T-Com Freecall',2);
@@ -299,46 +299,30 @@
     tables:=2;
     for i:=1 to maxwotage do
       tarif^[1].wochentag[i]:=(i<=5);
-    tarif^[1].zeitbereiche:=5;
+    tarif^[1].zeitbereiche:=3;
     if not newgeb then begin
-       bereich(1,1,'00:00','06:59',60,3,60,149,240,6,60,1.50,60,3,0,0,60,6,60,25.70,60,23.20,60,12.30,
+       bereich(1,1,'00:00','06:59',60,2.90,60,149,60,1.50,60,1.50,60,2.90,0,0,60,6,60,25.70,60,23.20,60,12.30,
                                  60,246,60,12.30,60,30.70,60,59);
-       bereich(1,2,'07:00','08:59',60,12,60,149,240,6,60,1.50,60,12,0,0,60,6,60,25.70,60,23.20,60,12.30,
+       bereich(1,2,'07:00','18:59',60,4.9,60,149,60,3.90,60,3.90,60,4.90,0,0,60,6,60,25.70,60,23.20,60,12.30,
                                  60,246,60,12.30,60,30.70,60,59);
-       bereich(1,3,'09:00','17:59',60,12,60,149,90,6,60,4,60,12,0,0,60,12,60,25.70,60,23.20,60,12.30,
-                                 60,246,60,12.30,60,30.70,60,59);
-       bereich(1,4,'18:00','20:59',60,6,60,149,240,6,60,1.50,60,6,0,0,60,6,60,25.70,60,23.20,60,12.30,
-                                 60,246,60,12.30,60,30.70,60,59);
-       bereich(1,5,'21:00','23:59',60,3,60,149,240,6,60,1.50,60,3,0,0,60,6,60,25.70,60,23.20,60,12.30,
+       bereich(1,3,'19:00','23:59',60,2.90,60,149,60,1.50,60,1.50,60,2.90,0,0,60,6,60,25.70,60,23.20,60,12.30,
                                  60,246,60,12.30,60,30.70,60,59);
     end else begin
-       bereich(1,1,'00:00','06:59',60,3,60,149,240,1.50,60,1.50,60,3,0,0,60,6,60,25.70,60,23.20,60,12.30,
-                                 60,246,60,12.30,60,30.70,60,59);
-       bereich(1,2,'07:00','08:59',60,12,60,149,240,1.50,60,1.50,60,12,0,0,60,6,60,25.70,60,23.20,60,12.30,
-                                 60,246,60,12.30,60,30.70,60,59);
-       bereich(1,3,'09:00','17:59',60,12,60,149,90,4,60,4,60,12,0,0,60,12,60,25.70,60,23.20,60,12.30,
+       bereich(1,1,'00:00','06:59',60,2.90,60,149,60,1.50,60,1.50,60,2.90,0,0,60,6,60,25.70,60,23.20,60,12.30,
                                  60,246,60,12.30,60,30.70,60,59);
-       bereich(1,4,'18:00','20:59',60,6,60,149,240,1.50,60,1.50,60,6,0,0,60,6,60,25.70,60,23.20,60,12.30,
-                                 60,246,60,12.30,60,30.70,60,59);
-       bereich(1,5,'21:00','23:59',60,3,60,149,240,1.50,60,1.50,60,3,0,0,60,6,60,25.70,60,23.20,60,12.30,
+       bereich(1,2,'07:00','18:59',60,4.9,60,149,60,3.90,60,3.90,60,4.90,0,0,60,6,60,25.70,60,23.20,60,12.30,
                                  60,246,60,12.30,60,30.70,60,59);
+       bereich(1,3,'19:00','23:59',60,2.90,60,149,60,1.50,60,1.50,60,2.90,0,0,60,6,60,25.70,60,23.20,60,12.30,
+                                 60,246,60,12.30,60,30.70,60,59);  
     end;
     for i:=1 to maxwotage do
       tarif^[2].wochentag[i]:=(i in [6,7,8,9,10]);
-    tarif^[2].zeitbereiche:=3;
+    tarif^[2].zeitbereiche:=1;
     if not newgeb then begin
-       bereich(2,1,'00:00','06:59',60,3,60,149,240,6,60,1.50,60,3,0,0,60,6,60,25.70,60,23.20,60,12.30,
-                                 60,246,60,12.30, 60,30.70,60,59);
-       bereich(2,2,'07:00','20:59',60,4.50,60,149,240,6,60,1.50,60,4.50,0,0,60,6,60,25.70,60,23.20,60,12.30,
-                                 60,246, 60,12.30,60,30.70,60,59);
-       bereich(2,3,'21:00','23:59',60,3,60,149,240,6,60,1.50,60,3,0,0,60,6,60,25.70,60,23.20,60,12.30,
+       bereich(2,1,'00:00','23:59',60,2.90,60,149,60,1.50,60,1.50,60,2.90,0,0,60,6,60,25.70,60,23.20,60,12.30,
                                  60,246,60,12.30, 60,30.70,60,59);
     end else begin
-       bereich(2,1,'00:00','06:59',60,3,60,149,240,1.50,60,1.50,60,3,0,0,60,6,60,25.70,60,23.20,60,12.30,
-                                 60,246,60,12.30, 60,30.70,60,59);
-       bereich(2,2,'07:00','20:59',60,4.50,60,149,240,1.50,60,1.50,60,4.50,0,0,60,6,60,25.70,60,23.20,60,12.30,
-                                 60,246, 60,12.30,60,30.70,60,59);
-       bereich(2,3,'21:00','23:59',60,3,60,149,240,1.50,60,1.50,60,3,0,0,60,6,60,25.70,60,23.20,60,12.30,
+       bereich(2,1,'00:00','23:59',60,2.90,60,149,60,1.50,60,1.50,60,2.90,0,0,60,6,60,25.70,60,23.20,60,12.30,
                                  60,246,60,12.30, 60,30.70,60,59);
     end;
     end;
@@ -359,6 +343,9 @@
 
 {
   $Log: xp10p.inc,v $
+  Revision 1.10  2005/02/18 11:08:51  mw
+  MW: - Neue Tarife der T-Com ab 01.03.2005 (Call-Plus)
+
   Revision 1.9  2005/01/01 11:16:27  mw
   MW: - Willkommen im Jahr 2005
 
Index: freexp/doc/snapshot.dq
===================================================================
RCS file: /server/cvs/freexp/doc/snapshot.dq,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- freexp/doc/snapshot.dq	7 Jan 2005 13:42:16 -0000	1.33
+++ freexp/doc/snapshot.dq	18 Feb 2005 11:24:52 -0000	1.34
@@ -4649,3 +4649,20 @@
   beseitigt.
   MONTAGE.PAS
 
+
+■  18.02.2005
+-------------
+MW:
+%*  Update der Gebührentabelle auf Stand 01.03.2005.
+- Die Tariftabelle ist jetzt an die neuen Tarife der
+  T-Com ab 01.03.2005 angepasst. Die vorliegende
+  Tabelle enthält den Tarif Call-Plus der T-Com.
+  Gültig für T-Net und T-ISDN.
+  XP10P.INC
+
+  TODO:
+  Einbau einen Flags um die Tarifänderung zum 01.05.2005
+  berücksichtigen zu können (Aufschlag von 0,2 Cent je
+  Minute bei Gesprächen zu Telefonanschlüssen von
+  Stadtnetzbetreibern).
+



Mehr Informationen über die CVS-List Mailingliste