Changeset 923

Timestamp:

04/16/03 10:01:54 (22 years ago)

Author:

jalet

Message:

edpykota --charge command line option works now.

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (3 diffs)
• po/en/pykota.po (modified) (2 diffs)
• po/fr/pykota.mo (modified) (previous)
• po/fr/pykota.po (modified) (2 diffs)
• po/pykota.pot (modified) (2 diffs)

pykota/trunk/bin/edpykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.39  2003/04/16 08:01:53  jalet
+# edpykota --charge command line option works now.
+#
 # Revision 1.38  2003/04/15 22:02:43  jalet
 # More complete docstring
@@ -334 +337 @@
             else :    
                 names = [ "*" ] # all users
+        if options["charge"] :
+            try :
+                charges = [float(part) for part in options["charge"].split(',', 1)]
+            except ValueError :    
+                raise PyKotaToolError, _("Invalid charge amount value %s" % options["charge"])
+            else :    
+                if len(charges) < 2 :
+                    charges.append(None)
         for (printerid, printer) in printers :
+            if options["charge"] :
+                (perpage, perjob) = charges
+                if perjob is None :
+                    # we don't want to change this one, get the old value
+                    (dummy, perjob) = self.storage.getPrinterPrices(printerid)
+                self.storage.setPrinterPrices(printerid, perpage, perjob)    
             if options["prototype"] :
                 if options["groups"] :
@@ -354 +371 @@
                 if softlimit is not None :
                     self.logger.log_message(_("Undefined soft limit set to hard limit (%s) on printer %s.") % (str(softlimit), printer))
-            if (not options["reset"] and not options["noquota"] and not options["prototype"] and not options["limitby"] and not options["balance"] and not options["delete"]) and ((hardlimit is None) or (softlimit is None)) :
+            if (not options["reset"] and not options["noquota"] and not options["prototype"] and not options["limitby"] and not options["balance"] and not options["delete"] and not options["charge"]) and ((hardlimit is None) or (softlimit is None)) :
                 raise PyKotaToolError, _("Both hard and soft limits must be set ! Aborting.")
             if options["add"] :    

pykota/trunk/po/en/pykota.po

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.15  2003/04/16 08:01:54  jalet
+# edpykota --charge command line option works now.
+#
 # Revision 1.14  2003/04/11 14:42:54  jalet
 # Translations
@@ -255 +258 @@
 msgid "User %s not registered in the PyKota system"
 msgstr ""
+
+msgid "Invalid charge amount value %s"
+msgstr ""

pykota/trunk/po/fr/pykota.po

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.13  2003/04/16 08:01:54  jalet
+# edpykota --charge command line option works now.
+#
 # Revision 1.12  2003/04/11 14:42:54  jalet
 # Translations
@@ -263 +266 @@
 msgid "User %s not registered in the PyKota system"
 msgstr "Utilisateur %s non enregistr�ans le syst� PyKota"
+
+msgid "Invalid charge amount value %s"
+msgstr "Montant �omptabiliser %s incorrect"

pykota/trunk/po/pykota.pot

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.15  2003/04/16 08:01:54  jalet
+# edpykota --charge command line option works now.
+#
 # Revision 1.14  2003/04/11 14:42:54  jalet
 # Translations
@@ -255 +258 @@
 msgid "User %s not registered in the PyKota system"
 msgstr ""
+
+msgid "Invalid charge amount value %s"
+msgstr ""