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

1 files changed, 1 insertions, 23 deletions

diff --git a/indoteknik_custom/models/gudang_service.py b/indoteknik_custom/models/gudang_service.py
index 72a0f00e..ce3b2919 100644
--- a/indoteknik_custom/models/gudang_service.py
+++ b/indoteknik_custom/models/gudang_service.py
@@ -15,7 +15,6 @@ class GudangService(models.Model):
     partner_id = fields.Many2one('res.partner', string='Customer', readonly=True)
     vendor_id = fields.Many2one('res.partner', string='Vendor', readonly=True, required=True)
     origin = fields.Many2one('sale.order', string='Origin SO', required=True)
-    # picking_id = fields.Many2one('stock.picking', string = 'Picking ID', domain="[('sale_id', '=', origin)]")
     schedule_date = fields.Date(
         string="Schedule Date",
         required=True,
@@ -41,24 +40,6 @@ class GudangService(models.Model):
     state = fields.Selection([('draft', 'Backlog'), ('onprogress', 'On Progress'),('done', 'Done'), ('cancel', 'Cancel')], default='draft', tracking=True)
     cancel_reason = fields.Text('Cancel Reason', tracking=True)
 
-    # @api.onchange('picking_id')
-    # def _onchange_picking_id(self):
-    #     if not self.picking_id:
-    #         self.gudang_service_lines = [(5, 0, 0)]
-    #         return
-
-    #     lines = [(5, 0, 0)]
-    #     for move in self.picking_id.move_ids_without_package:
-    #         if move.product_id:
-    #             lines.append((0, 0, {
-    #                 'product_id': move.product_id.id,
-    #                 'quantity': move.product_uom_qty,
-    #                 'origin_so': self.origin.id,
-    #             }))
-
-    #     self.gudang_service_lines = lines
-
-
     def _send_logistic_notification(self):
         group = self.env.ref('indoteknik_custom.group_role_logistic', raise_if_not_found=False)
         if not group:
@@ -101,7 +82,7 @@ class GudangService(models.Model):
     @api.model
     def cron_notify_onprogress_gudang_service(self):
         records = self.search([
-            ('state', '=', 'onprogress')
+            ('state', '=', 'draft')
         ])
 
         if records:
@@ -192,7 +173,6 @@ class GudangService(models.Model):
             rec.done_date = False
             rec.state = 'cancel'
 
-
     @api.model
     def create(self, vals):
         # Send notification
@@ -235,13 +215,11 @@ class GudangService(models.Model):
         self.gudang_service_lines = [(5, 0, 0)] + lines
 
 
-
 class GudangServiceLine(models.Model):
     _name = "gudang.service.line"
     _inherit = ['mail.thread', 'mail.activity.mixin']
 
     product_id = fields.Many2one('product.product', string='Product')
     quantity = fields.Float(string='Quantity')
-    # picking_id = fields.Many2one('stock.picking', string='Nomor Picking')
     origin_so = fields.Many2one('sale.order', string='Origin SO')
     gudang_service_id = fields.Many2one('gudang.service', string='Gudang Service ID')
\ No newline at end of file