push

5 files changed, 128 insertions, 59 deletions

diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 4983cc17..ad6d75dd 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -132,3 +132,5 @@ from . import vendor_approval
 from . import partner
 from . import find_page
 from . import approval_retur_picking
+from . import va_multi_approve
+from . import va_multi_reject
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 5e868edd..6475f29f 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -79,7 +79,7 @@ class SaleOrder(models.Model):
     payment_link_midtrans = fields.Char(string='Payment Link', help='Url payment yg digenerate oleh midtrans, harap diserahkan ke customer agar dapat dilakukan pembayaran secara mandiri')
     payment_qr_code = fields.Binary("Payment QR Code")
     due_id = fields.Many2one('due.extension', string="Due Extension", readonly=True, tracking=True)   
-    vendor_approval_id = fields.Many2one('vendor.approval', string="Vendor Approval", readonly=True, tracking=True, copy=False)   
+    vendor_approval_id = fields.Many2many('vendor.approval', string="Vendor Approval", readonly=True, tracking=True, copy=False)   
     customer_type = fields.Selection([
         ('pkp', 'PKP'),
         ('nonpkp', 'Non PKP')
@@ -882,29 +882,26 @@ class SaleOrder(models.Model):
                 }).send()
 
     def validate_different_vendor(self):
-        if self.vendor_approval_id and self.vendor_approval_id.state == 'draft':
-            raise UserError('SO ini sedang dalam review Vendor Approval')
-        
-        if self.vendor_approval_id and self.vendor_approval_id.state == 'cancel':
-            raise UserError('Vendor Approval SO ini Di Reject')
-        
-        if self.vendor_approval_id and self.vendor_approval_id.state == 'done':
+        if self.vendor_approval_id.filtered(lambda v: v.state == 'draft'):
+            draft_names = ", ".join(self.vendor_approval_id.filtered(lambda v: v.state == 'draft').mapped('name'))
+            raise UserError(f"SO ini sedang dalam review Vendor Approval: {draft_names}")
+
+        if self.vendor_approval_id and all(v.state != 'draft' for v in self.vendor_approval_id):
             return False
         
-        different_vendor = self.order_line.filtered(lambda l: l.vendor_id and l.vendor_md_id and l.vendor_id.id != l.vendor_md_id.id)
+        different_vendor = self.order_line.filtered(
+            lambda l: l.vendor_id and l.vendor_md_id and l.vendor_id.id != l.vendor_md_id.id
+        )
+        
         if different_vendor:
-            vendor_approval = self.env['vendor.approval'].create({
-                'order_id': self.id,
-                'create_date_so': self.create_date,
-                'partner_id': self.partner_id.id,
-                'state': 'draft',
-            })
-
-            self.vendor_approval_id = vendor_approval.id
-            
+            vendor_approvals = []
             for line in different_vendor:
