Merge branch 'odoo-backup' into CR/form-merchant

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 13 insertions, 2 deletions

diff --git a/indoteknik_custom/models/purchasing_job.py b/indoteknik_custom/models/purchasing_job.py
index 74b5134e..ea2f46cb 100644
--- a/indoteknik_custom/models/purchasing_job.py
+++ b/indoteknik_custom/models/purchasing_job.py
@@ -25,6 +25,15 @@ class PurchasingJob(models.Model):
     ], string='APO?')
     purchase_representative_id = fields.Many2one('res.users', string="Purchase Representative", readonly=True)
     note = fields.Char(string="Note Detail")
+    date_po = fields.Datetime(string='Date PO', copy=False)
+
+    def unlink(self):
+        # Example: Delete related records from the underlying model
+        underlying_records = self.env['purchasing.job'].search([
+            ('product_id', 'in', self.mapped('product_id').ids)
+        ])
+        underlying_records.unlink()
+        return super(PurchasingJob, self).unlink()
 
     def redirect_to_pjs(self):
         states = self.env['purchasing.job.state'].search([
@@ -56,8 +65,9 @@ class PurchasingJob(models.Model):
                 pmp.action,
                 max(pjs.status_apo::text) AS status_apo,
                 max(pjs.note::text) AS note,
+                max(pjs.date_po::text) AS date_po,
                     CASE
-                        WHEN pmp.brand IN ('Tekiro', 'RYU', 'Rexco') THEN 27
+                        WHEN pmp.brand IN ('Tekiro', 'RYU', 'Rexco', 'RYU (Sparepart)') THEN 27
                         WHEN sub.vendor_id = 9688 THEN 397
                         WHEN sub.vendor_id = 35475 THEN 397
                         WHEN sub.vendor_id = 29712 THEN 397
@@ -182,7 +192,8 @@ class OutstandingSales(models.Model):
             join product_product pp on pp.id = sm.product_id
             join product_template pt on pt.id = pp.product_tmpl_id
             left join x_manufactures xm on xm.id = pt.x_manufacture
-            where sp.state in ('draft', 'waiting', 'confirmed')
+            where sp.state in ('draft', 'waiting', 'confirmed', 'assigned')
+            and sm.state in ('draft', 'waiting', 'confirmed', 'partially_available')
             and sp.name like '%OUT%'
             )
         """)