From c06e29ddbc0a82d2c856e387fdcfb15e99e196c7 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 1 Feb 2013 18:35:35 +0530 Subject: [PATCH] removed sales order pending items report --- .../remove_sales_order_pending_items.py | 3 ++ patches/patch_list.py | 1 + .../sales_order_pending_items/__init__.py | 1 - .../sales_order_pending_items.js | 20 ------------- .../sales_order_pending_items.txt | 30 ------------------- .../ordered_items_to_be_delivered.txt | 16 +++++----- .../purchase_order_items_to_be_received.txt | 6 ++-- 7 files changed, 15 insertions(+), 62 deletions(-) create mode 100644 patches/february_2013/remove_sales_order_pending_items.py delete mode 100644 selling/search_criteria/sales_order_pending_items/__init__.py delete mode 100644 selling/search_criteria/sales_order_pending_items/sales_order_pending_items.js delete mode 100644 selling/search_criteria/sales_order_pending_items/sales_order_pending_items.txt diff --git a/patches/february_2013/remove_sales_order_pending_items.py b/patches/february_2013/remove_sales_order_pending_items.py new file mode 100644 index 0000000000..bde6a7b240 --- /dev/null +++ b/patches/february_2013/remove_sales_order_pending_items.py @@ -0,0 +1,3 @@ +def execute(): + import webnotes + webnotes.delete_doc("Search Criteria", "sales_order_pending_items") \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index f4b0127f08..3c7fad2dd6 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -163,4 +163,5 @@ patch_list = [ "patches.february_2013.remove_gl_mapper", "patches.february_2013.reload_bom_replace_tool_permission", "patches.february_2013.payment_reconciliation_reset_values", + "patches.february_2013.remove_sales_order_pending_items", ] \ No newline at end of file diff --git a/selling/search_criteria/sales_order_pending_items/__init__.py b/selling/search_criteria/sales_order_pending_items/__init__.py deleted file mode 100644 index baffc48825..0000000000 --- a/selling/search_criteria/sales_order_pending_items/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/selling/search_criteria/sales_order_pending_items/sales_order_pending_items.js b/selling/search_criteria/sales_order_pending_items/sales_order_pending_items.js deleted file mode 100644 index 1b3837a4ed..0000000000 --- a/selling/search_criteria/sales_order_pending_items/sales_order_pending_items.js +++ /dev/null @@ -1,20 +0,0 @@ -// ERPNext - web based ERP (http://erpnext.com) -// Copyright (C) 2012 Web Notes Technologies Pvt Ltd -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -report.customize_filters = function() { - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Company'].df['report_default'] = sys_defaults.company; - this.filter_fields_dict['Sales Order'+FILTER_SEP +'Fiscal Year'].df['report_default'] = sys_defaults.fiscal_year; -} \ No newline at end of file diff --git a/selling/search_criteria/sales_order_pending_items/sales_order_pending_items.txt b/selling/search_criteria/sales_order_pending_items/sales_order_pending_items.txt deleted file mode 100644 index ab5a1f8114..0000000000 --- a/selling/search_criteria/sales_order_pending_items/sales_order_pending_items.txt +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - "owner": "Administrator", - "docstatus": 0, - "creation": "2012-05-14 14:54:44", - "modified_by": "Administrator", - "modified": "2012-05-18 11:15:00" - }, - { - "add_col": "(`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) AS \"Qty To Deliver\"\n(`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0))*`tabSales Order Item`.basic_rate AS \"Amount To Deliver\"\n(`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.billed_qty, 0))*`tabSales Order Item`.basic_rate AS \"Amount To Bill\"", - "parent_doc_type": "Sales Order", - "module": "Selling", - "standard": "Yes", - "sort_order": "DESC", - "filters": "{\"Sales Order\\u0001Submitted\":1,\"Sales Order\\u0001Fiscal Year\":[],\"Sales Order\\u0001Status\":[]}", - "description": "Sales Order Pending Items", - "doc_type": "Sales Order Item", - "name": "__common__", - "add_cond": "(`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0) > 0 or `tabSales Order Item`.qty - ifnull(`tabSales Order Item`.billed_qty, 0) > 0)\n`tabSales Order`.status != \"Stopped\"", - "doctype": "Search Criteria", - "sort_by": "`tabSales Order`.`name`", - "page_len": 50, - "criteria_name": "Sales Order Pending Items", - "columns": "Sales Order\u0001ID,Sales Order\u0001Sales Order Date,Sales Order\u0001Customer,Sales Order Item\u0001Item Code,Sales Order Item\u0001Item Name,Sales Order Item\u0001Description,Sales Order Item\u0001Quantity,Sales Order Item\u0001Delivered Qty" - }, - { - "name": "sales_order_pending_items", - "doctype": "Search Criteria" - } -] \ No newline at end of file diff --git a/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt b/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt index 840124a1d7..1984ab934b 100644 --- a/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt +++ b/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.txt @@ -1,20 +1,20 @@ [ { - "owner": "Administrator", + "creation": "2012-12-17 12:57:24", "docstatus": 0, - "creation": "2012-12-14 10:18:14", + "modified": "2013-02-01 18:27:52", "modified_by": "Administrator", - "modified": "2012-12-14 10:19:13" + "owner": "Administrator" }, { - "name": "__common__", - "ref_doctype": "Delivery Note", "doctype": "Report", "is_standard": "Yes", - "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc" + "name": "__common__", + "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc", + "ref_doctype": "Delivery Note" }, { - "name": "Ordered Items To Be Delivered", - "doctype": "Report" + "doctype": "Report", + "name": "Ordered Items To Be Delivered" } ] \ No newline at end of file diff --git a/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt b/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt index 112a12416f..93795f5ad4 100644 --- a/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt +++ b/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-02-01 13:09:34", + "creation": "2013-02-01 14:03:42", "docstatus": 0, - "modified": "2013-02-01 13:09:34", + "modified": "2013-02-01 18:28:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,7 +10,7 @@ "doctype": "Report", "is_standard": "Yes", "name": "__common__", - "query": "select \n `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n `tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n `tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n `tabPurchase Order Item`.description as \"Description::180\",\n `tabPurchase Order Item`.qty as \"Qty:Float:100\",\n `tabPurchase Order Item`.received_qty as \"Received Qty:Float:100\"\nfrom\n `tabPurchase Order`, `tabPurchase Order Item`\nwhere\n `tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n and `tabPurchase Order`.docstatus = 1\n and ifnull(`tabPurchase Order Item`.received_qty, 0) < ifnull(`tabPurchase Order Item`.qty, 0)\norder by `tabPurchase Order`.transaction_date asc", + "query": "select \n `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n `tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n `tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n `tabPurchase Order Item`.description as \"Description::180\",\n `tabPurchase Order Item`.qty as \"Qty:Float:100\",\n `tabPurchase Order Item`.received_qty as \"Received Qty:Float:100\", \n (`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0)) as \"Qty to Receive:Float:100\"\nfrom\n `tabPurchase Order`, `tabPurchase Order Item`\nwhere\n `tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n and `tabPurchase Order`.docstatus = 1\n and ifnull(`tabPurchase Order Item`.received_qty, 0) < ifnull(`tabPurchase Order Item`.qty, 0)\norder by `tabPurchase Order`.transaction_date asc", "ref_doctype": "Purchase Receipt" }, {