r19299 - gnucash/trunk/src/business/business-reports - Bug #622637 - The classical invoices should use the more specific strings from taxinvoice, part 2, by Frank H. Ellenberger
Geert Janssens
gjanssens at code.gnucash.org
Fri Jun 25 09:20:11 EDT 2010
Author: gjanssens
Date: 2010-06-25 09:20:11 -0400 (Fri, 25 Jun 2010)
New Revision: 19299
Trac: http://svn.gnucash.org/trac/changeset/19299
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 2, 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 13:01:30 UTC (rev 19298)
+++ gnucash/trunk/src/business/business-reports/easy-invoice.scm 2010-06-25 13:20:11 UTC (rev 19299)
@@ -215,7 +215,7 @@
(gncEntryGetInvTaxTable entry))
(and (gncEntryGetBillTaxable entry)
(gncEntryGetBillTaxTable entry)))
- ;; This "T" is supposed to be an abbrev. for Tax?
+ ;; Translators: This "T" is displayed in the taxable column, if this entry contains tax
(_ "T") "")))
(if (taxvalue-col column-vector)
@@ -370,11 +370,11 @@
"x" (N_ "The format for the date->string conversion for today's date.")
(gnc-default-strftime-date-format)))
-
(gnc:options-set-default-section gnc:*report-options* "General")
gnc:*report-options*)
+
(define (make-entry-table invoice options add-order invoice?)
(define (opt-val section name)
(gnc:option-value
@@ -431,6 +431,7 @@
(row '()))
; Update to fix bug 564380, payment on bill doubles bill. Mike Evans <mikee at saxicola.co.uk>
+ ;; Reverse the value when needed
(if (not (null? invoice))
(begin
(set! owner (gncInvoiceGetOwner invoice))
@@ -447,6 +448,7 @@
(gnc:gnc-monetary-amount (gnc:monetary-neg amt))))
))))
+
(if (date-col used-columns)
(addto! row
(gnc-print-date (gnc-transaction-get-date-posted t))))
@@ -477,7 +479,7 @@
; jamie
(if (opt-val "Display" "Subtotal")
(add-subtotal-row table used-columns value-collector
- "grand-total" (_ "Subtotal")))
+ "grand-total" (_ "Net Price")))
(if display-all-taxes
(hash-for-each
@@ -494,6 +496,9 @@
(add-subtotal-row table used-columns tax-collector
"grand-total" (_ "Tax")))
+ (add-subtotal-row table used-columns total-collector
+ "grand-total" (_ "Total Price"))
+
(if (and show-payments (not (null? lot)))
(let ((splits (sort-list!
(gnc-lot-get-split-list lot)
Modified: gnucash/trunk/src/business/business-reports/fancy-invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/fancy-invoice.scm 2010-06-25 13:01:30 UTC (rev 19298)
+++ gnucash/trunk/src/business/business-reports/fancy-invoice.scm 2010-06-25 13:20:11 UTC (rev 19299)
@@ -163,6 +163,7 @@
(hash-set! hash acct (if ref (gnc-numeric-add-fixed ref val) val))))
values))
+
(define (monetary-or-percent numeric currency entry-type)
(if (gnc:entry-type-percent-p entry-type)
;; oli-custom - make a string instead of a table
@@ -221,6 +222,7 @@
(gncEntryGetInvTaxTable entry))
(and (gncEntryGetBillTaxable entry)
(gncEntryGetBillTaxTable entry)))
+ ;; Translators: This "T" is displayed in the taxable column, if this entry contains tax
(_ "T") "")))
(if (taxvalue-col column-vector)
@@ -343,13 +345,13 @@
(gnc:make-number-range-option
(N_ "Display") (N_ "Minimum # of entries")
"u" (N_ "The minimum number of invoice entries to display. (-1)") 23
- 4 23 3 1))
+ 4 23 0 1))
(gnc:register-inv-option
(gnc:make-text-option
(N_ "Display") (N_ "Extra Notes")
"u" (N_ "Extra notes to put on the invoice")
- ""))
+ (_ "Thank you for your patronage")))
(gnc:register-inv-option
(gnc:make-complex-boolean-option
@@ -359,7 +361,7 @@
gnc:*report-options* "Display" "Payable to string" x))))
(gnc:register-inv-option
- (gnc:make-string-option
+ (gnc:make-text-option
(N_ "Display") (N_ "Payable to string")
"ua2" (N_ "The phrase for specifying to whom payments should be made")
(_ "Make all cheques Payable to")))
@@ -372,7 +374,7 @@
gnc:*report-options* "Display" "Company contact string" x))))
(gnc:register-inv-option
- (gnc:make-string-option
+ (gnc:make-text-option
(N_ "Display") (N_ "Company contact string")
"ub2" (N_ "The phrase used to introduce the company contact")
(_ "Direct all inquiries to")))
@@ -388,6 +390,7 @@
gnc:*report-options*)
+
(define (make-entry-table invoice options add-order invoice?)
(define (opt-val section name)
(gnc:option-value
@@ -448,6 +451,7 @@
(row '()))
; Update to fix bug 564380, payment on bill doubles bill. Mike Evans <mikee at saxicola.co.uk>
+ ;; Reverse the value when needed
(if (not (null? invoice))
(begin
(set! owner (gncInvoiceGetOwner invoice))
@@ -504,7 +508,7 @@
#\space)))
)
(add-subtotal-row table used-columns value-collector
- "grand-total" (_ "Subtotal"))
+ "grand-total" (_ "Net Price"))
(if display-all-taxes
(hash-for-each
@@ -522,6 +526,10 @@
(add-subtotal-row table used-columns tax-collector
"grand-total" (_ "Tax")))
+ (add-subtotal-row table used-columns total-collector
+ "grand-total" (string-expand (_ "Total Price")
+ #\space " "))
+
(if (and show-payments (not (null? lot)))
(let ((splits (sort-list!
(gnc-lot-get-split-list lot)
Modified: gnucash/trunk/src/business/business-reports/invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/invoice.scm 2010-06-25 13:01:30 UTC (rev 19298)
+++ gnucash/trunk/src/business/business-reports/invoice.scm 2010-06-25 13:20:11 UTC (rev 19299)
@@ -209,6 +209,7 @@
(gncEntryGetInvTaxTable entry))
(and (gncEntryGetBillTaxable entry)
(gncEntryGetBillTaxTable entry)))
+ ;; Translators: This "T" is displayed in the taxable column, if this entry contains tax
(_ "T") "")))
(if (taxvalue-col column-vector)
@@ -235,9 +236,9 @@
(define (gnc:register-inv-option new-option)
(gnc:register-option gnc:*report-options* new-option))
- (gnc:register-inv-option
- (gnc:make-invoice-option invoice-page invoice-name "x" ""
- (lambda () '()) #f))
+ (gnc:register-inv-option
+ (gnc:make-invoice-option invoice-page invoice-name "x" ""
+ (lambda () '()) #f))
(gnc:register-inv-option
(gnc:make-string-option
@@ -341,6 +342,7 @@
gnc:*report-options*)
+
(define (make-entry-table invoice options add-order invoice?)
(define (opt-val section name)
(gnc:option-value
@@ -391,6 +393,7 @@
(currency (xaccTransGetCurrency t))
(invoice (opt-val invoice-page invoice-name))
(owner '())
+ ;; XXX Need to know when to reverse the value
(amt (gnc:make-gnc-monetary currency (xaccSplitGetValue split)))
(payment-style "grand-total")
(row '()))
@@ -442,7 +445,7 @@
(if (null? entries)
(begin
(add-subtotal-row table used-columns value-collector
- "grand-total" (_ "Subtotal"))
+ "grand-total" (_ "Net Price"))
(if display-all-taxes
(hash-for-each
@@ -459,6 +462,9 @@
(add-subtotal-row table used-columns tax-collector
"grand-total" (_ "Tax")))
+ (add-subtotal-row table used-columns total-collector
+ "grand-total" (_ "Total Price"))
+
(if (and show-payments (not (null? lot)))
(let ((splits (sort-list!
(gnc-lot-get-split-list lot)
More information about the gnucash-changes
mailing list