Changeset 946 for pykota

Timestamp:

04/18/03 10:29:30 (22 years ago)

Author:

jalet

Message:

Minor bug fix

Location:

pykota/trunk

Files:

• bin/repykota (modified) (3 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/repykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.29  2003/04/18 08:29:30  jalet
+# Minor bug fix
+#
 # Revision 1.28  2003/04/17 09:36:30  jalet
 # Bad alignment in output
@@ -206 +209 @@
                     totalmoney += money
             if total or totalmoney :        
-                pass
-            print (" " * 50) + (_("Total : %9i") % total) + ("%11s" % ("%7.2f" % totalmoney)[:11])
+                print (" " * 50) + (_("Total : %9i") % total) + ("%11s" % ("%7.2f" % totalmoney)[:11])
             printerpagecounter = self.storage.getPrinterPageCounter(printerid)
             try :
@@ -241 +243 @@
             else :
                 reached = (((softlimit is not None) and (pagecounter >= softlimit) and "+") or "-") + "Q"
-            strbalance = ("%5.2f" % balance)[:10]
-            strlifetimepaid = ("%6.2f" % lifetimepaid)[:10]
+            strbalance = ("%5.2f" % (balance or 0.0))[:10]
+            strlifetimepaid = ("%6.2f" % (lifetimepaid or 0.0))[:10]
             print "%-9.9s %s %7i %7s %7s %10s %-10.10s %8i %10s" % (name, reached, pagecounter, str(softlimit), str(hardlimit), strbalance, str(datelimit)[:10], lifepagecounter, strlifetimepaid)
             return (lifepagecounter, lifetimepaid)

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.03-unofficial"
+__version__ = "1.04pre0-unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS."""