Changeset 2689

Timestamp:

02/13/06 12:48:27 (18 years ago)

Author:

jerome

Message:

Doesn't output an invoice when amount due is 0.0.

Files:

• pykota/trunk/bin/pkinvoice (modified) (1 diff)

pykota/trunk/bin/pkinvoice

@@ -176 +176 @@
                 ht = ((amount * 10000.0) / (100.0 + vat)) / 100.0
                 vatamount = amount - ht
-            self.printVar(_("Invoice"), "#%s" % invoicenumber, 22)
-            self.printVar(_("Username"), entry.Name, 22)
-            self.ypos -= 20
-            if start : 
-                self.printVar(_("Since"), start, 14)
-            if end :
-                self.printVar(_("Until"), end, 14)
-            self.printVar(_("Edited on"), time.strftime("%c", time.localtime()), 14)
-                
-            self.ypos -= 20
-            # self.printVar(_("Number of bytes"), str(numberofbytes), 14)
-            self.printVar(_("Number of pages printed"), str(numberofpages), 14)
-            self.ypos -= 20
-            self.printVar(_("Amount due"), "%.2f %s" % (amount, unitname), 22)
-            if vat :
-                self.ypos += 8
-                self.printVar("%s (%.2f%%)" % (_("Included VAT"), vat), "%.2f %s" % (vatamount, unitname), 14)
-            self.canvas.showPage()
-            return 1
+                self.printVar(_("Invoice"), "#%s" % invoicenumber, 22)
+                self.printVar(_("Username"), entry.Name, 22)
+                self.ypos -= 20
+                if start : 
+                    self.printVar(_("Since"), start, 14)
+                if end :
+                    self.printVar(_("Until"), end, 14)
+                self.printVar(_("Edited on"), time.strftime("%c", time.localtime()), 14)
+                    
+                self.ypos -= 20
+                # self.printVar(_("Number of bytes"), str(numberofbytes), 14)
+                self.printVar(_("Number of pages printed"), str(numberofpages), 14)
+                self.ypos -= 20
+                self.printVar(_("Amount due"), "%.2f %s" % (amount, unitname), 22)
+                if vat :
+                    self.ypos += 8
+                    self.printVar("%s (%.2f%%)" % (_("Included VAT"), vat), "%.2f %s" % (vatamount, unitname), 14)
+                self.canvas.showPage()
+                return 1
         return 0