Rob Merkel's report patch. Register fixes.

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

ChangeLog

@@ -1,3 +1,8 @@
+2000-06-09  Robert Graham Merkel  <rgmerk@mira.net>
+
+	* src/scm/report/transaction-report.scm (): commented out
+	"merged" style because of conflict with double-column amounts.
+
 2000-06-08  Robert Graham Merkel  <rgmerk@mira.net>
 
 	* src/scm/report/average-balance.scm (average-balance-renderer): 

src/SplitLedger.c

@@ -2708,7 +2708,7 @@ xaccSRSaveChangedCells (SplitRegister *reg, Transaction *trans, Split *split)
     else
       new_amount = xaccSplitGetShareAmount(split);
 
-    if (value != price*new_amount) {
+    if (!DEQEPS(value, price * new_amount, 1.0e-15)) {
       int i;
       int choice;
       int default_value;
@@ -2763,10 +2763,10 @@ xaccSRSaveChangedCells (SplitRegister *reg, Transaction *trans, Split *split)
           changed |= MOD_AMNT;
           break;
         case 1: /* Modify the share price */
-          if (new_amount == 0)
+          if (DEQEPS(0.0, new_amount, 1.0e-15))
             break;
 
-          price = value/new_amount;
+          price = value / new_amount;
 
           if (price < 0) {
             price = -price;
@@ -2777,7 +2777,7 @@ xaccSRSaveChangedCells (SplitRegister *reg, Transaction *trans, Split *split)
           changed |= MOD_PRIC;
           break;
         case 2: /* Modify total value */
-          value = price*new_amount;
+          value = price * new_amount;
 
           xaccSetPriceCellValue(reg->valueCell, value);
           changed |= MOD_VALU;

src/scm/report/transaction-report.scm

@@ -436,10 +436,14 @@
      (gnc:make-multichoice-option
       "Report Options" "Style"
       "d" "Report style"
-      'merged
-      (list #(merged
-	      "Merged"
-	      "Display N-1 lines")
+;; XXX: merged style currently disabled because it breaks double-column
+;; amounts.  If somebody wants it back just uncomment the commented code
+;; below
+      ; 'merged
+      'single
+      (list ;#(merged
+	    ;  "Merged"
+	    ;  "Display N-1 lines")
 	    #(multi-line
 	      "Multi-Line"
 	      "Display N lines")