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 Keve Mueller's 'xea-fixes' into maint

Browse Source
This commit is contained in:
John Ralls 2018-06-03 10:26:52 -07:00
commit eb67baba5b
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -12,13 +12,13 @@ enable_testing()
# Version number of gnucash # Version number of gnucash
set (GNUCASH_MAJOR_VERSION 3) set (GNUCASH_MAJOR_VERSION 3)
set (GNUCASH_MINOR_VERSION 1) set (GNUCASH_MINOR_VERSION 900)
set (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}") set (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}")
set (GNUCASH_LATEST_STABLE_SERIES 3.x) set (GNUCASH_LATEST_STABLE_SERIES 3.x)
set (PACKAGE gnucash) set (PACKAGE gnucash)
set (PACKAGE_NAME GnuCash) set (PACKAGE_NAME GnuCash)
set (PACKAGE_VERSION 3.1) set (PACKAGE_VERSION 3.900)
set (PACKAGE_BUGREPORT gnucash-devel@gnucash.org) set (PACKAGE_BUGREPORT gnucash-devel@gnucash.org)
set (PACKAGE_TARNAME ${PACKAGE}) set (PACKAGE_TARNAME ${PACKAGE})
set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")

2
data/accounts/ca/acctchrt_common.gnucash-xea
View File

@ -698,7 +698,7 @@
<act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent> <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Recollida de brossa</act:name>i <act:name>Recollida de brossa</act:name>
<act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id> <act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id>
<act:type>EXPENSE</act:type> <act:type>EXPENSE</act:type>
<act:commodity> <act:commodity>

2
data/accounts/en_GB/uk-vat.gnucash-xea
View File

@ -40,13 +40,13 @@
<gnc-act:long-description> <gnc-act:long-description>
A basic set of accounts for tracking VAT in the UK. A basic set of accounts for tracking VAT in the UK.
</gnc-act:long-description> </gnc-act:long-description>
<gnc-act:start-selected>0</gnc-act:start-selected>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Root Account</act:name> <act:name>Root Account</act:name>
<act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id> <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
<act:type>ROOT</act:type> <act:type>ROOT</act:type>
<act:commodity-scu>0</act:commodity-scu> <act:commodity-scu>0</act:commodity-scu>
</gnc:account> </gnc:account>
<gnc-act:start-selected>0</gnc-act:start-selected>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Bank Accounts</act:name> <act:name>Bank Accounts</act:name>
<act:id type="new">48a242bf9a2d8c947cb41d96493d91da</act:id> <act:id type="new">48a242bf9a2d8c947cb41d96493d91da</act:id>

6
data/accounts/ja/acctchrt_full.gnucash-xea
View File

@ -266,7 +266,7 @@
<cmdty:id>USD</cmdty:id> <cmdty:id>USD</cmdty:id>
</act:commodity> </act:commodity>
<act:description>個人年金</act:description> <act:description>個人年金</act:description>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent> <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
<act:slots> <act:slots>
<slot> <slot>
<slot:key>placeholder</slot:key> <slot:key>placeholder</slot:key>
@ -277,7 +277,6 @@
<slot:value type="string">確定拠出年金、退職金、IRA、401(k)など</slot:value> <slot:value type="string">確定拠出年金、退職金、IRA、401(k)など</slot:value>
</slot> </slot>
</act:slots> </act:slots>
<act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>債券</act:name> <act:name>債券</act:name>
@ -332,7 +331,7 @@
<cmdty:id>USD</cmdty:id> <cmdty:id>USD</cmdty:id>
</act:commodity> </act:commodity>
<act:description>配偶者個人年金</act:description> <act:description>配偶者個人年金</act:description>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent> <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
<act:slots> <act:slots>
<slot> <slot>
<slot:key>notes</slot:key> <slot:key>notes</slot:key>
@ -343,7 +342,6 @@
<slot:value type="string">true</slot:value> <slot:value type="string">true</slot:value>
</slot> </slot>
</act:slots> </act:slots>
<act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>債券</act:name> <act:name>債券</act:name>