gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/120758f5 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c6611a40 (commit)
	from  https://github.com/Gnucash/gnucash/commit/13895e17 (commit)



commit 120758f5193d842048820cba8d77060d1990609f
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Nov 20 17:25:42 2022 +0800

    [assistant-stock-transaction] from Bug 798004 cash to offset fee

diff --git a/gnucash/gnome/assistant-stock-transaction.cpp b/gnucash/gnome/assistant-stock-transaction.cpp
index f83f8a5fe..c0022757c 100644
--- a/gnucash/gnome/assistant-stock-transaction.cpp
+++ b/gnucash/gnome/assistant-stock-transaction.cpp
@@ -239,7 +239,7 @@ reinvested must be subsequently recorded as a regular stock purchase.")
         FieldMask::ENABLED_DEBIT,          // stock_amt
         true,                              // input_new_balance
         FieldMask::DISABLED,               // stock_val
-        FieldMask::DISABLED,               // cash_amt
+        FieldMask::ENABLED_CREDIT | FieldMask::ALLOW_ZERO,          // cash_amt
         FieldMask::ENABLED_DEBIT | FieldMask::ALLOW_ZERO,          // fees_amt
         true,                   // fees_capitalize
         FieldMask::DISABLED,               // dividend_amt
@@ -253,7 +253,7 @@ reinvested must be subsequently recorded as a regular stock purchase.")
         FieldMask::ENABLED_CREDIT,         // stock_amt
         true,                              // input_new_balance
         FieldMask::DISABLED,               // stock_val
-        FieldMask::DISABLED,               // cash_amt
+        FieldMask::ENABLED_CREDIT | FieldMask::ALLOW_ZERO,          // cash_amt
         FieldMask::ENABLED_DEBIT | FieldMask::ALLOW_ZERO,          // fees_amt
         true,                   // fees_capitalize
         FieldMask::DISABLED,               // dividend_amt
@@ -344,7 +344,7 @@ static const TxnTypeVec short_types
         FieldMask::ENABLED_CREDIT,         // stock_amt
         true,                              // input_new_balance
         FieldMask::DISABLED,               // stock_val
-        FieldMask::DISABLED,               // cash_amt
+        FieldMask::ENABLED_CREDIT | FieldMask::ALLOW_ZERO,          // cash_amt
         FieldMask::ENABLED_DEBIT | FieldMask::ALLOW_ZERO,          // fees_amt
         true,                   // fees_capitalize
         FieldMask::DISABLED,               // dividend_amt
@@ -358,7 +358,7 @@ static const TxnTypeVec short_types
         FieldMask::ENABLED_DEBIT,          // stock_amt
         true,                              // input_new_balance
         FieldMask::DISABLED,               // stock_val
-        FieldMask::DISABLED,               // cash_amt
+        FieldMask::ENABLED_CREDIT | FieldMask::ALLOW_ZERO,          // cash_amt
         FieldMask::ENABLED_DEBIT | FieldMask::ALLOW_ZERO,          // fees_amt
         true,                   // fees_capitalize
         FieldMask::DISABLED,               // dividend_amt

commit c6611a40bbc13c8fb8fdfe1fc75e35f5adadcc25
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Nov 20 17:24:35 2022 +0800

    [ifrs-report] From Bug 798004 allow Cr cash to offset Dr fee
    
    and remove invalid "dividend reinvestment" during short.

diff --git a/gnucash/report/reports/standard/ifrs-cost-basis.scm b/gnucash/report/reports/standard/ifrs-cost-basis.scm
index 1ce7dcebd..4172dfcf8 100644
--- a/gnucash/report/reports/standard/ifrs-cost-basis.scm
+++ b/gnucash/report/reports/standard/ifrs-cost-basis.scm
@@ -198,11 +198,11 @@ the split action field to detect capitalized fees on stock activity")
    (list N100 N100 N011 N000 N011 N000 N111 #f #t "Sell")
    (list N000 N000 N001 N000 N011 N100 N000 #f #f "Dividend")
    (list N001 N001 N001 N011 N000 N100 N000 #t #f "Dividend reinvestment (w/ remainder)")
-   (list N001 N001 N000 N011 N000 N100 N000 #t #f "Dividend reinvestment (w/o remainder)")
+   (list N001 N001 N110 N011 N000 N100 N000 #t #f "Dividend reinvestment (w/o remainder)")
    (list N000 N100 N001 N011 N000 N000 N000 #t #f "Return of Capital")
    (list N000 N001 N000 N000 N011 N100 N000 #t #f "Notional distribution")
-   (list N001 N000 N000 N011 N000 N000 N000 #f #f "Stock split")
-   (list N100 N000 N000 N011 N000 N000 N000 #f #f "Reverse split")
+   (list N001 N000 N110 N011 N000 N000 N000 #f #f "Stock split")
+   (list N100 N000 N110 N011 N000 N000 N000 #f #f "Reverse split")
    (list N100 N100 N001 N000 N011 N000 N111 #f #t "Reverse split w/ cash in lieu for fractionals")))
 
 (define short-types
@@ -210,12 +210,10 @@ the split action field to detect capitalized fees on stock activity")
    (list N100 N100 N001 N011 N000 N000 N000 #t #f "Short Sell")
    (list N001 N001 N110 N000 N011 N000 N111 #f #t "Cover Buy")
    (list N000 N000 N100 N000 N011 N001 N000 #f #f "Compensatory dividend")
-   (list N000 N000 N000 N011 N000 N000 N000 #t #f "Dividend reinvestment (w remainder)")
-   (list N000 N000 N000 N011 N000 N000 N000 #t #f "Dividend reinvestment (w/o remainder)")
    (list N000 N001 N100 N011 N000 N000 N000 #t #f "Compensatory return of capital")
    (list N000 N100 N000 N000 N011 N001 N000 #t #f "Compensatory notional distribution")
-   (list N100 N000 N000 N011 N000 N000 N000 #f #f "Stock split")
-   (list N001 N000 N000 N011 N000 N000 N000 #f #f "Reverse split")
+   (list N100 N000 N110 N011 N000 N000 N000 #f #f "Stock split")
+   (list N001 N000 N110 N011 N000 N000 N000 #f #f "Reverse split")
    (list N001 N001 N100 N000 N011 N000 N111 #f #t "Reverse split w/ cash in lieu for fractionals")))
 
 (define (cmp amt neg zero pos)



Summary of changes:
 gnucash/gnome/assistant-stock-transaction.cpp       |  8 ++++----
 gnucash/report/reports/standard/ifrs-cost-basis.scm | 12 +++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)