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

3 files changed, 4 insertions, 4 deletions

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index eeaa8efc..842e64bf 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -354,12 +354,12 @@ class CustomerCommision(models.Model):
 
         if not self.status or self.status == 'draft':
             self.status = 'pengajuan1'
-        elif self.status == 'pengajuan1' and self.env.user.is_sales_manager:
+        elif self.status == 'pengajuan1' and self.env.user.id == 19:
             self.status = 'pengajuan2'
             self.approved_by = (self.approved_by + ', ' if self.approved_by else '') + self.env.user.name
             self.date_approved_sales = now_naive
             self.position_sales = 'Sales Manager'
-        elif self.status == 'pengajuan2' and self.env.user.id == 19:
+        elif self.status == 'pengajuan2' and self.env.user.id == 216:
             self.status = 'pengajuan3'
             self.approved_by = (self.approved_by + ', ' if self.approved_by else '') + self.env.user.name
             self.date_approved_marketing = now_naive
diff --git a/indoteknik_custom/models/shipment_group.py b/indoteknik_custom/models/shipment_group.py
index fcde39c9..4969c35a 100644
--- a/indoteknik_custom/models/shipment_group.py
+++ b/indoteknik_custom/models/shipment_group.py
@@ -22,7 +22,7 @@ class ShipmentGroup(models.Model):
             picking_names = [lines.picking_id.name for lines in self.shipment_line]
             if rec.shipment_id.carrier_id.id == 173:
                 rec.picking_id.action_get_kgx_pod(
-                    shipment=f"{self.number}, {', '.join(picking_names)}"
+                    shipment=f"{self.number}"
                 )
             elif rec.shipment_id.carrier_id.id == 151:
                 rec.picking_id.track_envio_shipment(shipment=f"{self.number}")
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 9dfc8b78..622c537e 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}"
     
     def _download_pod_photo(self, url):
         """Mengunduh foto POD dari URL"""