[freeside-users] 1.7.3 release candidate 2

[Jeremy Davis]

> Does this help?
> 
> Index: svc_Common.pm
> ===================================================================
> RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_Common.pm,v
> retrieving revision 1.43
> diff -u -r1.43 svc_Common.pm
> --- svc_Common.pm       12 Mar 2008 16:24:33 -0000      1.43
> +++ svc_Common.pm       10 Apr 2008 05:06:18 -0000
> @@ -206,7 +206,6 @@
>    my $objects = $options{'child_objects'} || [];
>    my $depend_jobnums = $options{'depend_jobnum'} || [];
>    $depend_jobnums = [ $depend_jobnums ] unless ref($depend_jobnums);
> -  my $error;
> 
>    local $SIG{HUP} = 'IGNORE';
>    local $SIG{INT} = 'IGNORE';
> @@ -219,9 +218,6 @@
>    local $FS::UID::AutoCommit = 0;
>    my $dbh = dbh;
> 
> -  $error = $self->check;
> -  return $error if $error;
> -
>    my $svcnum = $self->svcnum;
>    my $cust_svc = $svcnum ?
> qsearchs('cust_svc',{'svcnum'=>$self->svcnum}) : '';
>    #unless ( $svcnum ) {
> @@ -232,7 +228,7 @@
>        'pkgnum'  => $self->pkgnum,
>        'svcpart' => $self->svcpart,
>      } );
> -    $error = $cust_svc->insert;
> +    my $error = $cust_svc->insert;
>      if ( $error ) {
>        $dbh->rollback if $oldAutoCommit;
>        return $error;
> @@ -248,13 +244,9 @@
>      $self->svcpart($cust_svc->svcpart);
>    }
> 
> -  $error = $self->set_auto_inventory;
> -  if ( $error ) {
> -    $dbh->rollback if $oldAutoCommit;
> -    return $error;
> -  }
> -
> -  $error = $self->SUPER::insert;
> +  my $error =    $self->set_auto_inventory
> +              || $self->check
> +              || $self->SUPER::insert;
>    if ( $error ) {
>      $dbh->rollback if $oldAutoCommit;
>      return $error;

I tried to apply this patch and I get:

patching file svc_Common.pm
Hunk #1 succeeded at 203 (offset -3 lines).
patch: **** malformed patch at line 25:
qsearchs('cust_svc',{'svcnum'=>$self->svcnum}) : '';

I am using patch -p0 < patch.file to apply the patch.  Am I doing something
wrong?



Sincerely,

Jeremy Davis 
Maximum Technologies, LLC
Office 318.303.4725