Index: pykota/trunk/pykota/version.py
===================================================================
--- pykota/trunk/pykota/version.py (revision 946)
+++ pykota/trunk/pykota/version.py (revision 950)
@@ -21,5 +21,5 @@
 #
 
-__version__ = "1.04pre0-unofficial"
+__version__ = "1.04pre1-unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS."""
Index: pykota/trunk/bin/repykota
===================================================================
--- pykota/trunk/bin/repykota (revision 949)
+++ pykota/trunk/bin/repykota (revision 950)
@@ -23,4 +23,7 @@
 #
 # $Log$
+# Revision 1.31  2003/04/23 09:58:17  jalet
+# Prices per page/job are now displayed
+#
 # Revision 1.30  2003/04/18 08:34:51  jalet
 # Minor fix.
@@ -187,5 +190,14 @@
         for (printerid, printer) in printers :
             print _("*** Report for %s quota on printer %s") % ((options["groups"] and "group") or "user", printer)
-            print _("Pages grace time: %idays") % self.config.getGraceDelay(printer)
+            print _("Pages grace time: %i days") % self.config.getGraceDelay(printer)
+            prices = self.storage.getPrinterPrices(printerid)
+            if prices is None :
+                (perpage, perjob) = None
+            else :    
+                (perpage, perjob) = prices
+                if perjob is not None :
+                    print _("Price per job: %.3f") % perjob
+                if perpage is not None :    
+                    print _("Price per page: %.3f") % perpage
             total = 0
             totalmoney = 0.0
Index: pykota/trunk/NEWS
===================================================================
--- pykota/trunk/NEWS (revision 948)
+++ pykota/trunk/NEWS (revision 950)
@@ -22,4 +22,9 @@
 PyKota NEWS :
 
+    - 1.04pre1 :
+    
+        - repykota now displays prices per job and per page for each
+          printer, if they are defined.
+          
     - 1.04pre0 :
     
Index: pykota/trunk/po/en/pykota.po
===================================================================
--- pykota/trunk/po/en/pykota.po (revision 929)
+++ pykota/trunk/po/en/pykota.po (revision 950)
@@ -21,4 +21,7 @@
 #
 # $Log$
+# Revision 1.20  2003/04/23 09:58:17  jalet
+# Prices per page/job are now displayed
+#
 # Revision 1.19  2003/04/17 09:26:21  jalet
 # repykota now reports account balances too.
@@ -112,5 +115,5 @@
 msgstr ""
 
-msgid "Pages grace time: %idays"
+msgid "Pages grace time: %i days"
 msgstr ""
 
@@ -310,2 +313,8 @@
 msgid "Totals may be inaccurate if some users are members of several groups."
 msgstr ""
+
+msgid "Price per job: %.3f"
+msgstr ""
+
+msgid "Price per page: %.3f"
+msgstr ""
Index: pykota/trunk/po/fr/pykota.po
===================================================================
--- pykota/trunk/po/fr/pykota.po (revision 930)
+++ pykota/trunk/po/fr/pykota.po (revision 950)
@@ -21,4 +21,7 @@
 #
 # $Log$
+# Revision 1.19  2003/04/23 09:58:17  jalet
+# Prices per page/job are now displayed
+#
 # Revision 1.18  2003/04/17 09:32:13  jalet
 # Translation
@@ -119,6 +122,6 @@
 msgstr "l'option --groups n'est pas encore impl�nt�"
 
-msgid "Pages grace time: %idays"
-msgstr "D�i de gr�: %ijours"
+msgid "Pages grace time: %i days"
+msgstr "D�i de gr�: %i jours"
 
 msgid "unused arguments [%s]. Aborting."
@@ -323,2 +326,8 @@
 msgid "Totals may be inaccurate if some users are members of several groups."
 msgstr "Les totaux peuvent �e faux si des utilisateurs sont dans plusieurs groupes."
+
+msgid "Price per job: %.3f"
+msgstr "Prix par job: %.3f"
+
+msgid "Price per page: %.3f"
+msgstr "Prix par page: %.3f"
Index: pykota/trunk/po/pykota.pot
===================================================================
--- pykota/trunk/po/pykota.pot (revision 929)
+++ pykota/trunk/po/pykota.pot (revision 950)
@@ -21,4 +21,7 @@
 #
 # $Log$
+# Revision 1.20  2003/04/23 09:58:17  jalet
+# Prices per page/job are now displayed
+#
 # Revision 1.19  2003/04/17 09:26:21  jalet
 # repykota now reports account balances too.
@@ -112,5 +115,5 @@
 msgstr ""
 
-msgid "Pages grace time: %idays"
+msgid "Pages grace time: %i days"
 msgstr ""
 
@@ -310,2 +313,8 @@
 msgid "Totals may be inaccurate if some users are members of several groups."
 msgstr ""
+
+msgid "Price per job: %.3f"
+msgstr ""
+
+msgid "Price per page: %.3f"
+msgstr ""
