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

4 files changed, 22 insertions, 3 deletions

diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index d619e160..b66121e1 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -67,6 +67,15 @@ class AutomaticPurchase(models.Model):
 
         if count > 0:
             raise UserError('Ada sekitar %s SO Yang sudah create PO, berikut SO nya: %s' % (count, ', '.join(names)))
+        
+    def unlink_note_pj(self):
+        product = self.purchase_lines.mapped('product_id')
+        pj_state = self.env['purchasing.job.state'].search([
+            ('purchasing_job_id', 'in', product.ids)
+        ])
+
+        for line in pj_state:
+            line.unlink()
 
     def create_po_from_automatic_purchase(self):
         if not self.purchase_lines:
@@ -75,6 +84,7 @@ class AutomaticPurchase(models.Model):
             raise UserError('Sudah pernah di create PO')
 
         current_time = datetime.now()
+        self.unlink_note_pj()
         vendor_ids = self.env['automatic.purchase.line'].read_group(
             [('automatic_purchase_id', '=', self.id), ('partner_id', '!=', False)],
             fields=['partner_id'],
@@ -699,7 +709,7 @@ class SaleNotInMatchPO(models.Model):
                                 where apsm.sale_line_id not in (
                                     select distinct coalesce(posm.sale_line_id,0) 
                                     from purchase_order_sales_match posm
-                                    left join purchase_order po on po.id = posm.purchase_order_id
+                                    join purchase_order po on po.id = posm.purchase_order_id
                                     where po.state not in ('cancel')
                                 )
                             )
diff --git a/indoteknik_custom/models/purchasing_job_multi_update.py b/indoteknik_custom/models/purchasing_job_multi_update.py
index deba960a..80a43e45 100644
--- a/indoteknik_custom/models/purchasing_job_multi_update.py
+++ b/indoteknik_custom/models/purchasing_job_multi_update.py
@@ -18,7 +18,7 @@ class PurchasingJobMultiUpdate(models.TransientModel):
                 ('purchasing_job_id', '=', product.id)
             ])
 
-            purchasing_job_state.unlink()
+            # purchasing_job_state.unlink()
 
             purchasing_job_state.create({
             'purchasing_job_id': product.id,
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index f431d817..d032f99f 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -276,6 +276,15 @@ class StockPicking(models.Model):
     last_update_date_doc_kirim = fields.Datetime(string='Last Update Tanggal Kirim')
     update_date_doc_kirim_add = fields.Boolean(string='Update Tanggal Kirim Lewat ADD')
 
+    @api.constrains('sj_return_date')
+    def _check_sj_return_date(self):
+        for record in self:
+            if not record.driver_arrival_date:
+                if record.sj_return_date:
+                    raise ValidationError(
+                        _("Anda tidak dapat mengubah Tanggal Pengembalian setelah Tanggal Pengiriman!")
+                    )
+
     def _check_date_doc_kirim_modification(self):
         for record in self:
             if record.last_update_date_doc_kirim and not self.env.context.get('from_button_approve'):
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 9f980751..97bf40bb 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -65,7 +65,7 @@
             <field name="name">Shipment Group</field>
             <field name="code">shipment.group</field>
             <field name="active">TRUE</field>
-            <field name="prefix">SG/%(year)s/</field>
+            <field name="prefix">SGR/%(year)s/</field>
             <field name="padding">5</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>