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

# Conflicts:
#	indoteknik_custom/models/__init__.py

1 files changed, 6 insertions, 2 deletions

diff --git a/indoteknik_custom/models/sale_monitoring.py b/indoteknik_custom/models/sale_monitoring.py
index 70c51132..97e96e72 100755
--- a/indoteknik_custom/models/sale_monitoring.py
+++ b/indoteknik_custom/models/sale_monitoring.py
@@ -8,6 +8,8 @@ class SaleMonitoring(models.Model):
 
     id = fields.Integer()
     sale_order_id = fields.Many2one("sale.order", string="Sale Order")
+    partner_id = fields.Many2one("res.partner", string="Customer")
+    user_id = fields.Many2one("res.users", string="Salesperson")
     qty_so = fields.Integer(string="Qty SO")
     qty_po = fields.Integer(string="Qty PO")
     qty_po_received = fields.Integer(string="Qty PO Received")
@@ -23,7 +25,9 @@ class SaleMonitoring(models.Model):
             SELECT 
                 smd.sale_order_id AS id,
                 smd.date_order, 
-                smd.sale_order_id, 
+                smd.sale_order_id,
+                smd.partner_id,
+                smd.user_id,
                 SUM(smd.qty_so) AS qty_so, 
                 SUM(smd.qty_po) AS qty_po, 
                 SUM(smd.qty_po_received) AS qty_po_received, 
@@ -39,6 +43,6 @@ class SaleMonitoring(models.Model):
                     ELSE 'Belum Invoiced' 
                 END AS status
             FROM sale_monitoring_detail smd
-            GROUP BY smd.date_order, smd.sale_order_id
+            GROUP BY smd.date_order, smd.sale_order_id, smd.partner_id, smd.user_id
         )
         """ % self._table)