From 1a0b0cb4a740d831f69ea29943cfa0aed8e31fac Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 2 Jun 2025 09:17:29 +0700 Subject: fix email to putra & darren> --- indoteknik_custom/views/user_pengajuan_tempo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ Pengajuan Tempo Harus di Periksa! "Indoteknik.com" <noreply@indoteknik.com> sales@indoteknik.com - vita@indoteknik.co.id + putra@indoteknik.co.id,Darren@indoteknik.co.id -- cgit v1.2.3 From 8723d21169e32272addb7285163ddfa45682ac14 Mon Sep 17 00:00:00 2001 From: "Indoteknik ." Date: Mon, 2 Jun 2025 09:31:21 +0700 Subject: (andri) test add webhook --- indoteknik_api/controllers/api_v1/stock_picking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py index 49547779..be49bcdb 100644 --- a/indoteknik_api/controllers/api_v1/stock_picking.py +++ b/indoteknik_api/controllers/api_v1/stock_picking.py @@ -164,7 +164,7 @@ 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) + @http.route(prefix + 'webhook/biteship', auth='public', methods=['POST'], csrf=False) def udpate_status_from_bitehsip(self, **kw): return "ok" -- cgit v1.2.3 From c22cbb9f52be68baa089af59dc822cfe56554d70 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Mon, 2 Jun 2025 09:33:59 +0700 Subject: remove merchandiser from po --- indoteknik_custom/models/purchase_order.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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") -- cgit v1.2.3 From 01029f94471df384decb606dbb3088f31a5a8108 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 3 Jun 2025 09:49:28 +0700 Subject: push --- indoteknik_custom/models/stock_picking.py | 1 + indoteknik_custom/views/sale_order.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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..34540cc5 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -403,7 +403,7 @@ - + -- cgit v1.2.3 From b9846c274cfbe4fb23a6c86469fde5ca3d73d54b Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 3 Jun 2025 10:11:50 +0700 Subject: push --- indoteknik_api/controllers/api_v1/stock_picking.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py index be49bcdb..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', 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'))], -- cgit v1.2.3 From 3882ee6c3299525eeb8924cd9c7245f65cd15a28 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 3 Jun 2025 15:42:20 +0700 Subject: add notes to tree so --- indoteknik_custom/views/sale_order.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 34540cc5..03c978a7 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -428,6 +428,7 @@ + -- cgit v1.2.3