From 9f926080b68f407687122ba16aa3a30ddce7606b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 15 May 2015 10:41:47 +0530 Subject: [PATCH 1/2] minor fix in reports --- .../completed_production_orders.json | 4 ++-- .../report/open_production_orders/open_production_orders.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/manufacturing/report/completed_production_orders/completed_production_orders.json b/erpnext/manufacturing/report/completed_production_orders/completed_production_orders.json index 0ad6cc42a8..6e383a1981 100644 --- a/erpnext/manufacturing/report/completed_production_orders/completed_production_orders.json +++ b/erpnext/manufacturing/report/completed_production_orders/completed_production_orders.json @@ -5,12 +5,12 @@ "doctype": "Report", "idx": 1, "is_standard": "Yes", - "modified": "2015-03-30 05:42:42.742398", + "modified": "2015-05-15 05:42:42.742398", "modified_by": "Administrator", "module": "Manufacturing", "name": "Completed Production Orders", "owner": "Administrator", - "query": "SELECT\n `tabProduction Order`.name as \"Production Order:Link/Production Order:200\",\n `tabProduction Order`.creation as \"Date:Date:120\",\n `tabProduction Order`.production_item as \"Item:Link/Item:150\",\n `tabProduction Order`.qty as \"To Produce:Int:100\",\n `tabProduction Order`.produced_qty as \"Produced:Int:100\",\n `tabProduction Order`.company as \"Company:Link/Company:\",\nFROM\n `tabProduction Order`\nWHERE\n `tabProduction Order`.docstatus=1\n AND ifnull(`tabProduction Order`.produced_qty,0) = `tabProduction Order`.qty", + "query": "SELECT\n `tabProduction Order`.name as \"Production Order:Link/Production Order:200\",\n `tabProduction Order`.creation as \"Date:Date:120\",\n `tabProduction Order`.production_item as \"Item:Link/Item:150\",\n `tabProduction Order`.qty as \"To Produce:Int:100\",\n `tabProduction Order`.produced_qty as \"Produced:Int:100\",\n `tabProduction Order`.company as \"Company:Link/Company:\"\nFROM\n `tabProduction Order`\nWHERE\n `tabProduction Order`.docstatus=1\n AND ifnull(`tabProduction Order`.produced_qty,0) = `tabProduction Order`.qty", "ref_doctype": "Production Order", "report_name": "Completed Production Orders", "report_type": "Query Report" diff --git a/erpnext/manufacturing/report/open_production_orders/open_production_orders.json b/erpnext/manufacturing/report/open_production_orders/open_production_orders.json index bb32326463..d40b8adafe 100644 --- a/erpnext/manufacturing/report/open_production_orders/open_production_orders.json +++ b/erpnext/manufacturing/report/open_production_orders/open_production_orders.json @@ -5,12 +5,12 @@ "doctype": "Report", "idx": 1, "is_standard": "Yes", - "modified": "2015-03-30 05:43:59.976254", + "modified": "2015-05-15 05:43:59.976254", "modified_by": "Administrator", "module": "Manufacturing", "name": "Open Production Orders", "owner": "Administrator", - "query": "SELECT\n `tabProduction Order`.name as \"Production Order:Link/Production Order:200\",\n `tabProduction Order`.creation as \"Date:Date:120\",\n `tabProduction Order`.production_item as \"Item:Link/Item:150\",\n `tabProduction Order`.qty as \"To Produce:Int:100\",\n `tabProduction Order`.produced_qty as \"Produced:Int:100\",\n `tabProduction Order`.company as \"Company:Link/Company:\",\nFROM\n `tabProduction Order`\nWHERE\n `tabProduction Order`.docstatus=1\n AND ifnull(`tabProduction Order`.produced_qty,0) < `tabProduction Order`.qty\n AND NOT EXISTS (SELECT name from `tabStock Entry` where production_order =`tabProduction Order`.name) ", + "query": "SELECT\n `tabProduction Order`.name as \"Production Order:Link/Production Order:200\",\n `tabProduction Order`.creation as \"Date:Date:120\",\n `tabProduction Order`.production_item as \"Item:Link/Item:150\",\n `tabProduction Order`.qty as \"To Produce:Int:100\",\n `tabProduction Order`.produced_qty as \"Produced:Int:100\",\n `tabProduction Order`.company as \"Company:Link/Company:\"\nFROM\n `tabProduction Order`\nWHERE\n `tabProduction Order`.docstatus=1\n AND ifnull(`tabProduction Order`.produced_qty,0) < `tabProduction Order`.qty\n AND NOT EXISTS (SELECT name from `tabStock Entry` where production_order =`tabProduction Order`.name) ", "ref_doctype": "Production Order", "report_name": "Open Production Orders", "report_type": "Query Report" From 4cf549d223f39fc5dc12cb38309b11648fd0355d Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Fri, 15 May 2015 14:46:26 +0600 Subject: [PATCH 2/2] bumped to version 4.25.7 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 40c61dba31..60e425853e 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '4.25.6' +__version__ = '4.25.7' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 8b6460b5ba..882ed2a0bd 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "4.25.6" +app_version = "4.25.7" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index ececf0f110..e6f3618822 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.25.6" +version = "4.25.7" with open("requirements.txt", "r") as f: install_requires = f.readlines()