r16612 - gnucash/branches/gda-dev - 1) Merge with trunk up to 16597

Phil Longstaff plongstaff at cvs.gnucash.org
Sun Dec 2 16:29:49 EST 2007


Author: plongstaff
Date: 2007-12-02 16:29:35 -0500 (Sun, 02 Dec 2007)
New Revision: 16612
Trac: http://svn.gnucash.org/trac/changeset/16612

Added:
   gnucash/branches/gda-dev/accounts/ja/
   gnucash/branches/gda-dev/accounts/ja/Makefile.am
   gnucash/branches/gda-dev/accounts/ja/acctchrt_brokerage.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_business.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_carloan.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_cdmoneymkt.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_checkbook.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_childcare.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_common.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_eduloan.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_fixedassets.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_homeloan.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_homeown.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_otherloan.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_renter.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_retiremt.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_spouseinc.gnucash-xea
   gnucash/branches/gda-dev/accounts/ja/acctchrt_spouseretire.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/
   gnucash/branches/gda-dev/accounts/zh_CN/Makefile.am
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_brokerage.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_business.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_carloan.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_cdmoneymkt.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_checkbook.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_childcare.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_common.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_eduloan.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_fixedassets.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_full.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_homeloan.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_homeown.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_otherloan.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_renter.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_retiremt.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_spouseinc.gnucash-xea
   gnucash/branches/gda-dev/accounts/zh_CN/acctchrt_spouseretire.gnucash-xea
   gnucash/branches/gda-dev/lib/stf/
   gnucash/branches/gda-dev/lib/stf/Makefile.am
   gnucash/branches/gda-dev/lib/stf/README
   gnucash/branches/gda-dev/lib/stf/stf-parse.c
   gnucash/branches/gda-dev/lib/stf/stf-parse.h
   gnucash/branches/gda-dev/src/import-export/csv/Makefile.am
   gnucash/branches/gda-dev/src/import-export/csv/example-file.csv
   gnucash/branches/gda-dev/src/import-export/csv/gnc-csv-gnumeric-popup.c
   gnucash/branches/gda-dev/src/import-export/csv/gnc-csv-gnumeric-popup.h
   gnucash/branches/gda-dev/src/import-export/csv/gnc-csv-import.c
   gnucash/branches/gda-dev/src/import-export/csv/gnc-csv-import.h
   gnucash/branches/gda-dev/src/import-export/csv/gnc-csv-model.c
   gnucash/branches/gda-dev/src/import-export/csv/gnc-csv-model.h
   gnucash/branches/gda-dev/src/import-export/csv/gnc-csv-preview-dialog.glade
   gnucash/branches/gda-dev/src/import-export/csv/gnc-plugin-csv-ui.xml
   gnucash/branches/gda-dev/src/import-export/csv/gnc-plugin-csv.c
   gnucash/branches/gda-dev/src/import-export/csv/gnc-plugin-csv.h
   gnucash/branches/gda-dev/src/import-export/csv/gncmod-csv-import.c
Removed:
   gnucash/branches/gda-dev/accounts/ja_JP.EUC/acctchrt_common.gnucash-xea
   gnucash/branches/gda-dev/lib/libqof/qof/deprecated.c
   gnucash/branches/gda-dev/lib/libqof/qof/deprecated.h
   gnucash/branches/gda-dev/src/import-export/csv/gnc-csv2glist.c
   gnucash/branches/gda-dev/src/import-export/csv/gnc-csv2glist.h
