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

Merge remote-tracking branch 'upstream/maint'

Browse Source
pull/665/head
Christopher Lam 6 years ago
parent 41af84b937 6d9e7d9380
commit 1fa5fd0a14
10 changed files with 973 additions and 11418 deletions
Show Stats Download Patch File Download Diff File

15
bindings/guile/utilities.scm
Unescape View File

@ -63,18 +63,9 @@
(define (gnc:msg . items)
(gnc-scm-log-msg (strify items)))
;; this definition of gnc:debug is different from others because we
;; want to check loglevel is debug *once* at gnc:debug definition
;; instead of every call to gnc:debug. if loglevel isn't debug then
;; gnc:debug becomes a NOOP.
(define gnc:debug
(cond
((qof-log-check "gnc" QOF-LOG-DEBUG)
(display "debugging enabled\n")
(lambda items (gnc-scm-log-debug (strify items))))
(else
(lambda items #f))))
(define (gnc:debug . items)
(when (qof-log-check "gnc.scm" QOF-LOG-DEBUG)
(gnc-scm-log-debug (strify items))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; the following functions are initialized to log message to tracefile

12284
data/accounts/de_DE/acctchrt_skr04.gnucash-xea
View File

File diff suppressed because it is too large Load Diff

2
data/pixmaps/hicolor/scalable/apps/gnucash-icon.svg
Unescape View File

@ -7,7 +7,7 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48px"
height="48px"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

4
gnucash/gnome/gnucash.desktop.in.in
Unescape View File

@ -11,9 +11,9 @@ Icon=gnucash-icon
StartupNotify=true
Terminal=false
Categories=Office;Finance;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Bugzilla=gnucash.org
X-GNOME-Bugzilla-Product=GnuCash
X-GNOME-Bugzilla-Component=General
X-GNOME-Bugzilla-Version=@PROJECT_VERSION@
X-GNOME-DocPath=gnucash/gnucash.xml
X-GNOME-DocPath=gnucash-help/gnucash-help.xml
X-GNOME-FullName=GnuCash Finance Management

66
gnucash/report/reports/standard/job-report.scm
Unescape View File

@ -397,23 +397,11 @@
(gnc:options-set-default-section gnc:*report-options* "General")
gnc:*report-options*)
(define (job-options-generator)
(options-generator (list ACCT-TYPE-RECEIVABLE) GNC-OWNER-JOB
(_ "Invoice") #f))
(define (customer-options-generator)
(options-generator (list ACCT-TYPE-RECEIVABLE) GNC-OWNER-CUSTOMER
(_ "Invoice") #f))
(define (vendor-options-generator)
(options-generator (list ACCT-TYPE-PAYABLE) GNC-OWNER-VENDOR
(_ "Bill") #t))
(define (employee-options-generator)
(options-generator (list ACCT-TYPE-PAYABLE) GNC-OWNER-EMPLOYEE
(_ "Expense Report") #t))
(define (setup-query q owner account end-date)
(let* ((guid (gncOwnerReturnGUID owner)))
@ -458,24 +446,6 @@
'attribute (list "valign" "top"))
table))
(define (make-date-row! table label date)
(gnc:html-table-append-row!
table
(list
(string-append label " ")
(qof-print-date date))))
(define (make-date-table)
(let ((table (gnc:make-html-table)))
(gnc:html-table-set-style!
table "table"
'attribute (list "border" 0)
'attribute (list "cellpadding" 0))
(gnc:html-table-set-last-row-style!
table "td"
'attribute (list "valign" "top"))
table))
(define (make-myname-table book date-format)
(let* ((table (gnc:make-html-table))
(name (gnc:company-info book gnc:*company-name*))
@ -617,40 +587,6 @@
(qof-query-destroy query)
document))
(define (find-first-account type)
(define (find-first account num index)
(if (>= index num)
'()
(let* ((this-child (gnc-account-nth-child account index))
(account-type (xaccAccountGetType this-child)))
(if (eq? account-type type)
this-child
(find-first account num (+ index 1))))))
(let* ((current-root (gnc-get-current-root-account))
(num-accounts (gnc-account-n-children current-root)))
(if (> num-accounts 0)
(find-first current-root num-accounts 0)
'())))
(define (find-first-account-for-owner owner)
(let ((type (gncOwnerGetType (gncOwnerGetEndOwner owner))))
(cond
((eqv? type GNC-OWNER-CUSTOMER)
(find-first-account ACCT-TYPE-RECEIVABLE))
((eqv? type GNC-OWNER-VENDOR)
(find-first-account ACCT-TYPE-PAYABLE))
((eqv? type GNC-OWNER-EMPLOYEE)
(find-first-account ACCT-TYPE-PAYABLE))
((eqv? type GNC-OWNER-JOB)
(find-first-account-for-owner (gncOwnerGetEndOwner owner)))
(else
'()))))
(gnc:define-report
'version 1
'name (N_ "Job Report")

2
gnucash/report/test/test-report-utilities.scm
Unescape View File

@ -42,7 +42,7 @@
(test-day (tm:mday ts-now))
(test-month (+ 1 (tm:mon ts-now)))
(test-year (+ 1900 (tm:year ts-now)))
(end-date (gnc-dmy2time64-neutral test-day test-month test-year))
(end-date (gnc-dmy2time64 test-day test-month test-year))
(start-date (NDayDelta end-date 10))
(q-end-date (gnc-dmy2time64-end test-day test-month test-year))
(q-start-date (gnc-dmy2time64 test-day test-month test-year))

2
gnucash/report/trep-engine.scm
Unescape View File

@ -1738,7 +1738,7 @@ be excluded from periodic reporting.")
(for-each
(lambda (prime-collector sec-collector tot-collector value)
(when value
(when (gnc:gnc-monetary? value)
(let ((comm (gnc:gnc-monetary-commodity value))
(val (gnc:gnc-monetary-amount value)))
(prime-collector 'add comm val)

4
libgnucash/quotes/CMakeLists.txt
Unescape View File

@ -1,6 +1,6 @@
set(_BIN_FILES "")
foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-update.in gnc-fq-dump)
foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-update.in gnc-fq-dump.in)
string(REPLACE ".in" "" _OUTPUT_FILE_NAME ${file})
set(_ABS_OUTPUT_FILE ${BINDIR_BUILD}/${_OUTPUT_FILE_NAME})
configure_file( ${file} ${_ABS_OUTPUT_FILE} @ONLY)
@ -26,4 +26,4 @@ add_custom_target(quotes-bin ALL DEPENDS ${_BIN_FILES})
install(FILES ${_MAN_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
install(PROGRAMS ${_BIN_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR})
set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump gnc-fq-helper.in gnc-fq-update.in Quote_example.pl README)
set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump.in gnc-fq-helper.in gnc-fq-update.in Quote_example.pl README)

8
libgnucash/quotes/README
Unescape View File

@ -8,11 +8,11 @@ gnc-fq-check.in:
gnucash to determine if Finance::Quote is installed properly. The
responses is a scheme form.
gnc-fq-dump:
gnc-fq-dump.in:
A perl script that retrieves a quote from Finance::Quote and dumps
the response to the terminal. Its useful for determining problems
with F::Q.
Source file for gnc-fq-dump which is a perl script that retrieves
a quote from Finance::Quote and dumps the response to the terminal.
Its useful for determining problems with F::Q.
gnc-fq-helper.in:

4
libgnucash/quotes/gnc-fq-dump → libgnucash/quotes/gnc-fq-dump.in
Unescape View File

@ -1,4 +1,4 @@
#!/usr/bin/perl
#!@PERL@ -w
#
# Copyright (C) 2003, David Hampton <hampton@employees.org>
#
@ -157,7 +157,7 @@ if ($#ARGV < 1) {
}
my $verbose = 0;
if (@ARGV[0] eq "-v") {
if ($ARGV[0] eq "-v") {
$verbose = 1;
shift;
}
Write Preview
Loading…
Cancel
Save