Merge branch 'gudang-service' of bitbucket.org:altafixco/indoteknik-addons into gudang-service

1 files changed, 13 insertions, 18 deletions

diff --git a/indoteknik_custom/models/gudang_service.py b/indoteknik_custom/models/gudang_service.py
index b7ccc44f..bd8ec8bd 100644
--- a/indoteknik_custom/models/gudang_service.py
+++ b/indoteknik_custom/models/gudang_service.py
@@ -81,9 +81,9 @@ class GudangService(models.Model):
             return
 
         users = group.users
-        # Safa
-        md = self.env["res.users"].browse([3425])
-        # send to logistic and safa
+        # MD
+        md = self.env['res.users'].browse([3425, 4801, 1036])
+        # send to logistic and MD
         users = users | md
 
         if not users:
@@ -176,21 +176,16 @@ class GudangService(models.Model):
                 rec.state = "received_from_vendor"
 
     def action_done(self):
-        if self.state != "received_from_vendor":
-            raise UserError("Only 'Received From Vendor' state can be set to Done")
-        else:
-            for rec in self:
-                activities = self.env["mail.activity"].search(
-                    [
-                        ("res_id", "=", rec.id),
-                        ("res_model", "=", "gudang.service"),
-                        ("state", "=", "delivered_to_cust"),
-                    ]
-                )
-                activities.unlink()
-                rec.state = "delivered_to_cust"
-                if not rec.done_date:
-                    rec.done_date = fields.Datetime.now()
+        for rec in self:
+            if rec.state != 'received_from_vendor':
+                raise UserError("Only 'Received From Vendor' state can be set to Done")
+
+            rec.activity_ids.unlink()
+
+            rec.write({
+                'state': 'delivered_to_cust',
+                'done_date': fields.Datetime.now()
+            })
 
     def action_draft(self):
         """Reset to draft state"""