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:
Christian Stimming
2015-04-22 22:40:48 +02:00
parent c46c0a9e79 e9b6ee74ad
commit ea38f2b8e6
7 changed files with 67 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -114,6 +114,11 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
# ############################################################
# xsltproc
FIND_PROGRAM (XSLTPROC xsltproc)
# ############################################################
# libdbi
FIND_PATH (LIBDBI_INCLUDE_PATH dbi/dbi.h)
FIND_LIBRARY (LIBDBI_LIBRARY dbi)

90
src/business/business-gnome/gtkbuilder/business-prefs.glade
View File

@@ -2,6 +2,13 @@
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkAdjustment" id="days_in_adj">
<property name="lower">1</property>
<property name="upper">180</property>
<property name="value">7</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="liststore_printinvoice">
<columns>
<!-- column-name item -->
@@ -37,36 +44,6 @@
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="label53">
<property name="visible">True</property>
@@ -143,9 +120,6 @@
<property name="y_options"/>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
@@ -215,6 +189,9 @@
<property name="y_options"/>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkCheckButton" id="pref/dialogs.business.invoice/tax-included">
<property name="label" translatable="yes">_Tax included</property>
@@ -340,9 +317,6 @@
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
@@ -358,33 +332,9 @@
<property name="y_options"/>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkCheckButton" id="pref/dialogs.business.invoice/auto-pay">
<property name="label" translatable="yes">Auto pay on post_ing</property>
<property name="label" translatable="yes" comments="See the tooltip &quot;At post time...&quot; for details.">_Process payments on posting</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -400,18 +350,9 @@
<property name="x_padding">12</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkCheckButton" id="pref/dialogs.business.bill/auto-pay">
<property name="label" translatable="yes">Auto _pay on posting</property>
<property name="label" translatable="yes" comments="See the tooltip &quot;At post time...&quot; for details.">Pro_cess payments on posting</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -430,11 +371,4 @@
</object>
</child>
</object>
<object class="GtkAdjustment" id="days_in_adj">
<property name="lower">1</property>
<property name="upper">180</property>
<property name="value">7</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
</interface>

4
src/engine/CMakeLists.txt
View File

@@ -76,9 +76,9 @@ GNC_ADD_SWIG_COMMAND (${SWIG_ENGINE_C} ${CMAKE_CURRENT_SOURCE_DIR}/engine.i ${li
SET (ISO_4217_C ${CMAKE_CURRENT_BINARY_DIR}/iso-4217-currencies.c)
ADD_CUSTOM_COMMAND (
OUTPUT ${ISO_4217_C}
DEPENDS iso-4217-currencies.scm iso-currencies-to-c.in
DEPENDS iso-4217-currencies.xml iso-currencies-to-c.xsl
COMMAND
${GUILE_EXECUTABLE} -s "${CMAKE_CURRENT_SOURCE_DIR}/iso-currencies-to-c.in" "${CMAKE_CURRENT_SOURCE_DIR}"
${XSLTPROC} -o ${ISO_4217_C} "${CMAKE_CURRENT_SOURCE_DIR}/iso-currencies-to-c.xsl" "${CMAKE_CURRENT_SOURCE_DIR}/iso-4217-currencies.xml"
)
# Add dependency on iso-4217-currencies.c
SET_SOURCE_FILES_PROPERTIES (gnc-commodity.c PROPERTIES OBJECT_DEPENDS ${ISO_4217_C})

4
src/report/standard-reports/general-journal.scm
View File

@@ -105,7 +105,9 @@
;; One list per option here with: option-name, default-value
(list
(list (N_ "Date") #t)
(list (N_ "Num") #f)
(if (qof-book-use-split-action-for-num-field (gnc-get-current-book))
(list (N_ "Num/Action") #f)
(list (N_ "Num") #f))
(list (N_ "Description") #t)
(list (N_ "Account") #t)
(list (N_ "Shares") #f)

63
src/report/standard-reports/general-ledger.scm
View File

@@ -71,27 +71,50 @@
(lambda (l)
(set-option! gnc:pagename-display (car l) (cadr l)))
;; One list per option here with: option-name, default-value
(list
(list (N_ "Date") #t)
(list (N_ "Reconciled Date") #f)
(list (N_ "Num") #f)
(list (N_ "Description") #t)
(list (N_ "Memo") #f)
(list (N_ "Account Name") #f)
(list (N_ "Use Full Account Name") #f)
(list (N_ "Account Code") #f)
(list (N_ "Other Account Name") #f)
(list (N_ "Use Full Other Account Name") #f)
(list (N_ "Other Account Code") #f)
(list (N_ "Shares") #f)
(list (N_ "Price") #f)
;; note the "Amount" multichoice option here
(list (N_ "Amount") 'double)
(list (N_ "Running Balance") #t)
(list (N_ "Totals") #f)
(list (N_ "Sign Reverses") 'credit-accounts)
)
(if (qof-book-use-split-action-for-num-field (gnc-get-current-book))
(list
(list (N_ "Date") #t)
(list (N_ "Reconciled Date") #f)
(list (N_ "Num/Action") #f)
(list (N_ "Trans Number") #f)
(list (N_ "Description") #t)
(list (N_ "Memo") #f)
(list (N_ "Account Name") #f)
(list (N_ "Use Full Account Name") #f)
(list (N_ "Account Code") #f)
(list (N_ "Other Account Name") #f)
(list (N_ "Use Full Other Account Name") #f)
(list (N_ "Other Account Code") #f)
(list (N_ "Shares") #f)
(list (N_ "Price") #f)
;; note the "Amount" multichoice option here
(list (N_ "Amount") 'double)
(list (N_ "Running Balance") #t)
(list (N_ "Totals") #f)
(list (N_ "Sign Reverses") 'credit-accounts)
)
(list
(list (N_ "Date") #t)
(list (N_ "Reconciled Date") #f)
(list (N_ "Num") #f)
(list (N_ "Description") #t)
(list (N_ "Memo") #f)
(list (N_ "Account Name") #f)
(list (N_ "Use Full Account Name") #f)
(list (N_ "Account Code") #f)
(list (N_ "Other Account Name") #f)
(list (N_ "Use Full Other Account Name") #f)
(list (N_ "Other Account Code") #f)
(list (N_ "Shares") #f)
(list (N_ "Price") #f)
;; note the "Amount" multichoice option here
(list (N_ "Amount") 'double)
(list (N_ "Running Balance") #t)
(list (N_ "Totals") #f)
(list (N_ "Sign Reverses") 'credit-accounts)
)
)
)
;; set options in the general tab...
(set-option!

1
src/tax/us/txf-help-de_DE.scm
View File

@@ -12,6 +12,7 @@
;;
;; This file holds the explanations to the categories from txf-de_DE.scm.
;;
;; Changes in this file should also be applied on gnucash-docs/help/de/Help_txf-categories.xml
(define txf-help-strings
'(

1
src/tax/us/txf-help.scm
View File

@@ -6,6 +6,7 @@
;;
;; (n <- TurboTax (N <- IRS
;;
;; Changes in this file should also be applied on gnucash-docs/help/C/Help_txf-categories.xml
(define txf-help-strings
'(