gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/b7eb9bcb (commit)
	 via  https://github.com/Gnucash/gnucash/commit/43a9f8df (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5f534161 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7c605043 (commit)
	from  https://github.com/Gnucash/gnucash/commit/464d1d23 (commit)



commit b7eb9bcb47c0dd2acbae13aaf42184638c8dad70
Merge: 43a9f8df5 7c605043c
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Feb 6 12:31:52 2023 -0800

    Merge Ralf Habacker's 'fix-798732' into master.


commit 43a9f8df5eed528d63ff52375886793c934bb44e
Merge: 464d1d237 5f534161a
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Feb 6 12:27:53 2023 -0800

    Merge Richard Cohen's 'allow-c-declaration-after-statement' into master.


commit 5f534161a12a9eaafc0621fec23eb2da77ec643e
Author: Richard Cohen <richard at daijobu.co.uk>
Date:   Mon Feb 6 12:44:43 2023 +0000

    Allow C declarations after statements
    
    Good for declaring variables at point of use

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e711a069b..4dbdc2dc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -587,14 +587,14 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_EXTENSIONS ON)
 
 if (UNIX)
-  set( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
+  set( CMAKE_C_FLAGS "-Werror -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
   set( CMAKE_C_FLAGS "-Wno-error=deprecated-declarations -Wno-error=parentheses ${CMAKE_C_FLAGS}")
   set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
   set( CMAKE_CXX_FLAGS "-Wno-error=deprecated-declarations ${REGISTER_CXXFLAG} ${CMAKE_CXX_FLAGS}")
   set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
 endif()
 if (MINGW)
-  set( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations  -Wno-unused -Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
+  set( CMAKE_C_FLAGS "-Werror -Wno-pointer-sign -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations  -Wno-unused -Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
   set( CMAKE_CXX_FLAGS "-DWINVER=0x0500 -D_EMULATE_GLIBC=0 ${CMAKE_CXX_FLAGS}") # Workaround for bug in gtest on mingw, see https://github.com/google/googletest/issues/893 and https://github.com/google/googletest/issues/920
 endif()
 

commit 7c605043c3d300be29bb4b9b2f010771fde47c36
Author: Ralf Habacker <ralf.habacker at freenet.de>
Date:   Tue Jan 24 11:00:16 2023 +0100

    Bug 798732: Type of balance carry forward accounts for german skr49 account template fixed
    
    The accounts listed are of the EQUITY type and not ASSET.

diff --git a/data/accounts/de_DE/acctchrt_skr49.gnucash-xea b/data/accounts/de_DE/acctchrt_skr49.gnucash-xea
index 59077c9a1..a255c1361 100644
--- a/data/accounts/de_DE/acctchrt_skr49.gnucash-xea
+++ b/data/accounts/de_DE/acctchrt_skr49.gnucash-xea
@@ -14290,7 +14290,7 @@ Den Bereich habe ich mit „9999“ bezeichet, damit er unterhalb der regulären
 <gnc:account version="2.0.0">
   <act:name>9000 Saldenvorträge Sachkonten</act:name>
   <act:id type="new">597b9a70754011ac40c2a5a55eed5292</act:id>
-  <act:type>ASSET</act:type>
+  <act:type>EQUITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
@@ -14315,7 +14315,7 @@ Den Bereich habe ich mit „9999“ bezeichet, damit er unterhalb der regulären
 <gnc:account version="2.0.0">
   <act:name>9001-9007 Saldenvorträge, Sachkonten</act:name>
   <act:id type="new">c7d8aaca5031405857793ef2c808290b</act:id>
-  <act:type>ASSET</act:type>
+  <act:type>EQUITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
@@ -14334,7 +14334,7 @@ Den Bereich habe ich mit „9999“ bezeichet, damit er unterhalb der regulären
 <gnc:account version="2.0.0">
   <act:name>9008 Saldenvorträge Debitoren</act:name>
   <act:id type="new">555217da6afbf698e623fc357eb86107</act:id>
-  <act:type>ASSET</act:type>
+  <act:type>EQUITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
@@ -14353,7 +14353,7 @@ Den Bereich habe ich mit „9999“ bezeichet, damit er unterhalb der regulären
 <gnc:account version="2.0.0">
   <act:name>9009 Saldenvorträge Kreditoren</act:name>
   <act:id type="new">4c6390004e3d8e69309135cee0745b23</act:id>
-  <act:type>ASSET</act:type>
+  <act:type>EQUITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>



Summary of changes:
 CMakeLists.txt                                 | 4 ++--
 data/accounts/de_DE/acctchrt_skr49.gnucash-xea | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)