Changeset 946

Show
Ignore:
Timestamp:
04/18/03 10:29:30 (22 years ago)
Author:
jalet
Message:

Minor bug fix

Location:
pykota/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • pykota/trunk/bin/repykota

    r931 r946  
    2323# 
    2424# $Log$ 
     25# Revision 1.29  2003/04/18 08:29:30  jalet 
     26# Minor bug fix 
     27# 
    2528# Revision 1.28  2003/04/17 09:36:30  jalet 
    2629# Bad alignment in output 
     
    206209                    totalmoney += money 
    207210            if total or totalmoney :         
    208                 pass 
    209             print (" " * 50) + (_("Total : %9i") % total) + ("%11s" % ("%7.2f" % totalmoney)[:11]) 
     211                print (" " * 50) + (_("Total : %9i") % total) + ("%11s" % ("%7.2f" % totalmoney)[:11]) 
    210212            printerpagecounter = self.storage.getPrinterPageCounter(printerid) 
    211213            try : 
     
    241243            else : 
    242244                reached = (((softlimit is not None) and (pagecounter >= softlimit) and "+") or "-") + "Q" 
    243             strbalance = ("%5.2f" % balance)[:10] 
    244             strlifetimepaid = ("%6.2f" % lifetimepaid)[:10] 
     245            strbalance = ("%5.2f" % (balance or 0.0))[:10] 
     246            strlifetimepaid = ("%6.2f" % (lifetimepaid or 0.0))[:10] 
    245247            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) 
    246248            return (lifepagecounter, lifetimepaid) 
  • pykota/trunk/pykota/version.py

    r942 r946  
    2121# 
    2222 
    23 __version__ = "1.03-unofficial" 
     23__version__ = "1.04pre0-unofficial" 
    2424 
    2525__doc__ = """PyKota : a complete Printing Quota Solution for CUPS."""