Changeset 2929 for pykota/trunk

Timestamp:

06/09/06 18:27:27 (18 years ago)

Author:

jerome

Message:

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

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (1 diff)
• NEWS (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -443 +443 @@
                 self.Reason = _("Print job cancelled.")
                 os.environ["PYKOTASTATUS"] = "CANCELLED"
-            elif username :
-                self.UserName = username # If cancelled or denied, we don't allow username to be overwritten
-            # NB : we overwrite the billing code even if empty    
-            self.JobBillingCode = billingcode 
+            else :
+                # don't overwrite anything unless job authorized
+                # to continue to the physical printer.
+                if username and username.strip() :
+                    self.UserName = username
+                if billingcode is not None :
+                    self.JobBillingCode = billingcode 
         self.logdebug("Job ticket overwriting done.")
             

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.25alpha6 (2006-06-09) :
+    
+        - Fixed the incorrect overwriting of the original billing
+          code if the overwrite_jobticket directive was used.
+          
     - 1.25alpha5 (2006-06-03) :