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

5 files changed, 10 insertions, 8 deletions

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 49547779..7cbd3c96 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -164,9 +164,9 @@ class StockPicking(controller.Controller):
     #     except Exception as e:
     #         return {'success': False, 'message': str(e)}
 
-    @http.route(prefix + 'webhook/biteship', type='json', auth='public', methods=['POST'], csrf=False)
-    def udpate_status_from_bitehsip(self, **kw):
-        return "ok"
+    # @http.route(prefix + 'webhook/biteship', auth='public', methods=['POST'], csrf=False)
+    # def udpate_status_from_bitehsip(self, **kw):
+    #     return "ok"
 
     def process_order_status(self, data):
         picking_model = request.env['stock.picking'].sudo().search([('biteship_id', '=', data.get('order_id'))],
diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 21ca55eb..240289bf 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -816,7 +816,7 @@ class PurchaseOrder(models.Model):
         for line in self.order_line:
             if not line.so_line_id:
                 continue
-            if line.so_line_id.vendor_id.id != vendor_po and not self.env.user.has_group('indoteknik_custom.group_role_merchandiser'):
+            if line.so_line_id.vendor_id.id != vendor_po:
                 self.env.user.notify_danger(
                 title='WARNING!!!',
                 message="Produk "+line.product_id.name+" memiliki vendor berbeda dengan SO (Vendor PO: "+str(self.partner_id.name)+", Vendor SO: "+str(line.so_line_id.vendor_id.name)+")",
@@ -834,7 +834,7 @@ class PurchaseOrder(models.Model):
         if self.amount_untaxed >= 50000000 and not self.env.user.id == 21:
             raise UserError("Hanya Rafly Hanggara yang bisa approve")
             
-        if self.total_percent_margin < self.total_so_percent_margin and not self.env.user.has_group('indoteknik_custom.group_role_merchandiser') and not self.env.user.is_leader:
+        if self.total_percent_margin < self.total_so_percent_margin:
             self.env.user.notify_danger(
                 title='WARNING!!!',
                 message='Beda Margin dengan Sale Order',
@@ -1002,7 +1002,7 @@ class PurchaseOrder(models.Model):
                 self.approval_status_unlock = 'approvedFinance'
             else:
                 raise UserError("Bisa langsung Confirm, menunggu persetujuan Finance jika ingin unlock PO")
-        elif self.env.user.is_leader or self.env.user.has_group('indoteknik_custom.group_role_merchandiser'):
+        elif self.env.user.is_leader or self.env.user.has_group('indoteknik_custom.group_role_purchasing'):
             raise UserError("Bisa langsung Confirm")
         elif self.total_percent_margin == self.total_so_percent_margin and self.matches_so and not greater_than_plafon and not different_vendor_message:
             raise UserError("Bisa langsung Confirm")
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index a215eb74..3921ed5a 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -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.")
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 0fabf279..03c978a7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -403,7 +403,7 @@
                 <field name="state" position="after">
                     <field name="approval_status"/>
                     <field name="client_order_ref"/>
-                    <field name="notes"/>
+                    <field name="notes" optional="hide"/>
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
                     <field name="pareto_status" optional="hide"/>
@@ -428,6 +428,7 @@
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
                     <field name="pareto_status" optional="hide"/>
+                    <field name="notes" optional="hide"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/user_pengajuan_tempo.xml b/indoteknik_custom/views/user_pengajuan_tempo.xml
index 4eebe9e4..f9dca4ca 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo.xml
@@ -204,7 +204,7 @@
             <field name="subject">Pengajuan Tempo Harus di Periksa!</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
             <field name="reply_to">sales@indoteknik.com</field>
-            <field name="email_to">vita@indoteknik.co.id</field>
+            <field name="email_to">putra@indoteknik.co.id,Darren@indoteknik.co.id</field>
 <!--            <field name="email_to">sapiabon768@gmail.com</field>-->
             <field name="body_html" type="html">
                 <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">