IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* New and updated translations: brx, hi, kok, ks, lv, mr, ta, te, ur
* Bug 701052 - cannot click on 'cancel' or 'ok' button on dialogue box
* Updated resource files for Latvian: po/lv.po and  accounts/lv/acctchrt_business.gnucash-xea
* Add ability to skip rows when importing transactions.
* Ensure that the root account is saved to the SQL backend.
* Add sv_AX, sv_FI, zh_HK, and zh_TW to Makefiles & configure.
* Fix a bunch of non-literal-null-conversion warnings.
* Allow GUILE1_PROGS as m4 name

Conflicts:
	configure.ac
	src/register/ledger-core/split-register-model.c
This commit is contained in:
Geert Janssens 2014-10-02 11:05:40 +02:00
commit 9f3236f072
27 changed files with 263227 additions and 73304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

794
ChangeLog
View File

@ -1,6 +1,790 @@
2014-09-27 John Ralls
* Ensure that the root account is saved to the SQL backend. (HEAD, origin/maint, maint)
2014-09-20 Robert Fewell
* This patch allows the ability to skip rows when importing transactions.
2014-09-23 valdis
* Updated resource files for Latvian: po/lv.po and accounts/lv/acctchrt_business.gnucash-xea
2014-09-27 Chenxiong Qi
* Bug 701052 - cannot click on 'cancel' or 'ok' button on dialogue box
2014-09-26 Jeff Earickson
* Repaired version of Marathi Language translation file
2014-09-26 Jeff Earickson
* Repaired version of latest Konkani language translation.
2014-09-25 Jeff Earickson
* Tamil Language Translation
2014-09-25 Jeff Earickson
* Deleted Raman language version of Konkani in favor of updated Devangari version.
2014-09-25 Jeff Earickson
* Updated translation of the Konkani Language.
2014-09-25 Jeff Earickson
* Updated Translation of the Bodo Language
2014-09-25 Jeff Earickson
* Added or updated the following Indic Language Translation Files:
2014-09-25 Jeff Earickson
* Urdu Language Translation file.
2014-09-25 Jeff Earickson
* Telugu Language Translation file.
2014-09-25 Jeff Earickson
* Marathi Language Translation File.
2014-09-25 Jeff Earickson
* Kashmiri Language translation file.
2014-09-25 Jeff Earickson
* Hindi Language Translation file
2014-09-26 Geert Janssens
* Rework assistant csv import regex code to eliminate the mandatory dummy field (#eol).
2014-09-26 Geert Janssens
* CSV Import transform macro into function
2014-09-26 Geert Janssens
* CSV Export: factor out function to generate regular expression
2014-09-25 Geert Janssens
* Refactor OS-specific ifdef to reduce code duplication
2014-09-19 Robert Fewell
* This patch just changes the white space to be of a consistent format.
2014-09-19 Robert Fewell
* Part Bug fix for 729476, this changes the line endings to \r\n to make it more compatible with CSV format.
2014-09-19 Robert Fewell
* Part Bug fix for 729476, this fixes the quoting of quotes, newlines and separator to make it more compatible with CSV format.
2014-09-19 Robert Fewell
* This patch fixes bug 731519. The fix sets the upper limit before it sets the value of the end row spin button.
2014-09-25 John Ralls
* Bug 736703 - Scheduled transaction are registered without credit/debit
2014-09-23 Geert Janssens
* Bug 630638 - 'Process payment' should allow to select equity accounts for payment
2014-09-23 Geert Janssens
* Use same test for payment dialog transfer accounts and assign as payment checks
2014-09-22 Geert Janssens
* Avoid undocumented dependency on progress page type in assistant to skip page
2014-09-22 Robert Fewell
* This patch fixes bug 726888, cancel button is available on all pages of assistant.
2014-09-22 Robert Fewell
* Use same default setting for quotes in csv import and export
2014-09-22 Geert Janssens
* Set default currency for French account chart templates
2014-09-22 Geert Janssens
* Convert ISO-8859-1 account chart templates to UTF-8
2014-09-22 Geert Janssens
* Add context to generic translatable string
2014-09-22 Geert Janssens
* Bug 671615 - French: 'New Customer' button in Find Customer dialog is translated to 'Nouvel onglet'
2014-09-22 Geert Janssens
* Bug 720427 - Review of french account templates
2014-09-21 John Ralls
* Bug 732545 - gnucash-2.6.3 segfaults when started
2014-09-21 Mark Haanen
* Update Dutch translation, copied from the Translation Project.
2014-09-21 Geert Janssens
* Rewrite gfec_eval_file to avoid opening the file itself in guile
2014-09-21 Geert Janssens
* Swap static functions so the lower one can reuse the upper one
2014-09-20 Geert Janssens
* Bug 711567 - Cannot save a custom report if a path contain diacritic chars
2014-09-19 Geert Janssens
* Bug 695240 - mortgage wizard empty table
2014-09-20 Geert Janssens
* Provide strfmon function for platforms that don't have it
2014-09-16 David Maline
* Bug 733506 - (ForwadDisableQIF) The forward button is not active even though a file is selected
2014-09-16 Jethro Beekman
* Bug 733283 - [PATCH] Loss of fractions when importing OFX investment transactions
2014-09-16 Geert Janssens
* Align perl module requirements with recent Finance::Quote versions
2014-09-06 Dmitry Pavlov
* Updated Russian translation from Dmitry Pavlov
2014-09-06 Chenxiong Qi
* - New Chart of Accounts Assistant is too large for screen
2014-09-06 Alex Aycinena
* Correct txf output to use a minus sign, rather than parenthesis, for debits, without regard to locale settings, as is required by the txf pseudo-standard; was previously incorrectly using parenthesis for negatives in Windows environments, for example.
2014-08-12 lmat
* Replace C++ reserved words for future compatibility with C++
2014-09-04 John Ralls
* SQL: Save commodity namespace changes from template
2014-09-03 hawk-lord
* Missing translation
2014-09-03 hawk-lord
* Added Swedish association accounts.
2014-09-03 hawk-lord
* Added Swedish account files
2014-09-02 Geert Janssens
* Add business lot scrubbing to Check & Repair->All/This transaction(s)
2014-08-28 Geert Janssens
* Make scrub in lot viewer scrub business lots using the new scrub functions.
2014-08-27 Geert Janssens
* Rewrite invoice payment logic to fix lot link proliferation
2014-08-27 Geert Janssens
* Refactor get_pay_split into gncOwnerFindOffsettingSplit
2014-08-26 Geert Janssens
* Refactor gncOwnerReduceSplitTo out of reduce_biggest_split
2014-08-26 Geert Janssens
* Refactor gnc_doc_doc_link into gncOwnerSetLotLinkMemo and move it
2014-08-26 Geert Janssens
* Handle the case of scrubbing a lot link between two non-document lots
2014-08-26 Geert Janssens
* Tweak the get_pay_split function to prefer the best possible match
2014-08-26 Geert Janssens
* Refactor scrub_doc_pay_link into scrub_other_link and make it more generic
2014-08-23 Geert Janssens
* Add scrub function to reduce the amount of lot links used.
2014-08-23 Geert Janssens
* Widen the scope of the subsplit merge scrub function
2014-08-23 Geert Janssens
* Move account type checking functions into the engine
2014-08-16 Geert Janssens
* Remove superfluous include statements
2014-08-16 Geert Janssens
* Small corrections in doxygen comments
2014-08-23 Geert Janssens
* More ENTER/LEAVE corrections at function exit points
2014-07-31 John Ralls
* Balance ENTER with a LEAVE for all exit points.
2014-09-02 Geert Janssens
* Bug 434462 - register color don't work correct with system theme color - Part 2
2014-08-30 Geert Janssens
* Bug 434462 - register color don't work correct with system theme color - Part 1
2014-08-30 Geert Janssens
* Rename enum elements to make room for foreground equivalents
2014-08-30 Geert Janssens
* Refactor register color functions to reduce duplication
2014-08-30 Geert Janssens
* Bug 711440 - Tab labels have different background colour than containing gui element
2014-09-01 Mike Alexander
* Bug 735769: Enable price and shares cells in a split if it is not in the trans currency. The label for the cells are changed to "Exch. Rate" and "Oth. Curr." in this case.
2014-09-01 Mike Alexander
* If the cursor moves from one register cell to another, refresh the register headers. If trading accounts are on and the transaction is expanded then the headers depend on the type of split the cursor is in.
2014-07-01 Mike Alexander
* Use guint64 instead of uint64_t with G_GUINT64_FORMAT to avoid warnings.
2014-08-31 Mike Alexander
* Change gncOwnerGetBalanceInCurrency to only cosider lots that contain an invoice. This function is currently only used in the owner tree code and this change will cause payments not properly linked to invoices to be ignored when computing owner balances.
2014-08-31 Mike Alexander
* Finish implementing the "Show zero balance owners" filter option. It always showed nothing before.
2014-08-31 Mike Alexander
* The sense of the "Only show active customers" checkbox was inverted.
2014-08-29 Geert Janssens
* Bug 707243 - Hard-coded font colors in account tree?
2014-08-14 Mike Alexander
* Bug 722140: Add option to control inclusion of trading accounts in cash flow report.
2014-08-07 John Ralls
* Fix test-backend-dbi segfault with libdbi-0.9.0.
2014-08-07 John Ralls
* Fix uninitialized variable warning.
2014-08-07 John Ralls
* Add note about automake 1.14 to configure.ac
2014-08-07 John Ralls
* Revert "Fix broken test-backend-dbi with libdbi 0.9."
2014-08-07 John Ralls
* Fix broken test-backend-dbi with libdbi 0.9.
2014-08-07 Mike Evans
* Bug 734183 - Set all of the denominators correctly on the currency values.
2014-08-03 Mike Evans
* Bill invoice importer crashing when invoice has multiple lines.
2014-06-28 Michalis Kamprianis
* Bug 120199 - Incorrect sort order in "Sort by Statement Date"
2014-08-01 Geert Janssens
* Revert "Bug #622778 Miscalculation in cashflow reports - Step 01"
2014-08-01 Geert Janssens
* Revert "Bug #622778 Miscalculation in cashflow reports - Step 02"
2014-08-01 Geert Janssens
* Revert "Bug #622778 Miscalculation in cashflow reports - Step 03"
2014-08-01 Geert Janssens
* Revert "Round properly when computing fraction of the transaction's value due to a given split."
2014-08-01 Geert Janssens
* Revert "The cash flow report should ignore splits in trading accounts."
2014-08-01 Erik Johansson
* Update Swedish translation
2014-07-13 Mike Alexander
* Bug 733107: Search for reconcile status doesn't work right.
2014-07-01 Geert Janssens
* Drop packaging/win32
2014-06-21 Geert Janssens
* First unit test for gncEntry and fix first bug it revealed
2014-06-21 Geert Janssens
* Fix whitespace
2014-06-21 Geert Janssens
* Revert "Bug726674-BudgetReverseSignSupport"
2014-06-10 Geert Janssens
* Bug 723442 - Report Options - Report Name too short
2014-03-26 Carsten Rinke
* Bug726674-BudgetReverseSignSupport
2014-06-01 Michalis Kamprianis
* Bug 719457 - Template for Home Mortgage Loan isn't properly nested. (local/maint)
2014-05-29 Christoph Holtermann
* Some adjustments, new IPython version
2014-06-09 John Ralls
* Fix signed int overflow warning.
2014-06-08 John Ralls
* double_to_gnc_numeric: Return overflow error immediately on invalid input.
2014-06-08 John Ralls
* Use more significant digits for SX function returns.
2014-06-08 John Ralls
* 725366 - Formula Parsing Error with Scheduled Mortgage Transactions
2014-05-29 Christoph Holtermann
* Python bindings - no instance necessary anymore
2014-06-01 Carsten Rinke
* Bug 720934 - Barcharts with many data points have overlapping x-axis labels
2014-06-03 Jeff Earickson
* New/revised version of the Brazilian Portuguese translation file, For version 2.6.3. Translator: Miguel Rozsas <miguel@rozsas.eng.br>
2014-06-05 John Ralls
* Fix broken build on 64-bit systems
2014-06-03 John Ralls
* 722200 - configure script does not pick the correct am_cv_scanf version
2014-06-02 John Ralls
* Fix broken win32 build; MinGW needs our strptime.
2014-06-02 John Ralls
* 722200 - configure script does not pick the correct am_cv_scanf version
2014-06-02 John Ralls
* Revert "722200 - configure script does not pick the correct am_cv_scanf version"
2014-06-02 John Ralls
* Revert "722200 - configure script does not pick the correct am_cv_scanf version"
2014-06-02 Mike Evans
* Merge branch 'maint' of https://github.com/Gnucash/gnucash into maint
2014-06-01 John Ralls
* 722200 - configure script does not pick the correct am_cv_scanf version
2014-06-02 Mike Evans
* Add some date format checking and make sure generated dates are the correct user selected format, not always locale format.
2014-06-02 Mike Evans
* Relax requirements for booleans in invoice line.
2014-06-01 John Ralls
* 722200 - configure script does not pick the correct am_cv_scanf version
2014-06-01 Mike Evans
* Bug 730255 - Python bindings: Assigns bill entries to non-existant invoice.
2014-05-15 Mike Evans
* Python bindings. Add function gncVendorNextID, complementary to gncCustomerNextID.
2014-05-31 John Ralls
* 722200 - configure script does not pick the correct am_cv_scanf version
2014-05-27 John Ralls
* More fix-ups for the renumber subaccounts dialog.
2014-05-27 John Ralls
* Bug 725054 - Re-numbering sub accounts crashes the program
2014-05-26 John Ralls
* Bug 728717 - Ubuntu 14.04 - GNUcash crashes on close
2014-05-25 Mike Alexander
* Always use the price we display to calculate the current value of an account.
2014-05-10 Michalis Kamprianis
* Bug 719457 - Template for Home Mortgage Loan isn't properly nested.
2014-03-26 Frédéric Perrin
* Bug 723145 - Currency display does not respect locale
2014-05-04 Michalis Kamprianis
* Bug 728103 - Invoice opened does not contain the Job under circumstances
2014-04-30 Michalis Kamprianis
* Bug 509263 Since Last Run dialog won't allow resizing of Status column
2014-05-20 Geert Janssens
* Backport John's fix for a truly ancient bug
2014-05-20 Geert Janssens
* Merge branch 'scheduled_tx_i18n_prefix' of https://github.com/zeldigas/gnucash into maint
2014-05-19 Geert Janssens
* Bug 610202 - gnucash silently closes when no X11/$DISPLAY is present
2014-05-19 Dmitry Pavlov
* added context to ambigous i18n keys for scheduled transaction add/edit dialog
2014-05-13 Mike Alexander
* The cash flow report should ignore splits in trading accounts.
2014-05-13 Simon Arlott
* Bug 699687 - Add a configuration option to not display "since last run" window when opening a file
2014-05-13 Geert Janssens
* Fix regression in invoice pre-payments
2014-05-11 Michalis Kamprianis
* Bug 692249 - Add Help button in Custom Reports dialog box
2014-05-13 Geert Janssens
* Avoid defining the same translatable string twice
2014-04-29 Michalis Kamprianis
* Bug 729157 Bill Term discount days are allowed to be more than due days
2014-05-09 Geert Janssens
* Bug 688965 - Page Up, Page Down keys cause GnuCash to hang
2014-05-08 Geert Janssens
* Fix document type dispay for credit notes on owner report
2014-05-08 Amm
* Better period totals formatting
2014-05-05 Mike Alexander
* Don't nest AC_MSG_CHECKING calls, it produces confuing output.
2014-05-05 Colin
* Fix crash initialising dbi if libdbi version >= 0.9.0
2014-05-05 Geert Janssens
* Revert "Fix crash with libdib >= 0.9.0"
2014-05-05 Geert Janssens
* Bug 729497 - Saved Report Configuration selection window resize
2014-05-05 Geert Janssens
* Fix crash with libdib >= 0.9.0
2014-05-02 Mike Alexander
* Better test for conflict between optimization and FORTIFY_SOURCE
2014-05-02 Geert Janssens
* Add _FORTIFY_SOURCE directive only when compiling with optimization enabled
2014-04-28 Jeff Earickson
* The Dogri language in Devanagari Script.
2014-04-28 Jeff Earickson
* Addition of the Dogri language (doi) to LINGUAS
2014-04-28 Jeff Earickson
* Addition of the Bodo language translation file, in Devanagari script
2014-04-28 Jeff Earickson
* Addition of the Bodo language (brx) in Devanagari Script.
2014-04-28 Geert Janssens
* Revert error on warning default when building from svn
2014-01-17 Gary Bilkus
* Win32: Fix problem in gnc-split-reg.h caused by earlier preprocessor define of DELETE etc
2014-01-17 Gary Bilkus
* Win32: Fix configure.ac to cope with new gcc not understanding no-undefined flag
2014-04-26 Mike Alexander
* Ignore SIGTTOU while importing Python console class.
2014-04-25 Mike Alexander
* Fix code that customizes parameters for specific gcc versions to agree with the comments.
2014-04-26 Geert Janssens
* Additional changes to column calculations
2014-04-25 Amish
* calculate num-columns-required correctly
2014-04-26 Geert Janssens
* Fix price quotes after removal of yahoo-get-historical-quotes
2014-04-24 Michalis Kamprianis
* Minor corrections
2014-04-16 Moritz Lipp
* Use libsecret if available
2014-04-24 Geert Janssens
* Prevent older gnucash versions from opening a data file if previously unhandled kvps are used
2014-04-24 Michalis Kamprianis
* Bug 728841 - XML backend does not always store KVP slots
2014-04-24 Geert Janssens
* Remove unused function yahoo-get-historical-quotes
2014-04-22 Jeff Earickson
* Gnucash translation into Konkani, shown in Latin script.
2014-04-22 Jeff Earickson
* Gnucash translation into Konkani in the Devanagari script.
2014-04-22 Jeff Earickson
* Added kok and kok@latin to LINGUAS: Konkani in Devanagari script and latin script translations.
2014-04-23 Geert Janssens
* Update Latvian translation
2014-04-23 Geert Janssens
* Add fixed EUR-LVL conversion rate to gnc_euro_rates
2014-04-07 Carsten Rinke
* Bug726449 - Budget Barchart does not show up if running sum is selected
2014-04-17 Moritz Lipp
* Correct usage of realloc in gnc_xml_be_get_file_lock
2014-04-15 Moritz Lipp
* Make compatible to libdbi >= 0.9.0
2014-04-13 John Ralls
* Re-enable loading and saving gnucashdotdir/accelerator-home on OSX
2014-04-15 Moritz Lipp
* Replace deprecated g_dirname
2014-04-07 Christian Stimming
* Win32 build: Update gwenhywfar version after it has been fixed for compiling with mingw.
2014-04-05 Cristian Marchi
* Small improvement to italian translation.
2014-04-05 Cristian Marchi
* Related to bug #727338: currency for Latvia is EUR.
2014-04-05 Cristian Marchi
* Update it translation and a small fix for account.
2014-04-05 Cristian Marchi
* Fix spaces for some strings not correctly picked up by xgettext.scm script.
2014-04-05 Cristian Marchi
* Bump copyright year
2014-04-05 Cristian Marchi
* Bug #727338 - Translation and Account file updates for Latvian.
2014-03-30 Carsten Rinke
* Bug727130 - Crash when newline in Report Title
2014-04-01 John Ralls
* Rename _git files to plain, fix links.
2014-04-01 John Ralls
* Remove svn-based build files
2014-04-01 John Ralls
* Write a timestamp log file at the beginning of a build on the server.
2014-03-31 Christian Stimming
* Win32: Update gwenhyhwfar/aqbanking again, but slightly more cautious (gwen-4.11.0 does not compile on win/mingw right now)
2014-03-30 John Ralls
* Revert "Win32 build: Update aqbanking version numbers" (tag: 2.6.3)
2014-03-30 John Ralls
* Revert "Win32: Roll back Gwenhywfar to 4.9.0 to resolve broken build."
2014-03-29 John Ralls
* Work around some test issues. (HEAD, master)
* Release 2.6.3
2014-03-29 John Ralls
* Work around some test issues.
2014-03-29 John Ralls
@ -8,7 +792,7 @@
2014-03-28 John Ralls
* Win32: Roll back Gwenhywfar to 4.9.0 to resolve broken build. (origin/trunk, origin/master, origin/HEAD)
* Win32: Roll back Gwenhywfar to 4.9.0 to resolve broken build.
2014-03-28 John Ralls
@ -104,7 +888,7 @@
2014-03-06 Christian Stimming
* Aqbanking: SEPA transfer improvements - fix origin labels and add possibility to edit sender's name. (trunk, master)
* Aqbanking: SEPA transfer improvements - fix origin labels and add possibility to edit sender's name.
2014-03-06 Christian Stimming
@ -112,7 +896,7 @@
2014-03-01 John Ralls
* Release GnuCash 2.6.2 (2.6.2)
* Release GnuCash 2.6.2 (tag: 2.6.2)
2014-03-01 John Ralls
@ -2800,7 +3584,7 @@
2013-05-21 Geert Janssens
* Fix windows build after it got broken by r22982
* Fix windows build after it got broken by r22982 (github/trunk)
2013-05-20 Christian Stimming

178
NEWS
View File

@ -1,5 +1,132 @@
Version history:
------- -------
2.6.4 - 28 September 2014
Announcpement: GnuCash 2.6.4 Release 2014-09-28
GnuCash 2.6.4 released
The GnuCash development team proudly announces GnuCash 2.6.4, the
third maintenance release in the 2.6-stable series. Please take the
tour of all the new features.
Between 2.6.3 and 2.6.4, the following bugfixes were accomplished:
120199 - Incorrect sort order in "Sort by Statement Date".
434462 - register color don't work correct with system theme color.
509263 - Since Last Run dialog won't allow resizing of Status column.
610202 - gnucash silently closes when no X11/$DISPLAY is present.
630638 - 'Process payment' should allow to select equity accounts for
payment
671615 - French: 'New Customer' button in Find Customer dialog is
translated to 'Nouvel onglet'
688965 - Page Up, Page Down keys cause GnuCash to hang.
692249 - Add Help button in Custom Reports dialog box,
695240 - mortgage wizard empty table.
707243 - Hard-coded font colors in account tree?
711440 - Tab labels have different background colour than containing gui
element.
711567 - Cannot save a custom report if a path contain diacritic chars
719457 - Template for Home Mortgage Loan isn't properly nested.
719457 - Template for Home Mortgage Loan isn't properly nested.
720427 - Review of french account templates
720934 - Barcharts with many data points have overlapping x-axis labels.
722140 - Add option to control inclusion of trading accounts in cash flow
report.
722200 - configure script does not pick the correct am_cv_scanf version.
723145 - Currency display does not respect locale.
723442 - Report Options - Report Name too short.
725054 - Re-numbering sub accounts crashes the program.
725366 - Formula Parsing Error with Scheduled Mortgage Transactions
726449 - Budget Barchart does not show up if running sum is selected.
726888 - cancel button is available on all pages of assistant.
727130 - Crash when newline in Report Title
727338 - Translation and Account file updates for Latvian.
728103 - Invoice opened does not contain the Job under circumstances.
728717 - Ubuntu 14.04 - GNUcash crashes on close.
728841 - XML backend does not always store KVP slots.
729157 - Bill Term discount days are allowed to be more than due days.
729497 - Saved Report Configuration selection window resize.
730255 - Python bindings: Assigns bill entries to non-existant invoice.
731519 - The fix sets the upper limit before it sets the value of the end
row spin button.
733107 - Search for reconcile status doesn't work right.
733283 - [PATCH] Loss of fractions when importing OFX investment
transactions.
733506 - (ForwadDisableQIF) The forward button is not active even though
a file is selected.
734183 - Set all of the denominators correctly on the currency values.
736703 - Scheduled transaction are registered without credit/debit.
732545 - gnucash-2.6.3 segfaults when started.
Some other fixes not associated with reported bugs were accomplished:
Add business lot scrubbing to Check & Repair->All/This transaction(s).
Add context to generic translatable string. This was suggested in
Bug 671615 by Jérôme Rapinat.
Add scrub function to reduce the amount of lot links used. Only lot links
between two or more document lots must remain. All lot links between
document and payment lots can be scrubbed.
Add some date format checking and make sure generated dates are the correct
user selected format, not always locale format.
Allow the ability to skip rows when importing transactions.
Always use the price we display to calculate the current value of an
account.
Better period totals formatting in Invoices.
CSV Export: factor out function to generate regular expression.
CSV Import transform macro into function.
Convert ISO-8859-1 account chart templates to UTF-8.
Correct txf output to use a minus sign, rather than parenthesis.
Fix document type dispay for credit notes on owner report.
Fix test-backend-dbi segfault with libdbi-0.9.0.
Handle the case of scrubbing a lot link between two non-document lots.
Make scrub in lot viewer scrub business lots using the new scrub functions.
Move account type checking functions into the engine.
Prevent older gnucash versions from opening a data file if previously
unhandled kvps are used.
Python bindings. Add function gncVendorNextID, complementary to
gncCustomerNextID.
Re-enable loading and saving gnucashdotdir/accelerator-home on OSX.
Refactor OS-specific ifdef to reduce code duplication, which results
in reduced risk on typos in either branch
Refactor get_pay_split into gncOwnerFindOffsettingSplit. In this form it
can be used both for scrubbing lot links and for adding new payments
Refactor gncOwnerReduceSplitTo out of reduce_biggest_split. It can now be
used both for scrubbing and when applying payments
Refactor gnc_doc_doc_link into gncOwnerSetLotLinkMemo and move it. It can
now be used both for scrubbing and when applying payments
Refactor scrub_doc_pay_link into scrub_other_link and make it more generic.
It can now be used both to:
* move a payment to a document lot (its original use case)
* move a refund to a payment lot or the other way around
Relax requirements for booleans in invoice line, accepting 'y' as well as
'yes', 't' as well as 'true'.
Replace C++ reserved words for future compatibility with C++.
Rework assistant csv import regex code to eliminate the mandatory dummy
field.
Rewrite invoice payment logic to fix lot link proliferation.
SQL: Save commodity namespace changes from template.
Set default currency for French account chart templates.
Tweak the get_pay_split function to prefer the best possible match.
Use libsecret if available since gnome-keyring has been deprecated.
Use more significant digits for SX function returns.
Use same default setting for quotes in csv import and export.
Widen the scope of the subsplit merge scrub function. When used in a
strict sense it will only merge splits that are marked as subsplits
of each other. In relaxed mode it will merge any split two splits
that are both in the same lot and the same transaction.
double_to_gnc_numeric: Return overflow error immediately on invalid input.
Ensure that the root account is saved to the SQL backend.
Chart-of-Account Templates Updated: Latvian, French, Swedish
Translations Updated: Brazilian Portuguese, Dutch, Konkani (includes replacing Raman character set with Devangari) ,Latvian, Marathi, Tamil,
New Translations: Bodo, Hindi, Kashmiri, Telugu, Urdu. Thanks to The Centre for Development of Advanced Computing (C-DAC), Pune, India. Translation Team Leader: Chandrakant Dhutadmal
Documentation
Concurrent with the release of Gnucash 2.6.4 we're pleased to also release a new version 2.6.4 of the companion Help and Tutorial and Concepts Guide.
2.6.3 - 30 March 2014
The GnuCash development team proudly announces GnuCash 2.6.3,
the latest stable release of the GnuCash Free Accounting
@ -162,14 +289,14 @@ Version history:
Bug Fixes:
Bug 157247 - Asset account's "total" value should use most
157247 - Asset account's "total" value should use most
recent transaction prices
Bug 710823 - libofx can supply broken UTF-8 for account id
Bug 710824 - GnuCash should sanitise UTF-8 before serialising files
710823 - libofx can supply broken UTF-8 for account id
710824 - GnuCash should sanitise UTF-8 before serialising files
to avoid writing broken unparseable XML.
Bug 720555 - General Ledger - Can't Enter Transaction Amounts
Bug 720556 - The Tip of the Day preference isn't getting saved
Bug 720646 - New Book Tabs on Windows
720555 - General Ledger - Can't Enter Transaction Amounts
720556 - The Tip of the Day preference isn't getting saved
720646 - New Book Tabs on Windows
Other Changes:
@ -199,29 +326,28 @@ Version history:
Bug Fixes:
Bug 336843 - Attach images/files/urls to transactions:
336843 - Attach images/files/urls to transactions:
Disable the "show attachment" menu item if the transaction
has no attached file.
Bug 619478 - Build warning in html/gnc-html-webkit.c
Bug 627575 - Stylesheet names with non-alphanumeric characters
619478 - Build warning in html/gnc-html-webkit.c
627575 - Stylesheet names with non-alphanumeric characters
and saved-reports
Bug 630578 - current date instead of posting date in exchange rate,
630578 - current date instead of posting date in exchange rate,
when posting a bill
Bug 632588 - Scrub doesn't fix missing currency
Bug 639371 - Welcome Sample Report reports wrong version and
632588 - Scrub doesn't fix missing currency
639371 - Welcome Sample Report reports wrong version and
has a broken report
Bug 653594 - wrong amount printed on checks
Bug 705714 - QIF Import - File selection pop-up is not on top
653594 - wrong amount printed on checks
705714 - QIF Import - File selection pop-up is not on top
during qif import
Bug 708526 - GnuCash Crashes when opening About page:
708526 - GnuCash Crashes when opening About page:
Downgrade the error to a critical warning.
Bug 711317 - Indian Rupee Symbol appears as "?" marks
Bug 715123 - Post invoice problem, cannot unpost
Bug 719481 - GnuCash report crashes with Guile2
Bug 719521 - Missing radio button in "Edit security" dialog
Bug 719726 - Click on File -> Open seg-faults
Bug 720235 - Python bindings should load environment file just
711317 - Indian Rupee Symbol appears as "?" marks
715123 - Post invoice problem, cannot unpost
719481 - GnuCash report crashes with Guile2
719521 - Missing radio button in "Edit security" dialog
719726 - Click on File -> Open seg-faults
720235 - Python bindings should load environment file just
like gnucash does
Fix Python tests to no longer require gsettings schemas installed.
Fix the CuteCash (Qt GUI based) build
@ -530,12 +656,12 @@ Version history:
Python bindings. Patch by Tom Lofts
Carsten Rinke provided several patches:
Bug #682800 Generated balances on Report different than calculated
682800 Generated balances on Report different than calculated
balances on Ledger when using "open subaccounts"
Bug #622778 Miscalculation in cashflow reports
Bug #584869 net change line in general journal report
622778 Miscalculation in cashflow reports
584869 net change line in general journal report
Bug #589865 - Budget flow period doesn't work. Patches by Carsten
589865 - Budget flow period doesn't work. Patches by Carsten
Rinke and Mikhail Tsaplin
The translation files have been copied from the 2.4 branch.

35
accounts/Makefile.am
View File

@ -1,3 +1,36 @@
SUBDIRS = C cs da de_AT de_CH de_DE el_GR en_GB es_ES es_MX fi_FI fr_CH fr_CA fr_FR hu_HU it ja ko lv nl nb pl pt_BR pt_PT ru sk sv_SE tr_TR zh_CN
SUBDIRS = \
C \
cs \
da \
de_AT \
de_CH \
de_DE \
el_GR \
en_GB \
es_ES \
es_MX \
fi_FI \
fr_CA \
fr_CH \
fr_FR \
hu_HU \
it \
ja \
ko \
lv \
nb \
nl \
pl \
pt_BR \
pt_PT \
ru \
sk \
sv_AX \
sv_FI \
sv_SE \
tr_TR \
zh_CN \
zh_HK \
zh_TW

540
accounts/lv/acctchrt_business.gnucash-xea
View File

@ -15,19 +15,19 @@
xmlns:bgt="http://www.gnucash.org/XML/bgt"
xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
xmlns:lot="http://www.gnucash.org/XML/lot"
xmlns:job="http://www.gnucash.org/XML/job"
xmlns:invoice="http://www.gnucash.org/XML/invoice"
xmlns:addr="http://www.gnucash.org/XML/addr"
xmlns:cust="http://www.gnucash.org/XML/cust"
xmlns:owner="http://www.gnucash.org/XML/owner"
xmlns:billterm="http://www.gnucash.org/XML/billterm"
xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
xmlns:tte="http://www.gnucash.org/XML/tte"
xmlns:order="http://www.gnucash.org/XML/order"
xmlns:cust="http://www.gnucash.org/XML/cust"
xmlns:employee="http://www.gnucash.org/XML/employee"
xmlns:entry="http://www.gnucash.org/XML/entry"
xmlns:owner="http://www.gnucash.org/XML/owner"
xmlns:invoice="http://www.gnucash.org/XML/invoice"
xmlns:job="http://www.gnucash.org/XML/job"
xmlns:order="http://www.gnucash.org/XML/order"
xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
xmlns:tte="http://www.gnucash.org/XML/tte"
xmlns:vendor="http://www.gnucash.org/XML/vendor">
<gnc-act:title>
Uzņēmējdarbības konti
@ -132,6 +132,18 @@
<act:code>1290</act:code>
<act:parent type="new">03c7b55c5f9e7e575eb860b27361d0aa</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>1260 Avansa maksājumi par pamatlīdzekļiem</act:name>
<act:id type="new">9dbcebfe6ce5a224707b19156ba7b508</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1260</act:code>
<act:parent type="new">03c7b55c5f9e7e575eb860b27361d0aa</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>3. Pašu kapitāls</act:name>
<act:id type="new">f241bfd7e177b5591d6ca17d2065ec23</act:id>
@ -279,7 +291,7 @@
<gnc:account version="2.0.0">
<act:name>5.3. Norēķini ar piegādātājiem un darbuzņēmējiem</act:name>
<act:id type="new">a8a5f40f126c8ad09d17d69a9f4bf20a</act:id>
<act:type>LIABILITY</act:type>
<act:type>PAYABLE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
@ -305,21 +317,41 @@
<act:commodity-scu>100</act:commodity-scu>
<act:code>5310</act:code>
<act:slots>
<slot>
<slot:key>tax-related</slot:key>
<slot:value type="integer">1</slot:value>
</slot>
<slot>
<slot:key>last-num</slot:key>
<slot:value type="string">112450</slot:value>
</slot>
<slot>
<slot:key>notes</slot:key>
<slot:value type="string">Piem., saņemtie rēķini</slot:value>
</slot>
<slot>
<slot:key>tax-related</slot:key>
<slot:value type="integer">1</slot:value>
</slot>
</act:slots>
<act:parent type="new">a8a5f40f126c8ad09d17d69a9f4bf20a</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5311 Norēķini ar piegādātājiem un darbuzņēmējiem Eiro</act:name>
<act:id type="new">754b4460b340b43aed2c4cedff406745</act:id>
<act:type>PAYABLE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>5311</act:code>
<act:parent type="new">a8a5f40f126c8ad09d17d69a9f4bf20a</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5312 Norēķini ar piegādātājiem un darbuzņēmējiem USD</act:name>
<act:id type="new">0e0d20c559b6b6a8084aa9b4e080e926</act:id>
<act:type>PAYABLE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>5312 Norēķini ar piegādātājiem un darbuzņēmējiem USD</act:code>
<act:parent type="new">a8a5f40f126c8ad09d17d69a9f4bf20a</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5.6. Norēķini par darba samaksu un ieturējumiem (izņemot nodokļus</act:name>
<act:id type="new">d1dab714f10f758f918e6e9c42dcefd3</act:id>
@ -368,18 +400,6 @@
</act:slots>
<act:parent type="new">63436c16eef1271c1b20696e8c3a0d88</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5721 Norēķini par PVN</act:name>
<act:id type="new">790a9d5d942fd48aeff7ffea84a19b36</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>5721</act:code>
<act:parent type="new">f95b9f7c8b6db80dd7ded93317c09387</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5720 Norēķini par IIN</act:name>
<act:id type="new">5f679c7ac8baa02baf02700765a64e70</act:id>
@ -441,7 +461,97 @@
<act:parent type="new">f95b9f7c8b6db80dd7ded93317c09387</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5.5. Norēkini par parādiem ar personālu</act:name>
<act:name>5721 Norēķini par PVN</act:name>
<act:id type="new">3a9fd7f815bffce96b9006a38f13639c</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>5721 Norēķini par PVN</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
<act:parent type="new">f95b9f7c8b6db80dd7ded93317c09387</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>57212 Norēkini par PVN 12%</act:name>
<act:id type="new">6f0b99d89a465c240e7bab2e2e5bf0c5</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>5722 </act:code>
<act:parent type="new">3a9fd7f815bffce96b9006a38f13639c</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>57213 Norēķini par PVN ar Eiropas Savienību</act:name>
<act:id type="new">4479ede8639954c4f34d945a0df9d5c0</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>57213</act:code>
<act:parent type="new">3a9fd7f815bffce96b9006a38f13639c</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>57214 PVN uz robežas</act:name>
<act:id type="new">f5197f554273cf1ed9c843bab99b28ac</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>57214 </act:code>
<act:parent type="new">3a9fd7f815bffce96b9006a38f13639c</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>57211 Norēķini par PVN 21%</act:name>
<act:id type="new">790a9d5d942fd48aeff7ffea84a19b36</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>57211</act:code>
<act:parent type="new">3a9fd7f815bffce96b9006a38f13639c</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>57219 PVN parāda nomaksa valsts budžetā</act:name>
<act:id type="new">ccd9e4d8e1d4b26491b1e09f528e47c4</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>57219 </act:code>
<act:parent type="new">3a9fd7f815bffce96b9006a38f13639c</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5727 Norēķini par transportlīdzekļa nodokli</act:name>
<act:id type="new">2bb664651876d27339b0ac9bb2404121</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>5727 </act:code>
<act:parent type="new">f95b9f7c8b6db80dd7ded93317c09387</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5.5 Norēķini par parādiem ar personālu</act:name>
<act:id type="new">8b4824ee28408402da7af3410e586301</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
@ -449,6 +559,54 @@
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:parent type="new">63436c16eef1271c1b20696e8c3a0d88</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5510 Norēķini par parādiem personālam</act:name>
<act:id type="new">b24bedfbd433f378404a5f5cbc5c10e1</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>5510 Norēķini par parādiem ar personālu</act:code>
<act:parent type="new">8b4824ee28408402da7af3410e586301</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5.9 Nākošo periodu ieņēmumi</act:name>
<act:id type="new">65bcdb13a47c915d9fe5d0f0232bf653</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>5.9</act:code>
<act:parent type="new">63436c16eef1271c1b20696e8c3a0d88</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5910 Nākošo periodu ieņēmumi</act:name>
<act:id type="new">eed8f963fea8d797cdef4822157bfad3</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>5910</act:code>
<act:parent type="new">65bcdb13a47c915d9fe5d0f0232bf653</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5.2 Norēķini par saņemtajiem avansiem</act:name>
<act:id type="new">1ac21831c16d0e446410e79026d72f5e</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>5.2 Norēķini par saņemtajiem avansiem</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@ -458,22 +616,16 @@
<act:parent type="new">63436c16eef1271c1b20696e8c3a0d88</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>5510 Norēķini par parādiem personālam</act:name>
<act:id type="new">b24bedfbd433f378404a5f5cbc5c10e1</act:id>
<act:type>PAYABLE</act:type>
<act:name>5210 Norēķini par saņemtajiem avansiem</act:name>
<act:id type="new">6ebc2ff9089d79f37428cec6d075c859</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>5510</act:code>
<act:slots>
<slot>
<slot:key>color</slot:key>
<slot:value type="string">#ededececebeb</slot:value>
</slot>
</act:slots>
<act:parent type="new">8b4824ee28408402da7af3410e586301</act:parent>
<act:code>5210 Norēķini par saņemtajiem avansiem</act:code>
<act:parent type="new">1ac21831c16d0e446410e79026d72f5e</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>6. Ieņēmumi no uzņēmuma saimnieciskās darbības</act:name>
@ -486,14 +638,14 @@
<act:commodity-scu>100</act:commodity-scu>
<act:code>6.</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
<slot>
<slot:key>notes</slot:key>
<slot:value type="string">6110 Ieņēmumi no pamatdarbības</slot:value>
</slot>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
<act:parent type="new">f1d190ad7b90d92a692014bbf7e281a2</act:parent>
</gnc:account>
@ -527,6 +679,66 @@
<act:code>6110</act:code>
<act:parent type="new">e355fa0064ebe4f78ee7bfe3eb8eedcc</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>6111 Projekti ar pašvaldību</act:name>
<act:id type="new">9a914c27ca058479ceddd13aae774884</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>6111</act:code>
<act:parent type="new">e355fa0064ebe4f78ee7bfe3eb8eedcc</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>6112 Citi ieņēmumi</act:name>
<act:id type="new">365b4fa4d3925ffced8593a81f93ff08</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>6112 </act:code>
<act:parent type="new">e355fa0064ebe4f78ee7bfe3eb8eedcc</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>6.5 Dažādi </act:name>
<act:id type="new">5f2fd0fce062c478fb50b931cd888f07</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>6.5</act:code>
<act:parent type="new">d52bfba7a8020f9fdb13d95cdbc4a8a1</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>6500 Dažādi - kļūdu novēršana</act:name>
<act:id type="new">aea6e669fe5322a78c997d6b664c28e0</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>6500</act:code>
<act:parent type="new">5f2fd0fce062c478fb50b931cd888f07</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>6560 Ieņēmumos pātskaitītais uzkrājumu samazinājums</act:name>
<act:id type="new">8ebaf012f3599cd1eb9f30911d55509f</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>6560</act:code>
<act:parent type="new">5f2fd0fce062c478fb50b931cd888f07</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>7. Saimnieciskās darbības izdevumi</act:name>
<act:id type="new">5bff8991d59134283c3c6d0d50add02b</act:id>
@ -773,6 +985,18 @@
<act:code>7770</act:code>
<act:parent type="new">37a4fe57e3639910c229ec5a9dc5a43e</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>7771 Reprezentācijas izdevumi </act:name>
<act:id type="new">c2e81574d0fd6f0d48d68549d121739b</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>7771 </act:code>
<act:parent type="new">37a4fe57e3639910c229ec5a9dc5a43e</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>7.5 Pārējie saimnieciskās darbības izdevumi</act:name>
<act:id type="new">8180fe22cdc7b0d83257918cbee48522</act:id>
@ -821,6 +1045,42 @@
<act:code>7550</act:code>
<act:parent type="new">8180fe22cdc7b0d83257918cbee48522</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>7570 Komandējuma izdevumi</act:name>
<act:id type="new">403472bf4c2f655eb52727d85ba1cc88</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>7570</act:code>
<act:parent type="new">8180fe22cdc7b0d83257918cbee48522</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>7560 Darbinieku apmācības un apdrošināšanas izdevumi</act:name>
<act:id type="new">e992f3964e4f8d330e0cfde8d6c5b0f2</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>7560 </act:code>
<act:parent type="new">8180fe22cdc7b0d83257918cbee48522</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>7590 Transportlīdzekļa nodoklis</act:name>
<act:id type="new">d1cb6f3bcbf33ceb70210dcf8e2d2a9a</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>7590</act:code>
<act:parent type="new">8180fe22cdc7b0d83257918cbee48522</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>7.4. Pamatlīdzekļu nolietojums</act:name>
<act:id type="new">8dbac8e19acab0965568911995842d37</act:id>
@ -831,12 +1091,6 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>7.4.</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
<act:parent type="new">5bff8991d59134283c3c6d0d50add02b</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
@ -849,9 +1103,38 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>7420</act:code>
<act:parent type="new">8dbac8e19acab0965568911995842d37</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>7.6 Pārdošanas izmaksas</act:name>
<act:id type="new">5e47b3c833cc8cd6aeb4c6f7ac9becb1</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>7.6</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
<act:parent type="new">5bff8991d59134283c3c6d0d50add02b</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>7610 Pārdošanas izmaksas</act:name>
<act:id type="new">9ad9a49a0f4e19bf2744302522d803a3</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>7610</act:code>
<act:parent type="new">5e47b3c833cc8cd6aeb4c6f7ac9becb1</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>2. Apgrozāmie līdzekļi</act:name>
<act:id type="new">fb4aa78c11eb5a3fccb5f29307eb916c</act:id>
@ -891,19 +1174,13 @@
<gnc:account version="2.0.0">
<act:name>2380 Norēķini par prasībām pret personālu un īstermiņa aizdevumi personālam</act:name>
<act:id type="new">697720154aa032750390fec327bdc66f</act:id>
<act:type>RECEIVABLE</act:type>
<act:type>PAYABLE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>2380</act:code>
<act:slots>
<slot>
<slot:key>last-num</slot:key>
<slot:value type="string">6313</slot:value>
</slot>
</act:slots>
<act:parent type="new">e1bf896bb23a38b84eb16d3e3a1f09bc</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
@ -916,12 +1193,6 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>2310</act:code>
<act:slots>
<slot>
<slot:key>last-num</slot:key>
<slot:value type="string">15</slot:value>
</slot>
</act:slots>
<act:parent type="new">e1bf896bb23a38b84eb16d3e3a1f09bc</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
@ -934,12 +1205,6 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>2390</act:code>
<act:slots>
<slot>
<slot:key>color</slot:key>
<slot:value type="string">#ededececebeb</slot:value>
</slot>
</act:slots>
<act:parent type="new">e1bf896bb23a38b84eb16d3e3a1f09bc</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
@ -972,6 +1237,18 @@
<act:code>2620</act:code>
<act:parent type="new">9f327a18d3aa95242c78eb36d9ae95d0</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>2680 Valūtas konvertācijas konts</act:name>
<act:id type="new">8d3effc83d7a78a7068424652081fe3c</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>2680 Valūtas konvertācijas konts</act:code>
<act:parent type="new">9f327a18d3aa95242c78eb36d9ae95d0</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>2.1 Krājumi</act:name>
<act:id type="new">68f6b8855f8df3cda8a9068b78fcc276</act:id>
@ -983,14 +1260,14 @@
<act:commodity-scu>100</act:commodity-scu>
<act:code>2.1</act:code>
<act:slots>
<slot>
<slot:key>tax-related</slot:key>
<slot:value type="integer">1</slot:value>
</slot>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
<slot>
<slot:key>tax-related</slot:key>
<slot:value type="integer">1</slot:value>
</slot>
</act:slots>
<act:parent type="new">fb4aa78c11eb5a3fccb5f29307eb916c</act:parent>
</gnc:account>
@ -1028,12 +1305,6 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>2.4. </act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
<act:parent type="new">fb4aa78c11eb5a3fccb5f29307eb916c</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
@ -1105,12 +1376,6 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>8.6.</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
<act:parent type="new">d46cf499346c8af7d669b92a49ecd710</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
@ -1135,12 +1400,6 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>8.8.</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
<act:parent type="new">d46cf499346c8af7d669b92a49ecd710</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
@ -1156,7 +1415,7 @@
<act:parent type="new">eb4c860bcbfd5fd03228bc14c7369fcc</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>8.2. Dažādi izdevumi</act:name>
<act:name>8.2 Dažādi izdevumi</act:name>
<act:id type="new">8bb800a4801a59e337b19ebe59c2e731</act:id>
<act:type>INCOME</act:type>
<act:commodity>
@ -1164,13 +1423,7 @@
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>8.2.</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
<act:code>8.2</act:code>
<act:parent type="new">d46cf499346c8af7d669b92a49ecd710</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
@ -1185,6 +1438,66 @@
<act:code>8220</act:code>
<act:parent type="new">8bb800a4801a59e337b19ebe59c2e731</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>8270 Valūtu konvertēšanas izdevumi</act:name>
<act:id type="new">daa05eee07731acc4a02239977b8f44d</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>8270</act:code>
<act:parent type="new">8bb800a4801a59e337b19ebe59c2e731</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>8260 Izdevumi par reprezentācijas materiāliem</act:name>
<act:id type="new">d3bb819d57a311cfe44e4facd6207858</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>8260</act:code>
<act:parent type="new">8bb800a4801a59e337b19ebe59c2e731</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>8290 Nesaimnieciskie izdevumi par auto</act:name>
<act:id type="new">e12b68d1370688ec1bdc72b987c082d1</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>8290</act:code>
<act:parent type="new">8bb800a4801a59e337b19ebe59c2e731</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>8250 Samaksātās soda naudas un līgumsodi</act:name>
<act:id type="new">c5ead1b245f28cf443a6ec0508f8f345</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>8250</act:code>
<act:parent type="new">8bb800a4801a59e337b19ebe59c2e731</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>8291 Citi izdevumi</act:name>
<act:id type="new">a699ae93642dd0445d5b9d69e914763b</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>8291</act:code>
<act:parent type="new">8bb800a4801a59e337b19ebe59c2e731</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>4. Uzkrājumi</act:name>
<act:id type="new">0cceaa8a8ffb8ebbd73506bd64437daf</act:id>
@ -1194,13 +1507,7 @@
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4.</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
<act:code>4.3.</act:code>
<act:parent type="new">f1d190ad7b90d92a692014bbf7e281a2</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
@ -1213,12 +1520,6 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4.3.</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
<act:parent type="new">0cceaa8a8ffb8ebbd73506bd64437daf</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
@ -1230,9 +1531,20 @@
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4310</act:code>
<act:code>Citi uzkrājumi</act:code>
<act:parent type="new">83bc52b49a1c0a03a7ff68ecf853aaeb</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Imbalance-EUR</act:name>
<act:id type="new">0cfec028cb836cdfbb496f493a0a845d</act:id>
<act:type>BANK</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:parent type="new">f1d190ad7b90d92a692014bbf7e281a2</act:parent>
</gnc:account>
</gnc-account-example>
<!-- Local variables: -->

8
accounts/zh_HK/Makefile.am Normal file
View File

@ -0,0 +1,8 @@
accountdir = ${GNC_ACCOUNTS_DIR}/zh_HK
account_DATA = \
acctchrt_business.gnucash-xea
EXTRA_DIST = \
${account_DATA}

8
accounts/zh_TW/Makefile.am Normal file
View File

@ -0,0 +1,8 @@
accountdir = ${GNC_ACCOUNTS_DIR}/zh_TW
account_DATA = \
acctchrt_business.gnucash-xea
EXTRA_DIST = \
${account_DATA}

8
configure.ac
View File

@ -93,7 +93,7 @@ AC_DEFINE_UNQUOTED(GNUCASH_LATEST_STABLE_SERIES, "$GNUCASH_LATEST_STABLE_SERIES"
[Most recent stable GnuCash series])
dnl Set of available languages.
ALL_LINGUAS="ar bg brx ca cs da de doi el en_GB es_NI es eu fa fi fr he hu it ja ko kok kok@latin lt lv nb ne nl pl pt_BR pt ro ru rw sk sv ta tr uk vi zh_CN zh_TW"
ALL_LINGUAS="ar bg brx ca cs da de doi el en_GB es_NI es eu fa fi fr he hi hu it ja ko kok ks lt lv mr nb ne nl pl pt_BR pt ro ru rw sk sv ta te tr uk ur vi zh_CN zh_TW"
GETTEXT_PACKAGE=gnucash
AC_SUBST(GETTEXT_PACKAGE)
@ -1428,16 +1428,20 @@ AC_CONFIG_FILES(
accounts/ja/Makefile
accounts/ko/Makefile
accounts/lv/Makefile
accounts/nl/Makefile
accounts/nb/Makefile
accounts/nl/Makefile
accounts/pl/Makefile
accounts/pt_BR/Makefile
accounts/pt_PT/Makefile
accounts/ru/Makefile
accounts/sk/Makefile
accounts/sv_AX/Makefile
accounts/sv_FI/Makefile
accounts/sv_SE/Makefile
accounts/tr_TR/Makefile
accounts/zh_CN/Makefile
accounts/zh_HK/Makefile
accounts/zh_TW/Makefile
checks/Makefile
doc/Makefile
doc/examples/Makefile

40863
po/brx.po
View File

File diff suppressed because it is too large Load Diff

34867
po/hi.po Normal file
View File

File diff suppressed because it is too large Load Diff

35895
po/kok.po
View File

File diff suppressed because it is too large Load Diff

22226
po/kok@latin.po
View File

File diff suppressed because it is too large Load Diff

35655
po/ks.po Executable file
View File

File diff suppressed because it is too large Load Diff

17029
po/lv.po
View File

File diff suppressed because it is too large Load Diff

34883
po/mr.po Executable file
View File

File diff suppressed because it is too large Load Diff

40899
po/ta.po
View File

File diff suppressed because it is too large Load Diff

34652
po/te.po Executable file
View File

File diff suppressed because it is too large Load Diff

37742
po/ur.po Executable file
View File

File diff suppressed because it is too large Load Diff

6
src/backend/sql/gnc-book-sql.c
View File

@ -178,10 +178,14 @@ load_all_books( GncSqlBackend* be )
{
GncSqlRow* row = gnc_sql_result_get_first_row( result );
// If there are no rows, try committing the book
/* If there are no rows, try committing the book; unset
* loading so that it will actually get saved.
*/
if ( row == NULL )
{
be->loading = FALSE;
(void)gnc_sql_save_book( be, QOF_INSTANCE(be->book) );
be->loading = TRUE;
}
else
{

1
src/engine/Account.c
View File

@ -1104,6 +1104,7 @@ gnc_account_create_root (QofBook *book)
xaccAccountBeginEdit(root);
rpriv->type = ACCT_TYPE_ROOT;
CACHE_REPLACE(rpriv->accountName, "Root Account");
mark_account (root);
xaccAccountCommitEdit(root);
gnc_book_set_root_account(book, root);
return root;

1
src/engine/SX-book.c
View File

@ -118,6 +118,7 @@ sxtg_book_begin (QofBook *book)
xaccAccountBeginEdit(root);
xaccAccountSetType(root, ACCT_TYPE_ROOT);
xaccAccountSetName(root, "Template Root");
qof_instance_set_dirty (QOF_INSTANCE (root));
xaccAccountCommitEdit(root);
gnc_book_set_template_root (book, root);
}

16
src/gnome/dialog-sx-editor.c
View File

@ -1254,6 +1254,7 @@ void
schedXact_editor_create_freq_sel( GncSxEditorDialog *sxed )
{
GtkBox *b;
GtkWidget *example_cal_scrolled_win = NULL;
b = GTK_BOX(gtk_builder_get_object (sxed->builder, "gncfreq_hbox"));
@ -1264,16 +1265,25 @@ schedXact_editor_create_freq_sel( GncSxEditorDialog *sxed )
g_signal_connect( sxed->gncfreq, "changed",
G_CALLBACK(gnc_sxed_freq_changed),
sxed );
gtk_container_add( GTK_CONTAINER(b), GTK_WIDGET(sxed->gncfreq) );
gtk_box_pack_start(GTK_BOX(b), GTK_WIDGET(sxed->gncfreq), TRUE, TRUE, 0);
b = GTK_BOX(gtk_builder_get_object (sxed->builder, "example_cal_hbox" ));
example_cal_scrolled_win = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(example_cal_scrolled_win),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(b), example_cal_scrolled_win, TRUE, TRUE, 0);
sxed->dense_cal_model = gnc_dense_cal_store_new(EX_CAL_NUM_MONTHS * 31);
sxed->example_cal = GNC_DENSE_CAL(gnc_dense_cal_new_with_model(GNC_DENSE_CAL_MODEL(sxed->dense_cal_model)));
g_assert(sxed->example_cal);
gnc_dense_cal_set_num_months( sxed->example_cal, EX_CAL_NUM_MONTHS );
gnc_dense_cal_set_months_per_col( sxed->example_cal, EX_CAL_MO_PER_COL );
gtk_container_add( GTK_CONTAINER(b), GTK_WIDGET(sxed->example_cal) );
gtk_widget_show( GTK_WIDGET(sxed->example_cal) );
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(example_cal_scrolled_win),
GTK_WIDGET(sxed->example_cal));
gtk_widget_show_all( example_cal_scrolled_win );
}

2
src/gnome/gtkbuilder/dialog-sx.glade
View File

@ -1085,7 +1085,7 @@
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>

71
src/import-export/csv-imp/assistant-csv-trans-import.c
View File

@ -75,8 +75,9 @@ typedef struct
GtkWidget *check_butt; /**< The widget for the check label button */
GtkWidget *start_row_spin; /**< The widget for the start row spinner */
GtkWidget *end_row_spin; /**< The widget for the end row spinner */
int start_row; /**< The start row */
int end_row; /**< The end row */
GtkWidget *skip_rows; /**< The widget for Skip alternate rows from start row */
int start_row; /**< The liststore start row, smallest is 0 */
int end_row; /**< The liststore end row, max number of rows -1 */
GncCsvParseData *parse_data; /**< The actual data we are previewing */
GOCharmapSel *encselector; /**< The widget for selecting the encoding */
@ -141,9 +142,10 @@ void csv_import_trans_assistant_match_page_prepare (GtkAssistant *assistant, gpo
void csv_import_trans_assistant_finish_page_prepare (GtkAssistant *assistant, gpointer user_data);
void csv_import_trans_assistant_summary_page_prepare (GtkAssistant *assistant, gpointer user_data);
void csv_import_trans_srow_cb (GtkWidget *spin, gpointer user_data );
void csv_import_trans_erow_cb (GtkWidget *spin, gpointer user_data );
void csv_import_trans_auto_cb (GtkWidget *cb, gpointer user_data );
void csv_import_trans_srow_cb (GtkWidget *spin, gpointer user_data);
void csv_import_trans_erow_cb (GtkWidget *spin, gpointer user_data);
void csv_import_trans_skiprows_cb (GtkWidget *checkbox, gpointer user_data);
void csv_import_trans_auto_cb (GtkWidget *cb, gpointer user_data);
void csv_import_trans_file_chooser_confirm_cb (GtkWidget *button, CsvImportTrans *info);
static void gnc_csv_preview_update_assist (CsvImportTrans* info);
@ -235,22 +237,23 @@ void row_selection_update (CsvImportTrans* info)
GtkListStore *store;
GtkTreeIter iter;
gboolean valid;
int i;
int i = 0;
store = GTK_LIST_STORE(gtk_tree_view_get_model (info->treeview));
/* Start of file */
for ( i = 0; i <= info->start_row; i++)
{
/* Modify background color of rows less than start row */
if (info->start_row == i)
{
valid = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(store), &iter, NULL, i );
valid = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(store), &iter, NULL, i);
if (valid)
gtk_list_store_set (store, &iter, 0, NULL, -1);
}
else
{
valid = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(store), &iter, NULL, i );
valid = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(store), &iter, NULL, i);
if (valid)
gtk_list_store_set (store, &iter, 0, "pink", -1);
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
@ -260,6 +263,7 @@ void row_selection_update (CsvImportTrans* info)
}
/* End of File */
for ( i = info->num_of_rows - 1; i >= info->end_row; i--)
{
/* Modify background color of rows more than end row */
@ -279,6 +283,26 @@ void row_selection_update (CsvImportTrans* info)
gtk_list_store_set (store, &iter, 0, NULL, -1);
}
}
/* Remove background color from the start row to end row */
for ( i = info->start_row + 1; i <= info->end_row; i++)
{
valid = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(store), &iter, NULL, i);
if (valid)
gtk_list_store_set (store, &iter, 0, NULL, -1);
}
/* Skip rows */
if (info->parse_data->skip_rows == TRUE)
{
for ( i = info->start_row + 1; i <= info->end_row; i = i + 2)
{
/* Modify background color of alternate rows from the start row */
valid = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(store), &iter, NULL, i);
if (valid)
gtk_list_store_set (store, &iter, 0, "pink", -1);
}
}
}
@ -298,7 +322,7 @@ void csv_import_trans_srow_cb (GtkWidget *spin, gpointer user_data)
info->parse_data->start_row = info->start_row;
adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON(info->end_row_spin));
gtk_adjustment_set_lower (adj, info->start_row + 1 );
gtk_adjustment_set_lower (adj, info->start_row + 1);
/* Refresh the row highlighting */
row_selection_update (info);
@ -321,7 +345,7 @@ void csv_import_trans_erow_cb (GtkWidget *spin, gpointer user_data)
info->parse_data->end_row = info->end_row + 1;
adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON(info->start_row_spin));
gtk_adjustment_set_upper (adj, info->end_row + 1 );
gtk_adjustment_set_upper (adj, info->end_row + 1);
/* Refresh the row highlighting */
row_selection_update (info);
@ -354,6 +378,23 @@ void csv_import_trans_auto_cb (GtkWidget *cb, gpointer user_data)
}
/*******************************************************
* csv_import_trans_skiprows_cb
*
* call back for import skip rows checkbox
*******************************************************/
void csv_import_trans_skiprows_cb (GtkWidget *checkbox, gpointer user_data)
{
CsvImportTrans *info = user_data;
/* Set the skip_rows variable */
info->parse_data->skip_rows = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(checkbox));
/* Refresh the row highlighting */
row_selection_update (info);
}
/** Returns the cell renderer from a column in the preview's treeview.
* @param info The display of the data being imported
* @param col The number of the column whose cell renderer is being retrieved
@ -975,7 +1016,7 @@ gboolean preview_settings_valid (CsvImportTrans* info)
gtk_tree_model_get_iter_first (store, &iter);
/* Get an iterator for the first required row in the data store. */
gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(datastore), &iter2, NULL, info->start_row );
gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(datastore), &iter2, NULL, info->start_row);
/* Go through each of the columns. */
for (i = 0; i < ncols; i++)
@ -1262,7 +1303,6 @@ static void gnc_csv_preview_update_assist (CsvImportTrans* info)
static
void load_settings (CsvImportTrans *info)
{
info->start_row = 0;
info->start_row = 0;
info->account_page_step = TRUE;
info->match_parse_run = FALSE;
@ -1340,6 +1380,8 @@ csv_import_trans_assistant_preview_page_prepare (GtkAssistant *assistant,
/* Set spin buttons not sensative */
gtk_widget_set_sensitive (info->start_row_spin, FALSE);
gtk_widget_set_sensitive (info->end_row_spin, FALSE);
gtk_widget_set_sensitive (info->skip_rows, FALSE);
info->parse_data->skip_rows = FALSE;
/* Set check button label */
gtk_label_set_text (GTK_LABEL(info->check_label), _("Skip Errors"));
@ -1357,6 +1399,10 @@ csv_import_trans_assistant_preview_page_prepare (GtkAssistant *assistant,
gtk_spin_button_set_value (GTK_SPIN_BUTTON(info->end_row_spin), info->num_of_rows);
}
/* Set start row */
adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON(info->start_row_spin));
gtk_spin_button_set_value (GTK_SPIN_BUTTON(info->start_row_spin), 1);
/* Update the row selection highlight */
row_selection_update (info);
}
@ -1706,6 +1752,7 @@ csv_import_trans_assistant_create (CsvImportTrans *info)
info->start_row_spin = GTK_WIDGET(gtk_builder_get_object (builder, "start_row"));
info->end_row_spin = GTK_WIDGET(gtk_builder_get_object (builder, "end_row"));
info->skip_rows = GTK_WIDGET(gtk_builder_get_object (builder, "skip_rows"));
info->check_label = GTK_WIDGET(gtk_builder_get_object (builder, "check_label"));
info->check_butt = GTK_WIDGET(gtk_builder_get_object (builder, "check_butt"));

