Merge branch 'odoo-production' into dev/wms

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/stock_immediate_transfer.py
#	indoteknik_custom/models/stock_picking.py

1 files changed, 40 insertions, 5 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index df91d451..0699295f 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -97,7 +97,7 @@ class StockPicking(models.Model):
     purchase_representative_id = fields.Many2one('res.users', related='move_lines.purchase_line_id.order_id.user_id', string="Purchase Representative")
     carrier_id = fields.Many2one('delivery.carrier', string='Shipping Method')
     shipping_status = fields.Char(string='Shipping Status', compute="_compute_shipping_status")
-    date_reserved = fields.Datetime(string="Date Reserved", help='Tanggal ter-reserved semua barang nya')
+    date_reserved = fields.Datetime(string="Date Reserved", help='Tanggal ter-reserved semua barang nya', copy=False)
     status_printed = fields.Selection([
         ('not_printed', 'Belum Print'),
         ('printed', 'Printed')
@@ -123,7 +123,7 @@ class StockPicking(models.Model):
         ('ready', 'Ready to Ship'),
         ('done', 'Done'),
         ('cancel', 'Cancelled'),
-    ], string='Status Reserve', readonly=True, tracking=True, help="The current state of the stock picking.")
+    ], string='Status Reserve', tracking=True, copy=False, help="The current state of the stock picking.")
     notee = fields.Text(string="Note")
     quantity_koli = fields.Float(string="Quantity Koli", copy=False)
 
@@ -523,18 +523,52 @@ class StockPicking(models.Model):
     def check_state_reserve(self):
         pickings = self.search([
             ('state', 'not in', ['cancel', 'draft', 'done']),
+            ('picking_type_code', '=', 'outgoing'),
+            ('name', 'ilike', 'BU/OUT/'),
+        ])
+
+        count = self.search_count([
+            ('state', 'not in', ['cancel', 'draft', 'done']),
             ('picking_type_code', '=', 'outgoing')
         ])
         
         for picking in pickings:
-            fullfillments = self.env['sales.order.fullfillment'].search([
-                ('sales_order_id', '=', picking.sale_id.id)
+            fullfillments = self.env['sales.order.fulfillment.v2'].search([
+                ('sale_order_id', '=', picking.sale_id.id)
+            ])
+            
+            picking.state_reserve = 'ready'
+            picking.date_reserved = picking.date_reserved or datetime.datetime.utcnow()
+            
+            if any(rec.so_qty != rec.reserved_stock_qty for rec in fullfillments):
+                picking.state_reserve = 'waiting'
+                picking.date_reserved = ''
+                
+        self.check_state_reserve_backorder()
+
+    def check_state_reserve_backorder(self):
+        pickings = self.search([
+            ('backorder_id', '!=', False),
+            ('name', 'ilike', 'BU/OUT/'),
+            ('picking_type_code', '=', 'outgoing'),
+            ('state', 'not in', ['cancel', 'draft', 'done'])
+        ])
+
+        count = self.search_count([
+            ('backorder_id', '!=', False),
+            ('picking_type_code', '=', 'outgoing'),
+            ('state', 'not in', ['cancel', 'draft', 'done'])
+        ])
+        
+        for picking in pickings:
+            fullfillments = self.env['sales.order.fulfillment.v2'].search([
+                ('sale_order_id', '=', picking.sale_id.id)
             ])
             
             picking.state_reserve = 'ready'
             picking.date_reserved = picking.date_reserved or datetime.datetime.utcnow()
             
-            if any(rec.reserved_from not in ['Inventory On Hand', 'Reserved from stock', 'Free Stock'] for rec in fullfillments):
+            if any(rec.so_qty != rec.reserved_stock_qty for rec in fullfillments):
                 picking.state_reserve = 'waiting'
                 picking.date_reserved = ''
     
@@ -901,6 +935,7 @@ class StockPicking(models.Model):
                             'res_id': wizard.id,
                             'target': 'new',
                         }
+        self.send_mail_bills()
         return res