-                self.env['vendor.approval.line'].create({
-                    'vendor_approval_id': vendor_approval.id,
+                vendor_approval = self.env['vendor.approval'].create({
+                    'order_id': self.id,
+                    'order_line_id': line.id,
+                    'create_date_so': self.create_date,
+                    'partner_id': self.partner_id.id,
+                    'state': 'draft',
                     'product_id': line.product_id.id,
                     'product_uom_qty': line.product_uom_qty,
                     'vendor_id': line.vendor_id.id,
@@ -916,9 +913,15 @@ class SaleOrder(models.Model):
                     'margin_after': line.item_percent_margin,
                     'purchase_tax_id': line.purchase_tax_id.id,
                     'sales_tax_id': line.tax_id[0].id if line.tax_id else False,
-                    'percent_margin_difference': (line.price_unit - line.purchase_price_md) / line.purchase_price_md if line.purchase_price_md else False,
+                    'percent_margin_difference': (
+                        (line.price_unit - line.purchase_price_md) / line.purchase_price_md
+                        if line.purchase_price_md else False
+                    ),
                 })
-
+                
+                vendor_approvals.append(vendor_approval.id)
+            
+            self.vendor_approval_id = [(4, vid) for vid in vendor_approvals]
             return True
         else:
             return False
diff --git a/indoteknik_custom/models/va_multi_approve.py b/indoteknik_custom/models/va_multi_approve.py
new file mode 100644
index 00000000..028358c2
--- /dev/null
+++ b/indoteknik_custom/models/va_multi_approve.py
@@ -0,0 +1,22 @@
+from odoo import models, fields
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class VaMultiApprove(models.TransientModel):
+    _name = 'va.multi.approve'
+
+    def save_multi_approve_va(self):
+        va_ids = self._context['va_ids']
+        vendor_approval = self.env['vendor.approval'].browse(va_ids)
+        vendor_approval.action_approve()
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': 'Notification',
+                'message': 'Berhasil Di Approve',
+                'next': {'type': 'ir.actions.act_window_close'},
+            }
+        }
\ No newline at end of file
diff --git a/indoteknik_custom/models/va_multi_reject.py b/indoteknik_custom/models/va_multi_reject.py
new file mode 100644
index 00000000..c05581bf
--- /dev/null
+++ b/indoteknik_custom/models/va_multi_reject.py
@@ -0,0 +1,22 @@
+from odoo import models, fields
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class VaMultiReject(models.TransientModel):
+    _name = 'va.multi.reject'
+
+    def save_multi_reject_va(self):
+        va_ids = self._context['va_ids']
+        vendor_approval = self.env['vendor.approval'].browse(va_ids)
+        vendor_approval.action_reject()
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': 'Notification',
+                'message': 'Berhasil Di Reject',
+                'next': {'type': 'ir.actions.act_window_close'},
+            }
+        }
\ No newline at end of file
diff --git a/indoteknik_custom/models/vendor_approval.py b/indoteknik_custom/models/vendor_approval.py
index 56b81a37..ad323c29 100644
--- a/indoteknik_custom/models/vendor_approval.py
+++ b/indoteknik_custom/models/vendor_approval.py
@@ -13,10 +13,22 @@ class VendorApproval(models.Model):
 
     number = fields.Char(string='Document No', index=True, copy=False, readonly=True, tracking=True)
     partner_id = fields.Many2one('res.partner', string="Customer", readonly=True)
+    order_line_id = fields.Many2one('sale.order.line', string="SO Line", readonly=True)
     order_id = fields.Many2one('sale.order', string="SO", readonly=True)
-    vendor_approval_line = fields.One2many('vendor.approval.line', 'vendor_approval_id', string='Vendor Approval Lines', auto_join=True)
     state = fields.Selection([('draft', 'Draft'), ('done', 'Done'), ('cancel', 'Reject')], string='State', tracking=True)
     create_date_so = fields.Datetime(string='Create Date SO', readonly=True)
+    product_id = fields.Many2one('product.product', string='Product')
+    product_uom_qty = fields.Float(string='Quantity')
+    vendor_id = fields.Many2one('res.partner', string='Vendor')
+    vendor_md_id = fields.Many2one('res.partner', string='Vendor MD')
+    sales_price = fields.Float(string='Sales Price')
+    margin_before = fields.Float(string='Margin Before')
+    margin_after = fields.Float(string='Margin After')
+    purchase_price = fields.Float(string='Purchase Price')
+    purchase_price_md= fields.Float(string='Purchase Price MD')
+    purchase_tax_id = fields.Many2one('account.tax', string='Purchase Tax', domain=['|', ('active', '=', False), ('active', '=', True)])
+    sales_tax_id = fields.Many2one('account.tax', string='Sales Tax', domain=['|', ('active', '=', False), ('active', '=', True)])
+    percent_margin_difference = fields.Float(string='Percent Margin Difference')
 
     @api.model
     def create(self, vals):
@@ -25,49 +37,57 @@ class VendorApproval(models.Model):
         return result
 
     def action_approve(self):
