aherman
/
gnucash
mirror of https://github.com/Gnucash/gnucash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in: re-enable -Werror, make sure it only is used with GCC,

Browse Source 
but also move it to the end of the script so it wont interfere with
	  any other configuration test.

	* src/business/business-report/owner-report.scm: fix the column
	  headings and option names to match.  Fix the date-due column so
	  the heading properly goes away.  Also fix some of the
	  internationalization issues -- strings were translated but the
	  translation was not being used.   Fixes # 105036


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7922 57a11ea4-9604-0410-9ed3-97b8803252fd
zzzoldfeatures/g2-gog-integ
Derek Atkins 24 years ago
parent 7f35622cd2
commit f321b5dfec
3 changed files with 95 additions and 69 deletions
Show Stats Download Patch File Download Diff File

12
ChangeLog
Unescape View File

@ -1,3 +1,15 @@
2003-02-02 Derek Atkins <derek@ihtfp.com>
* configure.in: re-enable -Werror, make sure it only is used with GCC,
but also move it to the end of the script so it wont interfere with
any other configuration test.
* src/business/business-report/owner-report.scm: fix the column
headings and option names to match. Fix the date-due column so
the heading properly goes away. Also fix some of the
internationalization issues -- strings were translated but the
translation was not being used. Fixes # 105036
2003-02-01 Benoit Grégoire <bock@step.polymtl.ca>
* src/import-export/gnc-ofx-import.c: No longer assume that transaction with type OFX_OTHER are investement transactions. Fixes bug reported by Rik harris.

83
configure.in
Unescape View File

@ -345,21 +345,6 @@ AC_SUBST(GNC_SCM_INSTALL_DIR)
AC_SUBST(GNC_SHAREDIR)
AC_SUBST(GNC_LIBEXECDIR)
## Enable error-on-warning by default -- I'm tired of fixing other
## people's missing #includes, etc.
# Disable error-on-warning by default again because this seriously
# breaks quite a number of configure tests (due to, like, 'warning:
# unused variable some_variable') -- cstim, 02/02/2003
AC_ARG_ENABLE(error-on-warning,
[ --enable-error-on-warning treat compile warnings as errors],
[case "${enableval}" in
yes) CFLAGS="${CFLAGS} -Werror" ;;
no) ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-error-on-warning) ;;
esac])
#, [ CFLAGS="${CFLAGS} -Werror" ])
AC_ARG_ENABLE( debug,
[ --enable-debug compile with debugging flags set],
CFLAGS="${CFLAGS} -g"
@ -937,29 +922,6 @@ else
fi
fi
###-------------------------------------------------------------------------
### Additional compiler warnings (or not) if we're running GCC
###-------------------------------------------------------------------------
# This has to come after AC_PROG_CC _AND_ GNOME_COMPILE_WARNINGS
AC_MSG_CHECKING(what extra warning flags to pass to the C compiler)
if test ${GCC}x = yesx
then
warnFLAGS=
# These two are because of g-wrap -- it can't avoid unused and uninitialized.
#warnFLAGS="${warnFLAGS} -Wno-uninitialized"
#warnFLAGS="${warnFLAGS} -Wno-unused"
# other flags...
#warnFLAGS="${warnFLAGS} -Wmissing-prototypes"
#warnFLAGS="${warnFLAGS} -Wmissing-declarations"
#warnFLAGS="${warnFLAGS} -Werror-implicit-function-declaration" # In -Wall
CFLAGS="${CFLAGS} ${warnFLAGS}"
else
warnFLAGS=none
fi
AC_MSG_RESULT($warnFLAGS)
###-------------------------------------------------------------------------
### Stuff from Mac OS X Port
###-------------------------------------------------------------------------
@ -1041,6 +1003,51 @@ AC_SUBST(GNUCASH_REGISTER_CORE_LIBS)
AM_CONDITIONAL(GNUCASH_SEPARATE_BUILDDIR, test "x${srcdir}" != "x.")
AM_CONDITIONAL(GNC_FALSE, false)
###-------------------------------------------------------------------------
### Additional compiler warnings (or not) if we're running GCC
###-------------------------------------------------------------------------
# This has to come after AC_PROG_CC _AND_ GNOME_COMPILE_WARNINGS
AC_MSG_CHECKING(what extra warning flags to pass to the C compiler)
if test ${GCC}x = yesx
then
warnFLAGS=
# These two are because of g-wrap -- it can't avoid unused and uninitialized.
#warnFLAGS="${warnFLAGS} -Wno-uninitialized"
#warnFLAGS="${warnFLAGS} -Wno-unused"
# other flags...
# These next two are included in the GNOME_COMPILE_WARNINGS
#warnFLAGS="${warnFLAGS} -Wmissing-prototypes"
#warnFLAGS="${warnFLAGS} -Wmissing-declarations"
#warnFLAGS="${warnFLAGS} -Werror-implicit-function-declaration" # In -Wall
## Disable error-on-warning by default again because this seriously
## breaks quite a number of configure tests (due to, like, 'warning:
## unused variable some_variable') -- cstim, 02/02/2003
#
# Re-enabled and moved to later in the build process. This should allow
# us to keep it turned on, but also not break configure proceses.
# -- warlord, 02/02/2003
# Enable error-on-warning by default -- I'm tired of fixing other
# people's missing #includes, etc.
AC_ARG_ENABLE(error-on-warning,
[ --enable-error-on-warning treat compile warnings as errors],
[case "${enableval}" in
yes) warnFLAGS="${warnFLAGS} -Werror" ;;
no) ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-error-on-warning) ;;
esac],
[ warnFLAGS="${warnFLAGS} -Werror" ])
CFLAGS="${CFLAGS} ${warnFLAGS}"
else
warnFLAGS=none
fi
AC_MSG_RESULT($warnFLAGS)
### --------------------------------------------------------------------------
### Adjustments -- especially executables that aren't generated via
### makefiles, so that we don't have an opportunity to adjust them