27
src/import-export/csv-imp/assistant-csv-trans-import.glade
View File

@ -22,7 +22,7 @@ All transactions imported will be associated to one account for each import and
Various options exist for specifying the delimiter as well as a fixed width option. With the fixed width option, double click on the bar above the displayed rows to set the column width.
There is an option for specifying the start and end row which can be used if you have some header text or multiple accounts in the same file.</property>
There is an option for specifying the start row, end row and an option to skip alternate rows begining from the start row. These can be used if you have some header text, a points collected status row or multiple accounts in the same file.</property>
<property name="wrap">True</property>
</object>
<packing>
@ -151,6 +151,21 @@ Select location and file name for the Import, then click 'OK'...
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="skip_rows">
<property name="label" translatable="yes">Skip alternate rows from the start row</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="csv_import_trans_skiprows_cb" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHSeparator" id="hseparator7">
<property name="visible">True</property>
@ -160,7 +175,7 @@ Select location and file name for the Import, then click 'OK'...
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">8</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
<child>
@ -219,7 +234,7 @@ Select location and file name for the Import, then click 'OK'...
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="position">3</property>
</packing>
</child>
<child>
@ -232,7 +247,7 @@ Select location and file name for the Import, then click 'OK'...
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">10</property>
<property name="position">3</property>
<property name="position">4</property>
</packing>
</child>
<child>
@ -308,7 +323,7 @@ Select location and file name for the Import, then click 'OK'...
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">4</property>
<property name="position">5</property>
</packing>
</child>
<child>
@ -321,7 +336,7 @@ Select location and file name for the Import, then click 'OK'...
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">10</property>
<property name="position">5</property>
<property name="position">6</property>
</packing>
</child>
</object>

