r19298 - gnucash/trunk/src/business/business-reports - Bug #622637 - The classical invoices should use the more specific strings from taxinvoice, part 1: whitespace cleanups, patch by Frank H. Ellenberger.

Geert Janssens gjanssens at code.gnucash.org
Fri Jun 25 09:01:30 EDT 2010


Author: gjanssens
Date: 2010-06-25 09:01:30 -0400 (Fri, 25 Jun 2010)
New Revision: 19298
Trac: http://svn.gnucash.org/trac/changeset/19298

Modified:
   gnucash/trunk/src/business/business-reports/easy-invoice.scm
   gnucash/trunk/src/business/business-reports/fancy-invoice.scm
   gnucash/trunk/src/business/business-reports/invoice.scm
Log:
Bug #622637 - The classical invoices should use the more specific strings from taxinvoice, part 1: whitespace cleanups, patch by Frank H. Ellenberger.

Modified: gnucash/trunk/src/business/business-reports/easy-invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/easy-invoice.scm	2010-06-25 12:50:20 UTC (rev 19297)
+++ gnucash/trunk/src/business/business-reports/easy-invoice.scm	2010-06-25 13:01:30 UTC (rev 19298)
@@ -9,17 +9,17 @@
 ;;
 ;; stylesheet-header.scm : stylesheet with nicer layout
 ;; Copyright 2000 Bill Gribble <grib at gnumatic.com>
-;; 
-;; This program is free software; you can redistribute it and/or    
-;; modify it under the terms of the GNU General Public License as   
-;; published by the Free Software Foundation; either version 2 of   
-;; the License, or (at your option) any later version.              
-;;                                                                  
-;; This program is distributed in the hope that it will be useful,  
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of   
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    
-;; GNU General Public License for more details.                     
-;;                                                                  
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, contact:
 ;;