Modified:
   gnucash/branches/gda-dev/accounts/Makefile.am
   gnucash/branches/gda-dev/accounts/de_AT/acctchrt_brokerage.gnucash-xea
   gnucash/branches/gda-dev/accounts/de_AT/acctchrt_business.gnucash-xea
   gnucash/branches/gda-dev/accounts/de_AT/acctchrt_common.gnucash-xea
   gnucash/branches/gda-dev/accounts/de_CH/acctchrt_brokerage.gnucash-xea
   gnucash/branches/gda-dev/accounts/de_CH/acctchrt_chkmu.gnucash-xea
   gnucash/branches/gda-dev/accounts/de_CH/acctchrt_common.gnucash-xea
   gnucash/branches/gda-dev/accounts/de_DE/acctchrt_brokerage.gnucash-xea
   gnucash/branches/gda-dev/accounts/de_DE/acctchrt_common.gnucash-xea
   gnucash/branches/gda-dev/accounts/de_DE/acctchrt_full.gnucash-xea
   gnucash/branches/gda-dev/accounts/de_DE/acctchrt_skr03.gnucash-xea
   gnucash/branches/gda-dev/accounts/de_DE/acctchrt_skr04.gnucash-xea
   gnucash/branches/gda-dev/configure.in
   gnucash/branches/gda-dev/doc/tip_of_the_day.list.in
   gnucash/branches/gda-dev/lib/Makefile.am
   gnucash/branches/gda-dev/lib/libqof/qof/Makefile.am
   gnucash/branches/gda-dev/lib/libqof/qof/gnc-numeric.c
   gnucash/branches/gda-dev/lib/libqof/qof/qof.h
   gnucash/branches/gda-dev/lib/libqof/qof/qofbookmerge.h
   gnucash/branches/gda-dev/lib/libqof/qof/qofevent-p.h
   gnucash/branches/gda-dev/lib/libqof/qof/qofevent.c
   gnucash/branches/gda-dev/lib/libqof/qof/qofevent.h
   gnucash/branches/gda-dev/lib/libqof/qof/qofquerycore.c
   gnucash/branches/gda-dev/lib/libqof/qof/qofutil.c
   gnucash/branches/gda-dev/lib/libqof/qof/qofutil.h
   gnucash/branches/gda-dev/macros/svn2cl.xsl
   gnucash/branches/gda-dev/packaging/win32/
   gnucash/branches/gda-dev/packaging/win32/defaults.sh
   gnucash/branches/gda-dev/packaging/win32/functions.sh
   gnucash/branches/gda-dev/packaging/win32/gnucash.iss.in
   gnucash/branches/gda-dev/packaging/win32/install.sh
   gnucash/branches/gda-dev/src/app-utils/gnc-sx-instance-model.c
   gnucash/branches/gda-dev/src/app-utils/options.scm
   gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-recurrence-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-recurrence-gda.h
   gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c
   gnucash/branches/gda-dev/src/base-typemaps.i
   gnucash/branches/gda-dev/src/bin/gnucash-bin.c
   gnucash/branches/gda-dev/src/business/business-core/business-core.i
   gnucash/branches/gda-dev/src/business/business-gnome/glade/date-close.glade
   gnucash/branches/gda-dev/src/business/business-gnome/gnc-plugin-page-invoice.c
   gnucash/branches/gda-dev/src/business/business-reports/easy-invoice.scm
   gnucash/branches/gda-dev/src/business/business-reports/fancy-invoice.scm
   gnucash/branches/gda-dev/src/business/business-reports/invoice.scm
   gnucash/branches/gda-dev/src/business/business-reports/payables.scm
   gnucash/branches/gda-dev/src/business/business-reports/receivables.scm
   gnucash/branches/gda-dev/src/core-utils/gnc-gconf-utils.h
   gnucash/branches/gda-dev/src/doc/design/component-manager.texinfo
   gnucash/branches/gda-dev/src/doc/design/engine.texinfo
   gnucash/branches/gda-dev/src/doc/design/intro.texinfo
   gnucash/branches/gda-dev/src/doc/design/register.texinfo
   gnucash/branches/gda-dev/src/doc/design/reports.texinfo
   gnucash/branches/gda-dev/src/doc/design/top-level.texinfo
   gnucash/branches/gda-dev/src/doc/design/user-preferences.texinfo
   gnucash/branches/gda-dev/src/doc/doxygen.cfg.in
   gnucash/branches/gda-dev/src/engine/SchedXaction.c
   gnucash/branches/gda-dev/src/engine/TransLog.c
   gnucash/branches/gda-dev/src/engine/iso-4217-currencies.scm
   gnucash/branches/gda-dev/src/engine/test/test-book-merge.c
   gnucash/branches/gda-dev/src/gnome-search/search.glade
   gnucash/branches/gda-dev/src/gnome-utils/dialog-options.c
   gnucash/branches/gda-dev/src/gnome-utils/dialog-preferences.c
   gnucash/branches/gda-dev/src/gnome-utils/glade/preferences.glade
   gnucash/branches/gda-dev/src/gnome-utils/gnc-account-sel.c
   gnucash/branches/gda-dev/src/gnome-utils/gnc-file.c
   gnucash/branches/gda-dev/src/gnome-utils/gnc-html-graph-gog.c
   gnucash/branches/gda-dev/src/gnome-utils/gnc-plugin-page.h
   gnucash/branches/gda-dev/src/gnome/dialog-print-check.c
   gnucash/branches/gda-dev/src/gnome/dialog-sx-editor.c
   gnucash/branches/gda-dev/src/gnome/druid-merge.h
   gnucash/branches/gda-dev/src/gnome/gnc-plugin-page-account-tree.c
   gnucash/branches/gda-dev/src/gnome/gnc-plugin-page-register.c
   gnucash/branches/gda-dev/src/gnome/gnucash.desktop.in.in
   gnucash/branches/gda-dev/src/gnome/schemas/apps_gnucash_general.schemas.in
   gnucash/branches/gda-dev/src/import-export/qif-import/druid-qif-import.c
   gnucash/branches/gda-dev/src/import-export/qif-import/qif.glade
   gnucash/branches/gda-dev/src/register/register-gnome/gnucash-sheet.c
   gnucash/branches/gda-dev/src/register/register-gnome/gnucash-sheet.h
   gnucash/branches/gda-dev/src/report/locale-specific/us/taxtxf-de_DE.scm
   gnucash/branches/gda-dev/src/report/locale-specific/us/taxtxf.scm
   gnucash/branches/gda-dev/src/report/report-system/html-acct-table.scm
   gnucash/branches/gda-dev/src/report/standard-reports/income-statement.scm
   gnucash/branches/gda-dev/src/report/standard-reports/standard-reports.scm
   gnucash/branches/gda-dev/src/report/utility-reports/view-column.scm
   gnucash/branches/gda-dev/src/tax/us/txf-de_DE.scm
Log:
1) Merge with trunk up to 16597
2) When inserting into a table which doesn't have a guid as the primary
key (e.g. slots), where the first key is an auto-increment key, don't
provide a value for the key.
3) Work on recurrences and scheduled transactions.  They don't work yet,
but the sx struct is saved





More information about the gnucash-patches mailing list