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

3 files changed, 52 insertions, 3 deletions

diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index fbdf8dae..a39abba9 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -1,4 +1,4 @@
-from odoo import models, api, fields
+from odoo import models, api, fields, tools
 from odoo.exceptions import UserError
 from datetime import datetime
 import logging, math
@@ -284,7 +284,7 @@ class AutomaticPurchase(models.Model):
     def create_purchase_order_sales_match(self, purchase_order):
         matches_so_product_ids = [line.product_id.id for line in purchase_order.order_line]
 
-        matches_so = self.env['automatic.purchase.sales.match'].search([
+        matches_so = self.env['v.sale.notin.matchpo'].search([
             ('automatic_purchase_id', '=', self.id),
             ('sale_line_id.product_id', 'in', matches_so_product_ids),
         ])
@@ -292,6 +292,8 @@ class AutomaticPurchase(models.Model):
         sale_ids_set = set()
         sale_ids_name = set()
         for sale_order in matches_so:
+            # @stephan skip so line yang sudah pernah ada di purchase order sales match sebelumnya
+
             salesperson_name = sale_order.sale_id.user_id.name
 
             sale_id_with_salesperson = f"{sale_order.sale_id.name} - {salesperson_name}"
@@ -655,3 +657,49 @@ class SyncPurchasingJob(models.Model):
     outgoing = fields.Float(string="Outgoing")
     action = fields.Char(string="Status")
     date = fields.Datetime(string="Date Sync")
+
+
+class SaleNotInMatchPO(models.Model):
+    # created by @stephan for speed up performance while create po from automatic purchase
+    _name = 'v.sale.notin.matchpo'
+    _auto = False
+    _rec_name = 'id'
+
+    id = fields.Integer()
+    automatic_purchase_id = fields.Many2one('automatic.purchase', string='APO')
+    automatic_purchase_line_id = fields.Many2one('automatic.purchase.line', string='APO Line')
+    sale_id = fields.Many2one('sale.order', string='Sale')
+    sale_line_id = fields.Many2one('sale.order.line', string='Sale Line')
+    picking_id = fields.Many2one('stock.picking', string='Picking')
+    move_id = fields.Many2one('stock.move', string='Move')
+    partner_id = fields.Many2one('res.partner', string='Partner')
+    partner_invoice_id = fields.Many2one('res.partner', string='Partner Invoice')
+    salesperson_id = fields.Many2one('res.user', string='Salesperson')
+    product_id = fields.Many2one('product.product', string='Product')
+    qty_so = fields.Float(string='Qty SO')
+    qty_po = fields.Float(string='Qty PO')
+    create_uid = fields.Many2one('res.user', string='Created By')
+    create_date = fields.Datetime(string='Create Date')
+    write_uid = fields.Many2one('res.user', string='Updated By')
+    write_date = fields.Many2one(string='Updated')
+    purchase_price = fields.Many2one(string='Purchase Price')
+    purchase_tax_id = fields.Many2one('account.tax', string='Purchase Tax')
+    note_procurement = fields.Many2one(string='Note Procurement')
+
+    def init(self):
+        tools.drop_view_if_exists(self.env.cr, self._table)
+        self.env.cr.execute("""
+                            CREATE OR REPLACE VIEW %s AS(
+                                select apsm.id, apsm.automatic_purchase_id, apsm.automatic_purchase_line_id, apsm.sale_id, apsm.sale_line_id, 
+                                apsm.picking_id, apsm.move_id, apsm.partner_id,
+                                apsm.partner_invoice_id, apsm.salesperson_id, apsm.product_id, apsm.qty_so, apsm.qty_po, apsm.create_uid, 
+                                apsm.create_date, apsm.write_uid, apsm.write_date, apsm.purchase_price,
+                                apsm.purchase_tax_id, apsm.note_procurement
+                                from automatic_purchase_sales_match apsm
+                                where apsm.sale_line_id not in (
+                                    select distinct coalesce(posm.sale_line_id,0) 
+                                    from purchase_order_sales_match posm
+                                    where posm.state not in ('cancel')
+                                )
+                            )
+                            """ % self._table)
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index 7d7c98f4..601f04c5 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -180,3 +180,4 @@ access_reject_reason_commision,reject.reason.commision,model_reject_reason_commi
 access_shipping_option,shipping.option,model_shipping_option,,1,1,1,1
 access_production_purchase_match,access.production.purchase.match,model_production_purchase_match,,1,1,1,1
 access_image_carousel,access.image.carousel,model_image_carousel,,1,1,1,1
+access_v_sale_notin_matchpo,access.v.sale.notin.matchpo,model_v_sale_notin_matchpo,,1,1,1,1
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index d6ad2408..920268bc 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -140,7 +140,7 @@
                 </field>
 
                 <field name="order_line" position="attributes">
-                    <attribute name="attrs">{'readonly': ['|', ('state', 'in', ['done', 'cancel']), ('has_active_invoice', '=', True)]}</attribute>
+                    <attribute name="attrs">{'readonly': ['|', ('state', 'in', ['purchase', 'done', 'cancel']), ('has_active_invoice', '=', True)]}</attribute>
                 </field>
                 
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="attributes">