Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into odoo-backup

# Conflicts:
#	indoteknik_custom/models/sale_order.py

8 files changed, 92 insertions, 41 deletions

diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index b66121e1..ff10b814 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -696,21 +696,42 @@ class SaleNotInMatchPO(models.Model):
     purchase_tax_id = fields.Many2one('account.tax', string='Purchase Tax')
     note_procurement = fields.Many2one(string='Note Procurement')
 
+    # 1. yang bug
+    # def init(self):
+    #     tools.drop_view_if_exists(self.env.cr, self._table)
+    #     self.env.cr.execute("""
+    #                         CREATE OR REPLACE VIEW %s AS(
+    #                             select apsm.id, apsm.automatic_purchase_id, apsm.automatic_purchase_line_id, apsm.sale_id, apsm.sale_line_id, 
+    #                             apsm.picking_id, apsm.move_id, apsm.partner_id,
+    #                             apsm.partner_invoice_id, apsm.salesperson_id, apsm.product_id, apsm.qty_so, apsm.qty_po, apsm.create_uid, 
+    #                             apsm.create_date, apsm.write_uid, apsm.write_date, apsm.purchase_price,
+    #                             apsm.purchase_tax_id, apsm.note_procurement
+    #                             from automatic_purchase_sales_match apsm
+    #                             where apsm.sale_line_id not in (
+    #                                 select distinct coalesce(posm.sale_line_id,0) 
+    #                                 from purchase_order_sales_match posm
+    #                                 join purchase_order po on po.id = posm.purchase_order_id
+    #                                 where po.state not in ('cancel')
+    #                             )
+    #                         )
+    #                         """ % self._table)
+
     def init(self):
         tools.drop_view_if_exists(self.env.cr, self._table)
         self.env.cr.execute("""
                             CREATE OR REPLACE VIEW %s AS(
-                                select apsm.id, apsm.automatic_purchase_id, apsm.automatic_purchase_line_id, apsm.sale_id, apsm.sale_line_id, 
-                                apsm.picking_id, apsm.move_id, apsm.partner_id,
-                                apsm.partner_invoice_id, apsm.salesperson_id, apsm.product_id, apsm.qty_so, apsm.qty_po, apsm.create_uid, 
-                                apsm.create_date, apsm.write_uid, apsm.write_date, apsm.purchase_price,
-                                apsm.purchase_tax_id, apsm.note_procurement
-                                from automatic_purchase_sales_match apsm
-                                where apsm.sale_line_id not in (
-                                    select distinct coalesce(posm.sale_line_id,0) 
-                                    from purchase_order_sales_match posm
-                                    join purchase_order po on po.id = posm.purchase_order_id
-                                    where po.state not in ('cancel')
+                                SELECT apsm.id, apsm.automatic_purchase_id, apsm.automatic_purchase_line_id, 
+                                    apsm.sale_id, apsm.sale_line_id, apsm.picking_id, apsm.move_id, 
+                                    apsm.partner_id, apsm.partner_invoice_id, apsm.salesperson_id, 
+                                    apsm.product_id, apsm.qty_so, apsm.qty_po, apsm.create_uid, 
+                                    apsm.create_date, apsm.write_uid, apsm.write_date, apsm.purchase_price,
+                                    apsm.purchase_tax_id, apsm.note_procurement
+                                FROM automatic_purchase_sales_match apsm
+                                WHERE apsm.sale_line_id NOT IN (
+                                    SELECT posm.sale_line_id
+                                    FROM purchase_order_sales_match posm
+                                    JOIN purchase_order po ON po.id = posm.purchase_order_id
+                                    WHERE po.state NOT IN ('cancel')
                                 )
                             )
-                            """ % self._table)
+                            """ % self._table)
\ No newline at end of file
diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py
index 17805c6c..89392033 100755
--- a/indoteknik_custom/models/product_template.py
+++ b/indoteknik_custom/models/product_template.py
@@ -870,9 +870,9 @@ class ProductTemplate(models.Model):
                 record.message_post(body=f"<b>Updated:</b><ul>{''.join(changes)}</ul>")
 
                 # log changes to product variants
-                variant_message = f"<b>Updated:</b><ul>{''.join(changes)}</ul>"
-                for variant in record.product_variant_ids:
-                    variant.message_post(body=variant_message)
+                # variant_message = f"<b>Updated:</b><ul>{''.join(changes)}</ul>"
+                # for variant in record.product_variant_ids:
+                #     variant.message_post(body=variant_message)
 
     # simpan data lama dan log perubahan field
     def write(self, vals):
diff --git a/indoteknik_custom/models/sale_advance_payment_inv.py b/indoteknik_custom/models/sale_advance_payment_inv.py
index bea9a900..48b753cc 100644
--- a/indoteknik_custom/models/sale_advance_payment_inv.py
+++ b/indoteknik_custom/models/sale_advance_payment_inv.py
@@ -197,6 +197,7 @@ class SaleAdvancePaymentInv(models.TransientModel):
     #     if final:
     #         moves.sudo().filtered(lambda m: m.amount_total < 0).action_switch_invoice_into_refund_credit_note()
     #     for move in moves:
+    
     #         move.message_post_with_view('mail.message_origin_link',
     #             values={'self': move, 'origin': move.line_ids.mapped('sale_line_ids.order_id')},
     #             subtype_id=self.env.ref('mail.mt_note').id
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 6028a1d0..db0e1227 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -332,9 +332,9 @@ class SaleOrder(models.Model):
         ('approve', 'Approve')
     ], tracking=True, string='State Cancel', copy=False)
     date_hold = fields.Datetime(string='Date Hold', tracking=True, readonly=True, help='Waktu ketika SO di Hold'
-    )
+                                )
     date_unhold = fields.Datetime(string='Date Unhold', tracking=True, readonly=True, help='Waktu ketika SO di Unhold'
-    )
+                                  )
 
     ready_to_ship_status_detail = fields.Char(
         string='Status Shipping Detail',
@@ -379,7 +379,7 @@ class SaleOrder(models.Model):
                     }
                 }
 
-    def hold_unhold_qty_outgoing_so(self):  
+    def hold_unhold_qty_outgoing_so(self):
         if self.hold_outgoing == True:
             self.hold_outgoing = False
             self.date_unhold = fields.Datetime.now()
@@ -393,7 +393,6 @@ class SaleOrder(models.Model):
                 picking.do_unreserve()
             self.hold_outgoing = True
             self.date_hold = fields.Datetime.now()
-        
 
     def _validate_uniform_taxes(self):
         for order in self:
@@ -411,8 +410,8 @@ class SaleOrder(models.Model):
     #         if rec.fee_third_party == 0 and rec.total_margin_excl_third_party != rec.total_percent_margin:
     #             # Gunakan direct SQL atau flag context untuk menghindari rekursi
     #             self.env.cr.execute("""
