[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.28 and 1.32

version 1.28, 2011/04/19 04:35:12 version 1.32, 2011/05/07 02:09:43
Line 1 
Line 1 
 #!/usr/bin/perl  #!/usr/bin/perl
 # $AFresh1: rt_invoices.pl,v 1.27 2011/04/19 03:21:06 andrew Exp $  # $AFresh1: rt_invoices.pl,v 1.31 2011/05/07 01:03:55 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) {      if ( !$ticket->time_worked ) {
         say "Ticket " . $ticket->id . " has no time worked";          say "Ticket " . $ticket->id . " has no time worked";
         next;          next;
     }      }
   
     my $cust = find_customer_for_ticket( $ticket );      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 101 
     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 = exists $hours->{ $fee->{type} }
             = exists $hours->{ $fee->{type} }              && $hours->{ $fee->{type} } > 0 ? $fee->{type} : 'default';
             ? $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";
         }          }
     }      }
   
Line 135 
Line 133 
     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 =>      my %li = (
         DateTime->now( time_zone => 'local' )->ymd, );          custid  => $cust->{id},
           invdate => DateTime->now( time_zone => 'local' )->ymd,
       );
   
     foreach my $project ( @{ $invoice->{projects} } ) {      foreach my $project ( @{ $invoice->{projects} } ) {
         if ( $project->{transactions} ) {          if ( $project->{transactions} ) {
Line 178 
Line 178 
     $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 240 
Line 240 
         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 321 
Line 324 
     $billend->subtract( days => 1 )      $billend->subtract( days => 1 )
         while $day && $billend->$day_method != $day;          while $day && $billend->$day_method != $day;
   
     my $date    = $billend->clone->subtract( $per => $freq );      my $date = $billend->clone->subtract( $per => $freq );
     my %invoice = ( end => $billend->clone->subtract( seconds => 1 ) );      my %invoice = ( end => $billend->clone->subtract( seconds => 1 ) );
   
     my $lastinvoice = $state->last_invoice( $cust->{id} );      my $lastinvoice = $state->last_invoice( $cust->{id} );
Line 336 
Line 339 
     }      }
   
     # 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 = $billend - $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,
             {   date       => $date,              {   date    => $date,
                 billend    => $billend,                  billend => $billend,
                 per        => $per,                  per     => $per,
                 freq       => $freq,                  freq    => $freq,
             }              }
         );          );
   
Line 476 
Line 480 
         }          }
   
         my $invoice = $cust->{invoice};          my $invoice = $cust->{invoice};
         if ($invoice->{start} && $invoice->{start} > $fee->{date}) {          if ( $invoice->{start} && $invoice->{start} > $fee->{date} ) {
             warn "Ticket " . $ticket->id              warn "Ticket "
                 . " has old uninvoiced Transaction " .  $txn->id . "\n";                  . $ticket->id
                   . " has uninvoiced Transaction "
                   . $txn->id . "\n";
             next;              next;
         }          }
         next if $invoice->{end} < $fee->{date};          next if $invoice->{end} < $fee->{date};
Line 609 
Line 615 
     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 618 
Line 624 
             $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 627 
Line 633 
             $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.28  
changed lines
  Added in v.1.32
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>