Merge branch 'odoo-backup' into feature/feedback_bitehisp

# Conflicts:
#	indoteknik_custom/models/sale_order.py

1 files changed, 15 insertions, 0 deletions

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index 6920154a..0d31e954 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -157,7 +157,22 @@ class CustomerCommision(models.Model):
         ('pending', 'Pending'),
         ('payment', 'Payment'),
     ], string='Payment Status', copy=False, readonly=True, tracking=3, default='pending')
+    grouped_so_number = fields.Char(string='Group SO Number', compute='_compute_grouped_numbers')
+    grouped_invoice_number = fields.Char(string='Group Invoice Number', compute='_compute_grouped_numbers')
 
+    def _compute_grouped_numbers(self):
+        for rec in self:
+            so_numbers = set()
+            invoice_numbers = set()
+            
+            for line in rec.commision_lines:
+                if line.invoice_id:
+                    if line.invoice_id.sale_id:
+                        so_numbers.add(line.invoice_id.sale_id.name)
+                    invoice_numbers.add(line.invoice_id.name)
+            
+            rec.grouped_so_number = ', '.join(sorted(so_numbers))
+            rec.grouped_invoice_number = ', '.join(sorted(invoice_numbers))
     # add status for type of commision, fee, rebate / cashback
     # include child or not?