Merge branch 'maint'

CMakeLists.txt

@@ -84,8 +84,6 @@ foreach(install_dir ${CMAKE_INSTALL_FULL_BINDIR}
     break()
   endif()
 endforeach()
-message(STATUS "CMAKE_INSTALL_FULL_DATADIR: ${CMAKE_INSTALL_FULL_DATADIR}")
-message(STATUS "DESTDIR: ${DESTDIR}")
 
 # GnuCash installs two files in ${CMAKE_INSTALL_SYSCONFDIR}
 set(BINDIR ${CMAKE_INSTALL_BINDIR} CACHE STRING "user executables")

README.dependencies

@@ -90,7 +90,7 @@ Libraries/Deps
   optional
   --------
   aqbanking             5.3.4                    online banking; also requires
-                                                 gwehywfar.
+                                                 gwenhywfar.
 
   libdbi                0.8.3                    SQL backend; also requires at
                                                  least one of libdbd-sqlite3,

doc/README-ca.win32-bin.txt

@@ -40,13 +40,11 @@ al menú "Ajuda" quan feu clic a "Guia de conceptes i tutorials".
 
 Sobre el programa:
 
-GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
+GnuCash és un programa de comptabilitat lliure, de codi obert publicat
-Llicència pública general GNU (GPL). Està desenvolupat de manera col·laborativa per
+sota la Llicència pública general GNU (GPL). Està desenvolupat de
-12 persones de més de 6 països.
+manera col·laborativa per 200+ persones.
 
 La programació de GnuCash va començar el 1997, i la seva primera versió
 va ser l'any 1998. 
 
 -------------------
-
-Aquesta és la traducció al català del fitxer README GnuCash 2.2.x per als paquets binaris de Windows.

doc/README-de.win32-bin.txt

@@ -44,7 +44,7 @@ Kurs und Konzepte«.
 Über GnuCash:
 
 GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
-erhältlich unter der GNU GPL Lizenz. Das Programm wird von 12
+erhältlich unter der GNU GPL Lizenz. Das Programm wird von 200+
 Programmierern aus mehr als 6 Ländern gemeinsam weiterentwickelt.
 
 Die Anfänge von GnuCash reichen ins Jahr 1997 zurück. Die erste
@@ -52,5 +52,3 @@ Veröffentlichung war im Jahr 1998.
 
 -------------------
 
-This is the German GnuCash 2.2.x README file for Windows binary
-packages.

doc/README-fr.win32-bin.txt

@@ -47,12 +47,9 @@ et guide des concepts" dans le menu d'aide.
 
 GnuCash est un logiciel de comptabilité gratuit et de source
 libre, émis sous licence GNU Public Licence (GPL). Il est développé
-en collaboration par 12 personnes provenant d'au moins 6 pays.
+en collaboration par plus de 200 personnes.
 
 La programmation de GnuCash a commencé en 1997, sa première version
 a été lancée en 1998.
 
 -------------------
-
-Ceci est le fichier README de GnuCash 2.2.x pour les paquetages en
-binaire pour Windows.

doc/README-hr.win32-bin.txt

@@ -41,12 +41,11 @@ Detaljne informacije i upute za rad s GnuCashom možeš naći u izborniku
 
 O programu:
 
-GnuCash je slobodan softver za računovodstvo otvorenog koda, izdan pod GNU općom 
+GnuCash je slobodan softver za računovodstvo otvorenog koda, izdan pod
-javnom licencom (GPL). Razvijen je zajedničkim radom dvanaestero ljudi iz više 
+GNU općom javnom licencom (GPL). Razvijen je zajedničkim radom
-od šest zemalja.
+dvanaestero ljudi iz više od šest zemalja.
 
 Početak programiranja GnuCasha, 1997. Prvo izdanje, 1998.
 
 -------------------
 
-Ovo je GnuCash 2.2.x README datoteka za Windows binarne pakete.

doc/README-it.win32-bin.txt

@@ -42,10 +42,9 @@ Informazioni sul programma:
 
 GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
 licenza GNU Public Licence (GPL). E' sviluppato con la collaborazione di
-12 programmatori provenienti da oltre 6 paesi.
+200+ programmatori.
 
 La programmazione di GnuCash è iniziata nel 1997 e il primo rilascio risale al 1998. 
 
 -------------------
 
-Questo è il file LEGGIMI di GnuCash 2.2.x dei pacchetti binari per Windows.

doc/README-lv.win32-bin.txt

@@ -43,10 +43,9 @@ Par šo programmu:
 
 GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar 
 GNU General Public License (GPL) licenci. Tās galvenie izstrādātāji ir
-12 cilvēki, kas sadarbojas ar atbalstītājiem vairāk kā 6 valstīs.
+200+ cilvēki.
 
 GnuCash izstrāde sākās 1997. gadā un tās pirmais laidiens bija 1998. gadā.
 
 -------------------
 
-Šis ir GnuCash 2.2.x README fails Windows binārajai pakotnei.

doc/README-nl.win32-bin.txt

@@ -41,11 +41,10 @@ in het "Hulp" menu onder het "Tutorial en concepten gids".
 Over het programma:
 
 GnuCash is a  vrij, open source boekhoudprogramma uitgegeven onder de
-GNU General Public License (GPL). Het wordt door 12 personen uit meer dan
+GNU General Public License (GPL). Meer dan 200 programmeurs en 40
-6 landen gezamelijk ontwikkeld.
+documentie schrijvers hebben gedurende 20+ jaar bijgedragen aan de ontwikkeling
+ervan. Voor meer info, zie de AUTHORS en DOCUMENTORS bestanden.
 
 De ontwikkeling van GnuCash begon in 1997, de de eerste uitgave was in 1998. 
 
 -------------------
-
-Dit is het Nederlandstalige GnuCash 2.2.x LEESMIJ bestand voor het Windows installatie programma.

doc/README-zh_CN.win32-bin.txt

@@ -32,10 +32,8 @@ IRC (聊天):   irc.gnome.org 服务器的 #gnucash 频道，另见 https://wiki
 
 关于程序：
 
-GnuCash 是一个免费的、开放源代码的理财软件，它使用 GNU 通用公共许可证(GPL)。它是由横跨6个国家共12个开发人员共同合作开发而成。
+GnuCash 是一个免费的、开放源代码的理财软件，它使用 GNU 通用公共许可证(GPL)。它是由横跨6个国家共200+个开发人员共同合作开发而成。
 
 程序撰写开始于1997年，并且于1998年第一次发布。
 
 -------------------
-
-这是 GnuCash 2.2.x 用于 Windows 二进制发布包的自述文件。

doc/README-zh_TW.win32-bin.txt

@@ -33,10 +33,9 @@ https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
 
 關於程式:
 
-GnuCash 是一個自由、開放原始碼的帳務軟體，它使用 GNU 通用公共許可證(GPL)發布。它是由橫跨 6 國共 12 個開發人員共同合作開發而成。
+GnuCash 是一個自由、開放原始碼的帳務軟體，它使用 GNU 通用公共許可證(GPL)發布。它是由橫跨 6 國共 200+ 個開發人員共同合作開發而成。
 
 GnuCash 的程式撰寫始於 1997 年，第一版發布於 1998 年。
 
 -------------------
 
-這是 GnuCash 2.2.x 在 Windows 二進位套件的 README 檔案。

doc/README.win32-bin.txt

@@ -41,12 +41,11 @@ the "Help" menu when clicking on "Tutorial and Concepts Guide".
 About the Program:
 
 GnuCash is a free, open source accounting program released under the
-GNU General Public License (GPL). It is collaboratively developed by
+GNU General Public License (GPL). More than 200 programmers and 40
-12 people from over 6 countries.
+documentors have contributed to its development over 20+ years, please
+see the AUTHORS and DOCUMENTORS files.
 
 Programming on GnuCash began in 1997, and its first release was in
 1998. 
 
 -------------------
-
-This is the GnuCash 2.2.x README file for Windows binary packages.

gnucash/gnome/dialog-invoice.c

@@ -1918,13 +1918,13 @@ gnc_invoice_update_window (InvoiceWindow *iw, GtkWidget *widget)
 
         /* Setup viewer for read-only access */
         gtk_widget_set_sensitive (acct_entry, FALSE);
-        gtk_widget_set_sensitive (iw->id_entry, FALSE);
+        gtk_widget_set_sensitive (iw->id_entry, FALSE); /* XXX: why set FALSE and then TRUE? */
         gtk_widget_set_sensitive (iw->id_entry, TRUE);
         gtk_widget_set_sensitive (iw->terms_menu, FALSE);
-        gtk_widget_set_sensitive (iw->owner_box, FALSE);
+        gtk_widget_set_sensitive (iw->owner_box, TRUE);
-        gtk_widget_set_sensitive (iw->job_box, FALSE);
+        gtk_widget_set_sensitive (iw->job_box, TRUE);
         gtk_widget_set_sensitive (iw->billing_id_entry, FALSE);
-        gtk_widget_set_sensitive (iw->notes_text, FALSE); /* XXX: should notes remain writable?*/
+        gtk_widget_set_sensitive (iw->notes_text, TRUE);
     }
     else           /* ! posted */
     {

gnucash/report/report-utilities.scm

@@ -872,15 +872,15 @@
       (format #f "Split<d:~a,acc:~a,amt:~a,val:~a>"
               (qof-print-date (xaccTransGetDate txn))
               (xaccAccountGetName (xaccSplitGetAccount spl))
-              (gnc:monetary->string
-               (gnc:make-gnc-monetary
-                (xaccTransGetCurrency txn)
-                (xaccSplitGetValue spl)))
               (gnc:monetary->string
                (gnc:make-gnc-monetary
                 (xaccAccountGetCommodity
                  (xaccSplitGetAccount spl))
-                (xaccSplitGetAmount spl))))))
+                (xaccSplitGetAmount spl)))
+              (gnc:monetary->string
+               (gnc:make-gnc-monetary
+                (xaccTransGetCurrency txn)
+                (xaccSplitGetValue spl))))))
   (define (trans->str txn)
     (format #f "Txn<d:~a>" (qof-print-date (xaccTransGetDate txn))))
   (define (account->str acc)

gnucash/report/reports/standard/budget-balance-sheet.scm

@@ -776,7 +776,7 @@
 	  
           (add-subtotal-line
             right-table
-            (_ "Total Liabilities & Equity")
+            (gnc:html-string-sanitize (_ "Total Liabilities & Equity"))
             #f
             liability-plus-equity)
 	  

gnucash/report/reports/standard/test/test-budget.scm

@@ -32,6 +32,7 @@
 (use-modules (sw_engine))
 (use-modules (gnucash reports standard budget))
 (use-modules (gnucash reports standard budget-income-statement))
+(use-modules (gnucash reports standard budget-balance-sheet))
 (use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
 (use-modules (tests test-engine-extras))
@@ -41,6 +42,7 @@
 (setlocale LC_ALL "C")
 (define budget-uuid "810ed4b25ef0486ea43bbd3dddb32b11")
 (define budget-is-uuid "583c313fcc484efc974c4c844404f454")
+(define budget-bs-uuid "ecc35ea9dbfa4e20ba389fc85d59cb69")
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)
@@ -51,6 +53,9 @@
   (test-group-with-cleanup "budget-income-statement.scm"
     (test-budget-income-statement)
     (teardown))
+  (test-group-with-cleanup "budget-balance-sheet.scm"
+    (test-budget-balance-sheet)
+    (teardown))
   (test-end "budget"))
 
 (define (set-option options page tag value)
@@ -182,3 +187,72 @@
         ((sxpath '(// table // (tr 2) // table // (tr 5) // *text*))
          sxml)))))
 
