Merge pull request #7924 from turbo124/v5-develop

V5 develop

app/Import/Definitions/BankTransactionMap.php

@@ -16,16 +16,16 @@ class BankTransactionMap
     public static function importable()
     {
         return [
-            0 => 'bank.transaction_id',
+            0 => 'transaction.transaction_id',
-            1 => 'bank.amount',
+            1 => 'transaction.amount',
-            2 => 'bank.currency',
+            2 => 'transaction.currency',
-            3 => 'bank.account_type',
+            3 => 'transaction.account_type',
-            4 => 'bank.category_id',
+            4 => 'transaction.category_id',
-            5 => 'bank.category_type',
+            5 => 'transaction.category_type',
-            6 => 'bank.date',
+            6 => 'transaction.date',
-            7 => 'bank.bank_account_id',
+            7 => 'transaction.bank_account_id',
-            8 => 'bank.description',
+            8 => 'transaction.description',
-            9 => 'bank.base_type',
+            9 => 'transaction.base_type',
         ];
     }
 

lang/en/texts.php

@@ -4777,7 +4777,8 @@ $LANG = array(
     'invoice_task_project' => 'Invoice Task Project',
     'invoice_task_project_help' => 'Add the project to the invoice line items',
     'bulk_action' => 'Bulk Action',
-    'phone_validation_error' => 'This phone number is not valid, please enter in E.164 format',    
+    'phone_validation_error' => 'This phone number is not valid, please enter in E.164 format',
+    'transaction' => 'Transaction',    
 );
 
 return $LANG;