@@ -50,8 +50,8 @@
   `(set! ,alist (cons ,element ,alist)))
 
 (define (set-last-row-style! table tag . rest)
-  (let ((arg-list 
-         (cons table 
+  (let ((arg-list
+         (cons table
                (cons (- (gnc:html-table-num-rows table) 1)
                      (cons tag rest)))))
     (apply gnc:html-table-set-row-style! arg-list)))
@@ -77,16 +77,16 @@
 
 (define columns-used-size 9)
 
-(define (num-columns-required columns-used)  
-  (do ((i 0 (+ i 1)) 
-       (col-req 0 col-req)) 
+(define (num-columns-required columns-used)
+  (do ((i 0 (+ i 1))
+       (col-req 0 col-req))
       ((>= i columns-used-size) col-req)
     (if (vector-ref columns-used i)
         (set! col-req (+ col-req 1)))))
 
-(define (build-column-used options)   
+(define (build-column-used options)
   (define (opt-val section name)
-    (gnc:option-value 
+    (gnc:option-value
      (gnc:lookup-option options section name)))
   (define (make-set-col col-vector)
     (let ((col 0))
@@ -96,7 +96,7 @@
               (vector-set! col-vector index col)
               (set! col (+ col 1)))
             (vector-set! col-vector index #f)))))
-  
+
   (let* ((col-vector (make-vector columns-used-size #f))
          (set-col (make-set-col col-vector)))
     (set-col (opt-val "Display Columns" "Date") 0)
@@ -161,7 +161,7 @@
 	 table "td"
 	 'attribute (list "valign" "top"))
 	table)
-      (gnc:make-gnc-monetary currency numeric)))      
+      (gnc:make-gnc-monetary currency numeric)))
 
 (define (add-entry-row table currency entry column-vector row-style invoice?)
   (let* ((row-contents '())
@@ -232,7 +232,7 @@
 
     (gnc:html-table-append-row/markup! table row-style
                                        (reverse row-contents))
-    
+
     (cons entry-value entry-tax-value)))
 
 (define (options-generator)
@@ -247,9 +247,9 @@
 			    (lambda () '()) #f))
 
   (gnc:register-inv-option
-   (gnc:make-string-option 
-    invoice-page (N_ "Custom Title") 
-    "z" (N_ "A custom string to replace Invoice, Bill or Expense Voucher") 
+   (gnc:make-string-option
+    invoice-page (N_ "Custom Title")
+    "z" (N_ "A custom string to replace Invoice, Bill or Expense Voucher")
     ""))
 
   (gnc:register-inv-option
@@ -377,7 +377,7 @@
 
 (define (make-entry-table invoice options add-order invoice?)
   (define (opt-val section name)
-    (gnc:option-value 
+    (gnc:option-value
      (gnc:lookup-option options section name)))
 
   (let ((show-payments (opt-val "Display" "Payments"))
@@ -408,7 +408,7 @@
 			      'format gnc:make-gnc-monetary #f)))
 
 	(for-each (lambda (currency)
-		    (gnc:html-table-append-row/markup! 
+		    (gnc:html-table-append-row/markup!
 		     table
 		     subtotal-style
 		     (append (cons (gnc:make-html-table-cell/markup
@@ -429,7 +429,7 @@
 	     (amt (gnc:make-gnc-monetary currency (xaccSplitGetValue split)))
 	     (payment-style "grand-total")
 	     (row '()))
-	
+
 	; Update to fix bug 564380, payment on bill doubles bill. Mike Evans <mikee at saxicola.co.uk>
 	(if (not (null? invoice))
 	(begin
@@ -438,11 +438,11 @@
                        (gncOwnerGetEndOwner owner))))
 	    (cond
 	      ((eqv? type GNC-OWNER-CUSTOMER)
-	       (total-collector 'add 
+	       (total-collector 'add
 			  (gnc:gnc-monetary-commodity amt)
 			 (gnc:gnc-monetary-amount amt)))
 	      ((eqv? type GNC-OWNER-VENDOR)
-	       (total-collector 'add 
+	       (total-collector 'add
 			  (gnc:gnc-monetary-commodity amt)
 			 (gnc:gnc-monetary-amount (gnc:monetary-neg amt))))
 	      ))))
@@ -453,8 +453,8 @@
 
 	(if (description-col used-columns)
 	    (addto! row (_ "Payment, thank you")))
-		    
-	(gnc:html-table-append-row/markup! 
+
+	(gnc:html-table-append-row/markup!
 	 table
 	 payment-style
 	 (append (reverse row)
@@ -661,12 +661,12 @@
      'attribute (list "valign" "top")
      'attribute (list "cellspacing" 0)
      'attribute (list "cellpadding" 0))
-    (gnc:html-table-append-row! table 
+    (gnc:html-table-append-row! table
       (list (if name (string-append "<div align='right'>" name "</div>") "")))
 
     ; this is pretty strange.  If addy is set, then make caddy <div>addy</div>,
     ; then when adding the row to the table, we actually add several rows by expanding
-    ; caddy (the <div> is already set for the first in list and </dev> for last because 
+    ; caddy (the <div> is already set for the first in list and </dev> for last because
     ; of addy)
     (if (and addy (> (string-length addy) 0))
      (let ((caddy (string-append "<div align='right'>" addy "</div>")))
@@ -762,7 +762,7 @@
         )
         (add-html! document "</td>")
         (add-html! document "</tr></table>")
-                                                                              
+
         (make-break! document)
         (make-break! document)
 
@@ -809,7 +809,7 @@
                   (add-html! document (gnc-print-date due-date))
                   (add-html! document "</td>")))
               (add-html! document "</tr></table>"))
-            (add-html! document 
+            (add-html! document
 		       (string-append "<font color='red'>"
 				      (_ "INVOICE NOT POSTED")
 				      "</font>"))))
@@ -826,7 +826,7 @@
                   document
                   (gnc:make-html-text
                     (string-append
-                      (_ "Billing ID") ":&nbsp;" 
+                      (_ "Billing ID") ":&nbsp;"
                       (string-expand billing-id #\newline "<br>"))))
                 (make-break! document)))))
 
@@ -838,7 +838,7 @@
                 document
                 (gnc:make-html-text
                   (string-append
-                    (_ "Terms") ":&nbsp;" 
+                    (_ "Terms") ":&nbsp;"
                     (string-expand terms #\newline "<br>")))))))
 
         (make-break! document)
@@ -864,7 +864,7 @@
                (string-expand notes #\newline "<br>"))))
             (make-break! document)
             (make-break! document)))
-	  
+
         (gnc:html-document-add-object!
           document
           (gnc:make-html-text

Modified: gnucash/trunk/src/business/business-reports/fancy-invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/fancy-invoice.scm	2010-06-25 12:50:20 UTC (rev 19297)
+++ gnucash/trunk/src/business/business-reports/fancy-invoice.scm	2010-06-25 13:01:30 UTC (rev 19298)
@@ -4,16 +4,16 @@
 ;; Created by:  Derek Atkins <warlord at MIT.EDU>
 ;; Copyright (c) 2003 Derek Atkins <warlord at MIT.EDU>
 ;;
-;; This program is free software; you can redistribute it and/or    
-;; modify it under the terms of the GNU General Public License as   
-;; published by the Free Software Foundation; either version 2 of   
-;; the License, or (at your option) any later version.              
-;;                                                                  
-;; This program is distributed in the hope that it will be useful,  
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of   
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    
-;; GNU General Public License for more details.                     
-;;                                                                  
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, contact:
 ;;
@@ -68,8 +68,8 @@
   `(set! ,alist (cons ,element ,alist)))
 
 (define (set-last-row-style! table tag . rest)
-  (let ((arg-list 
-         (cons table 
+  (let ((arg-list
+         (cons table
                (cons (- (gnc:html-table-num-rows table) 1)
                      (cons tag rest)))))
     (apply gnc:html-table-set-row-style! arg-list)))
@@ -95,16 +95,16 @@
 
 (define columns-used-size 9)
 
-(define (num-columns-required columns-used)  
-  (do ((i 0 (+ i 1)) 
-       (col-req 0 col-req)) 
+(define (num-columns-required columns-used)
+  (do ((i 0 (+ i 1))
+       (col-req 0 col-req))
       ((>= i columns-used-size) col-req)
     (if (vector-ref columns-used i)
         (set! col-req (+ col-req 1)))))
 
-(define (build-column-used options)   
+(define (build-column-used options)
   (define (opt-val section name)
-    (gnc:option-value 
+    (gnc:option-value
      (gnc:lookup-option options section name)))
   (define (make-set-col col-vector)
     (let ((col 0))
@@ -114,7 +114,7 @@
               (vector-set! col-vector index col)
               (set! col (+ col 1)))
             (vector-set! col-vector index #f)))))
-  
+
   (let* ((col-vector (make-vector columns-used-size #f))
          (set-col (make-set-col col-vector)))
     (set-col (opt-val "Display Columns" "Date") 0)
@@ -237,7 +237,7 @@
 
     (gnc:html-table-append-row/markup! table row-style
                                        (reverse row-contents))
-    
+
     (cons entry-value entry-tax-value)))
 
 ;; oli-custom - here you can set your default options
@@ -254,9 +254,9 @@
 			    (lambda () '()) #f))
 
   (gnc:register-inv-option
-   (gnc:make-string-option 
-    invoice-page (N_ "Custom Title") 
-    "z" (N_ "A custom string to replace Invoice, Bill or Expense Voucher") 
+   (gnc:make-string-option
+    invoice-page (N_ "Custom Title")
+    "z" (N_ "A custom string to replace Invoice, Bill or Expense Voucher")
     ""))
 
   (gnc:register-inv-option
@@ -363,7 +363,7 @@
     (N_ "Display") (N_ "Payable to string")
     "ua2" (N_ "The phrase for specifying to whom payments should be made")
     (_ "Make all cheques Payable to")))
-     
+
   (gnc:register-inv-option
    (gnc:make-complex-boolean-option
     (N_ "Display") (N_ "Company contact")
@@ -390,7 +390,7 @@
 
 (define (make-entry-table invoice options add-order invoice?)
   (define (opt-val section name)
-    (gnc:option-value 
+    (gnc:option-value
      (gnc:lookup-option options section name)))
 
   (let ((show-payments (opt-val "Display" "Payments"))
@@ -422,7 +422,7 @@
 			      'format gnc:make-gnc-monetary #f)))
 
 	(for-each (lambda (currency)
-		    (gnc:html-table-append-row/markup! 
+		    (gnc:html-table-append-row/markup!
 		     table
 		     subtotal-style
 		     ;; oli-custom modified to colspan the subtotal labels
@@ -446,7 +446,7 @@
 	     (amt (gnc:make-gnc-monetary currency (xaccSplitGetValue split)))
 	     (payment-style "grand-total")
 	     (row '()))
-	     
+
 	; Update to fix bug 564380, payment on bill doubles bill. Mike Evans <mikee at saxicola.co.uk>
 	(if (not (null? invoice))
 	(begin
@@ -455,11 +455,11 @@
                        (gncOwnerGetEndOwner owner))))
 	    (cond
 	      ((eqv? type GNC-OWNER-CUSTOMER)
-	       (total-collector 'add 
+	       (total-collector 'add
 			  (gnc:gnc-monetary-commodity amt)
 			 (gnc:gnc-monetary-amount amt)))
 	      ((eqv? type GNC-OWNER-VENDOR)
-	       (total-collector 'add 
+	       (total-collector 'add
 			  (gnc:gnc-monetary-commodity amt)
 			 (gnc:gnc-monetary-amount (gnc:monetary-neg amt))))
 	      ))))
@@ -471,8 +471,8 @@
 
 	(if (description-col used-columns)
 	    (addto! row (_ "Payment, thank you")))
-		    
-	(gnc:html-table-append-row/markup! 
+
+	(gnc:html-table-append-row/markup!
 	 table
 	 payment-style
 	 (append (reverse row)
@@ -577,7 +577,7 @@
 	      (if (not (null? order)) (add-order order)))
 
 	    (set! entries-added (+ entries-added 1))
-	    
+
 	    (do-rows-with-subtotals rest
 				    table
 				    used-columns
@@ -816,7 +816,7 @@
     ;; invoice number moved below
     ;;(gnc:html-document-set-title! document title)
 
-    
+
     (if (not (null? invoice))
 	(let* ((book (gncInvoiceGetBook invoice))
 	      (slots (qof-book-get-slots book))
@@ -884,15 +884,15 @@
 		  ;; oli-custom - FIXME: I have a feeling I broke a
 		 ;; translation by not using string-expand for &nbsp;
 		  (string-append title "<br>" (N_ "Invoice in progress..."))))))
-	  
+
 	  (gnc:html-table-append-row!
 	  	helper-table
 		(list (make-client-table owner orders) date-object))
-	
+
 	  (gnc:html-table-set-col-style!
 	  	helper-table 0 "td"
 		'attribute (list "valign" "top"))
-		
+
 	  (gnc:html-table-set-col-style!
 	  	helper-table 1 "td"
 		'attribute (list "valign" "top")
@@ -915,7 +915,7 @@
 		       document
 		       (gnc:make-html-text
 			(string-append
-			 (_ "Reference") ":&nbsp;" 
+			 (_ "Reference") ":&nbsp;"
 			 (string-expand billing-id #\newline "<br>"))))
 		      (make-break! document)))))
 
@@ -927,7 +927,7 @@
 		     document
 		     (gnc:make-html-text
 		      (string-append
-		       (_ "Terms") ":&nbsp;" 
+		       (_ "Terms") ":&nbsp;"
 		       (string-expand terms #\newline "<br>")))))))
 
 	  (make-break! document)
@@ -943,7 +943,7 @@
 		 document
 		 (gnc:make-html-text
 		  (string-expand notes #\newline "<br>")))))
-	  
+
 	  (make-break! document)
 
 	  (if (opt-val "Display" "Payable to")

Modified: gnucash/trunk/src/business/business-reports/invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/invoice.scm	2010-06-25 12:50:20 UTC (rev 19297)
+++ gnucash/trunk/src/business/business-reports/invoice.scm	2010-06-25 13:01:30 UTC (rev 19298)
@@ -4,16 +4,16 @@
 ;; Created by:  Derek Atkins <warlord at MIT.EDU>
 ;; Copyright (c) 2002, 2003 Derek Atkins <warlord at MIT.EDU>
 ;;
-;; This program is free software; you can redistribute it and/or    
-;; modify it under the terms of the GNU General Public License as   
-;; published by the Free Software Foundation; either version 2 of   
-;; the License, or (at your option) any later version.              
-;;                                                                  
-;; This program is distributed in the hope that it will be useful,  
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of   
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    
-;; GNU General Public License for more details.                     
-;;                                                                  
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, contact:
 ;;
@@ -44,8 +44,8 @@
   `(set! ,alist (cons ,element ,alist)))
 
 (define (set-last-row-style! table tag . rest)
-  (let ((arg-list 
-         (cons table 
+  (let ((arg-list
+         (cons table
                (cons (- (gnc:html-table-num-rows table) 1)
                      (cons tag rest)))))
     (apply gnc:html-table-set-row-style! arg-list)))
@@ -71,16 +71,16 @@
 
 (define columns-used-size 9)
 
-(define (num-columns-required columns-used)  
-  (do ((i 0 (+ i 1)) 
-       (col-req 0 col-req)) 
+(define (num-columns-required columns-used)
+  (do ((i 0 (+ i 1))
+       (col-req 0 col-req))
       ((>= i columns-used-size) col-req)
     (if (vector-ref columns-used i)
         (set! col-req (+ col-req 1)))))
 
-(define (build-column-used options)   
+(define (build-column-used options)
   (define (opt-val section name)
-    (gnc:option-value 
+    (gnc:option-value
      (gnc:lookup-option options section name)))
   (define (make-set-col col-vector)
     (let ((col 0))
@@ -90,7 +90,7 @@
               (vector-set! col-vector index col)
               (set! col (+ col 1)))
             (vector-set! col-vector index #f)))))
-  
+
   (let* ((col-vector (make-vector columns-used-size #f))
          (set-col (make-set-col col-vector)))
     (set-col (opt-val "Display Columns" "Date") 0)
@@ -155,7 +155,7 @@
 	 table "td"
 	 'attribute (list "valign" "top"))
 	table)
-      (gnc:make-gnc-monetary currency numeric)))      
+      (gnc:make-gnc-monetary currency numeric)))
 
 (define (add-entry-row table currency entry column-vector row-style invoice?)
   (let* ((row-contents '())
@@ -225,7 +225,7 @@
 
     (gnc:html-table-append-row/markup! table row-style
                                        (reverse row-contents))
-    
+
     (cons entry-value entry-tax-value)))
 
 (define (options-generator)
@@ -240,9 +240,9 @@
  			    (lambda () '()) #f))
 
   (gnc:register-inv-option
-   (gnc:make-string-option 
-    invoice-page (N_ "Custom Title") 
-    "z" (N_ "A custom string to replace Invoice, Bill or Expense Voucher") 
+   (gnc:make-string-option
+    invoice-page (N_ "Custom Title")
+    "z" (N_ "A custom string to replace Invoice, Bill or Expense Voucher")
     ""))
 
   (gnc:register-inv-option
@@ -343,7 +343,7 @@
 
 (define (make-entry-table invoice options add-order invoice?)
   (define (opt-val section name)
-    (gnc:option-value 
+    (gnc:option-value
      (gnc:lookup-option options section name)))
 
   (let ((show-payments (opt-val "Display" "Payments"))
@@ -374,7 +374,7 @@
 			      'format gnc:make-gnc-monetary #f)))
 
 	(for-each (lambda (currency)
-		    (gnc:html-table-append-row/markup! 
+		    (gnc:html-table-append-row/markup!
 		     table
 		     subtotal-style
 		     (append (cons (gnc:make-html-table-cell/markup
@@ -404,24 +404,24 @@
 				(gncOwnerGetEndOwner owner))))
 		      (cond
 			((eqv? type GNC-OWNER-CUSTOMER)
-			 (total-collector 'add 
+			 (total-collector 'add
 			    (gnc:gnc-monetary-commodity amt)
 			    (gnc:gnc-monetary-amount amt)))
 			((eqv? type GNC-OWNER-VENDOR)
-			 (total-collector 'add 
+			 (total-collector 'add
 			    (gnc:gnc-monetary-commodity amt)
 			    (gnc:gnc-monetary-amount (gnc:monetary-neg amt))))
 	))))
-	       
-	
+
+
 	(if (date-col used-columns)
 	    (addto! row
 		    (gnc-print-date (gnc-transaction-get-date-posted t))))
 
 	(if (description-col used-columns)
 	    (addto! row (_ "Payment, thank you")))
-		    
-	(gnc:html-table-append-row/markup! 
+
+	(gnc:html-table-append-row/markup!
 	 table
 	 payment-style
 	 (append (reverse row)
@@ -733,7 +733,7 @@
 		       document
 		       (gnc:make-html-text
 			(string-append
-			 (_ "Reference") ":&nbsp;" 
+			 (_ "Reference") ":&nbsp;"
 			 (string-expand billing-id #\newline "<br>"))))
 		      (make-break! document)))))
 
@@ -745,7 +745,7 @@
 		     document
 		     (gnc:make-html-text
 		      (string-append
-		       (_ "Terms") ":&nbsp;" 
+		       (_ "Terms") ":&nbsp;"
 		       (string-expand terms #\newline "<br>")))))))
 
 	  (make-break! document)
@@ -761,7 +761,7 @@
 		 document
 		 (gnc:make-html-text
 		  (string-expand notes #\newline "<br>")))))
-	  
+
 	  (make-break! document)
 
 	  (gnc:html-document-add-object!



More information about the gnucash-changes mailing list