+(define (test-budget-balance-sheet)
+  (let* ((env (create-test-env))
+         (account-alist (create-test-data))
+         (budget (gnc:create-budget-and-transactions env account-alist))
+         (options (gnc:make-report-options budget-bs-uuid))
+         (bank (assoc-ref account-alist "Bank")))
+
+    (display "\nbudget-balance-sheet.scm\n")
+    (let ((sxml (options->sxml options budget-bs-uuid "budget-bs-basic")))
+      (test-equal "basic test"
+        52
+        (length (sxml->table-row-col sxml 1 #f #f)))
+
+      (test-equal "existing assets"
+        '("Existing Assets" "$3,118.00")
+        (sxml->table-row-col sxml 1 8 #f))
+
+      (test-equal "allocated assets"
+        '("Allocated Assets" "$120.00")
+        (sxml->table-row-col sxml 1 9 #f))
+
+      (test-equal "unallocated assets"
+        '("Unallocated Assets" "-$405.00")
+        (sxml->table-row-col sxml 1 10 #f))
+
+      (test-equal "total assets"
+        '("Total Assets" "$2,833.00")
+        (sxml->table-row-col sxml 1 11 #f))
+
+      (test-equal "existing liab"
+        '("Existing Liabilities" "$3.00")
+        (sxml->table-row-col sxml 1 16 #f))
+
+      (test-equal "new liab"
+        '("New Liabilities" "$0.00")
+        (sxml->table-row-col sxml 1 17 #f))
+
+      (test-equal "total liab"
+        '("Total Liabilities" "$3.00")
+        (sxml->table-row-col sxml 1 18 #f))
+
+      (test-equal "retained earnings"
+        '("Existing Retained Earnings" "$3,227.00")
+        (sxml->table-row-col sxml 1 22 #f))
+
+      (test-equal "retained losses"
+        '("New Retained Losses" "$285.00")
+        (sxml->table-row-col sxml 1 23 #f))
+
+      (test-equal "unrealized losses"
+        '("Unrealized Losses" "$1.00")
+        (sxml->table-row-col sxml 1 24 #f))
+
+      (test-equal "existing equity"
+        '("Existing Equity" "$3,115.00")
+        (sxml->table-row-col sxml 1 25 #f))
+
+      (test-equal "new equity"
+        '("New Equity" "-$285.00")
+        (sxml->table-row-col sxml 1 26 #f))
+
+      (test-equal "total equity"
+        '("Total Equity" "$2,830.00")
+        (sxml->table-row-col sxml 1 27 #f))
+
+      (test-equal "total liab and equity"
+        '("Total Liabilities & Equity" "$2,833.00")
+        (sxml->table-row-col sxml 1 29 #f)))))
+

libgnucash/gnc-module/test/CMakeLists.txt

@@ -55,7 +55,7 @@ set(test_gnc_module_SCHEME
   test-gnc-module-scm-multi.scm
   )
 
-set(GUILE_DEPENDS
+set(CORE_GUILE_DEPENDS
   gnc-module
   scm-test-core
   scm-mod-foo
@@ -69,7 +69,7 @@ set(GUILE_DEPENDS
 gnc_add_scheme_test_targets(test-gnc-modules-scm
   "${test_gnc_module_SCHEME}"
   "tests"
-  "${GUILE_DEPENDS}"
+  "${CORE_GUILE_DEPENDS}"
   TRUE
   )
 

po/de.po

@@ -19001,7 +19001,7 @@ msgid ""
 "account number might contain an error."
 msgstr ""
 "Die interne Überprüfung der angegebenen IBAN »%s« ist fehlgeschlagen. Die "
-"Kontonummer enthält wahrscheinlich einen Fehler enthält."
+"Kontonummer enthält wahrscheinlich einen Fehler."
 
 #: gnucash/import-export/aqb/dialog-ab-trans.c:549
 #, c-format