Fixed merge conflicts

src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java

@@ -129,7 +129,7 @@ public class TemplateController extends BaseController
 
 		if(template.getAmount() == null)
 		{
-			template.setExpenditure(true);
+			template.setIsExpenditure(true);
 		}
 
 		final DateTime date = dateService.getDateTimeFromCookie(cookieDate);
@@ -175,7 +175,7 @@ public class TemplateController extends BaseController
 
 		if(template.isExpenditure() == null)
 		{
-			template.setExpenditure(false);
+			template.setIsExpenditure(false);
 		}
 
 		if(template.getAmount() != null)

src/main/resources/templates/transactions/newTransactionMacros.ftl

@@ -375,10 +375,26 @@
     </button>
 </#macro>
 
-<#macro buttonTemplate>
-    <div class="fixed-action-btn">
-        <a id="buttonSaveAsTemplate" class="btn-floating btn-large waves-effect waves-light budgetmaster-blue tooltipped" data-position="left" data-tooltip="${locale.getString("save.as.template")}" data-url="<@s.url '/templates/fromTransactionModal'/>">
-            <i class="material-icons left">file_copy</i>${locale.getString("save")}
+<#macro buttonTransactionActions canChangeType canCreateTemplate changetypeInProgress>
+    <#if (canChangeType || canCreateTemplate) && !changetypeInProgress>
+        <div class="fixed-action-btn" id="transaction-actions-button">
+            <a class="btn-floating btn-large waves-effect waves-light budgetmaster-blue">
+                <i class="material-icons left">settings</i>${locale.getString("save")}
             </a>
+            <ul>
+                <#if canChangeType>
+                    <li>
+                        <a class="btn-floating btn transaction-action mobile-fab-tip no-wrap" data-action-type="changeType" data-url="<@s.url '/transactions/${transaction.getID()?c}/changeTypeModal'/>">${locale.getString("transaction.change.type")}</a>
+                        <a class="btn-floating btn transaction-action budgetmaster-baby-blue" data-action-type="changeType" data-url="<@s.url '/transactions/${transaction.getID()?c}/changeTypeModal'/>"><i class="material-icons">shuffle</i></a>
+                    </li>
+                </#if>
+                <#if canCreateTemplate>
+                    <li>
+                        <a class="btn-floating btn transaction-action mobile-fab-tip no-wrap" data-action-type="saveAsTemplate" data-url="<@s.url '/templates/fromTransactionModal'/>">${locale.getString("save.as.template")}</a>
+                        <a class="btn-floating btn transaction-action budgetmaster-dark-orange" data-action-type="saveAsTemplate" data-url="<@s.url '/templates/fromTransactionModal'/>"><i class="material-icons">file_copy</i></a>
+                    </li>
+                </#if>
+            </ul>
         </div>
+    </#if>
 </#macro>
\ No newline at end of file