[freeside-commits] freeside/FS/FS cdr.pm, 1.42, 1.43 Schema.pm, 1.151, 1.152 cdr_termination.pm, 1.1, 1.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv8494/FS/FS

Modified Files:
	cdr.pm Schema.pm cdr_termination.pm 
Log Message:
settlement cdr processing, RT#5495

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- Schema.pm	1 Jul 2009 10:28:49 -0000	1.151
+++ Schema.pm	2 Jul 2009 11:22:48 -0000	1.152
@@ -2142,7 +2142,7 @@
       ],
       'primary_key' => 'acctid',
       'unique' => [],
-      'index' => [ [ 'calldate' ], [ 'src' ], [ 'dst' ], [ 'charged_party' ], [ 'accountcode' ], [ 'freesidestatus' ], [ 'freesiderewritestatus' ], [ 'cdrbatch' ], ],
+      'index' => [ [ 'calldate' ], [ 'src' ], [ 'dst' ], [ 'charged_party' ], [ 'accountcode' ], [ 'carrierid' ], [ 'freesidestatus' ], [ 'freesiderewritestatus' ], [ 'cdrbatch' ], ],
     },
 
     'cdr_termination' => {

Index: cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cdr.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- cdr.pm	30 May 2009 10:45:43 -0000	1.42
+++ cdr.pm	2 Jul 2009 11:22:47 -0000	1.43
@@ -527,8 +527,8 @@
     sub { time2str('%D', shift->calldate_unix ) },   #DATE
     sub { time2str('%r', shift->calldate_unix ) },   #TIME
     #'userfield',                                     #USER
-    'dst',                                           #NUMBER_DIALED
     'src',                                           #called from
+    'dst',                                           #NUMBER_DIALED
     $duration_sub,                                   #DURATION
     #sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE
     sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, #PRICE

Index: cdr_termination.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cdr_termination.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cdr_termination.pm	1 Jul 2009 10:28:49 -0000	1.1
+++ cdr_termination.pm	2 Jul 2009 11:22:48 -0000	1.2
@@ -117,26 +117,26 @@
     #|| $self->ut_foreign_key('termpart', 'part_termination', 'termpart')
     || $self->ut_number('termpart')
     || $self->ut_float('rated_price')
-    || $self->ut_enum('status', '', 'done' ) # , 'skipped' )
+    || $self->ut_enum('status', [ '', 'done' ] ) # , 'skipped' ] )
   ;
   return $error if $error;
 
   $self->SUPER::check;
 }
 
-=item set_status_and_rated_price STATUS [ RATED_PRICE ]
-
-Sets the status to the provided string.  If there is an error, returns the
-error, otherwise returns false.
-
-=cut
-
-sub set_status_and_rated_price {
-  my($self, $status, $rated_price) = @_;
-  $self->status($status);
-  $self->rated_price($rated_price);
-  $self->replace();
-}
+#=item set_status_and_rated_price STATUS [ RATED_PRICE ]
+#
+#Sets the status to the provided string.  If there is an error, returns the
+#error, otherwise returns false.
+#
+#=cut
+#
+#sub set_status_and_rated_price {
+#  my($self, $status, $rated_price) = @_;
+#  $self->status($status);
+#  $self->rated_price($rated_price);
+#  $self->replace();
+#}
 
 =back