Changeset 946
- Timestamp:
- 04/18/03 10:29:30 (22 years ago)
- Location:
- pykota/trunk
- Files:
-
- 2 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/bin/repykota
r931 r946 23 23 # 24 24 # $Log$ 25 # Revision 1.29 2003/04/18 08:29:30 jalet 26 # Minor bug fix 27 # 25 28 # Revision 1.28 2003/04/17 09:36:30 jalet 26 29 # Bad alignment in output … … 206 209 totalmoney += money 207 210 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]) 210 212 printerpagecounter = self.storage.getPrinterPageCounter(printerid) 211 213 try : … … 241 243 else : 242 244 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] 245 247 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) 246 248 return (lifepagecounter, lifetimepaid) -
pykota/trunk/pykota/version.py
r942 r946 21 21 # 22 22 23 __version__ = "1.0 3-unofficial"23 __version__ = "1.04pre0-unofficial" 24 24 25 25 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS."""