Merge branch 'production' into iman/switch-account

1 files changed, 37 insertions, 7 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index aa5443c5..3a28bc54 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -38,14 +38,14 @@ class SaleOrder(models.Model):
     have_outstanding_po = fields.Boolean('Have Outstanding PO', compute='_have_outstanding_po')
     purchase_ids = fields.Many2many('purchase.order', string='Purchases', compute='_get_purchases')
     real_shipping_id = fields.Many2one(
-        'res.partner', string='Real Delivery Address', readonly=True, required=True,
+        'res.partner', string='Real Delivery Address', readonly=True,
         states={'draft': [('readonly', False)], 'sent': [('readonly', False)], 'sale': [('readonly', False)]},
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
-        help="Dipakai untuk alamat tempel")
+        help="Dipakai untuk alamat tempel", tracking=True)
     real_invoice_id = fields.Many2one(
         'res.partner', string='Delivery Invoice Address', required=True,
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
-        help="Dipakai untuk alamat tempel")
+        help="Dipakai untuk alamat tempel", tracking=True)
     fee_third_party = fields.Float('Fee Pihak Ketiga')
     so_status = fields.Selection([
         ('terproses', 'Terproses'),
@@ -116,6 +116,21 @@ class SaleOrder(models.Model):
     percent_margin_after_delivery_purchase = fields.Float(string='% Margin After Delivery Purchase', compute='_compute_margin_after_delivery_purchase')
     purchase_delivery_amt = fields.Float(string='Purchase Delivery Amount', compute='_compute_purchase_delivery_amount')
     type_promotion = fields.Char(string='Type Promotion', compute='_compute_type_promotion')
+    partner_invoice_id = fields.Many2one(
+        'res.partner', string='Invoice Address',
+        readonly=True, required=True,
+        states={'draft': [('readonly', False)], 'sent': [('readonly', False)], 'sale': [('readonly', False)]},
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+        tracking=True,  # Menambahkan tracking=True
+    )
+    partner_shipping_id = fields.Many2one(
+        'res.partner', string='Delivery Address', readonly=True, required=True,
+        states={'draft': [('readonly', False)], 'sent': [('readonly', False)], 'sale': [('readonly', False)]},
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]", tracking=True)
+    
+    payment_term_id = fields.Many2one(
+        'account.payment.term', string='Payment Terms', check_company=True,  # Unrequired company
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]", tracking=True)
 
     def _compute_type_promotion(self):
         for rec in self:
@@ -430,10 +445,22 @@ class SaleOrder(models.Model):
     #         return [('id', 'not in', order_ids)]
     #     return ['&', ('order_line.invoice_lines.move_id.move_type', 'in', ('out_invoice', 'out_refund')), ('order_line.invoice_lines.move_id', operator, value)]
 
-    @api.onchange('partner_shipping_id')
-    def onchange_partner_shipping(self):
-        self.real_shipping_id = self.partner_shipping_id
-        self.real_invoice_id = self.partner_invoice_id
+
+    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')
+        if not real_delivery_address.kelurahan_id:
+            raise UserError('Kelurahan Real Delivery Address harus diisi')
 
     @api.onchange('partner_id')
     def onchange_partner_contact(self):
@@ -675,6 +702,9 @@ class SaleOrder(models.Model):
             if not order.commitment_date and order.create_date > datetime(2024, 9, 12):
                 raise UserError("Expected Delivery Date kosong, wajib diisi")
             
+            if not order.real_shipping_id:
+                UserError('Real Delivery Address harus di isi')
+            
             if order.validate_partner_invoice_due():
                 return self._create_notification_action('Notification', 'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')