Removed useless machine-generated po/ChangeLog, more doc updates,

and fixed ordering bug in transaction report.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4906 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,3 +1,10 @@
+2001-07-06  Robert Graham Merkel  <rgmerk@mira.net>
+
+	* src/scm/report/transaction.scm: Add new sort option "register
+	order", make it the default for secondary sorting.
+
+	* po/ChangeLog: removed from CVS.
+
 2001-07-06  Joshua Sled  <jsled@asynchronous.org>
 
 	* src/gnome/gnc-schedxaction-xml-v2.c: Support for new

doc/sgml/C/xacc-file-operations.sgml

@@ -11,7 +11,8 @@
 	are self-contained and can be moved, copied, and backed-up to tape, 
 	floppies, or any other medium you choose.
         They can be saved using any name, and any file extension you choose, but, traditionally
-      the developers and users have used the extension ".xac".
+      the developers and users have used the extension ".xac", or "gml2"
+	to distinguish the new XML format files from the old 1.4 binary file format.
       </para>
 
       <para>
@@ -87,13 +88,17 @@
     </sect1>
     <sect1 id="xacc-export-accounts">
       <title>
-	Exporting Accounts
+	Exporting Your account Hierachy
       </title>
+     
       <para>
-	FIXME: Need content!
+	If you wish for some reason, to create an empty file with the 
+	same account structure as a current one, you can do so by
+	selecting "Export accounts" from the File menu.
 	</para>
       <para>
-	This needs to describe how to use the export accounts feature.
+	This can be used as a basic way to close your accounts, 
+	if you wish.
       </para>
     </sect1>
 

po/ChangeLog

@@ -1,42 +0,0 @@
-2001-06-16  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.36.
-
-2001-06-14  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.36.
-
-2001-06-13  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.36.
-
-2001-06-10  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.36.
-
-2001-06-10  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.36.
-
-2001-06-10  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.36.
-
-2001-06-10  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.36.
-	* cat-id-tbl.c: Remove file.
-	* stamp-cat-id: Remove file.
-
-2001-06-04  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.38.
-
-2001-05-27  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.37.
-
-2001-04-17  gettextize  <bug-gnu-utils@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.10.36.
-

src/scm/report/transaction.scm

@@ -329,6 +329,7 @@
 (define (add-split-row table split column-vector
                        row-style account-types-to-reverse transaction-row?)
   (let* ((row-contents '())
+	 (dummy  (gnc:debug "split is originally" split))
          (parent (gnc:split-get-parent split))
          (account (gnc:split-get-account split))
          (account-type (gw:enum-<gnc:AccountType>-val->sym
@@ -400,15 +401,21 @@
                      "number-cell" (gnc:monetary-neg split-value)))
             (addto! row-contents " ")))
     (if (used-running-balance column-vector)
-        (addto! row-contents
+	(begin
-                (gnc:make-html-table-cell/markup
+	  (gnc:debug "split is " split)
-                 "number-cell"
+	  (gnc:debug "split get balance:" (gnc:split-get-balance split))
-                 (gnc:make-gnc-monetary currency
+	  (addto! row-contents
-                                        (gnc:split-get-balance split)))))
+		  (gnc:make-html-table-cell/markup
-    (gnc:html-table-append-row/markup! table row-style
+		   "number-cell"
+		   (gnc:make-gnc-monetary currency
+					  (gnc:split-get-balance split))))))
+	(gnc:html-table-append-row/markup! table row-style
                                        (reverse row-contents))
     split-value))
 
+
+(define date-sorting-types (list 'date 'exact-time 'register-order))
+
 (define (trep-options-generator)
   (define gnc:*transaction-report-options* (gnc:new-options))
   (define (gnc:register-trep-option new-option)
@@ -488,7 +495,10 @@
       
   ;; Sorting options
   
+
+      
   (let ((options gnc:*transaction-report-options*)
+
         (key-choice-list 
          (list (vector 'none
                        (N_ "None")
@@ -505,7 +515,9 @@
                (vector 'exact-time
                        (N_ "Exact Time")
                        (N_ "Sort by exact time"))
-               
+               (vector 'register-order
+		       (N_ "Register Order")
+		       (N_ "Sort as with the register"))
                (vector 'corresponding-acc-name 
                        (N_ "Other Account Name")
                        (N_ "Sort by account transferred from/to's name"))
@@ -558,7 +570,7 @@
          (and (member x subtotal-enabled) #t))
         (gnc:option-db-set-option-selectable-by-name
          options pagename-sorting optname-prime-date-subtotal
-         (if (member x (list 'exact-time 'date)) #t #f))))) 
+         (if (member x date-sorting-types) #t #f)))))
     
     (gnc:register-trep-option
      (gnc:make-simple-boolean-option
@@ -587,7 +599,7 @@
       pagename-sorting optname-sec-sortkey
       "f"
       (N_ "Sort by this criterion second")
-      'date
+      'register-order
       key-choice-list #f
       (lambda (x)
         (gnc:option-db-set-option-selectable-by-name
@@ -595,7 +607,7 @@
          (and (member x subtotal-enabled) #t))
         (gnc:option-db-set-option-selectable-by-name
          options pagename-sorting optname-sec-date-subtotal
-         (if (member x (list 'exact-time 'date )) #t #f)))))
+         (if (member x date-sorting-types) #t #f)))))
     
     (gnc:register-trep-option
      (gnc:make-simple-boolean-option
@@ -935,7 +947,13 @@ and Income accounts")))))
                                 render-account-code-subtotal))
           (cons 'exact-time          (vector 'by-date #f #f #f))
           (cons 'date          (vector
-                                'by-date-rounded #f #f #f))
+                                'by-date #f #f #f))
+	  (cons 'register-order 
+		 (vector
+		  'by-standard
+		  #f 
+		  #f 
+		  #f))
           (cons 'corresponding-acc-name
                 (vector 'by-corr-account-full-name 
                         split-same-corr-account-full-name-p 
@@ -968,7 +986,7 @@ and Income accounts")))))
            comp-index date-index)
     ;; The value of the sorting-key multichoice option.
     (let ((sortkey (opt-val pagename-sorting name-sortkey)))
-      (if (member sortkey (list 'date 'exact-time))
+      (if (member sortkey date-sorting-types)
           ;; If sorting by date, look up the value of the
           ;; date-subtotalling multichoice option and return the
           ;; corresponding funcs in the assoc-list.