[BACK]Return to rt_invoices.pl CVS log [TXT][DIR] Up to [local] / RT / Invoicing

Diff for /RT/Invoicing/rt_invoices.pl between version 1.26 and 1.37

version 1.26, 2011/04/19 04:19:27 version 1.37, 2011/05/26 02:09:36
Line 1 
Line 1 
 #!/usr/bin/perl  #!/usr/bin/perl
 # $AFresh1: rt_invoices.pl,v 1.25 2011/04/19 03:18:13 andrew Exp $  # $AFresh1: rt_invoices.pl,v 1.36 2011/05/18 19:03:17 andrew Exp $
 ########################################################################  ########################################################################
 # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 76 
Line 76 
   
 my $iterator = $results->get_iterator;  my $iterator = $results->get_iterator;
 while ( my $ticket = &$iterator ) {  while ( my $ticket = &$iterator ) {
     if (!$ticket->time_worked) {      my $cust = find_customer_for_ticket($ticket);
         say "Ticket " . $ticket->id . " has no time worked";  
         next;  
     }  
   
     my $cust = find_customer_for_ticket( $ticket );  
     if ( !$cust ) {      if ( !$cust ) {
         warn "No customer found for ticket " . $ticket->id;          warn "No customer found for ticket " . $ticket->id;
         next;          next;
Line 101 
Line 96 
     foreach my $fee ( @{ $project->{fees} } ) {      foreach my $fee ( @{ $project->{fees} } ) {
         my $hours = hours_for_date( $cust->{invoice}, $fee->{date} );          my $hours = hours_for_date( $cust->{invoice}, $fee->{date} );
   
         my $h_type          my $type = 'unknown';
             = exists $hours->{ $fee->{type} }          while ( $type && $type ne 'default' ) {
             ? $fee->{type}              $type = exists $hours->{ $fee->{type} }
             : 'default';                  && $hours->{ $fee->{type} } > 0 ? $fee->{type} : 'default';
   
         next unless exists $hours->{$h_type} && $hours->{$h_type} > 0;              next unless exists $hours->{$type} && $hours->{$type} > 0;
   
         my $discount_time = 0;              my $discount_time = 0;
         if ( $hours->{$h_type} > $fee->{count} ) {              if ( $hours->{$type} > $fee->{count} ) {
             $hours->{$h_type} -= $fee->{count};                  $hours->{$type} -= $fee->{count};
             $discount_time = $fee->{count};                  $discount_time = $fee->{count};
         }              }
         else {              else {
             $discount_time = $hours->{$h_type};                  $discount_time = $hours->{$type};
             $hours->{$h_type} = 0;                  $hours->{$type} = 0;
         }              }
   
         if ($discount_time) {              if ($discount_time) {
             $cust->{invoice}->{discount}->{amount}                  $cust->{invoice}->{discount}->{amount}
                 += round( $discount_time * $fee->{rate} );                      += round( $discount_time * $fee->{rate} );
             $cust->{invoice}->{discount}->{hours}{$h_type} += $discount_time;                  $cust->{invoice}->{discount}->{hours}{$type}
                       += $discount_time;
   
             $h_type = '' if $h_type eq 'default';                  $type = '' if $type eq 'default';
             $fee->{detail} = "$discount_time $h_type Hours Discounted";                  $fee->{detail} .= " $discount_time $type Hours Discounted";
               }
   
               last if $discount_time == $fee->{count};
         }          }
     }      }
   
Line 135 
Line 134 
     my $invoice = $cust->{invoice};      my $invoice = $cust->{invoice};
     next unless $invoice && $invoice->{projects} && @{ $invoice->{projects} };      next unless $invoice && $invoice->{projects} && @{ $invoice->{projects} };
   
     my %li = ( custid => $cust->{id}, invdate => DateTime->now->ymd, );      my %li = (
           custid       => $cust->{id},
           invdate      => DateTime->now( time_zone => 'local' )->ymd,
           transactions => [],
       );
   
       my %transactions;
     foreach my $project ( @{ $invoice->{projects} } ) {      foreach my $project ( @{ $invoice->{projects} } ) {
         if ( $project->{transactions} ) {          if ( $project->{transactions} ) {
             push @{ $li{transactions} }, @{ $project->{transactions} };              %transactions = ( %transactions, %{ $project->{transactions} } );
         }          }
         my $subtotal = 0;          my $subtotal = 0;
         foreach my $fee ( @{ $project->{fees} } ) {          foreach my $fee ( @{ $project->{fees} } ) {
Line 152 
Line 156 
         $project->{total} = $subtotal;          $project->{total} = $subtotal;
         $invoice->{total} += $subtotal;          $invoice->{total} += $subtotal;
     }      }
       @{ $li{transactions} } = sort { $a <=> $b } keys %transactions;
   
     if ( $invoice->{discount} ) {      if ( $invoice->{discount} ) {
         my $c = "Included Hours\n";          my $c = "Included Hours\n";
         if ( $invoice->{discount}{hours} ) {          if ( $invoice->{discount}{hours} ) {
             foreach my $t ( keys %{ $invoice->{discount}{hours} } ) {              foreach my $t ( keys %{ $invoice->{discount}{hours} } ) {
                 $c .= "\n$invoice->{discount}{hours}{$t} $t hour";                  my $type = $t eq 'default' ? '' : $t;
                   $c .= "\n$invoice->{discount}{hours}{$t} $type hour";
                 $c .= 's' if $invoice->{discount}{hours}{$t} != 1;                  $c .= 's' if $invoice->{discount}{hours}{$t} != 1;
                 $c .= "\n";                  $c .= "\n";
             }              }
Line 177 
Line 183 
     $from = get_user($from) if !ref $from;      $from = get_user($from) if !ref $from;
   
     $invoice->{organization} = $from->{organization} || $from->{name};      $invoice->{organization} = $from->{organization} || $from->{name};
     $invoice->{from}         = make_address($from);      $invoice->{from} = make_address($from);
     $invoice->{to}           = make_address( $cust->{address} || $cust->{id} );      $invoice->{to} = make_address( $cust->{address} || $cust->{id} );
   
     $state->{lastinvoice}++;      $state->{lastinvoice}++;
     $invoice->{id} = $state->{lastinvoice};      $invoice->{id}   = $state->{lastinvoice};
     $invoice->{file} = sprintf 'invoice_%06d.pdf', $state->{lastinvoice};      $invoice->{file} = sprintf 'invoice_%06d.pdf', $state->{lastinvoice};
     $invoice->{logo} = $config->get('logo');      $invoice->{logo} = $config->get('logo');
   
Line 239 
Line 245 
         next unless $cust->{match};          next unless $cust->{match};
         foreach my $m ( @{ $cust->{match} } ) {          foreach my $m ( @{ $cust->{match} } ) {
             my $type = $m->{type};              my $type = $m->{type};
             my $match = exists $m->{$type} ? lc($m->{$type}) : qr/\Q$m->{regex}\E/;              my $match
             my $thing = [ map { lc } $ticket->$type ];                  = exists $m->{$type}
                   ? lc( $m->{$type} )
                   : qr/\Q$m->{regex}\E/;
               my $thing = [ map {lc} $ticket->$type ];
   
             if (! $match) {              if ( !$match ) {
                 warn "Invalid match!";                  warn "Invalid match!";
                 next;                  next;
             }              }
             return $cust if ($match ~~ $thing);              return $cust if ( $match ~~ $thing );
         }          }
     }      }
   
Line 313 
Line 322 
         default { die "Unknown per [$per]\n" }          default { die "Unknown per [$per]\n" }
     }      }
   
     my $billends = DateTime->now      my $billend = DateTime->now( time_zone => 'local' )
         ->subtract( days => 1 )          ->set( hour => 0, minute => 0, second => 0 );
         ->set( hour => 23, minute => 59, second => 59 );  
   
     # XXX This is helpful, but monthly and billday > 28 == !!!      # XXX This is helpful, but monthly and billday > 28 == !!!
     $billends->subtract( days => 1 )      $billend->subtract( days => 1 )
         while $day && $billends->$day_method != $day;          while $day && $billend->$day_method != $day;
   
     my $date = $billends->clone->subtract( $per => $freq )      my $date = $billend->clone->subtract( $per => $freq );
         ->set( hour => 0, minute => 0, second => 0 );      my %invoice = ( end => $billend->clone->subtract( seconds => 1 ) );
   
     my %invoice = ( end => $billends->clone->subtract( seconds => 1 ) );  
   
     my $lastinvoice = $state->last_invoice( $cust->{id} );      my $lastinvoice = $state->last_invoice( $cust->{id} );
     if ( $lastinvoice->{date} ) {      if ( $lastinvoice->{date} ) {
         my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} );          my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} );
Line 338 
Line 344 
     }      }
   
     # Is the start date more than $freq $per before the end date?      # Is the start date more than $freq $per before the end date?
     my $diff = $billends - $date;      return {}
     return {} if $diff->in_units($per) < 1;          if DateTime->compare( $date->clone->add( $per => $freq ), $billend )
               > 0;
   
     if ( $cust->{base_rate} ) {      if ( $cust->{base_rate} ) {
         my ( $project, $hours ) = make_base_project(          my ( $project, $hours ) = make_base_project(
             $cust,              $cust,
             {   startdate  => $date,              {   date    => $date,
                 enddate    => $billends,                  billend => $billend,
                 per        => $per,                  per     => $per,
                 freq       => $freq,                  freq    => $freq,
                 day        => $day,  
                 day_method => $day_method,  
             }              }
         );          );
   
Line 375 
Line 380 
 sub make_base_project {  sub make_base_project {
     my ( $cust, $args ) = @_;      my ( $cust, $args ) = @_;
   
     my $date       = $args->{startdate};      my $date    = $args->{date};
     my $enddate    = $args->{enddate};      my $billend = $args->{billend};
     my $per        = $args->{per};      my $per     = $args->{per};
     my $freq       = $args->{freq};      my $freq    = $args->{freq};
     my $day        = $args->{day};  
     my $day_method = $args->{day_method};  
   
     my $title      my $title
         = $freq == 1          = $freq == 1
Line 391 
Line 394 
     my %project = ( title => $title, start => $date->clone, fees => [], );      my %project = ( title => $title, start => $date->clone, fees => [], );
     my @hours;      my @hours;
   
     while ( $date < $enddate ) {      while ( $date < $billend ) {
         my $start = $date->clone;          my $start = $date->clone;
   
         $date->add( $per => $freq );          $date->add( $per => $freq );
         $date = $enddate->clone if $date > $enddate;  
   
         # XXX This is helpful, but monthly and billday > 28 == !!!  
         $date->subtract( days => 1 ) while $day && $date->$day_method != $day;  
   
         my $end = $date->clone->subtract( seconds => 1 );          my $end = $date->clone->subtract( seconds => 1 );
           $end = $billend->clone->subtract( seconds => 1 ) if $date > $billend;
   
         last if $end < $start;  
   
         $project{end} = $end->clone;          $project{end} = $end->clone;
   
         push @{ $project{fees} },          push @{ $project{fees} },
Line 476 
Line 474 
     my $txns = $ticket->transactions( type => [qw(Comment Correspond)] );      my $txns = $ticket->transactions( type => [qw(Comment Correspond)] );
     my $txn_i = $txns->get_iterator;      my $txn_i = $txns->get_iterator;
     while ( my $txn = $txn_i->() ) {      while ( my $txn = $txn_i->() ) {
         next unless $txn->time_taken;  
         next if $state->txn_is_invoiced( $txn->id );          next if $state->txn_is_invoiced( $txn->id );
   
           if ( my $expense = make_expense( $txn, $ticket ) ) {
               push @{ $project{expenses} }, $expense;
               $project{transactions}{ $txn->id } = 1;
           }
   
           next unless $txn->time_taken;
   
         my $fee = make_fee( $txn, $cust->{rates}, $ticket );          my $fee = make_fee( $txn, $cust->{rates}, $ticket );
   
         if ( !( $fee->{rate} && $fee->{count} ) ) {          if ( !( $fee->{rate} && $fee->{count} ) ) {
Line 487 
Line 491 
         }          }
   
         my $invoice = $cust->{invoice};          my $invoice = $cust->{invoice};
         next          if ( $invoice->{start} && $invoice->{start} > $fee->{date} ) {
             if $invoice->{start}              warn "Ticket "
                 && $invoice->{start} > $fee->{date};                  . $ticket->id
                   . " has uninvoiced Transaction "
                   . $txn->id . "\n";
               next;
           }
         next if $invoice->{end} < $fee->{date};          next if $invoice->{end} < $fee->{date};
   
         push @{ $project{fees} },         $fee;          push @{ $project{fees} }, $fee;
         push @{ $project{transactions} }, $txn->id;          $project{transactions}{ $txn->id } = 1;
     }      }
   
     return \%project;      return \%project;
Line 507 
Line 515 
     my $work_time = sprintf "%.03f", $txn->time_taken / 60;      my $work_time = sprintf "%.03f", $txn->time_taken / 60;
     my $work_type = $txn->cf('WorkType');      my $work_type = $txn->cf('WorkType');
   
       if ( $work_type =~ s/\s*Onsite//i ) {
   
           # XXX Do something special for onsite activities
       }
   
       $work_type =~ s/^\s+|\s+$//g;
       $work_type ||= 'Normal';
   
     my %fee = (      my %fee = (
         id       => $txn->id,          id       => $txn->id,
         contents => $txn->created . ' ('          contents => $txn->created . ' ('
Line 525 
Line 541 
     return \%fee;      return \%fee;
 }  }
   
   sub make_expense {
       my ( $txn, $ticket ) = @_;
   
       my $amount = $txn->cf('ExpenseAmount') or return;
   
       my %expense = (
           id       => $txn->id,
           contents => $txn->created . ' ('
               . $txn->id . ')' . "\n\n"
               . ( $txn->data || $ticket->subject ),
           amount => $amount,
           date   => ymd_to_DateTime( $txn->created ),
   
           # detail => ???,
       );
   
       return \%expense;
   }
   
 sub hours_for_date {  sub hours_for_date {
     my ( $invoice, $date ) = @_;      my ( $invoice, $date ) = @_;
   
Line 548 
Line 583 
     my ( $hour, $minute, $second ) = split ':', $time if $time;      my ( $hour, $minute, $second ) = split ':', $time if $time;
   
     return DateTime->new(      return DateTime->new(
         year   => $year,          year      => $year,
         month  => $month,          month     => $month,
         day    => $day,          day       => $day,
         hour   => $hour || 0,          hour      => $hour || 0,
         minute => $minute || 0,          minute    => $minute || 0,
         second => $second || 0,          second    => $second || 0,
           time_zone => 'local',
     );      );
 }  }
   
Line 617 
Line 653 
     my $value = Load( Dump( $self->{_config}->{$key} ) );      my $value = Load( Dump( $self->{_config}->{$key} ) );
   
     return $value if $value;      return $value if $value;
     my ($volume,$directories,$file) =File::Spec->splitpath(      my ( $volume, $directories, $file )
          File::Spec->rel2abs( $self->{file} ));          = File::Spec->splitpath( File::Spec->rel2abs( $self->{file} ) );
   
     given ($key) {      given ($key) {
         when ('state') {          when ('state') {
Line 626 
Line 662 
             $value =~ s/(?:\.[^.]+)?$/\.state/;              $value =~ s/(?:\.[^.]+)?$/\.state/;
         }          }
         when ('invoice_dir') {          when ('invoice_dir') {
             $value = File::Spec->catdir($volume, $directories, 'invoices' );              $value = File::Spec->catdir( $volume, $directories, 'invoices' );
         }          }
         when ('template_dir') {          when ('template_dir') {
             $value = File::Spec->catdir( $volume, $directories );              $value = File::Spec->catdir( $volume, $directories );
Line 635 
Line 671 
             $value = 'invoice.tex.tt';              $value = 'invoice.tex.tt';
         }          }
         when ('logo') {          when ('logo') {
             $value = File::Spec->catfile($volume, $directories, 'Logo.pdf' );              $value = File::Spec->catfile( $volume, $directories, 'Logo.pdf' );
         }          }
     }      }
   
Legend:
Removed from v.1.26  
changed lines
  Added in v.1.37
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>