(andri) resolved conflict

1 files changed, 56 insertions, 6 deletions

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index 32e81b9a..eeaa8efc 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -1,8 +1,10 @@
 from odoo import models, api, fields, _
 from odoo.exceptions import UserError
 from datetime import datetime
+# import datetime
 import logging
 from terbilang import Terbilang
+import pytz
 
 _logger = logging.getLogger(__name__)
 
@@ -199,7 +201,8 @@ class CustomerCommision(models.Model):
     grouped_invoice_number = fields.Char(string='Group Invoice Number', compute='_compute_grouped_numbers')
 
     sales_id = fields.Many2one('res.users', string="Sales", tracking=True, default=lambda self: self.env.user,
-        domain=lambda self: [('groups_id', 'in', self.env.ref('sales_team.group_sale_salesman').id)])
+                               domain=lambda self: [
+                                   ('groups_id', 'in', self.env.ref('sales_team.group_sale_salesman').id)])
 
     date_approved_sales = fields.Datetime(string="Date Approved Sales", tracking=True)
     date_approved_marketing = fields.Datetime(string="Date Approved Marketing", tracking=True)
@@ -211,6 +214,46 @@ class CustomerCommision(models.Model):
     position_pimpinan = fields.Char(string="Position Pimpinan", tracking=True)
     position_accounting = fields.Char(string="Position Accounting", tracking=True)
 
+    # get partner ids so it can be grouped by
+    @api.model
+    def read_group(self, domain, fields, groupby, offset=0, limit=None, orderby=False, lazy=True):
+        if 'partner_ids' in groupby:
+            # Get all records matching the domain
+            records = self.search(domain)
+
+            # Create groups for each partner
+            groups = {}
+            for record in records:
+                for partner in record.partner_ids:
+                    if partner.id not in groups:
+                        groups[partner.id] = {
+                            'partner_ids': partner,
+                            'records': self.env['customer.commision']
+                        }
+                    groups[partner.id]['records'] |= record
+
+            # Format the result
+            result = []
+            for partner_id, group_data in groups.items():
+                partner = group_data['partner_ids']
+                record_ids = group_data['records'].ids
+
+                # Create the domain
+                group_domain = [('id', 'in', record_ids)]
+                if domain:
+                    group_domain = ['&'] + domain + group_domain
+
+                result.append({
+                    'partner_ids': (partner.id, partner.display_name),
+                    'partner_ids_count': len(record_ids),
+                    '__domain': group_domain,
+                    '__count': len(record_ids),
+                })
+
+            return result
+
+        return super(CustomerCommision, self).read_group(domain, fields, groupby, offset, limit, orderby, lazy)
+
     def compute_delivery_amt_text(self):
         tb = Terbilang()
 
@@ -276,6 +319,9 @@ class CustomerCommision(models.Model):
 
     @api.constrains('commision_amt')
     def _onchange_commision_amt(self):
+        """
+        Constrain to update commision percent from commision amount
+        """
         if not self.env.context.get('_onchange_commision_amt', True):
             return
 
@@ -301,30 +347,34 @@ class CustomerCommision(models.Model):
         return result
 
     def action_confirm_customer_commision(self):
-        now = datetime.utcnow()
+        jakarta_tz = pytz.timezone('Asia/Jakarta')
+        now = datetime.now(jakarta_tz)
+
+        now_naive = now.replace(tzinfo=None)
+
         if not self.status or self.status == 'draft':
             self.status = 'pengajuan1'
         elif self.status == 'pengajuan1' and self.env.user.is_sales_manager:
             self.status = 'pengajuan2'
             self.approved_by = (self.approved_by + ', ' if self.approved_by else '') + self.env.user.name
-            self.date_approved_sales = now
+            self.date_approved_sales = now_naive
             self.position_sales = 'Sales Manager'
         elif self.status == 'pengajuan2' and self.env.user.id == 19:
             self.status = 'pengajuan3'
             self.approved_by = (self.approved_by + ', ' if self.approved_by else '') + self.env.user.name
-            self.date_approved_marketing = now
+            self.date_approved_marketing = now_naive
             self.position_marketing = 'Marketing Manager'
         elif self.status == 'pengajuan3' and self.env.user.is_leader:
             self.status = 'pengajuan4'
             self.approved_by = (self.approved_by + ', ' if self.approved_by else '') + self.env.user.name
-            self.date_approved_pimpinan = now
+            self.date_approved_pimpinan = now_naive
             self.position_pimpinan = 'Pimpinan'
         elif self.status == 'pengajuan4' and self.env.user.id == 1272:
             for line in self.commision_lines:
                 line.invoice_id.is_customer_commision = True
             self.status = 'approved'
             self.approved_by = (self.approved_by + ', ' if self.approved_by else '') + self.env.user.name
-            self.date_approved_accounting = now
+            self.date_approved_accounting = now_naive
             self.position_accounting = 'Accounting'
         else:
             raise UserError('Harus di approved oleh yang bersangkutan')