From 7c60fc13b2c65cdb9c9985cbc8a6debabdff1558 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 3 May 2012 18:22:32 +0530 Subject: [PATCH] reports fixed: itemwise sales/delivery report --- .../itemwise_delivery_details.js | 4 +--- .../itemwise_delivery_details.py | 8 ++++---- .../itemwise_delivery_details.txt | 8 ++++---- .../itemwise_sales_details/itemwise_sales_details.py | 8 ++++---- .../itemwise_sales_details/itemwise_sales_details.txt | 8 ++++---- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.js b/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.js index d501844c440..b0566765c0b 100644 --- a/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.js +++ b/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.js @@ -15,9 +15,7 @@ // along with this program. If not, see . report.customize_filters = function() { - this.filter_fields_dict['Delivery Note'+FILTER_SEP +'From Voucher Date'].df['report_default'] = sys_defaults.year_start_date; - this.filter_fields_dict['Delivery Note'+FILTER_SEP +'To Voucher Date'].df['report_default'] = dateutil.obj_to_str(new Date()); this.filter_fields_dict['Delivery Note'+FILTER_SEP +'From Posting Date'].df['report_default'] = sys_defaults.year_start_date; this.filter_fields_dict['Delivery Note'+FILTER_SEP +'To Posting Date'].df['report_default'] = dateutil.obj_to_str(new Date()); -} \ No newline at end of file +} diff --git a/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.py b/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.py index e86f8d3022a..8f868e92ddb 100644 --- a/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.py +++ b/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.py @@ -15,12 +15,12 @@ # along with this program. If not, see . out=[] -qty,amt,bil_qty=0,0,0 +qty,amt,bill_amt=0,0,0 for r in res: qty += flt(r[col_idx['Quantity']]) amt += flt(r[col_idx['Amount*']]) - bil_qty += flt(r[col_idx['Billed Qty']]) + bill_amt += flt(r[col_idx['Billed Amt']]) out.append(r) @@ -29,5 +29,5 @@ l_row = ['' for i in range(len(colnames))] l_row[col_idx['Item Name']] = 'TOTALS' l_row[col_idx['Quantity']] = qty l_row[col_idx['Amount*']] = amt -l_row[col_idx['Billed Qty']] = bil_qty -out.append(l_row) \ No newline at end of file +l_row[col_idx['Billed Amt']] = bill_amt +out.append(l_row) diff --git a/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt b/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt index 894aeee1308..73b602d3ad0 100644 --- a/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt +++ b/erpnext/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt @@ -3,20 +3,20 @@ # These values are common in all dictionaries { - 'creation': '2012-04-03 12:49:51', + 'creation': '2012-04-23 12:46:00', 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', + 'modified': '2012-05-03 18:13:49', 'modified_by': u'Administrator', 'owner': u'Administrator' }, # These values are common for all Search Criteria { - 'columns': u'Delivery Note\x01ID,Delivery Note Item\x01Item Code,Delivery Note Item\x01Item Name,Delivery Note Item\x01Quantity,Delivery Note Item\x01Rate*,Delivery Note Item\x01Amount*,Delivery Note Item\x01Billed Qty,Delivery Note\x01Company', + 'columns': u'Delivery Note\x01ID,Delivery Note Item\x01Item Code,Delivery Note Item\x01Item Name,Delivery Note Item\x01Quantity,Delivery Note Item\x01Rate*,Delivery Note Item\x01Amount*,Delivery Note Item\x01Billed Amt', 'criteria_name': u'Itemwise Delivery Details', 'doc_type': u'Delivery Note Item', 'doctype': 'Search Criteria', - 'filters': u"{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'','Delivery Note\x01From Voucher Date\x01lower':'','Delivery Note\x01To Voucher Date\x01upper':'','Delivery Note\x01Fiscal Year':''}", + 'filters': u'{"Delivery Note\\u0001Submitted":1,"Delivery Note\\u0001Status":[""],"Delivery Note\\u0001Fiscal Year":[""]}', 'module': u'Selling', 'name': '__common__', 'page_len': 50, diff --git a/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.py b/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.py index 0e88acbaa8f..ba161dd5c73 100644 --- a/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.py +++ b/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.py @@ -15,13 +15,13 @@ # along with this program. If not, see . out=[] -qty,amt,del_qty,bil_qty=0,0,0,0 +qty,amt,del_qty,bill_amt=0,0,0,0 for r in res: qty += flt(r[col_idx['Quantity']]) amt += flt(r[col_idx['Amount*']]) del_qty += flt(r[col_idx['Delivered Qty']]) - bil_qty += flt(r[col_idx['Billed Qty']]) + bill_amt += flt(r[col_idx['Billed Amt']]) out.append(r) @@ -31,5 +31,5 @@ l_row[col_idx['Item Name']] = 'TOTALS' l_row[col_idx['Quantity']] = qty l_row[col_idx['Amount*']] = amt l_row[col_idx['Delivered Qty']] = del_qty -l_row[col_idx['Billed Qty']] = bil_qty -out.append(l_row) \ No newline at end of file +l_row[col_idx['Billed Amt']] = bill_amt +out.append(l_row) diff --git a/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt b/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt index 3566ea99a61..fbc4642eaf8 100644 --- a/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt +++ b/erpnext/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt @@ -3,20 +3,20 @@ # These values are common in all dictionaries { - 'creation': '2012-04-03 12:49:51', + 'creation': '2012-04-23 12:46:00', 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', + 'modified': '2012-05-03 18:18:31', 'modified_by': u'Administrator', 'owner': u'Administrator' }, # These values are common for all Search Criteria { - 'columns': u'Sales Order\x01ID,Sales Order\x01Customer,Sales Order Item\x01Item Code,Sales Order Item\x01Item Name,Sales Order Item\x01Quantity,Sales Order Item\x01Basic Rate*,Sales Order Item\x01Amount*,Sales Order Item\x01Delivered Qty,Sales Order Item\x01Billed Qty,Sales Order\x01Company', + 'columns': u'Sales Order\x01ID,Sales Order\x01Customer,Sales Order Item\x01Item Code,Sales Order Item\x01Item Name,Sales Order Item\x01Quantity,Sales Order Item\x01Basic Rate*,Sales Order Item\x01Amount*,Sales Order Item\x01Delivered Qty,Sales Order Item\x01Billed Amt', 'criteria_name': u'Itemwise Sales Details', 'doc_type': u'Sales Order Item', 'doctype': 'Search Criteria', - 'filters': u"{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}", + 'filters': u'{"Sales Order\\u0001Submitted":1,"Sales Order\\u0001Fiscal Year":[""],"Sales Order\\u0001Status":[""]}', 'module': u'Selling', 'name': '__common__', 'page_len': 50,