fixup! [ADD] import analytic accounts (KOST1/2)

OCA · Sep 4, 2023 · d699099 · d699099
1 parent d63eac4
commit d699099
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/datev_import_csv_dtvf/tests/test_datev_import_csv_dtvf.py b/datev_import_csv_dtvf/tests/test_datev_import_csv_dtvf.py
@@ -87,6 +87,9 @@ def setUp(self):
             )
         self.env["account.account"].search([("code", "=", "7095")]).code = "7095000"
         self.env["account.account"].search([("code", "=", "1700")]).code = "170"
+        self.env["account.account"].search(
+            [("code", "=", "4900")]
+        ).account_type = "income"
         for code in ("4811",):
             if self.env["account.analytic.account"].search(
                 [
@@ -129,8 +132,8 @@ def test_wizard(self):
         self.assertEqual(last_line.account_id.code, "2450")
         self.assertEqual(last_line.debit, 72)
         analytic_lines = move.line_ids.mapped("analytic_line_ids")
-        self.assertEqual(len(analytic_lines), 2)
-        self.assertEqual(sum(analytic_lines.mapped("amount")), 0)
+        self.assertEqual(len(analytic_lines), 1)
+        self.assertEqual(sum(analytic_lines.mapped("amount")), 0.01)
 
     def test_wizard_broken_file(self):
         wizard = self.env["account.move.import"].create(

diff --git a/datev_import_csv_dtvf/wizard/import_move.py b/datev_import_csv_dtvf/wizard/import_move.py
@@ -441,6 +441,13 @@ def _prepare_move_line_01(self, pivot_line, sequence, indicator):
                         "analytic_account_2_id",
                     )
                     if pivot_line.get(analytic_account_id_field)
+                    and self.env["account.account"]
+                    .browse(pivot_line["account_id"])
+                    .account_type
+                    in (
+                        "income",
+                        "expense",
+                    )
                 },
             }
         )
@@ -475,6 +482,13 @@ def _prepare_move_line_02(self, pivot_line, sequence, indicator):
                         "analytic_account_2_id",
                     )
                     if pivot_line.get(analytic_account_id_field)
+                    and self.env["account.account"]
+                    .browse(pivot_line["contra_account_id"])
+                    .account_type
+                    in (
+                        "income",
+                        "expense",
+                    )
                 },
             }
         )