-    #                 UPDATE sale_order 
-    #                 SET total_margin_excl_third_party = %s 
+    #                 UPDATE sale_order
+    #                 SET total_margin_excl_third_party = %s
     #                 WHERE id = %s
     #             """, (rec.total_percent_margin, rec.id))
     #             self.invalidate_cache()
@@ -1232,10 +1231,12 @@ class SaleOrder(models.Model):
         for order in self:
             for line in order.order_line:
                 if 'bom-it' in line.name.lower() or 'bom' in line.product_id.default_code.lower() if line.product_id.default_code else False:
-                    search_bom = self.env['mrp.production'].search([('product_id', '=', line.product_id.id), ('sale_order', '=', order.id), ('state', '!=', 'cancel')],
-                    order='name desc')
+                    search_bom = self.env['mrp.production'].search(
+                        [('product_id', '=', line.product_id.id), ('sale_order', '=', order.id),
+                         ('state', '!=', 'cancel')],
+                        order='name desc')
                     if search_bom:
-                        confirmed_bom = search_bom.filtered(lambda x: x.state == 'confirmed' or x.state == 'done') 
+                        confirmed_bom = search_bom.filtered(lambda x: x.state == 'confirmed' or x.state == 'done')
                         if not confirmed_bom:
                             raise UserError(
                                 "Product BOM belum dikonfirmasi di Manufacturing Orders. Silakan hubungi MD.")
@@ -1533,7 +1534,7 @@ class SaleOrder(models.Model):
 
             if not order.real_shipping_id:
                 UserError('Real Delivery Address harus di isi')
