Merge branch 'production' into purchasing-job

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 7 insertions, 7 deletions

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index a11d85c7..a9ad624c 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -131,7 +131,7 @@ class CustomerCommision(models.Model):
     number = fields.Char(string='Document No', index=True, copy=False, readonly=True)
     date_from = fields.Date(string='Date From', required=True)
     date_to = fields.Date(string='Date To', required=True)
-    partner_id = fields.Many2one('res.partner', String='Customer', required=True)
+    partner_ids = fields.Many2many('res.partner', String='Customer', required=True)
     description = fields.Char(string='Description')
     notification = fields.Char(string='Notification')
     commision_lines = fields.One2many('customer.commision.line', 'customer_commision_id', string='Lines', auto_join=True)
@@ -202,9 +202,9 @@ class CustomerCommision(models.Model):
             self._generate_customer_commision_rebate()
 
     def _generate_customer_commision_rebate(self):
-        partners = []
-        partners += self.partner_id.child_ids
-        partners.append(self.partner_id)
+        for rec in self:
+            # partners = rec.partner_ids.child_ids + rec.partner_ids
+            partners = rec.partner_ids
 
         for partner in partners:
             brand = [92, 10, 89, 12, 324, 11]
@@ -234,9 +234,9 @@ class CustomerCommision(models.Model):
         return
 
     def _generate_customer_commision_fee(self):
-        partners = []
-        partners += self.partner_id.child_ids
-        partners.append(self.partner_id)
+        for rec in self:
+            # partners = rec.partner_ids.child_ids + rec.partner_ids
+            partners = rec.partner_ids
 
         for partner in partners:
             where = [