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
This commit is contained in:
Geert Janssens
2020-01-17 18:35:30 +01:00
parent 6b7ef46d6a 073e47801d
commit 490b20d2da
64 changed files with 196 additions and 3523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libgnucash/engine/Account.cpp
View File

@@ -2284,18 +2284,6 @@ xaccAccountOrder (const Account *aa, const Account *ab)
da = priv_aa->accountCode;
db = priv_ab->accountCode;
/* If accountCodes are both base 36 integers do an integer sort */
la = strtoul (da, &endptr, 36);
if ((*da != '\0') && (*endptr == '\0'))
{
lb = strtoul (db, &endptr, 36);
if ((*db != '\0') && (*endptr == '\0'))
{
if (la < lb) return -1;
if (la > lb) return +1;
}
}
/* Otherwise do a string sort */
result = g_strcmp0 (da, db);
if (result)

2
libgnucash/engine/gncAddress.h
View File

@@ -55,9 +55,7 @@ up to you to pass a suitable entity.
#define GNC_ADDRESS_H_
#include "qof.h"
#ifdef GNUCASH_MAJOR_VERSION
#include "gncBusiness.h"
#endif
#define GNC_ADDRESS_MODULE_NAME "gncAddress"
#define GNC_ID_ADDRESS GNC_ADDRESS_MODULE_NAME

3
libgnucash/engine/gncBillTerm.h
View File

@@ -35,9 +35,8 @@ typedef struct _gncBillTerm GncBillTerm;
typedef struct _gncBillTermClass GncBillTermClass;
#include "qof.h"
#ifdef GNUCASH_MAJOR_VERSION
#include "gncBusiness.h"
#endif
#define GNC_ID_BILLTERM "gncBillTerm"
/* --- type macros --- */

2
libgnucash/engine/gncCustomer.c
View File

@@ -37,9 +37,7 @@
#include "gncAddressP.h"
#include "gncBillTermP.h"
#include "gncInvoice.h"
#ifdef GNUCASH_MAJOR_VERSION
#include "gncBusiness.h"
#endif
#include "gncCustomer.h"
#include "gncCustomerP.h"

2
libgnucash/engine/gncEntry.h
View File

@@ -49,9 +49,7 @@ typedef enum
typedef GList AccountValueList;
#ifdef GNUCASH_MAJOR_VERSION
#include "gncBusiness.h"
#endif
#include "gncInvoice.h"
#include "gncOrder.h"
#include "gncTaxTable.h"

6
libgnucash/engine/gncJob.c
View File

@@ -576,11 +576,7 @@ gboolean gncJobRegister (void)
{ JOB_ACTIVE, QOF_TYPE_BOOLEAN, (QofAccessFunc)gncJobGetActive, (QofSetterFunc)gncJobSetActive },
{ JOB_REFERENCE, QOF_TYPE_STRING, (QofAccessFunc)gncJobGetReference, (QofSetterFunc)gncJobSetReference },
{ JOB_RATE, QOF_TYPE_NUMERIC, (QofAccessFunc)gncJobGetRate, (QofSetterFunc)gncJobSetRate },
#ifdef GNUCASH_MAJOR_VERSION
{ JOB_OWNER, GNC_ID_OWNER, (QofAccessFunc)gncJobGetOwner, NULL },
#else
{ JOB_OWNER, QOF_TYPE_CHOICE, (QofAccessFunc)qofJobGetOwner, (QofSetterFunc)qofJobSetOwner },
#endif
{ QOF_PARAM_ACTIVE, QOF_TYPE_BOOLEAN, (QofAccessFunc)gncJobGetActive, NULL },
{ QOF_PARAM_BOOK, QOF_ID_BOOK, (QofAccessFunc)qof_instance_get_book, NULL },
{ QOF_PARAM_GUID, QOF_TYPE_GUID, (QofAccessFunc)qof_instance_get_guid, NULL },
@@ -597,10 +593,8 @@ gboolean gncJobRegister (void)
}
qof_class_register (_GNC_MOD_NAME, (QofSortFunc)gncJobCompare, params);
#ifdef GNUCASH_MAJOR_VERSION
qofJobGetOwner(NULL);
qofJobSetOwner(NULL, NULL);
#endif
return qof_object_register (&gncJobDesc);
}

2
libgnucash/engine/qof-backend.cpp
View File

@@ -109,7 +109,7 @@ QofBackend::register_backend(const char* directory, const char* module_name)
g_free (fullpath);
if (!backend)
{
PINFO ("%s: %s\n", PACKAGE, g_module_error ());
PINFO ("%s: %s\n", PROJECT_NAME, g_module_error ());
return false;
}
void (*module_init_func)(void);