gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/c4a18ae2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8314d960 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6ed47c64 (commit)
	from  https://github.com/Gnucash/gnucash/commit/50e72f1d (commit)



commit c4a18ae2ddb9abc7d38f56fb4fa001383f3346e8
Merge: 6ed47c6 8314d96
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu May 8 21:11:55 2014 +0200

    Merge branch 'maint'
    
    * Fix document type dispay for credit notes on owner report

diff --cc src/report/business-reports/owner-report.scm
index eb98952,bfaa086..2b05ac1
--- a/src/report/business-reports/owner-report.scm
+++ b/src/report/business-reports/owner-report.scm
@@@ -419,12 -386,8 +419,10 @@@
      (total (gnc-numeric-zero))
      (debit (gnc-numeric-zero))
      (credit (gnc-numeric-zero))
 +    (tax (gnc-numeric-zero))
 +    (sale (gnc-numeric-zero))
      (currency (gnc-default-currency)) ;XXX
      (table (gnc:make-html-table))
-     (inv-str (gnc:option-value (gnc:lookup-option options "__reg"
-                               "inv-str")))
      (reverse? (gnc:option-value (gnc:lookup-option options "__reg"
                                "reverse?"))))
  

commit 8314d960b476bdd497da257570690f779decb911
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu May 8 21:10:17 2014 +0200

    Fix document type dispay for credit notes on owner report

diff --git a/src/report/business-reports/owner-report.scm b/src/report/business-reports/owner-report.scm
index ec86c20..bfaa086 100644
--- a/src/report/business-reports/owner-report.scm
+++ b/src/report/business-reports/owner-report.scm
@@ -323,7 +323,7 @@
 ;; Return a list of (printed? value odd-row?)
 ;;
 (define (add-txn-row table txn acc column-vector odd-row? printed?
-             inv-str reverse? start-date total)
+             reverse? start-date total)
   (let* ((type (xaccTransGetTxnType txn))
      (date (gnc-transaction-get-date-posted txn))
      (due-date #f)
@@ -338,8 +338,8 @@
         (gnc:make-html-text
          (gnc:html-markup-anchor
           (gnc:invoice-anchor-text invoice)
-          inv-str))
-        inv-str))
+          (gncInvoiceGetTypeString invoice)))
+        (_ "Unknown")))
        ((equal? type TXN-TYPE-PAYMENT)
         (gnc:make-html-text
 	 (gnc:html-markup-anchor
@@ -388,8 +388,6 @@
     (credit (gnc-numeric-zero))
     (currency (gnc-default-currency)) ;XXX
     (table (gnc:make-html-table))
-    (inv-str (gnc:option-value (gnc:lookup-option options "__reg"
-                              "inv-str")))
     (reverse? (gnc:option-value (gnc:lookup-option options "__reg"
                               "reverse?"))))
 
@@ -409,7 +407,7 @@
         (or (equal? type TXN-TYPE-INVOICE)
         (equal? type TXN-TYPE-PAYMENT))
         (let ((result (add-txn-row table txn acc used-columns odd-row? printed?
-                       inv-str reverse? start-date total)))
+                       reverse? start-date total)))
 
           (set! printed? (car result))
           (if (and printed? total)
@@ -484,7 +482,7 @@
 
     table))
 
-(define (options-generator acct-type-list owner-type inv-str reverse?)
+(define (options-generator acct-type-list owner-type reverse?)
 
   (define gnc:*report-options* (gnc:new-options))
 
@@ -492,9 +490,6 @@
    (gnc:register-option gnc:*report-options* new-option))
 
   (gnc:register-inv-option
-   (gnc:make-internal-option "__reg" "inv-str" inv-str))
-
-  (gnc:register-inv-option
    (gnc:make-simple-boolean-option "__reg" "reverse?" "" "" reverse?))
 
   (gnc:register-inv-option
@@ -581,16 +576,13 @@
   gnc:*report-options*)
 
 (define (customer-options-generator)
-  (options-generator (list ACCT-TYPE-RECEIVABLE) GNC-OWNER-CUSTOMER
-                     (_ "Invoice") #f))
+  (options-generator (list ACCT-TYPE-RECEIVABLE) GNC-OWNER-CUSTOMER #f))
 
 (define (vendor-options-generator)
-  (options-generator (list ACCT-TYPE-PAYABLE) GNC-OWNER-VENDOR
-                     (_ "Bill") #t))
+  (options-generator (list ACCT-TYPE-PAYABLE) GNC-OWNER-VENDOR #t))
 
 (define (employee-options-generator)
-  (options-generator (list ACCT-TYPE-PAYABLE) GNC-OWNER-EMPLOYEE
-                     (_ "Expense Report") #t))
+  (options-generator (list ACCT-TYPE-PAYABLE) GNC-OWNER-EMPLOYEE #t))
 
 (define (string-expand string character replace-string)
   (define (car-line chars)

commit 6ed47c64f98fc1e1997b6cc96ab4770d5b668f5c
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu May 8 20:59:22 2014 +0200

    Fix sign for credit notes on owner report

diff --git a/src/report/business-reports/owner-report.scm b/src/report/business-reports/owner-report.scm
index ab6a7ea..eb98952 100644
--- a/src/report/business-reports/owner-report.scm
+++ b/src/report/business-reports/owner-report.scm
@@ -384,7 +384,7 @@
           (set! sale (gncInvoiceGetTotalSubtotal invoice))
           (set! tax (gncInvoiceGetTotalTax invoice))))
 
-      (if reverse?
+      (if (gncInvoiceGetIsCreditNote invoice)
         (begin
           (set! tax (gnc-numeric-neg tax))
           (set! sale (gnc-numeric-neg sale))))



Summary of changes:
 src/report/business-reports/owner-report.scm | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)