Changeset 2929

Show
Ignore:
Timestamp:
06/09/06 18:27:27 (17 years ago)
Author:
jerome
Message:

Fixed a problem with the overwriting of the job's billing code.

Location:
pykota/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • pykota/trunk/bin/cupspykota

    r2919 r2929  
    443443                self.Reason = _("Print job cancelled.") 
    444444                os.environ["PYKOTASTATUS"] = "CANCELLED" 
    445             elif username : 
    446                 self.UserName = username # If cancelled or denied, we don't allow username to be overwritten 
    447             # NB : we overwrite the billing code even if empty     
    448             self.JobBillingCode = billingcode  
     445            else : 
     446                # don't overwrite anything unless job authorized 
     447                # to continue to the physical printer. 
     448                if username and username.strip() : 
     449                    self.UserName = username 
     450                if billingcode is not None : 
     451                    self.JobBillingCode = billingcode  
    449452        self.logdebug("Job ticket overwriting done.") 
    450453             
  • pykota/trunk/NEWS

    r2913 r2929  
    2222PyKota NEWS : 
    2323        
     24    - 1.25alpha6 (2006-06-09) : 
     25     
     26        - Fixed the incorrect overwriting of the original billing 
     27          code if the overwrite_jobticket directive was used. 
     28           
    2429    - 1.25alpha5 (2006-06-03) : 
    2530