mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 02:36:28 +00:00 
			
		
		
		
	Merge branch 'develop' into 5.8-dev
This commit is contained in:
		| @@ -56,7 +56,7 @@ | ||||
|                                title="{{ group.title }}">{{ group.title }}</a> | ||||
|                         </strong></small> | ||||
|                 </td> | ||||
|                 <td colspan="2" style="border-top:1px #aaa solid;"> | ||||
|                 <td colspan="1" style="text-align:right;border-top:1px #aaa solid;"> | ||||
|                     {% for sum in group.sums %} | ||||
|                         {% if group.transaction_type == 'Deposit' %} | ||||
|                             {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}{% if loop.index != group.sums|length %},{% endif %} | ||||
| @@ -75,7 +75,7 @@ | ||||
|                 {% else %} | ||||
|                     <td style="border-top:1px #aaa solid;" colspan="2"> </td> | ||||
|                 {% endif %} | ||||
|                 <td style="border-top:1px #aaa solid;" class="hidden-xs"> | ||||
|                 <td style="border-top:1px #aaa solid;" colspan="2" class="hidden-xs"> | ||||
|                     <div class="btn-group btn-group-xs pull-right"> | ||||
|                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" | ||||
|                                 aria-haspopup="true" aria-expanded="false"> | ||||
| @@ -94,9 +94,9 @@ | ||||
|             </tr> | ||||
|         {% endif %} | ||||
|         {% for index, transaction in group.transactions %} | ||||
|             {% set style="" %} | ||||
|             {% set style="text-align:right;" %} | ||||
|             {% if group.transactions|length == loop.index and group.count > 1 %} | ||||
|                 {% set style="border-bottom:1px #aaa solid;" %} | ||||
|                 {% set style="text-align:right;border-bottom:1px #aaa solid;" %} | ||||
|             {% endif %} | ||||
|             <tr data-date="{{ transaction.date.format('Y-m-d') }}" data-count="{{ group.count }}" data-id="{{ group.id }}"> | ||||
|                 <td style=" {{ style|raw }}" class="hidden-xs"> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user