Bug #603186: Fix crash with txf.scm on win32

Patch by J. Alex Aycinena:

In further testing I discovered that I omitted some codes in
txf-de_DE.scm and txf.scm that need to be there. Without them gnucash
crashes under certain circumstances.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18465 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2009-12-04 21:09:59 +00:00
parent a699183ae5
commit 116b8b2371
3 changed files with 42 additions and 0 deletions

View File

@ -487,6 +487,8 @@ gnc_ui_account_get_tax_info_string (const Account *account)
else /* with tax code */ else /* with tax code */
{ {
tax_type = gnc_get_current_book_tax_type (); tax_type = gnc_get_current_book_tax_type ();
if (tax_type == NULL || (safe_strcmp (tax_type, "") == 0))
return g_strdup (_("Tax entity type not specified"));
atype = xaccAccountGetType (account); atype = xaccAccountGetType (account);
/* tax_entity_type = scm_from_locale_string (tax_type); <- requires guile 1.8*/ /* tax_entity_type = scm_from_locale_string (tax_type); <- requires guile 1.8*/
tax_entity_type = scm_makfrom0str (tax_type); /* <-guile 1.6 */ tax_entity_type = scm_makfrom0str (tax_type); /* <-guile 1.6 */

View File

@ -135,6 +135,11 @@
) )
) )
(cons 'Other
(list
(cons 'N000 #(none "" "Nur zur Voransicht im Steuer-Bericht -- kein Export" 0 #f ""))
)
)
)) ))
@ -171,6 +176,11 @@
(cons 'K96 #(none "96" "Innergemeinschaftliche Erwerbe neuer Fahrzeuge von Lieferern ohne USt-IdNr. (Steuer)" 1 #f "96")) (cons 'K96 #(none "96" "Innergemeinschaftliche Erwerbe neuer Fahrzeuge von Lieferern ohne USt-IdNr. (Steuer)" 1 #f "96"))
) )
) )
(cons 'Other
(list
(cons 'N000 #(none "" "Nur zur Voransicht im Steuer-Bericht -- kein Export" 0 #f ""))
)
)
)) ))
@ -181,6 +191,11 @@
(cons 'N000 #(none "" "Nur zur Voransicht im Steuer-Bericht -- kein Export" 0 #f "")) (cons 'N000 #(none "" "Nur zur Voransicht im Steuer-Bericht -- kein Export" 0 #f ""))
) )
) )
(cons 'Other
(list
(cons 'N000 #(none "" "Nur zur Voransicht im Steuer-Bericht -- kein Export" 0 #f ""))
)
)
)) ))
(define txf-liab-eq-categories (define txf-liab-eq-categories
@ -190,6 +205,11 @@
(cons 'N000 #(none "" "Nur zur Voransicht im Steuer-Bericht -- kein Export" 0 #f "")) (cons 'N000 #(none "" "Nur zur Voransicht im Steuer-Bericht -- kein Export" 0 #f ""))
) )
) )
(cons 'Other
(list
(cons 'N000 #(none "" "Nur zur Voransicht im Steuer-Bericht -- kein Export" 0 #f ""))
)
)
)) ))
;;; Register global options in this book ;;; Register global options in this book

View File

@ -474,6 +474,11 @@
(cons 'N528 #(parent "Sched K-1" "Tax-exempt interest income" 1 #t "" ((2004 "18") (1992 "19")))) (cons 'N528 #(parent "Sched K-1" "Tax-exempt interest income" 1 #t "" ((2004 "18") (1992 "19"))))
) )
) )
(cons 'Other
(list
(cons 'N000 #(none "" "Tax Report Only - No TXF Export" 0 #f ""))
)
)
) )
) )
@ -1089,6 +1094,11 @@
(cons 'N679 #(none "Sched K-1" "Total Foreign Taxes" 1 #t "" ((2004 "16") (2001 "17g") (2000 "17f") (1990 "17e")))) (cons 'N679 #(none "Sched K-1" "Total Foreign Taxes" 1 #t "" ((2004 "16") (2001 "17g") (2000 "17f") (1990 "17e"))))
) )
) )
(cons 'Other
(list
(cons 'N000 #(none "" "Tax Report Only - No TXF Export" 0 #f ""))
)
)
) )
) )
@ -1174,6 +1184,11 @@
(cons 'N1569 #(none "F1120S" "Other assets" 1 #f "" ((1990 "L14")))) (cons 'N1569 #(none "F1120S" "Other assets" 1 #f "" ((1990 "L14"))))
) )
) )
(cons 'Other
(list
(cons 'N000 #(none "" "Tax Report Only - No TXF Export" 0 #f ""))
)
)
) )
) )
@ -1227,5 +1242,10 @@
(cons 'N1591 #(none "F1120S" "Treasury stock" 1 #f "" ((1997 "L26") (1990 "L25")))) (cons 'N1591 #(none "F1120S" "Treasury stock" 1 #f "" ((1997 "L26") (1990 "L25"))))
) )
) )
(cons 'Other
(list
(cons 'N000 #(none "" "Tax Report Only - No TXF Export" 0 #f ""))
)
)
) )
) )