Show Gift batch total and gift transaction total in the lists

fixes openpetra/openpetra#276
tpokorra · Apr 26, 2019 · 2bd59b8 · 2bd59b8
1 parent ad16fbd
commit 2bd59b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/locales/de-DE/common.json b/locales/de-DE/common.json
@@ -276,7 +276,7 @@
       "batchdate":"Buchungsdatum",
       "batchname":"Beschreibung",
       "batchstatus":"Stapelstatus",
-      "batchtotal":"Prüfsumme",
+      "batchtotal":"Gesamtsumme",
       "bank_account_code": "Bank Konto",
       "bank_ccenter_code": "Bank Kostenstelle",
       "trans_number": "Transaktions-Nummer",

diff --git a/src/forms/Finance/Gift/GiftEntry/GiftBatches.html b/src/forms/Finance/Gift/GiftEntry/GiftBatches.html
@@ -8,6 +8,7 @@ <h2>{caption}</h2>
 			<div class="col">{val_a_batch_number_i}</div>
 			<div class="col format_date">{val_a_gl_effective_date_d}</div>
 			<div class="col">{val_a_batch_description_c}</div>
+			<div class="col">{val_a_batch_total_n}</div>
 			<div class="col" batch-status>{val_a_batch_status_c}</div>
 			<div class="col-1">
 				<button type="button" class="btn btn-primary" onclick="edit_batch({val_a_batch_number_i})">
@@ -37,6 +38,7 @@ <h2>{caption}</h2>
 							<div class="col">{trans_number}</div>
 							<div class="col">{trans_date}</div>
 							<div class="col">{trans_donor}</div>
+							<div class="col">{trans_amount_in_base}</div>
 							<div class="col-1">
 								<button type="button" class="btn" onclick="$('.tpl_row .collapse').collapse('hide');">
 									<i class="fa fa-close"></i>
@@ -57,6 +59,7 @@ <h2>{caption}</h2>
 			<div class="col">{val_a_gift_transaction_number_i}</div>
 			<div class="col format_date">{val_a_date_entered_d}</div>
 			<div class="col">{val_DonorName}</div>
+			<div class="col">{val_GiftTotal}</div>
 			<div class="col-1">
 				<button type="button" class="btn btn-primary" name="button" onclick="edit_gift_trans({val_a_ledger_number_i}, {val_a_batch_number_i}, {val_a_gift_transaction_number_i})">
 					<i class="fa fa-wrench"></i>
@@ -413,6 +416,7 @@ <h3>{edittitle_trans_detail}</h3>
 		<div class="col"><b>{batchnumber}</b></div>
 		<div class="col"><b>{batchdate}</b></div>
 		<div class="col"><b>{batchname}</b></div>
+		<div class="col"><b>{batchtotal}</b></div>
 		<div class="col"><b>{batchstatus}</b></div>
 	<div class="col-1"></div>
 	</div>