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

# Conflicts:
#	indoteknik_custom/models/product_template.py

6 files changed, 25 insertions, 11 deletions

diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index e21b411d..990d3cc5 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -30,12 +30,13 @@ class AutomaticPurchase(models.Model):
         for vendor in vendor_ids:
             param_header = {
                 'partner_id': vendor['partner_id'][0],
-                'partner_ref': 'Automatic PO',
+                # 'partner_ref': 'Automatic PO',
                 'currency_id': 12,
                 'user_id': self.env.user.id,
                 'company_id': 1, # indoteknik dotcom gemilang
                 'picking_type_id': 28, # indoteknik bandengan receipts
-                'date_order': current_time
+                'date_order': current_time,
+                'note_description': 'Automatic PO'
             }
             # new_po = self.env['purchase.order'].create([param_header])
             products_vendors = self.env['automatic.purchase.line'].search([
diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py
index e69d6044..19bcc780 100755
--- a/indoteknik_custom/models/product_template.py
+++ b/indoteknik_custom/models/product_template.py
@@ -52,7 +52,11 @@ class ProductTemplate(models.Model):
                                     help='Centang jika ingin ditammpilkan di website sebagai segment Produk Baru')
     seq_new_product = fields.Integer(string='Seq New Product', help='Urutan Sequence New Product')
     is_edited = fields.Boolean(string='Is Edited')
-
+    qty_sold = fields.Float(string='Sold Quantity', compute='_get_qty_sold')
+    
+    def _get_qty_sold(self):
+        for rec in self:
+            rec.qty_sold = sum(x.qty_sold for x in rec.product_variant_ids)
 
     def day_product_to_edit(self):
         day_products = []
@@ -184,12 +188,7 @@ class ProductTemplate(models.Model):
 
     def _compute_web_price(self):
         for template in self:
-            products = self.env['product.product'].search([
-                ('product_tmpl_id', '=', template.id),
-                ('active', 'in', [True, False])
-            ])
-            for variants in products:  
-                template.web_price = variants[0].web_price
+            template.web_price = template.product_variant_id.web_price
 
     def _have_promotion_program(self):
         for template in self:
@@ -332,9 +331,19 @@ class ProductProduct(models.Model):
     qty_upcoming = fields.Float(string='Qty Upcoming', compute='_get_qty_upcoming')
     sla_version = fields.Integer(string="SLA Version", default=0)
     is_edited = fields.Boolean(string='Is Edited')
+    qty_sold = fields.Float(string='Sold Quantity', compute='_get_qty_sold')
+    
     def _get_qty_upcoming(self):
         for product in self:
             product.qty_upcoming = product.incoming_qty + product.qty_available
+    
+    def _get_qty_sold(self):
+        for product in self:
+            order_line = self.env['sale.order.line'].search([
+                ('order_id.state', 'in', ['done', 'sale']),
+                ('product_id', '=', product.id)
+            ])
+            product.qty_sold = sum(x.product_uom_qty for x in order_line)
 
     def day_product_to_edit(self):
         day_products = []
@@ -407,7 +416,7 @@ class ProductProduct(models.Model):
         for product in self:
             pricelist_id = self.env['ir.config_parameter'].sudo().get_param('product.pricelist.default_price_id_v2')
 
-            domain = [('pricelist_id', '=', pricelist_id or 17022), ('product_id', '=', product.id)]
+            domain = [('pricelist_id.id', '=', pricelist_id or 17022), ('product_id.id', '=', product.id)]
             product_pricelist_item = self.env['product.pricelist.item'].search(domain, limit=1)
 
             if product_pricelist_item.base_pricelist_id:
diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 8ad25228..5e4617d4 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -47,6 +47,7 @@ class PurchaseOrder(models.Model):
     count_line_product = fields.Float('Total Item', compute='compute_count_line_product')
     note_description = fields.Char(string='Note', help='bisa diisi sebagai informasi indent barang tertentu atau apapun')
     has_active_invoice = fields.Boolean(string='Has Active Invoice', compute='_compute_has_active_invoice')
+    description = fields.Char(string='Description', help='bisa diisi sebagai informasi indent barang tertentu atau apapun')
 
     def _compute_has_active_invoice(self):
         for order in self:
diff --git a/indoteknik_custom/models/solr/product_product.py b/indoteknik_custom/models/solr/product_product.py
index 31a0026d..720be7fa 100644
--- a/indoteknik_custom/models/solr/product_product.py
+++ b/indoteknik_custom/models/solr/product_product.py
@@ -64,6 +64,7 @@ class ProductProduct(models.Model):
                 'attributes': [x.name for x in variant.product_template_attribute_value_ids],
                 'has_product_info_b': True,
                 'publish_b': variant.product_tmpl_id.active and variant.product_tmpl_id.type == 'product',
+                'qty_sold_f': variant.qty_sold
             })
 
             self.solr().add(docs=[document], softCommit=True)
diff --git a/indoteknik_custom/models/solr/product_template.py b/indoteknik_custom/models/solr/product_template.py
index d7439bcb..cc8d4bf2 100644
--- a/indoteknik_custom/models/solr/product_template.py
+++ b/indoteknik_custom/models/solr/product_template.py
@@ -80,7 +80,8 @@ class ProductTemplate(models.Model):
                 "category_name": category_name,
                 "description_t": template.website_description or '',
                 'has_product_info_b': True,
-                'publish_b': template.active and template.type == 'product'
+                'publish_b': template.active and template.type == 'product',
+                "qty_sold_f": template.qty_sold
             })
 
             self.solr().add(docs=[document], softCommit=True)
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index adcaaf43..a0614a56 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -75,6 +75,7 @@
                 </page>
                 <field name="fiscal_position_id" position="after">
                     <field name="note_description"/>
+                    <field name="description"/>
                     <field name="total_so_percent_margin"/>
                     <field name="has_active_invoice" invisible="1" />
                 </field>