Merge branch 'production' into CR/quotation-noPo

# Conflicts:
#	indoteknik_custom/models/user_company_request.py

1 files changed, 50 insertions, 47 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index c00b2f4e..7fc6d96a 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -11,6 +11,7 @@ _logger = logging.getLogger(__name__)
 class SaleOrder(models.Model):
     _inherit = "sale.order"
 
+    fulfillment_line_v2 = fields.One2many('sales.order.fulfillment.v2', 'sale_order_id', string='Fullfillment2')
     fullfillment_line = fields.One2many('sales.order.fullfillment', 'sales_order_id', string='Fullfillment')
     reject_line = fields.One2many('sales.order.reject', 'sale_order_id', string='Reject Lines')
     order_sales_match_line = fields.One2many('sales.order.purchase.match', 'sales_order_id', string='Purchase Match Lines', states={'cancel': [('readonly', True)], 'done': [('readonly', True)]}, copy=True)
@@ -78,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)   
+    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')
@@ -157,7 +158,7 @@ class SaleOrder(models.Model):
         missing_weight_products = []
 
         for line in self.order_line:
-            if line.weight:
+            if line.weight > 0:
                 total_weight += line.weight * line.product_uom_qty
 
         self.total_weight = total_weight
@@ -170,7 +171,7 @@ class SaleOrder(models.Model):
         missing_weight_products = []
 
         for line in self.order_line:
-            if line.weight:
+            if line.weight > 0:
                 total_weight += line.weight * line.product_uom_qty
                 line.product_id.weight = line.weight    
             else:
@@ -195,7 +196,7 @@ class SaleOrder(models.Model):
         missing_weight_products = []
 
         for line in self.order_line:
-            if line.weight:
+            if line.weight > 0:
                 total_weight += line.weight * line.product_uom_qty
                 line.product_id.weight = line.weight    
             else:
@@ -355,10 +356,10 @@ class SaleOrder(models.Model):
     
     def _compute_fullfillment(self):
         for rec in self:
-            rec.fullfillment_line.unlink()
-
-            for line in rec.order_line:
-                line._compute_reserved_from()
+        #     rec.fullfillment_line.unlink()
+        #
+        #     for line in rec.order_line:
+        #         line._compute_reserved_from()
 
             rec.compute_fullfillment = True
 
@@ -499,8 +500,8 @@ class SaleOrder(models.Model):
             raise UserError('Phone Real Delivery Address harus diisi')
         if not real_delivery_address.kecamatan_id:
             raise UserError('Kecamatan Real Delivery Address harus diisi')
-        if not real_delivery_address.kelurahan_id:
-            raise UserError('Kelurahan Real Delivery Address harus diisi')
+        # if not real_delivery_address.kelurahan_id:
+        #     raise UserError('Kelurahan Real Delivery Address harus diisi')
 
     def generate_payment_link_midtrans_sales_order(self):
         # midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions' # dev - sandbox
@@ -634,20 +635,6 @@ class SaleOrder(models.Model):
     #     return ['&', ('order_line.invoice_lines.move_id.move_type', 'in', ('out_invoice', 'out_refund')), ('order_line.invoice_lines.move_id', operator, value)]
 
 
-    def check_data_real_delivery_address(self):
-        real_delivery_address = self.real_shipping_id
-
-        if not real_delivery_address.state_id:
-            raise UserError('State Real Delivery Address harus diisi')
-        if not real_delivery_address.zip:
-            raise UserError('Zip code Real Delivery Address harus diisi')
-        if not real_delivery_address.mobile:
-            raise UserError('Mobile Real Delivery Address harus diisi')
-        if not real_delivery_address.phone:
-            raise UserError('Phone Real Delivery Address harus diisi')
-        if not real_delivery_address.kecamatan_id:
-            raise UserError('Kecamatan Real Delivery Address harus diisi')
-
     @api.onchange('partner_id')
     def onchange_partner_contact(self):
         parent_id = self.partner_id.parent_id
@@ -658,6 +645,7 @@ class SaleOrder(models.Model):
         self.customer_type = parent_id.customer_type
         self.email = parent_id.email
         self.pareto_status = parent_id.pareto_status
+        self.user_id = parent_id.user_id
     
     @api.onchange('partner_id')
     def onchange_partner_id(self):
@@ -770,7 +758,7 @@ class SaleOrder(models.Model):
                 raise UserError("Salesperson sudah tidak aktif, mohon diisi yang benar pada data SO dan Contact")
             
     def sale_order_approve(self):
-        if self.validate_different_vendor() and not self.vendor_approval and not self.vendor_approval_id:
+        if self.validate_different_vendor() and not self.vendor_approval:
             return self._create_notification_action('Notification', 'Terdapat Vendor yang berbeda dengan MD Vendor')
         self.check_due()
 
@@ -903,29 +891,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('number'))
+            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,
@@ -937,9 +922,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
@@ -947,7 +938,7 @@ class SaleOrder(models.Model):
         
     def action_confirm(self):
         for order in self:
-            if self.validate_different_vendor() and not self.vendor_approval and not self.vendor_approval_id:
+            if self.validate_different_vendor() and not self.vendor_approval:
                 return self._create_notification_action('Notification', 'Terdapat Vendor yang berbeda dengan MD Vendor')
             
             order.check_data_real_delivery_address()
@@ -988,6 +979,16 @@ class SaleOrder(models.Model):
             # order.order_line.get_reserved_from()
 
         res = super(SaleOrder, self).action_confirm()
+        for order in self:
+            note = []
+            for line in order.order_line:
+                if line.display_type == 'line_note':
+                    note.append(line.name)
+            
+            if order.picking_ids:
+                # Sort picking_ids by creation date to get the most recent one
+                latest_picking = order.picking_ids.sorted(key=lambda p: p.create_date, reverse=True)[0]
+                latest_picking.notee = '\n'.join(note)
         return res
 
     def action_cancel(self):
@@ -1071,6 +1072,8 @@ class SaleOrder(models.Model):
             partner.email = self.email
         if not partner.customer_type:
             partner.customer_type = self.customer_type
+        if not partner.user_id:
+            partner.user_id = self.user_id.id
 
         # if not partner.sppkp or not partner.npwp or not partner.email or partner.customer_type:
         #     partner.customer_type = self.customer_type