Index: freexp/xp10p.inc
===================================================================
RCS file: /server/cvs/freexp/xp10p.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freexp/xp10p.inc 8 Nov 2004 12:07:16 -0000 1.7
+++ freexp/xp10p.inc 5 Dec 2004 12:33:57 -0000 1.8
@@ -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.7 2004/11/08 12:07:16 mw Exp $ }
+{ $Id: xp10p.inc,v 1.8 2004/12/05 12:33:57 mw Exp $ }
procedure SavePhonezones;
var t : text;
@@ -301,44 +301,44 @@
tarif^[1].wochentag[i]:=(i<=5);
tarif^[1].zeitbereiche:=5;
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,29.20,60,24.60,60,12.30,
+
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,
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,29.20,60,24.60,60,12.30,
+
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,
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,29.20,60,24.60,60,12.30,
+
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,29.20,60,24.60,60,12.30,
+
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,29.20,60,24.60,60,12.30,
+
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,
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,29.20,60,24.60,60,12.30,
+
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,29.20,60,24.60,60,12.30,
+
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,29.20,60,24.60,60,12.30,
+
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,
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,29.20,60,24.60,60,12.30,
+
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,29.20,60,24.60,60,12.30,
+
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,
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;
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,29.20,60,24.60,60,12.30,
+
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,29.20,60,24.60,60,12.30,
+
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,29.20,60,24.60,60,12.30,
+
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,
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,29.20,60,24.60,60,12.30,
+
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,29.20,60,24.60,60,12.30,
+
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,29.20,60,24.60,60,12.30,
+
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,
60,246,60,12.30, 60,30.70,60,59);
end;
end;
@@ -359,6 +359,9 @@
{
$Log: xp10p.inc,v $
+ Revision 1.8 2004/12/05 12:33:57 mw
+ MW: - Tariftabellenanpassung an neue Tarife ab 15.12.2004
+
Revision 1.7 2004/11/08 12:07:16 mw
MW: - Anpassung an aktuelle Telefon-Tarife
------------------------------------------------------------------------
FreeXP CVS-Mailingliste
[EMAIL PROTECTED]
http://www.freexp.de/cgi-bin/mailman/listinfo/cvs-list
