FreeXP

CVS freexp

CVS User mw cvs-list at freexp.de
Die Jan 23 19:27:53 CET 2007


Update of /server/cvs/freexp
In directory m25s18:/tmp/cvs-serv10306

Modified Files:
      Tag: Branch_3_40_Release
	xp10p.inc 
Log Message:
MW: - Anpassungen an die Mehrwertsteuererhoeung vom 01.01.2007
      bzw. an die aktuellen Tarife der T-Com

--- /server/cvs/freexp/xp10p.inc	2007/01/23 14:15:56	1.10.2.2
+++ /server/cvs/freexp/xp10p.inc	2007/01/23 18:27:52	1.10.2.3
@@ -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.10.2.2 2007/01/23 14:15:56 mw Exp $ }
+{ $Id: xp10p.inc,v 1.10.2.3 2007/01/23 18:27:52 mw Exp $ }
 
 procedure SavePhonezones;
 var t     : text;
@@ -301,29 +301,29 @@
       tarif^[1].wochentag[i]:=(i<=5);
     tarif^[1].zeitbereiche:=3;
     if not newgeb then begin
-       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','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);
+       bereich(1,1,'00:00','06:59',60,3,60,152.80,60,1.60,60,1.60,60,3,0,0,60,6.20,60,23.40,60,21.20,60,12.60,
+                                 60,25.20,60,12.60,60,40,60,60.50);
+       bereich(1,2,'07:00','18:59',60,5.10,60,152.80,60,4,60,4,60,5.10,0,0,60,12.30,60,23.40,60,21.20,60,12.60,
+                                 60,25.20,60,12.60,60,40,60,60.50);
+       bereich(1,3,'19:00','23:59',60,3,60,152.80,60,1.60,60,1.60,60,3,0,0,60,6.20,60,23.40,60,21.20,60,12.60,
+                                 60,25.20,60,12.60,60,40,60,60.50);
     end else begin
-       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','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);  
+       bereich(1,1,'00:00','06:59',60,3,60,152.80,60,1.60,60,1.60,60,3,0,0,60,6.20,60,23.40,60,21.20,60,12.60,
+                                 60,25.20,60,12.60,60,40,60,60.50);
+       bereich(1,2,'07:00','18:59',60,5.10,60,152.80,60,4,60,4,60,5.10,0,0,60,12.30,60,23.40,60,21.20,60,12.60,
+                                 60,25.20,60,12.60,60,40,60,60.50);
+       bereich(1,3,'19:00','23:59',60,3,60,152.80,60,1.60,60,1.60,60,3,0,0,60,6.20,60,23.40,60,21.20,60,12.60,
+                                 60,25.20,60,12.60,60,40,60,60.50);
     end;
     for i:=1 to maxwotage do
       tarif^[2].wochentag[i]:=(i in [6,7,8,9,10]);
     tarif^[2].zeitbereiche:=1;
     if not newgeb then begin
-       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);
+       bereich(2,1,'00:00','23:59',60,3,60,152.80,60,1.60,60,1.60,60,3,0,0,60,6.20,60,23.40,60,21.20,60,12.60,
+                                 60,25.20,60,12.60,60,40,60,60.50);
     end else begin
-       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);
+       bereich(2,1,'00:00','23:59',60,3,60,152.80,60,1.60,60,1.60,60,3,0,0,60,6.20,60,23.40,60,21.20,60,12.60,
+                                 60,25.20,60,12.60,60,40,60,60.50);
     end;
     end;
   if not loadt then SavePhonezones;
@@ -343,6 +343,10 @@
 
 {
   $Log: xp10p.inc,v $
+  Revision 1.10.2.3  2007/01/23 18:27:52  mw
+  MW: - Anpassungen an die Mehrwertsteuererhoeung vom 01.01.2007
+        bzw. an die aktuellen Tarife der T-Com
+
   Revision 1.10.2.2  2007/01/23 14:15:56  mw
   MW: - Neues Jahr 2007
 




Mehr Informationen über die CVS-List Mailingliste