Merge branch '2024.11'

tine-groupware · Feb 24, 2025 · 2c59b27 · 2c59b27
2 parents 7808bc7 + 20928a3
commit 2c59b27
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/tine20/Tinebase/Frontend/Cli.php b/tine20/Tinebase/Frontend/Cli.php
@@ -1325,6 +1325,7 @@ public function monitoringCheckQueue()
                         . ';lastDurationUpdate=' . ($now - $lastDurationUpdate) . ';';
                 } catch (Exception $e) {
                     $message = 'QUEUE FAIL: ' . get_class($e) . ' - ' . $e->getMessage();
+                    $message .= ' - https://tine-docu.s3web.rz1.metaways.net/operators/howto/tine20AdminQueue/';
                     $result = 2;
                 }
 

diff --git a/tine20/Tinebase/Import/definitions/tinebase_import_bankaccount_csv.xml b/tine20/Tinebase/Import/definitions/tinebase_import_bankaccount_csv.xml
@@ -2,6 +2,7 @@
 <config>
     <name>tinebase_import_bankaccount_csv</name>
     <model>Tinebase_Model_BankAccount</model>
+    <plugin>Tinebase_Import_Csv_Generic</plugin>
     <type>import</type>
     <headline>1</headline>
     <dryrun>0</dryrun>

diff --git a/tine20/Tinebase/Import/definitions/tinebase_import_costcenter_csv.xml b/tine20/Tinebase/Import/definitions/tinebase_import_costcenter_csv.xml
@@ -2,7 +2,7 @@
 <config>
     <name>tinebase_import_costcenter_csv</name>
     <model>Tinebase_Model_CostCenter</model>
-    <plugin>Tinebase_Import_CostCenter_Csv</plugin>
+    <plugin>Tinebase_Import_Csv_Generic</plugin>
     <type>import</type>
     <headline>1</headline>
     <dryrun>0</dryrun>

diff --git a/tine20/Tinebase/Import/definitions/tinebase_import_costunit_csv.xml b/tine20/Tinebase/Import/definitions/tinebase_import_costunit_csv.xml
@@ -2,7 +2,7 @@
 <config>
     <name>tinebase_import_costunit_csv</name>
     <model>Tinebase_Model_CostUnit</model>
-    <plugin>Tinebase_Import_CostUnit_Csv</plugin>
+    <plugin>Tinebase_Import_Csv_Generic</plugin>
     <type>import</type>
     <headline>1</headline>
     <dryrun>0</dryrun>