69
src/business/business-reports/owner-report.scm
Unescape View File

@ -24,6 +24,13 @@
(define owner-string (N_ "Company"))
(define owner-page gnc:pagename-general)
(define date-header (N_ "Date"))
(define due-date-header (N_ "Due Date"))
(define reference-header (N_ "Reference"))
(define type-header (N_ "Type"))
(define desc-header (N_ "Description"))
(define amount-header (N_ "Amount"))
(define-macro (addto! alist element)
`(set! ,alist (cons ,element ,alist)))
@ -64,28 +71,28 @@
(let* ((col-vector (make-vector columns-used-size #f))
(set-col (make-set-col col-vector)))
(set-col (opt-val "Display Columns" "Date") 0)
(set-col (opt-val "Display Columns" "Due Date") 1)
(set-col (opt-val "Display Columns" "Num") 2)
(set-col (opt-val "Display Columns" "Type") 3)
(set-col (opt-val "Display Columns" "Memo") 4)
(set-col (opt-val "Display Columns" "Value") 5)
(set-col (opt-val "Display Columns" date-header) 0)
(set-col (opt-val "Display Columns" due-date-header) 1)
(set-col (opt-val "Display Columns" reference-header) 2)
(set-col (opt-val "Display Columns" type-header) 3)
(set-col (opt-val "Display Columns" desc-header) 4)
(set-col (opt-val "Display Columns" amount-header) 5)
col-vector))
(define (make-heading-list column-vector)
(let ((heading-list '()))
(if (date-col column-vector)
(addto! heading-list (_ "Date")))
(if (date-col column-vector)
(addto! heading-list (_ "Due Date")))
(addto! heading-list (_ date-header)))
(if (date-due-col column-vector)
(addto! heading-list (_ due-date-header)))
(if (num-col column-vector)
(addto! heading-list (_ "Reference")))
(addto! heading-list (_ reference-header)))
(if (type-col column-vector)
(addto! heading-list (_ "Type")))
(addto! heading-list (_ type-header)))
(if (memo-col column-vector)
(addto! heading-list (_ "Description")))
(addto! heading-list (_ desc-header)))
(if (value-col column-vector)
(addto! heading-list (_ "Amount")))
(addto! heading-list (_ amount-header)))
(reverse heading-list)))
@ -147,10 +154,10 @@
(gnc:html-table-set-col-headers!
table
(list (N_ "0-30 days")
(N_ "31-60 days")
(N_ "61-90 days")
(N_ "91+ days")))
(list (_ "0-30 days")
(_ "31-60 days")
(_ "61-90 days")
(_ "91+ days")))
(gnc:html-table-append-row!
table
@ -183,8 +190,8 @@
(gnc:invoice-anchor-text invoice)
inv-str))
inv-str))
((equal? type gnc:transaction-type-payment) (N_ "Payment, thank you"))
(else (N_ "Unknown"))))
((equal? type gnc:transaction-type-payment) (_ "Payment, thank you"))
(else (_ "Unknown"))))
(row-contents '()))
(if reverse?
@ -259,8 +266,8 @@
(append (cons (gnc:make-html-table-cell/markup
"total-label-cell"
(if (gnc:numeric-negative-p total)
(N_ "Total Credit")
(N_ "Total Due")))
(_ "Total Credit")
(_ "Total Due")))
'())
(list (gnc:make-html-table-cell/size/markup
1 (value-col used-columns)
@ -307,32 +314,32 @@
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") (N_ "Date")
(N_ "Display Columns") date-header
"b" (N_ "Display the transaction date?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") (N_ "Due Date")
(N_ "Display Columns") due-date-header
"c" (N_ "Display the transaction date?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") (N_ "Num")
(N_ "Display Columns") reference-header
"d" (N_ "Display the transaction reference?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") (N_ "Type")
(N_ "Display Columns") type-header
"g" (N_ "Display the transaction type?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") (N_ "Memo")
(N_ "Display Columns") desc-header
"ha" (N_ "Display the transaction description?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") (N_ "Value")
(N_ "Display Columns") amount-header
"hb" "Display the transaction amount?" #t))
(gnc:register-inv-option
@ -346,10 +353,10 @@
gnc:*report-options*)
(define (customer-options-generator)
(options-generator '(receivable) 'gnc-owner-customer (N_ "Invoice") #f))
(options-generator '(receivable) 'gnc-owner-customer (_ "Invoice") #f))
(define (vendor-options-generator)
(options-generator '(payable) 'gnc-owner-vendor (N_ "Bill") #t))
(options-generator '(payable) 'gnc-owner-vendor (_ "Bill") #t))
(define (string-expand string character replace-string)
(define (car-line chars)
@ -495,8 +502,8 @@
(set! title (gnc:html-markup
"!"
type-str
(N_ " Report: ")
(_ type-str )
(_ " Report: ")
(gnc:html-markup-anchor
(gnc:owner-anchor-text owner)
(gnc:owner-get-name owner)))))

Write Preview
Loading…
Cancel
Save