Merge branch 'dev' into beta

components/EntityShow.vue

@@ -26,11 +26,13 @@ defineShortcuts({
   'arrowleft': () => {
     if(openTab.value > 0){
       openTab.value -= 1
+      router.push(`${router.currentRoute.value.path}?tabIndex=${openTab.value}`)
     }
   },
   'arrowright': () => {
     if(openTab.value < dataType.showTabs.length - 1) {
       openTab.value += 1
+      router.push(`${router.currentRoute.value.path}?tabIndex=${openTab.value}`)
     }
   },
 })

components/displayBankaccounts.vue

@@ -41,9 +41,9 @@ const calculateOpenSum = (statement) => {
         {{dayjs(account.synced_at).format("DD.MM.YY HH:mm")}}
       </td>
       <td>
-        <span v-if="account.balance < 0" class="text-rose-600 font-bold">{{useCurrency(account.balance)}}</span>
+        <span v-if="account.balance < 0" class=" text-nowrap text-rose-600 font-bold">{{useCurrency(account.balance)}}</span>
-        <span v-else-if="account.balance > 0" class="text-primary-500 font-bold">{{useCurrency(account.balance)}}</span>
+        <span v-else-if="account.balance > 0" class="text-nowrap text-primary-500 font-bold">{{useCurrency(account.balance)}}</span>
-        <span v-else>{{useCurrency(account.balance)}}</span>
+        <span v-else class="text-nowrap ">{{useCurrency(account.balance)}}</span>
       </td>
     </tr>
   </table>

components/displayOpenBalances.vue

@@ -10,8 +10,6 @@ const setupPage = async () => {
   let draftDocuments = documents.filter(i => i.state === "Entwurf")
   let finalizedDocuments = documents.filter(i => i.state === "Gebucht")
 
-
-
   finalizedDocuments = finalizedDocuments.filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== useSum().getCreatedDocumentSum(i, documents).toFixed(2))
 
   finalizedDocuments.forEach(i => {

ios/App/App.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 70;
+	objectVersion = 77;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -64,7 +64,7 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		D5A301A52D970BAC002A22E9 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+		D5A301A52D970BAC002A22E9 /* Exceptions for "OneSignalNotificationServiceExtension" folder in "OneSignalNotificationServiceExtension" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				Info.plist,
@@ -74,7 +74,14 @@
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		D5A3019E2D970BAC002A22E9 /* OneSignalNotificationServiceExtension */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (D5A301A52D970BAC002A22E9 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = OneSignalNotificationServiceExtension; sourceTree = "<group>"; };
+		D5A3019E2D970BAC002A22E9 /* OneSignalNotificationServiceExtension */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+				D5A301A52D970BAC002A22E9 /* Exceptions for "OneSignalNotificationServiceExtension" folder in "OneSignalNotificationServiceExtension" target */,
+			);
+			path = OneSignalNotificationServiceExtension;
+			sourceTree = "<group>";
+		};
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -218,7 +225,6 @@
 				};
 			};
 			buildConfigurationList = 504EC2FF1FED79650016851F /* Build configuration list for PBXProject "App" */;
-			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -226,6 +232,7 @@
 				Base,
 			);
 			mainGroup = 504EC2FB1FED79650016851F;
+			preferredProjectObjectVersion = 77;
 			productRefGroup = 504EC3051FED79650016851F /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -283,10 +290,10 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
+			inputFileListPaths = (
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
+			outputFileListPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

pages/banking/statements/[mode]/[[id]].vue

@@ -543,7 +543,7 @@ const archiveStatement = async () => {
         >
           <template #header>
             <div class="flex flex-row justify-between">
-              <span v-if="customers.find(i => i.id === item.cd_id.customer)">{{item.cd_id.customer.documentNumber}} - {{customers.find(i => i.id === item.cd_id.customer).name}}</span>
+              <span v-if="customers.find(i => i.id === item.cd_id.customer)">{{item.cd_id.documentNumber}} - {{customers.find(i => i.id === item.cd_id.customer).name}}</span>
               <span class="font-semibold text-nowrap">{{displayCurrency(item.amount)}}</span>
             </div>
           </template>

pages/settings/banking/index.vue

@@ -147,7 +147,7 @@ setupPage()
 
     <UButton
       @click="addAccount(account)"
-      v-if="!dataStore.bankAccounts.find(i => i.accountId === account.id)"
+      v-if="!bankaccounts.find(i => i.iban === account.iban)"
     >
       + Konto
     </UButton>