-        if not self.env.user.has_group('indoteknik_custom.group_role_merchandiser'):
-            raise UserError('Hanya Merchandiser yang bisa approve')
-        
-        self.state = 'done'
-        self.order_id.vendor_approval = True
-        message = "Vendor Approval approved by %s" % (self.env.user.name)
-        self.order_id.message_post(body=message)
-        if not self.order_id.due_id and self.order_id.state == 'draft':
-            self.order_id.action_confirm()
+        for rec in self:
+            if not self.env.user.has_group('indoteknik_custom.group_role_merchandiser'):
+                raise UserError('Hanya Merchandiser yang bisa approve')
+            
+            # Set state menjadi 'done'
+            rec.state = 'done'
+            rec.order_id.vendor_approval = True
+            message = f"Vendor Approval approved by {self.env.user.name}"
+            rec.order_id.message_post(body=message)
+            
+            # Cek semua vendor.approval dengan order_id yang sama
+            related_approvals = self.env['vendor.approval'].search([('order_id', '=', rec.order_id.id)])
+            if all(approval.state != 'draft' for approval in related_approvals):
+                # Jalankan action_confirm hanya jika semua state bukan draft
+                if not rec.order_id.due_id and rec.order_id.state == 'draft':
+                    rec.order_id.action_confirm()
+
 
     def action_reject(self):
-        if not self.env.user.has_group('indoteknik_custom.group_role_merchandiser'):
-            raise UserError('Hanya Merchandiser yang bisa cancel')
-        
-        self.state = 'cancel'
+        for rec in self:
+            if not self.env.user.has_group('indoteknik_custom.group_role_merchandiser'):
+                raise UserError('Hanya Merchandiser yang bisa cancel')
+            
+            rec.state = 'cancel'
+
+            rec.order_line_id.vendor_id = rec.vendor_md_id.id
+
+            message = "Vendor Approval rejected by %s" % (self.env.user.name)
+            self.order_id.message_post(body=message)
 
-        message = "Vendor Approval rejected by %s" % (self.env.user.name)
-        self.order_id.message_post(body=message)
+            related_approvals = self.env['vendor.approval'].search([('order_id', '=', rec.order_id.id)])
+            if all(approval.state != 'draft' for approval in related_approvals):
+                # Jalankan action_confirm hanya jika semua state bukan draft
+                if not rec.order_id.due_id and rec.order_id.state == 'draft':
+                    rec.order_id.action_confirm()
 
     def unlink(self):
         res = super(VendorApproval, self).unlink()
         if not self._name == 'vendor.approval':
             raise UserError('Vendor Approval tidak bisa didelete')
         return res
-                
     
-class VendorApprovalLine(models.Model):
-    _name = 'vendor.approval.line'
-    _description = 'Vendor Approval Line'
-    _order = 'vendor_approval_id, id'
-
-    vendor_approval_id = fields.Many2one('vendor.approval', string='Vendor Approval Ref', required=True, ondelete='cascade', index=True, copy=False)
-    product_id = fields.Many2one('product.product', string='Product')
-    product_uom_qty = fields.Float(string='Quantity')
-    vendor_id = fields.Many2one('res.partner', string='Vendor')
-    vendor_md_id = fields.Many2one('res.partner', string='Vendor MD')
-    sales_price = fields.Float(string='Sales Price')
-    margin_before = fields.Float(string='Margin Before')
-    margin_after = fields.Float(string='Margin After')
-    purchase_price = fields.Float(string='Purchase Price')
-    purchase_price_md= fields.Float(string='Purchase Price MD')
-    purchase_tax_id = fields.Many2one('account.tax', string='Purchase Tax', domain=['|', ('active', '=', False), ('active', '=', True)])
-    sales_tax_id = fields.Many2one('account.tax', string='Sales Tax', domain=['|', ('active', '=', False), ('active', '=', True)])
-    percent_margin_difference = fields.Float(string='Percent Margin Difference')
-    
-
+    def open_form_multi_approve(self):
+        action = self.env['ir.actions.act_window']._for_xml_id('indoteknik_custom.action_va_multi_approve')
+        action['context'] = {
+            'va_ids': [x.id for x in self]
+        }
+        return action
+    def open_form_multi_reject(self):
+        action = self.env['ir.actions.act_window']._for_xml_id('indoteknik_custom.action_va_multi_reject')
+        action['context'] = {
+            'va_ids': [x.id for x in self]
+        }
+        return action
\ No newline at end of file