6
src/import-export/csv-imp/gnc-csv-model.c
View File

@ -340,6 +340,7 @@ GncCsvParseData* gnc_csv_new_parse_data (void)
parse_data->chunk = g_string_chunk_new(100 * 1024);
parse_data->start_row = 0;
parse_data->end_row = 1000;
parse_data->skip_rows = FALSE;
return parse_data;
}
@ -1077,7 +1078,7 @@ int gnc_csv_parse_to_trans (GncCsvParseData* parse_data, Account* account,
/* This flag is TRUE if there are any errors in this row. */
gboolean errors = FALSE;
gchar* error_message = NULL;
TransPropertyList* list = trans_property_list_new (account, parse_data->date_format, parse_data->currency_format );
TransPropertyList* list = trans_property_list_new (account, parse_data->date_format, parse_data->currency_format);
GncCsvTransLine* trans_line = NULL;
for (j = 0; j < line->len; j++)
@ -1184,7 +1185,10 @@ int gnc_csv_parse_to_trans (GncCsvParseData* parse_data, Account* account,
}
else
{
if (parse_data->skip_rows == FALSE)
i++;
else
i = i + 2;
}
}

1
src/import-export/csv-imp/gnc-csv-model.h
View File

@ -115,6 +115,7 @@ typedef struct
int date_format; /**< The format of the text in the date columns from date_format_internal. */
int start_row; /**< The start row to generate transactions from. */
int end_row; /**< The end row to generate transactions from. */
gboolean skip_rows; /**< Skip Alternate Rows from start row. */
int currency_format; /**< The currency format, 0 for locale, 1 for comma dec and 2 for period */
} GncCsvParseData;