-                
+
             if not self.env.context.get('due_approve', []):
                 if order.validate_partner_invoice_due():
                     return self._create_notification_action('Notification',
@@ -2015,6 +2016,7 @@ class SaleOrder(models.Model):
 <<<<<<< HEAD
             self._calculate_etrts_date()
         return res
+<<<<<<< HEAD
 =======
             self._calculate_etrts_date() 
         return res
@@ -2054,3 +2056,27 @@ class SaleOrder(models.Model):
             else:
                 order.ready_to_ship_status_detail = 'On Track'
 >>>>>>> CR/form-merchant
+=======
+
+    def write(self, vals):
+        # Cek apakah payment_term_id diubah dan SO sedang dalam approval
+        if 'payment_term_id' in vals and any(
+                order.approval_status in ['pengajuan1', 'pengajuan2', 'approved'] for order in self):
+            raise UserError(
+                "Payment Term tidak dapat diubah karena Sales Order sedang dalam proses approval atau sudah diapprove.")
+
+        if 'payment_term_id' in vals:
+            for order in self:
+                partner = order.partner_id.parent_id or order.partner_id
+                customer_payment_term = partner.property_payment_term_id
+
+                # Jika payment term yang diinput berbeda dengan payment term customer
+                if vals['payment_term_id'] != customer_payment_term.id:
+                    raise UserError(
+                        f"Payment Term berbeda pada Master Data Customer. "
+                        f"Harap ganti ke '{customer_payment_term.name}' "
+                        f"sesuai dengan payment term yang terdaftar pada customer."
+                    )
+
+        return super(SaleOrder, self).write(vals)
+>>>>>>> 46e4c80e1b530274c01cca5603f3e1be873820f6
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 0071bb1a..504338b0 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -288,7 +288,7 @@ class StockPicking(models.Model):
         self.ensure_one()
         if not self.name or not self.origin:
             return False
-        return f"{self.name} {self.origin}"
+        return f"{self.name}, {self.origin}"
     
     def _download_pod_photo(self, url):
         """Mengunduh foto POD dari URL"""
@@ -584,6 +584,7 @@ class StockPicking(models.Model):
                     self.lalamove_phone = phone
                     self.lalamove_status = pod.get("status")
                     self.lalamove_delivered_at = delivered_at_dt
+                    self.driver_arrival_date = delivered_at_dt
                     return data
 
             raise UserError("No delivered data found in Lalamove response.")
@@ -1012,15 +1013,15 @@ class StockPicking(models.Model):
         self.sale_id.date_doc_kirim = self.date_doc_kirim
 
     def action_assign(self):
-        if self.sale_id.hold_outgoing and self.location_id.id == 57 and self.location_dest_id.id == 60:
-            print(1)
-        else:
-            res = super(StockPicking, self).action_assign()
+        res = super(StockPicking, self).action_assign()
+        for move in self:
+            # if not move.sale_id.hold_outgoing and move.location_id.id != 57 and move.location_dest_id.id != 60:
+            # TODO cant skip hold outgoing cause of not singleton method
             current_time = datetime.datetime.utcnow()
-            self.real_shipping_id = self.sale_id.real_shipping_id
-            self.date_availability = current_time
+            move.real_shipping_id = move.sale_id.real_shipping_id
+            move.date_availability = current_time
         # self.check_state_reserve()
-            return res
+        return res
 
     def ask_approval(self):
         if self.env.user.is_accounting:
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 92d13fa7..2191acf4 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -96,11 +96,11 @@
                     <attribute name="invisible">1</attribute>
                 </field>
                 <field name="user_id" position="after">
-                    <field name="hold_outgoing" readonly="1" />
-                    <field name="date_hold" readonly="1" widget="datetime" />
-                    <field name="date_unhold" readonly="1" widget="datetime" />
-                    <field name="helper_by_id" readonly="1" />
-                    <field name="compute_fullfillment" invisible="1" />
+                    <field name="hold_outgoing" readonly="1"/>
+                    <field name="date_hold" readonly="1" widget="datetime"/>
+                    <field name="date_unhold" readonly="1" widget="datetime"/>
+                    <field name="helper_by_id" readonly="1"/>
+                    <field name="compute_fullfillment" invisible="1"/>
                 </field>
                 <field name="tag_ids" position="after">
 <<<<<<< HEAD
@@ -316,8 +316,9 @@
                 </field>
                 <field name="payment_term_id" position="attributes">
                     <attribute name="attrs">
-                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
-                                                                             ['cancel', 'draft'])]}
+                        {'readonly': ['|', ('approval_status', 'in', ['pengajuan1', 'pengajuan2', 'approved']),
+                                      ('state', 'not in',
+                                       ['cancel', 'draft'])]}
                     </attribute>
                 </field>
 
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index ae77ab9a..02959d69 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -19,6 +19,7 @@
                     <field name="note" optional="hide"/>
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
+                    <field name="sj_return_date" optional="hide"/>
                     <field name="state_packing" widget="badge" decoration-success="state_packing == 'packing_done'" decoration-danger="state_packing == 'not_packing'" optional="hide"/>
                     <field name="final_seq"/>
                     <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" optional="hide"/>
diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
index 339ce8db..898d5b2a 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
@@ -426,7 +426,7 @@
     <menuitem
         id="menu_user_pengajuan_tempo_request"
         name="User Pengajuan Tempo Request"
-        parent="res_partner_menu_user"
+        parent="account.menu_finance_receivables"
         sequence="3"
         action="action_user_pengajuan_tempo_request"
     />