diff options
Diffstat (limited to 'indoteknik_custom/models')
| -rwxr-xr-x | indoteknik_custom/models/sale_monitoring.py | 8 | ||||
| -rwxr-xr-x | indoteknik_custom/models/sale_monitoring_detail.py | 6 |
2 files changed, 11 insertions, 3 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) diff --git a/indoteknik_custom/models/sale_monitoring_detail.py b/indoteknik_custom/models/sale_monitoring_detail.py index ec9fe222..cb412c98 100755 --- a/indoteknik_custom/models/sale_monitoring_detail.py +++ b/indoteknik_custom/models/sale_monitoring_detail.py @@ -8,6 +8,8 @@ class SaleMonitoringDetail(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") product_id = fields.Many2one("product.product", string="Product") qty_so = fields.Integer(string="Qty SO") qty_po = fields.Integer(string="Qty PO") @@ -36,7 +38,9 @@ class SaleMonitoringDetail(models.Model): ( SELECT p.id AS id, - so.id AS sale_order_id, + so.id AS sale_order_id, + so.partner_id as partner_id, + so.user_id, p.id AS product_id, sol.product_uom_qty AS qty_so, sol.qty_delivered AS qty_so_delivered, |