Merge pull request #1 from grindtildeath/vrenaville-imp_partner_split

Add boolean to activate split on analytic tags
OCA · Nov 5, 2019 · c7bd996 · c7bd996
2 parents bad32f4 + c4e085f
commit c7bd996
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/account_cutoff_base/models/account_cutoff.py b/account_cutoff_base/models/account_cutoff.py
@@ -54,7 +54,11 @@ def _default_cutoff_journal_id(self):
         states={'draft': [('readonly', False)]}, copy=False,
         track_visibility='onchange'
     )
-
+    analytic_tag_split = fields.Boolean(
+        string='Split by analytic tags', readonly=True,
+        states={'draft': [('readonly', False)]}, copy=False,
+        track_visibility='onchange'
+    )
     partner_split = fields.Boolean(
         string='Split by Partner', readonly=True,
         states={'draft': [('readonly', False)]}, copy=False,
@@ -158,7 +162,9 @@ def _get_merge_keys(self):
         same values for these fields will be merged.
         The list must at least contain account_id.
         """
-        merge_keys = ['account_id', 'analytic_account_id', 'analytic_tag_ids']
+        merge_keys = ['account_id', 'analytic_account_id']
+        if self.analytic_tag_split:
+            merge_keys.append('analytic_tag_ids')
         if self.partner_split:
             merge_keys.append('partner_id')
         return merge_keys
@@ -236,9 +242,17 @@ def _prepare_provision_line(self, cutoff_line):
         provision_line = {
             'account_id': cutoff_line.cutoff_account_id.id,
             'analytic_account_id': cutoff_line.analytic_account_id.id,
-            'analytic_tag_ids': [(6, 0, cutoff_line.analytic_tag_ids.ids)],
+
             'amount': cutoff_line.cutoff_amount,
         }
+        if self.analytic_tag_split:
+            provision_line.update(
+                {
+                    'analytic_tag_ids': [
+                        (6, 0, cutoff_line.analytic_tag_ids.ids)
+                    ]
+                }
+            )
         if self.partner_split:
             provision_line.update({'partner_id': cutoff_line.partner_id.id})
         return provision_line

diff --git a/account_cutoff_base/views/account_cutoff.xml b/account_cutoff_base/views/account_cutoff.xml
@@ -33,6 +33,7 @@
                         <group name="general-params">
                             <field name="cutoff_date"/>
                             <field name="partner_split"/>
+                            <field name="analytic_tag_split"/>
                             <field name="total_cutoff_amount"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection" />
                             <field name="company_currency_id" invisible="1"/>