feat: Add Item Group Field in Employee Item Wise Sales

ury-erp · Jul 29, 2024 · 80c4585 · 80c4585
1 parent bed8bfd
commit 80c4585
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ury_pulse/ury_pulse/report/employee_item_wise_sales/employee_item_wise_sales.json b/ury_pulse/ury_pulse/report/employee_item_wise_sales/employee_item_wise_sales.json
@@ -40,13 +40,13 @@
  ],
  "idx": 0,
  "is_standard": "Yes",
- "modified": "2024-01-05 17:06:30.301947",
+ "modified": "2024-07-29 19:49:46.477463",
  "modified_by": "Administrator",
  "module": "URY Pulse",
  "name": "Employee Item Wise Sales",
  "owner": "Administrator",
  "prepared_report": 0,
- "query": "SELECT\n    b.`item_name` AS \"Item name\",\n    SUM(b.`qty`) AS \"Qty\",\n    SUM(b.`amount`) AS \"Amount\"\nFROM \n    (\n        SELECT %(start_date)s AS `date`\n        UNION\n        SELECT DATE_ADD(%(start_date)s, INTERVAL n DAY) AS `date`\n        FROM (\n            SELECT a.N + b.N * 10 + c.N * 100 + 1 AS n\n            FROM (\n                SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9\n            ) AS a\n            CROSS JOIN (\n                SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9\n            ) AS b\n            CROSS JOIN (\n                SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9\n            ) AS c\n            ORDER BY n\n        ) AS nums\n        WHERE DATE_ADD(%(start_date)s, INTERVAL n DAY) < %(end_date)s\n        UNION\n        SELECT %(end_date)s AS `date`\n    ) AS date_list\nLEFT JOIN `tabPOS Invoice` a ON (\n    a.`branch` = %(branch)s\n    AND a.`status` IN (\"Consolidated\",\"Paid\") \n    AND a.`docstatus` = 1\n)\nLEFT JOIN `tabURY Report Settings` rs ON (\n    rs.`branch` = %(branch)s\n)\nINNER JOIN `tabPOS Invoice Item` b ON (\n\ta.name = b.parent\n)\nINNER JOIN `tabUser` e ON(\n    e.`name` = %(employee)s\n    AND e.`name`= a.`waiter`\n)\nWHERE\n(\n    ((rs.`hours` IS NULL OR rs.`hours` = 0) AND a.`posting_date` = date_list.`date`)\n    OR (rs.`hours` > 0 AND TIMESTAMP(a.`posting_date`, a.`posting_time`) <= TIMESTAMP(DATE_ADD(date_list.`date`, INTERVAL 1 DAY), CONCAT(LPAD(rs.`hours`, 2, '0'), ':00:00')) AND TIMESTAMP(a.`posting_date`, a.`posting_time`) >= TIMESTAMP(date_list.`date`, CONCAT(LPAD(rs.`hours`, 2, '0'), ':00:00')))\n    OR (rs.`branch` IS NULL AND a.`posting_date` = date_list.`date`)\n)\nGROUP BY \n    b.`item_name`\nORDER BY \n    date_list.`date` DESC",
+ "query": "SELECT\n    b.`item_name` AS \"Item name\",\n    i.`item_group` AS \"Item Group\",\n    SUM(b.`qty`) AS \"Qty\",\n    SUM(b.`amount`) AS \"Amount\"\nFROM \n    (\n        SELECT %(start_date)s AS `date`\n        UNION\n        SELECT DATE_ADD(%(start_date)s, INTERVAL n DAY) AS `date`\n        FROM (\n            SELECT a.N + b.N * 10 + c.N * 100 + 1 AS n\n            FROM (\n                SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9\n            ) AS a\n            CROSS JOIN (\n                SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9\n            ) AS b\n            CROSS JOIN (\n                SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9\n            ) AS c\n            ORDER BY n\n        ) AS nums\n        WHERE DATE_ADD(%(start_date)s, INTERVAL n DAY) < %(end_date)s\n        UNION\n        SELECT %(end_date)s AS `date`\n    ) AS date_list\nLEFT JOIN `tabPOS Invoice` a ON (\n    a.`branch` = %(branch)s\n    AND a.`status` IN (\"Consolidated\",\"Paid\") \n    AND a.`docstatus` = 1\n)\nLEFT JOIN `tabURY Report Settings` rs ON (\n    rs.`branch` = %(branch)s\n)\nINNER JOIN `tabPOS Invoice Item` b ON (\n\ta.name = b.parent\n)\nINNER JOIN `tabUser` e ON (\n    e.`name` = %(employee)s\n    AND e.`name`= a.`waiter`\n)\nINNER JOIN `tabItem` i ON (\n    b.`item_code` = i.`item_code`\n)\nWHERE\n(\n    ((rs.`hours` IS NULL OR rs.`hours` = 0) AND a.`posting_date` = date_list.`date`)\n    OR (rs.`hours` > 0 AND TIMESTAMP(a.`posting_date`, a.`posting_time`) <= TIMESTAMP(DATE_ADD(date_list.`date`, INTERVAL 1 DAY), CONCAT(LPAD(rs.`hours`, 2, '0'), ':00:00')) AND TIMESTAMP(a.`posting_date`, a.`posting_time`) >= TIMESTAMP(date_list.`date`, CONCAT(LPAD(rs.`hours`, 2, '0'), ':00:00')))\n    OR (rs.`branch` IS NULL AND a.`posting_date` = date_list.`date`)\n)\nGROUP BY \n    b.`item_name`, i.`item_group`\nORDER BY \n    date_list.`date` DESC\n",
  "ref_doctype": "POS Invoice",
  "report_name": "Employee Item Wise Sales",
  "report_type": "Query Report",