Changeset 1285 for pykota/trunk/pykota/accounter.py

Timestamp:

01/12/04 23:43:40 (20 years ago)

Author:

jalet

Message:

New formula to compute a job's price

Files:

• pykota/trunk/pykota/accounter.py (modified) (2 diffs)

pykota/trunk/pykota/accounter.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.13  2004/01/12 22:43:40  jalet
+# New formula to compute a job's price
+#
 # Revision 1.12  2004/01/11 23:43:31  jalet
 # Bug wrt number of copies with CUPS should be fixed.
@@ -131 +134 @@
         
         # adds the current job to history    
-        jobprice = (float(userpquota.Printer.PricePerPage or 0.0) * jobsize) + float(userpquota.Printer.PricePerJob or 0.0)
+        jobprice = userpquota.computeJobPrice(jobsize)
         userpquota.Printer.addJobToHistory(self.filter.jobid, userpquota.User, self.getLastPageCounter(), action, jobsize, jobprice, self.filter.preserveinputfile, self.filter.title, self.filter.copies, self.filter.options)
         self.endJob(userpquota)