From 75fa42b4f5afb7a70e30c84b7a348f65e1bb99e9 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 4 Dec 2024 14:08:32 +0700 Subject: api tracking envio --- indoteknik_custom/models/stock_picking.py | 115 +++++++++++++++++++++++++++++- 1 file changed, 112 insertions(+), 3 deletions(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 03b10cdb..0d8c6b0f 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -1,9 +1,11 @@ from odoo import fields, models, api, _ from odoo.exceptions import AccessError, UserError, ValidationError from odoo.tools.float_utils import float_is_zero -from datetime import datetime +from datetime import datetime, timedelta from itertools import groupby -import pytz, datetime, requests, json +import pytz, requests, json, requests +from dateutil import parser +# import datetime class StockPicking(models.Model): @@ -113,6 +115,113 @@ class StockPicking(models.Model): ], string='Status Reserve', readonly=True, tracking=True, help="The current state of the stock picking.") notee = fields.Text(string="Note") + # Envio Tracking Section + envio_id = fields.Char(string="Envio ID", readonly=True) + envio_code = fields.Char(string="Envio Code", readonly=True) + envio_ref_code = fields.Char(string="Envio Reference Code", readonly=True) + envio_eta_at = fields.Char(string="Estimated Time of Arrival (ETA)", readonly=True) + envio_ata_at = fields.Char(string="Actual Time of Arrival (ATA)", readonly=True) + envio_etd_at = fields.Char(string="Estimated Time of Departure (ETD)", readonly=True) + envio_atd_at = fields.Char(string="Actual Time of Departure (ATD)", readonly=True) + envio_received_by = fields.Char(string="Received By", readonly=True) + envio_status = fields.Char(string="Status", readonly=True) + envio_cod_value = fields.Float(string="COD Value", readonly=True) + envio_cod_status = fields.Char(string="COD Status", readonly=True) + envio_logs = fields.Text(string="Logs", readonly=True) + envio_latest_message = fields.Text(string="Latest Log Message", readonly=True) + envio_latest_recorded_at = fields.Char(string="Log Recorded At", readonly=True) + envio_latest_latitude = fields.Float(string="Log Latitude", readonly=True) + envio_latest_longitude = fields.Float(string="Log Longitude", readonly=True) + tracking_by = fields.Many2one('res.users', string='Tracking By', readonly=True, tracking=True) + + def _convert_to_wib(self, date_str): + """ + Mengonversi string waktu ISO 8601 ke format waktu Indonesia (WIB) + """ + if not date_str: + return False + try: + utc_time = datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%SZ') + wib_time = utc_time + timedelta(hours=7) + return wib_time.strftime('%d-%m-%Y %H:%M:%S') + except ValueError: + raise UserError(f"Format waktu tidak sesuai: {date_str}") + + def _convert_to_datetime(self, date_str): + """Mengonversi string waktu dari API ke datetime.""" + if not date_str: + return False + try: + # Format waktu dengan milidetik + return datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S.%fZ') + except ValueError: + try: + # Format waktu tanpa milidetik + return datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%SZ') + except ValueError: + raise UserError(f"Format waktu tidak sesuai: {date_str}") + + def track_envio_shipment(self): + pickings = self.env['stock.picking'].search([ + ('picking_type_code', '=', 'outgoing'), + ('state', '=', 'done'), + ('carrier_id', '=', 151) + ]) + for picking in pickings: + if not picking.name: + raise UserError("Name pada stock.picking tidak ditemukan.") + + # API URL dan headers + url = f"https://api.envio.co.id/v1/tracking/distribution?code={picking.name}" + headers = { + 'Authorization': 'Bearer JZ0Seh6qpYJAC3CJHdhF7sPqv8B/uSSfZe1VX5BL?vPYdo', + 'Content-Type': 'application/json', + } + + try: + # Request ke API + response = requests.get(url, headers=headers, timeout=10) + response.raise_for_status() # Raise error jika status code bukan 200 + response_data = response.json() + + # Validasi jika respons tidak sesuai format yang diharapkan + if not response_data or "data" not in response_data: + raise UserError("Respons API tidak sesuai format yang diharapkan.") + + data = response_data.get("data") + if not data: + continue + + # Menyimpan data ke field masing-masing + picking.envio_id = data.get("id") + picking.envio_code = data.get("code") + picking.envio_ref_code = data.get("ref_code") + picking.envio_eta_at = self._convert_to_datetime(data.get("eta_at")) + picking.envio_ata_at = self._convert_to_datetime(data.get("ata_at")) + picking.envio_etd_at = self._convert_to_datetime(data.get("etd_at")) + picking.envio_atd_at = self._convert_to_datetime(data.get("atd_at")) + picking.envio_received_by = data.get("received_by") + picking.envio_status = data.get("status") + picking.envio_cod_value = data.get("cod_value", 0.0) + picking.envio_cod_status = data.get("cod_status") + + # Menyimpan log terbaru + logs = data.get("logs", []) + if logs and isinstance(logs, list) and logs[0]: + latest_log = logs[0] + picking.envio_latest_message = latest_log.get("message", "Log kosong.") + picking.envio_latest_recorded_at = self._convert_to_datetime(latest_log.get("recorded_at")) + picking.envio_latest_latitude = latest_log.get("latitude", 0.0) + picking.envio_latest_longitude = latest_log.get("longitude", 0.0) + + picking.tracking_by = self.env.user.id + ata_at_str = data.get("ata_at") + picking.driver_arrival_date = self._convert_to_datetime(ata_at_str) if ata_at_str else False + except requests.exceptions.RequestException as e: + raise UserError(f"Terjadi kesalahan saat menghubungi API Envio: {str(e)}") + except Exception as e: + raise UserError(f"Kesalahan tidak terduga: {str(e)}") + def action_send_to_biteship(self): url = "https://api.biteship.com/v1/orders" api_key = "biteship_test.eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiSW5kb3Rla25payIsInVzZXJJZCI6IjY3MTViYTJkYzVkMjdkMDAxMjRjODk2MiIsImlhdCI6MTcyOTQ5ODAwMX0.L6C73couP4-cgVEfhKI2g7eMCMo3YOFSRZhS-KSuHNA" @@ -539,7 +648,7 @@ class StockPicking(models.Model): qty_onhand = check_qty_per_inventory(self, line.product_id, line.location_id) if line.qty_done > qty_onhand: - raise UserError(f'{line.product_id.display_name} : Quantity Done melebihi Quantity Onhand') + raise UserError('Quantity Done melebihi Quantity Onhand') def button_validate(self): if not self.env.user.is_logistic_approver and self.env.context.get('active_model') == 'stock.picking': -- cgit v1.2.3 From c60a7a4b0844fe04ec29656b185b9fa80d398c26 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Wed, 4 Dec 2024 14:10:10 +0700 Subject: add validation mandatory category --- indoteknik_custom/models/product_template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py index 4d186568..6fb8c7a0 100755 --- a/indoteknik_custom/models/product_template.py +++ b/indoteknik_custom/models/product_template.py @@ -66,7 +66,7 @@ class ProductTemplate(models.Model): @api.constrains('name', 'internal_reference', 'x_manufacture') def required_public_categ_ids(self): for rec in self: - if not rec.public_categ_ids: + if not rec.public_categ_ids and rec.type == 'product': raise UserError('Field Categories harus diisi') def _get_qty_sold(self): @@ -388,7 +388,7 @@ class ProductProduct(models.Model): @api.constrains('name', 'internal_reference', 'x_manufacture') def required_public_categ_ids(self): for rec in self: - if not rec.public_categ_ids: + if not rec.public_categ_ids and rec.type == 'product': raise UserError('Field Categories harus diisi') @api.constrains('active') -- cgit v1.2.3 From 61cfbef8ec24ca67c9a65b7901bb9ec615364977 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 4 Dec 2024 14:20:40 +0700 Subject: fix error --- indoteknik_custom/models/stock_picking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 0d8c6b0f..0da258e5 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -5,7 +5,7 @@ from datetime import datetime, timedelta from itertools import groupby import pytz, requests, json, requests from dateutil import parser -# import datetime +import datetime class StockPicking(models.Model): -- cgit v1.2.3 From 65a1d7c8fb4e4bd3b055efec5362d98a2d4340fc Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 4 Dec 2024 14:27:53 +0700 Subject: test api envio --- indoteknik_custom/models/stock_picking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 0da258e5..327a4223 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -167,7 +167,7 @@ class StockPicking(models.Model): ('state', '=', 'done'), ('carrier_id', '=', 151) ]) - for picking in pickings: + for picking in self: if not picking.name: raise UserError("Name pada stock.picking tidak ditemukan.") -- cgit v1.2.3 From 4eac4d0709ec5d9e03b517a39cb67acbc35e2932 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 4 Dec 2024 14:43:55 +0700 Subject: fix bug --- indoteknik_custom/models/stock_picking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 327a4223..931da588 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -1,7 +1,7 @@ from odoo import fields, models, api, _ from odoo.exceptions import AccessError, UserError, ValidationError from odoo.tools.float_utils import float_is_zero -from datetime import datetime, timedelta +from datetime import timedelta from itertools import groupby import pytz, requests, json, requests from dateutil import parser -- cgit v1.2.3 From 32a33b7ef6c61424bc9785bdb4246a9be58e5b42 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Thu, 5 Dec 2024 16:10:09 +0700 Subject: fix bug api envio --- indoteknik_custom/models/stock_picking.py | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 931da588..6d911470 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -1,7 +1,7 @@ from odoo import fields, models, api, _ from odoo.exceptions import AccessError, UserError, ValidationError from odoo.tools.float_utils import float_is_zero -from datetime import timedelta +from datetime import timedelta, datetime from itertools import groupby import pytz, requests, json, requests from dateutil import parser @@ -119,17 +119,17 @@ class StockPicking(models.Model): envio_id = fields.Char(string="Envio ID", readonly=True) envio_code = fields.Char(string="Envio Code", readonly=True) envio_ref_code = fields.Char(string="Envio Reference Code", readonly=True) - envio_eta_at = fields.Char(string="Estimated Time of Arrival (ETA)", readonly=True) - envio_ata_at = fields.Char(string="Actual Time of Arrival (ATA)", readonly=True) - envio_etd_at = fields.Char(string="Estimated Time of Departure (ETD)", readonly=True) - envio_atd_at = fields.Char(string="Actual Time of Departure (ATD)", readonly=True) + envio_eta_at = fields.Datetime(string="Estimated Time of Arrival (ETA)", readonly=True) + envio_ata_at = fields.Datetime(string="Actual Time of Arrival (ATA)", readonly=True) + envio_etd_at = fields.Datetime(string="Estimated Time of Departure (ETD)", readonly=True) + envio_atd_at = fields.Datetime(string="Actual Time of Departure (ATD)", readonly=True) envio_received_by = fields.Char(string="Received By", readonly=True) envio_status = fields.Char(string="Status", readonly=True) envio_cod_value = fields.Float(string="COD Value", readonly=True) envio_cod_status = fields.Char(string="COD Status", readonly=True) envio_logs = fields.Text(string="Logs", readonly=True) envio_latest_message = fields.Text(string="Latest Log Message", readonly=True) - envio_latest_recorded_at = fields.Char(string="Log Recorded At", readonly=True) + envio_latest_recorded_at = fields.Datetime(string="Log Recorded At", readonly=True) envio_latest_latitude = fields.Float(string="Log Latitude", readonly=True) envio_latest_longitude = fields.Float(string="Log Longitude", readonly=True) tracking_by = fields.Many2one('res.users', string='Tracking By', readonly=True, tracking=True) @@ -141,7 +141,7 @@ class StockPicking(models.Model): if not date_str: return False try: - utc_time = datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%SZ') + utc_time = datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%SZ') wib_time = utc_time + timedelta(hours=7) return wib_time.strftime('%d-%m-%Y %H:%M:%S') except ValueError: @@ -153,11 +153,13 @@ class StockPicking(models.Model): return False try: # Format waktu dengan milidetik - return datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S.%fZ') + date = datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S.%fZ') + return date except ValueError: try: # Format waktu tanpa milidetik - return datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%SZ') + date = datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%SZ') + return date except ValueError: raise UserError(f"Format waktu tidak sesuai: {date_str}") @@ -167,7 +169,7 @@ class StockPicking(models.Model): ('state', '=', 'done'), ('carrier_id', '=', 151) ]) - for picking in self: + for picking in pickings: if not picking.name: raise UserError("Name pada stock.picking tidak ditemukan.") @@ -216,7 +218,12 @@ class StockPicking(models.Model): picking.tracking_by = self.env.user.id ata_at_str = data.get("ata_at") - picking.driver_arrival_date = self._convert_to_datetime(ata_at_str) if ata_at_str else False + envio_ata = self._convert_to_datetime(data.get("ata_at")) + + picking.driver_arrival_date = envio_ata + if data.get("status") == 'returned': + picking.driver_arrival_date = False + picking.envio_ata_at = False except requests.exceptions.RequestException as e: raise UserError(f"Terjadi kesalahan saat menghubungi API Envio: {str(e)}") except Exception as e: -- cgit v1.2.3 From 3771d33ddb1abf2ffe434d71bd1dbeadcb83c00d Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 6 Dec 2024 09:01:32 +0700 Subject: fix bug --- indoteknik_custom/models/stock_picking.py | 69 +++++++++++++++---------------- 1 file changed, 33 insertions(+), 36 deletions(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 6d911470..37e43054 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -169,11 +169,11 @@ class StockPicking(models.Model): ('state', '=', 'done'), ('carrier_id', '=', 151) ]) + for picking in pickings: if not picking.name: raise UserError("Name pada stock.picking tidak ditemukan.") - # API URL dan headers url = f"https://api.envio.co.id/v1/tracking/distribution?code={picking.name}" headers = { 'Authorization': 'Bearer JZ0Seh6qpYJAC3CJHdhF7sPqv8B/uSSfZe1VX5BL?vPYdo', @@ -181,53 +181,50 @@ class StockPicking(models.Model): } try: - # Request ke API response = requests.get(url, headers=headers, timeout=10) - response.raise_for_status() # Raise error jika status code bukan 200 + response.raise_for_status() response_data = response.json() - # Validasi jika respons tidak sesuai format yang diharapkan - if not response_data or "data" not in response_data: - raise UserError("Respons API tidak sesuai format yang diharapkan.") - data = response_data.get("data") if not data: continue - # Menyimpan data ke field masing-masing - picking.envio_id = data.get("id") - picking.envio_code = data.get("code") - picking.envio_ref_code = data.get("ref_code") - picking.envio_eta_at = self._convert_to_datetime(data.get("eta_at")) - picking.envio_ata_at = self._convert_to_datetime(data.get("ata_at")) - picking.envio_etd_at = self._convert_to_datetime(data.get("etd_at")) - picking.envio_atd_at = self._convert_to_datetime(data.get("atd_at")) - picking.envio_received_by = data.get("received_by") - picking.envio_status = data.get("status") - picking.envio_cod_value = data.get("cod_value", 0.0) - picking.envio_cod_status = data.get("cod_status") - - # Menyimpan log terbaru - logs = data.get("logs", []) - if logs and isinstance(logs, list) and logs[0]: - latest_log = logs[0] - picking.envio_latest_message = latest_log.get("message", "Log kosong.") - picking.envio_latest_recorded_at = self._convert_to_datetime(latest_log.get("recorded_at")) - picking.envio_latest_latitude = latest_log.get("latitude", 0.0) - picking.envio_latest_longitude = latest_log.get("longitude", 0.0) - + # Mapping field dengan data API + fields_map = { + 'envio_id': "id", + 'envio_code': "code", + 'envio_ref_code': "ref_code", + 'envio_eta_at': "eta_at", + 'envio_ata_at': "ata_at", + 'envio_etd_at': "etd_at", + 'envio_atd_at': "atd_at", + 'envio_received_by': "received_by", + 'envio_status': "status", + 'envio_cod_value': "cod_value", + 'envio_cod_status': "cod_status", + } + + for field, key in fields_map.items(): + setattr(picking, field, data.get(key, 0.0 if 'cod' in key else False)) + + # Menyimpan log terbaru jika ada + latest_log = (data.get("logs") or [{}])[0] + picking.envio_latest_message = latest_log.get("message", "Log kosong.") + picking.envio_latest_recorded_at = self._convert_to_datetime(latest_log.get("recorded_at")) + picking.envio_latest_latitude = latest_log.get("latitude", 0.0) + picking.envio_latest_longitude = latest_log.get("longitude", 0.0) + + # Menyimpan data tambahan picking.tracking_by = self.env.user.id - ata_at_str = data.get("ata_at") envio_ata = self._convert_to_datetime(data.get("ata_at")) + picking.driver_arrival_date = envio_ata if envio_ata != '0001-01-01 00:00:00' else False + picking.envio_ata_at = envio_ata if envio_ata != '0001-01-01 00:00:00' else False - picking.driver_arrival_date = envio_ata - if data.get("status") == 'returned': - picking.driver_arrival_date = False - picking.envio_ata_at = False except requests.exceptions.RequestException as e: - raise UserError(f"Terjadi kesalahan saat menghubungi API Envio: {str(e)}") + raise UserError(f"Terjadi kesalahan saat menghubungi API Envio: {e}") except Exception as e: - raise UserError(f"Kesalahan tidak terduga: {str(e)}") + raise UserError(f"Kesalahan tidak terduga: {e}") + def action_send_to_biteship(self): url = "https://api.biteship.com/v1/orders" -- cgit v1.2.3 From b0e71c613a80283a76371a468d54771b284205b5 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 6 Dec 2024 11:27:03 +0700 Subject: fix bug envio --- indoteknik_custom/models/stock_picking.py | 69 ++++++++++++++++--------------- 1 file changed, 36 insertions(+), 33 deletions(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 37e43054..e6506a0b 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -169,11 +169,11 @@ class StockPicking(models.Model): ('state', '=', 'done'), ('carrier_id', '=', 151) ]) - for picking in pickings: if not picking.name: raise UserError("Name pada stock.picking tidak ditemukan.") + # API URL dan headers url = f"https://api.envio.co.id/v1/tracking/distribution?code={picking.name}" headers = { 'Authorization': 'Bearer JZ0Seh6qpYJAC3CJHdhF7sPqv8B/uSSfZe1VX5BL?vPYdo', @@ -181,50 +181,53 @@ class StockPicking(models.Model): } try: + # Request ke API response = requests.get(url, headers=headers, timeout=10) - response.raise_for_status() + response.raise_for_status() # Raise error jika status code bukan 200 response_data = response.json() + # Validasi jika respons tidak sesuai format yang diharapkan + if not response_data or "data" not in response_data: + raise UserError("Respons API tidak sesuai format yang diharapkan.") + data = response_data.get("data") if not data: continue - # Mapping field dengan data API - fields_map = { - 'envio_id': "id", - 'envio_code': "code", - 'envio_ref_code': "ref_code", - 'envio_eta_at': "eta_at", - 'envio_ata_at': "ata_at", - 'envio_etd_at': "etd_at", - 'envio_atd_at': "atd_at", - 'envio_received_by': "received_by", - 'envio_status': "status", - 'envio_cod_value': "cod_value", - 'envio_cod_status': "cod_status", - } - - for field, key in fields_map.items(): - setattr(picking, field, data.get(key, 0.0 if 'cod' in key else False)) - - # Menyimpan log terbaru jika ada - latest_log = (data.get("logs") or [{}])[0] - picking.envio_latest_message = latest_log.get("message", "Log kosong.") - picking.envio_latest_recorded_at = self._convert_to_datetime(latest_log.get("recorded_at")) - picking.envio_latest_latitude = latest_log.get("latitude", 0.0) - picking.envio_latest_longitude = latest_log.get("longitude", 0.0) - - # Menyimpan data tambahan + # Menyimpan data ke field masing-masing + picking.envio_id = data.get("id") + picking.envio_code = data.get("code") + picking.envio_ref_code = data.get("ref_code") + picking.envio_eta_at = self._convert_to_datetime(data.get("eta_at")) + picking.envio_ata_at = self._convert_to_datetime(data.get("ata_at")) + picking.envio_etd_at = self._convert_to_datetime(data.get("etd_at")) + picking.envio_atd_at = self._convert_to_datetime(data.get("atd_at")) + picking.envio_received_by = data.get("received_by") + picking.envio_status = data.get("status") + picking.envio_cod_value = data.get("cod_value", 0.0) + picking.envio_cod_status = data.get("cod_status") + + # Menyimpan log terbaru + logs = data.get("logs", []) + if logs and isinstance(logs, list) and logs[0]: + latest_log = logs[0] + picking.envio_latest_message = latest_log.get("message", "Log kosong.") + picking.envio_latest_recorded_at = self._convert_to_datetime(latest_log.get("recorded_at")) + picking.envio_latest_latitude = latest_log.get("latitude", 0.0) + picking.envio_latest_longitude = latest_log.get("longitude", 0.0) + picking.tracking_by = self.env.user.id + ata_at_str = data.get("ata_at") envio_ata = self._convert_to_datetime(data.get("ata_at")) - picking.driver_arrival_date = envio_ata if envio_ata != '0001-01-01 00:00:00' else False - picking.envio_ata_at = envio_ata if envio_ata != '0001-01-01 00:00:00' else False + picking.driver_arrival_date = envio_ata + if data.get("status") != 'delivered': + picking.driver_arrival_date = False + picking.envio_ata_at = False except requests.exceptions.RequestException as e: - raise UserError(f"Terjadi kesalahan saat menghubungi API Envio: {e}") + raise UserError(f"Terjadi kesalahan saat menghubungi API Envio: {str(e)}") except Exception as e: - raise UserError(f"Kesalahan tidak terduga: {e}") - + raise UserError(f"Kesalahan tidak terduga: {str(e)}") def action_send_to_biteship(self): url = "https://api.biteship.com/v1/orders" -- cgit v1.2.3 From 7ae86bcd136fcd3aebbaf9bb483ee474d2a19c0c Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Mon, 9 Dec 2024 11:20:50 +0700 Subject: cr retur stock picking --- indoteknik_custom/models/stock_picking_return.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/stock_picking_return.py b/indoteknik_custom/models/stock_picking_return.py index 91a3a9fd..d4347235 100644 --- a/indoteknik_custom/models/stock_picking_return.py +++ b/indoteknik_custom/models/stock_picking_return.py @@ -14,14 +14,14 @@ class ReturnPicking(models.TransientModel): ('id', '=', res['picking_id']), ]) - sale_id = stock_picking.group_id.sale_id - if not stock_picking.approval_return_status == 'approved' and sale_id.invoice_ids: + # sale_id = stock_picking.group_id.sale_id + if not stock_picking.approval_return_status == 'approved': raise UserError('Harus Approval Accounting AR untuk melakukan Retur') - purchase = self.env['purchase.order'].search([ - ('name', '=', stock_picking.group_id.name), - ]) - if not stock_picking.approval_return_status == 'approved' and purchase.invoice_ids: - raise UserError('Harus Approval Accounting AP untuk melakukan Retur') + # purchase = self.env['purchase.order'].search([ + # ('name', '=', stock_picking.group_id.name), + # ]) + # if not stock_picking.approval_return_status == 'approved' and purchase.invoice_ids: + # raise UserError('Harus Approval Accounting AP untuk melakukan Retur') return res \ No newline at end of file -- cgit v1.2.3 From 9dbae80871e94f439ea1b6c3cf6a13cab9221532 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 10 Dec 2024 10:27:44 +0700 Subject: barcode product --- indoteknik_custom/models/product_template.py | 43 +++++++++++++++++++++++++++- indoteknik_custom/models/stock_move.py | 12 ++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py index 6fb8c7a0..ebf81811 100755 --- a/indoteknik_custom/models/product_template.py +++ b/indoteknik_custom/models/product_template.py @@ -5,7 +5,9 @@ import logging import requests import json import re +import qrcode, base64 from bs4 import BeautifulSoup +from io import BytesIO _logger = logging.getLogger(__name__) @@ -58,10 +60,30 @@ class ProductTemplate(models.Model): ('sp', 'Spare Part'), ('acc', 'Accessories') ], string='Kind of', copy=False) - sni = fields.Boolean(string='SNI') + sni = fields.Boolean(string='SNI') tkdn = fields.Boolean(string='TKDN') short_spesification = fields.Char(string='Short Spesification') merchandise_ok = fields.Boolean(string='Product Promotion') + print_barcode = fields.Boolean(string='Print Barcode', default="True") + qr_code = fields.Binary("QR Code", compute='_compute_qr_code') + + def _compute_qr_code(self): + for rec in self.product_variant_ids: + qr = qrcode.QRCode( + version=1, + error_correction=qrcode.constants.ERROR_CORRECT_L, + box_size=5, + border=4, + ) + qr.add_data(rec.display_name) + qr.make(fit=True) + img = qr.make_image(fill_color="black", back_color="white") + + buffer = BytesIO() + img.save(buffer, format="PNG") + qr_code_img = base64.b64encode(buffer.getvalue()).decode() + + rec.qr_code = qr_code_img @api.constrains('name', 'internal_reference', 'x_manufacture') def required_public_categ_ids(self): @@ -379,6 +401,25 @@ class ProductProduct(models.Model): qty_rpo = fields.Float(string='Qty RPO', compute='_get_qty_rpo') plafon_qty = fields.Float(string='Max Plafon', compute='_get_plafon_qty_product') merchandise_ok = fields.Boolean(string='Product Promotion') + qr_code_variant = fields.Binary("QR Code Variant", compute='_compute_qr_code_variant') + + def _compute_qr_code_variant(self): + for rec in self.product_variant_ids: + qr = qrcode.QRCode( + version=1, + error_correction=qrcode.constants.ERROR_CORRECT_L, + box_size=5, + border=4, + ) + qr.add_data(rec.display_name) + qr.make(fit=True) + img = qr.make_image(fill_color="black", back_color="white") + + buffer = BytesIO() + img.save(buffer, format="PNG") + qr_code_img = base64.b64encode(buffer.getvalue()).decode() + + rec.qr_code_variant = qr_code_img def _get_clean_website_description(self): for rec in self: diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py index ac2e3cc0..8214a057 100644 --- a/indoteknik_custom/models/stock_move.py +++ b/indoteknik_custom/models/stock_move.py @@ -7,6 +7,18 @@ class StockMove(models.Model): line_no = fields.Integer('No', default=0) sale_id = fields.Many2one('sale.order', string='SO') + print_barcode = fields.Boolean( + string="Print Barcode", + default=lambda self: self.product_id.print_barcode, + ) + + def write(self, vals): + res = super(StockMove, self).write(vals) + if 'print_barcode' in vals: + for line in self: + if line.product_id: + line.product_id.print_barcode = vals['print_barcode'] + return res def _do_unreserve(self, product=None, quantity=False): moves_to_unreserve = OrderedSet() -- cgit v1.2.3 From cc9abe07512a6e317dc82f6a4be626c55f298379 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 10 Dec 2024 11:25:10 +0700 Subject: fix bug --- indoteknik_custom/models/product_template.py | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py index ebf81811..b38f9155 100755 --- a/indoteknik_custom/models/product_template.py +++ b/indoteknik_custom/models/product_template.py @@ -65,25 +65,25 @@ class ProductTemplate(models.Model): short_spesification = fields.Char(string='Short Spesification') merchandise_ok = fields.Boolean(string='Product Promotion') print_barcode = fields.Boolean(string='Print Barcode', default="True") - qr_code = fields.Binary("QR Code", compute='_compute_qr_code') - - def _compute_qr_code(self): - for rec in self.product_variant_ids: - qr = qrcode.QRCode( - version=1, - error_correction=qrcode.constants.ERROR_CORRECT_L, - box_size=5, - border=4, - ) - qr.add_data(rec.display_name) - qr.make(fit=True) - img = qr.make_image(fill_color="black", back_color="white") - - buffer = BytesIO() - img.save(buffer, format="PNG") - qr_code_img = base64.b64encode(buffer.getvalue()).decode() - - rec.qr_code = qr_code_img + # qr_code = fields.Binary("QR Code", compute='_compute_qr_code') + + # def _compute_qr_code(self): + # for rec in self.product_variant_ids: + # qr = qrcode.QRCode( + # version=1, + # error_correction=qrcode.constants.ERROR_CORRECT_L, + # box_size=5, + # border=4, + # ) + # qr.add_data(rec.display_name) + # qr.make(fit=True) + # img = qr.make_image(fill_color="black", back_color="white") + + # buffer = BytesIO() + # img.save(buffer, format="PNG") + # qr_code_img = base64.b64encode(buffer.getvalue()).decode() + + # rec.qr_code = qr_code_img @api.constrains('name', 'internal_reference', 'x_manufacture') def required_public_categ_ids(self): -- cgit v1.2.3 From 8e9b91259ecd62eff4e17210678287b844f78132 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 10 Dec 2024 16:13:37 +0700 Subject: test wati --- indoteknik_custom/models/wati.py | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/wati.py b/indoteknik_custom/models/wati.py index f3632334..ec7bd3b9 100644 --- a/indoteknik_custom/models/wati.py +++ b/indoteknik_custom/models/wati.py @@ -217,26 +217,42 @@ class WatiHistory(models.Model): limit = 50 wati_histories = self.env['wati.history'].search(domain, limit=limit) count = 0 + for wati_history in wati_histories: count += 1 - _logger.info('[Parse Notification] Process: %s/%s' % (str(count), str(limit))) + _logger.info('[Parse Notification] Processing: %s/%s', count, limit) wati_api = self.env['wati.api'] - # Perbaikan pada params 'attribute' untuk menghindari masalah "type object is not subscriptable" + # Perbaikan pada parameter JSON params = { 'pageSize': 1, 'pageNumber': 1, - 'attribute': json.dumps([{'name': "phone", 'operator': "contain", 'value': wati_history.wa_id}]), + 'attribute': json.dumps([ + {'name': "phone", 'operator': "contain", 'value': wati_history.wa_id} + ]), } - wati_contacts = wati_api.http_get('/api/v1/getContacts', params) + try: + wati_contacts = wati_api.http_get('/api/v1/getContacts', params) + except Exception as e: + _logger.error('Error while calling WATI API: %s', str(e)) + continue + # Validasi respons dari API + if not isinstance(wati_contacts, dict): + _logger.error('Invalid response format from WATI API: %s', wati_contacts) + continue + if wati_contacts.get('result') != 'success': - return + _logger.warning('WATI API request failed with result: %s', wati_contacts.get('result')) + continue contact_list = wati_contacts.get('contact_list', []) - + if not contact_list: + _logger.info('No contacts found for WA ID: %s', wati_history.wa_id) + continue + perusahaan = email = '' for data in contact_list: custom_params = data.get('customParams', []) @@ -247,12 +263,14 @@ class WatiHistory(models.Model): perusahaan = value elif name == 'email': email = value - # End inner loop # Update wati_history fields - wati_history.perusahaan = perusahaan - wati_history.email = email - wati_history.is_get_attribute = True + wati_history.write({ + 'perusahaan': perusahaan, + 'email': email, + 'is_get_attribute': True, + }) + _logger.info('Wati history updated: %s', wati_history.id) # @api.onchange('last_reply_date') # def _compute_expired_date(self): -- cgit v1.2.3 From 72f8f3081d29b100e159f766e1c3483bdef5ce45 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 10 Dec 2024 16:24:43 +0700 Subject: fix bug wati --- indoteknik_custom/models/wati.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/wati.py b/indoteknik_custom/models/wati.py index ec7bd3b9..a0619f83 100644 --- a/indoteknik_custom/models/wati.py +++ b/indoteknik_custom/models/wati.py @@ -32,28 +32,43 @@ class WatiNotification(models.Model): ]).unlink() _logger.info('Success Cleanup WATI Notification') - def _parse_notification(self, limit = 0): + def _parse_notification(self, limit=0): domain = [('is_parsed', '=', False)] notifications = self.search(domain, order='id', limit=limit) notification_not_parsed_count = self.search_count(domain) i = 0 for notification in notifications: i += 1 - _logger.info('[Parse Notification][%s] Process: %s/%s | Not Parsed: %s' % (notification.id, i, str(limit), str(notification_not_parsed_count))) + _logger.info('[Parse Notification][%s] Process: %s/%s | Not Parsed: %s' % + (notification.id, i, str(limit), str(notification_not_parsed_count))) + notification_json = json.loads(notification.json_raw) sender_name = 'Indoteknik' if 'senderName' in notification_json: sender_name = notification_json['senderName'] - ticket_id = notification_json['ticketId'] - date_wati = float(notification_json['timestamp']) - date_wati = datetime.fromtimestamp(date_wati) + ticket_id = notification_json.get('ticketId') + timestamp = notification_json.get('timestamp') + + if not timestamp: + _logger.warning('[Parse Notification][%s] Missing timestamp in notification JSON: %s' % + (notification.id, notification.json_raw)) + continue # Skip this notification + + try: + date_wati = datetime.fromtimestamp(float(timestamp)) + except ValueError as e: + _logger.error('[Parse Notification][%s] Invalid timestamp format: %s. Error: %s' % + (notification.id, timestamp, str(e))) + continue + wati_history = self.env['wati.history'].search([('ticket_id', '=', ticket_id)], limit=1) if wati_history: self._create_wati_history_line(wati_history, ticket_id, sender_name, notification_json, date_wati) else: new_header = self._create_wati_history_header(ticket_id, sender_name, notification_json, date_wati) self._create_wati_history_line(new_header, ticket_id, sender_name, notification_json, date_wati) + notification.is_parsed = True return -- cgit v1.2.3 From 335d724a7f359223138de74bf682cfc3530b5ea7 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 11 Dec 2024 08:44:08 +0700 Subject: cr default qr code product variants --- indoteknik_custom/models/product_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py index b38f9155..00e756c9 100755 --- a/indoteknik_custom/models/product_template.py +++ b/indoteknik_custom/models/product_template.py @@ -64,7 +64,7 @@ class ProductTemplate(models.Model): tkdn = fields.Boolean(string='TKDN') short_spesification = fields.Char(string='Short Spesification') merchandise_ok = fields.Boolean(string='Product Promotion') - print_barcode = fields.Boolean(string='Print Barcode', default="True") + print_barcode = fields.Boolean(string='Print Barcode', default=True) # qr_code = fields.Binary("QR Code", compute='_compute_qr_code') # def _compute_qr_code(self): -- cgit v1.2.3 From cac17b71c07892411128a00f158a45af19344e98 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Mon, 16 Dec 2024 10:16:23 +0700 Subject: add check kredit limit on ask approve so --- indoteknik_custom/models/sale_order.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index 7fc6d96a..f5e7e8a1 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -758,6 +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): + self.check_credit_limit() 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() @@ -890,6 +891,37 @@ class SaleOrder(models.Model): 'email_to': salesperson_email, }).send() + def check_credit_limit(self): + for rec in self: + outstanding_amount = rec.outstanding_amount + check_credit_limit = False + ###### + block_stage = 0 + if rec.partner_id.parent_id: + if rec.partner_id.parent_id.active_limit and rec.partner_id.parent_id.enable_credit_limit: + check_credit_limit = True + else: + if rec.partner_id.active_limit and rec.partner_id.enable_credit_limit: + check_credit_limit = True + + term_days = 0 + for term_line in rec.payment_term_id.line_ids: + term_days += term_line.days + if term_days == 0: + check_credit_limit = False + + if check_credit_limit: + if rec.partner_id.parent_id: + block_stage = rec.partner_id.parent_id.blocking_stage or 0 + else: + block_stage = rec.partner_id.blocking_stage or 0 + + if (outstanding_amount + rec.amount_total) >= block_stage: + if block_stage != 0: + remaining_credit_limit = block_stage - outstanding_amount + raise UserError(_("%s is in Blocking Stage, Remaining credit limit is %s, from %s and outstanding %s") + % (rec.partner_id.name, remaining_credit_limit, block_stage, outstanding_amount)) + def validate_different_vendor(self): 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')) -- cgit v1.2.3 From 97d9a59c82be9052815be6039327148f07d98514 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 17 Dec 2024 10:13:13 +0700 Subject: add new condition on po --- indoteknik_custom/models/purchase_order.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py index 9388ae4c..0e39d12a 100755 --- a/indoteknik_custom/models/purchase_order.py +++ b/indoteknik_custom/models/purchase_order.py @@ -74,6 +74,7 @@ class PurchaseOrder(models.Model): approve_by = fields.Many2one('res.users', string='Approve By') exclude_incoming = fields.Boolean(string='Exclude Incoming', default=False, help='Centang jika tidak mau masuk perhitungan Incoming Qty') + not_update_purchasepricelist = fields.Boolean(string='Not Update Purchase Pricelist?') def _compute_total_margin_match(self): for purchase in self: @@ -620,7 +621,8 @@ class PurchaseOrder(models.Model): raise UserError("Tidak ada link dengan SO, harus approval Merchandise") send_email = False - self.add_product_to_pricelist() + if not self.not_update_purchasepricelist: + self.add_product_to_pricelist() for line in self.order_line: if not line.product_id.purchase_ok: raise UserError("Terdapat barang yang tidak bisa diproses") -- cgit v1.2.3 From d3abcb6d9efeb6fc48ab05df1da7e06175d04dea Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Tue, 17 Dec 2024 17:22:35 +0700 Subject: add approval stephan --- indoteknik_custom/models/requisition.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/requisition.py b/indoteknik_custom/models/requisition.py index 32a9f94f..c972b485 100644 --- a/indoteknik_custom/models/requisition.py +++ b/indoteknik_custom/models/requisition.py @@ -82,11 +82,11 @@ class Requisition(models.Model): state = ['done', 'sale'] if self.sale_order_id.state in state: raise UserError('SO sudah Confirm, akan berakibat double Purchase melalui PJ') - if self.env.user.id not in [377, 19]: + if self.env.user.id not in [377, 19, 28]: raise UserError('Hanya Vita dan Darren Yang Bisa Approve') - if self.env.user.id == 377: + if self.env.user.id == 377 or self.env.user.id == 28: self.sales_approve = True - elif self.env.user.id == 19: + elif self.env.user.id == 19 or self.env.user.id == 28: if not self.sales_approve: raise UserError('Vita Belum Approve') self.merchandise_approve = True -- cgit v1.2.3 From 01d85b9f0d8fc70c35eaa13a154f3443fc35f1c6 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 18 Dec 2024 10:25:09 +0700 Subject: new field qr code variant --- indoteknik_custom/models/stock_move.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py index 8214a057..e1d4e74c 100644 --- a/indoteknik_custom/models/stock_move.py +++ b/indoteknik_custom/models/stock_move.py @@ -11,6 +11,15 @@ class StockMove(models.Model): string="Print Barcode", default=lambda self: self.product_id.print_barcode, ) + qr_code_variant = fields.Binary("QR Code Variant", compute='_compute_qr_code_variant') + + def _compute_qr_code_variant(self): + for rec in self: + if rec.print_barcode and rec.print_barcode == True and rec.product_id and rec.product_id.qr_code_variant: + rec.qr_code_variant = rec.product_id.qr_code_variant + else: + rec.qr_code_variant = False + def write(self, vals): res = super(StockMove, self).write(vals) -- cgit v1.2.3 From d35c2dce88a87bc05d30c4935d51d7d58aa5d37d Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Thu, 19 Dec 2024 10:33:53 +0700 Subject: fix qr code variant --- indoteknik_custom/models/product_template.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'indoteknik_custom/models') diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py index 00e756c9..9007dd71 100755 --- a/indoteknik_custom/models/product_template.py +++ b/indoteknik_custom/models/product_template.py @@ -404,12 +404,17 @@ class ProductProduct(models.Model): qr_code_variant = fields.Binary("QR Code Variant", compute='_compute_qr_code_variant') def _compute_qr_code_variant(self): - for rec in self.product_variant_ids: + for rec in self: + # Skip inactive variants + if not rec.active: + rec.qr_code_variant = False # Clear the QR Code for archived variants + continue + qr = qrcode.QRCode( - version=1, - error_correction=qrcode.constants.ERROR_CORRECT_L, - box_size=5, - border=4, + version=1, + error_correction=qrcode.constants.ERROR_CORRECT_L, + box_size=5, + border=4, ) qr.add_data(rec.display_name) qr.make(fit=True) -- cgit v1.2.3