gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Tue Mar 22 15:13:17 EDT 2016
Updated via https://github.com/Gnucash/gnucash/commit/aec61497 (commit)
via https://github.com/Gnucash/gnucash/commit/0114a731 (commit)
via https://github.com/Gnucash/gnucash/commit/9f984c05 (commit)
from https://github.com/Gnucash/gnucash/commit/62425247 (commit)
commit aec61497f27862848062fc465b0ad6a3433eaa0e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Mar 22 18:33:49 2016 +0100
Bug 482186 - Customer and vendor report for partners who get invoiced/paid in foreign currency show total labeled with the symbol of the default currency.
diff --git a/src/report/business-reports/owner-report.scm b/src/report/business-reports/owner-report.scm
index 84c61fe..03598de 100644
--- a/src/report/business-reports/owner-report.scm
+++ b/src/report/business-reports/owner-report.scm
@@ -202,11 +202,10 @@
(define oldintervalreversed (reverse (make-interval-list to-date)))
(reverse (cons dayforcurrent oldintervalreversed)))
-(define (make-aging-table options query bucket-intervals reverse? date-type)
+(define (make-aging-table options query bucket-intervals reverse? date-type currency)
(let ((lots (xaccQueryGetLots query QUERY-TXN-MATCH-ANY))
(buckets (new-bucket-vector))
(payments (gnc-numeric-zero))
- (currency (gnc-default-currency)) ;XXX
(table (gnc:make-html-table)))
(define (in-interval this-date current-bucket)
@@ -385,7 +384,7 @@
(total (gnc-numeric-zero))
(debit (gnc-numeric-zero))
(credit (gnc-numeric-zero))
- (currency (gnc-default-currency)) ;XXX
+ (currency (xaccAccountGetCommodity acc))
(table (gnc:make-html-table))
(reverse? (gnc:option-value (gnc:lookup-option options "__reg"
"reverse?"))))
@@ -477,7 +476,7 @@
"grand-total"
(list (gnc:make-html-table-cell/size
1 columns-used-size
- (make-aging-table options query interval-vec reverse? date-type)))))
+ (make-aging-table options query interval-vec reverse? date-type currency)))))
table))
commit 0114a7317b5f03d466396a26a3812d6994a2cc05
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Mar 21 17:11:05 2016 +0100
Bug 728074 - Posting bill converts currency to itself using 0 rate
diff --git a/src/business/business-gnome/dialog-invoice.c b/src/business/business-gnome/dialog-invoice.c
index b522a94..e14df99 100644
--- a/src/business/business-gnome/dialog-invoice.c
+++ b/src/business/business-gnome/dialog-invoice.c
@@ -814,10 +814,13 @@ gnc_invoice_post(InvoiceWindow *iw, struct post_invoice_params *post_params)
/* Yep, we're posting. So, save the invoice...
* Note that we can safely ignore the return value; we checked
* the verify_ok earlier, so we know it's ok.
+ * Additionally make sure the invoice has the owner's currency
+ * refer to https://bugzilla.gnome.org/show_bug.cgi?id=728074
*/
gnc_suspend_gui_refresh ();
gncInvoiceBeginEdit (invoice);
gnc_invoice_window_ok_save (iw);
+ gncInvoiceSetCurrency (invoice, gncOwnerGetCurrency (gncInvoiceGetOwner (invoice)));
/* Fill in the conversion prices with feedback from the user */
text = _("One or more of the entries are for accounts different from the invoice/bill currency. You will be asked a conversion rate for each.");
commit 9f984c05ebfa3957453ddd009308d2cfc53b4e7f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Mar 21 11:30:44 2016 +0100
Bug 118391 - Long currency names untranslated
Fix for Win32
diff --git a/src/bin/gnucash-bin.c b/src/bin/gnucash-bin.c
index c1c74d5..8514ee6 100644
--- a/src/bin/gnucash-bin.c
+++ b/src/bin/gnucash-bin.c
@@ -729,6 +729,7 @@ main(int argc, char ** argv)
#ifdef HAVE_GETTEXT
{
gchar *localedir = gnc_path_get_localedir();
+ bindtextdomain("iso_4217", localedir); // For win32 to find currency name translations
bindtextdomain(GETTEXT_PACKAGE, localedir);
textdomain(GETTEXT_PACKAGE);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
Summary of changes:
src/bin/gnucash-bin.c | 1 +
src/business/business-gnome/dialog-invoice.c | 3 +++
src/report/business-reports/owner-report.scm | 7 +++----
3 files changed, 7 insertions(+), 4 deletions(-)
More information about the gnucash-changes
mailing list