From 81b98261aeeb9bc3f5c311960ff266cef991d07b Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Tue, 27 Jan 2015 11:28:56 +0530 Subject: [PATCH 1/6] patch fix --- erpnext/patches/v4_2/set_item_batch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/patches/v4_2/set_item_batch.py b/erpnext/patches/v4_2/set_item_batch.py index 3e84a59e00..35ed2e087f 100644 --- a/erpnext/patches/v4_2/set_item_batch.py +++ b/erpnext/patches/v4_2/set_item_batch.py @@ -44,7 +44,7 @@ def get_sle_count(): def get_sle_with_batch(): sle_with_batch = {} for d in frappe.db.sql("""select item_code, count(name) as cnt from `tabStock Ledger Entry` - where batch_no != '' group by item_code""", as_dict=1): + where ifnull(batch_no, '') != '' group by item_code""", as_dict=1): sle_with_batch.setdefault(d.item_code, d.cnt) return sle_with_batch @@ -53,7 +53,7 @@ def get_sle_with_batch(): def get_sle_with_serial(): sle_with_serial = {} for d in frappe.db.sql("""select item_code, count(name) as cnt from `tabStock Ledger Entry` - where serial_no != '' group by item_code""", as_dict=1): + where ifnull(serial_no, '') != '' group by item_code""", as_dict=1): sle_with_serial.setdefault(d.item_code, d.cnt) return sle_with_serial From a7fb9216c91cacb5ca2303ac13fd0f2ce020a77d Mon Sep 17 00:00:00 2001 From: The Gitter Badger Date: Tue, 27 Jan 2015 06:12:58 +0000 Subject: [PATCH 2/6] Added Gitter badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b9d5a6e5f7..a13c7909f0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # ERPNext - Open Source ERP for small, medium sized businesses [![Build Status](https://travis-ci.org/frappe/erpnext.png)](https://travis-ci.org/frappe/erpnext) +[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/frappe/erpnext?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + [https://erpnext.com](https://erpnext.com) Includes Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Built on Python / MariaDB. From dc65dc3778fe0542de400d6416823c518838ca1c Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Tue, 27 Jan 2015 12:27:10 +0530 Subject: [PATCH 3/6] rename patch --- erpnext/patches.txt | 2 +- .../patches/v4_2/{set_item_batch.py => set_item_has_batch.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename erpnext/patches/v4_2/{set_item_batch.py => set_item_has_batch.py} (100%) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 8978a3b19b..bfce3463c8 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -92,4 +92,4 @@ execute:frappe.delete_doc("DocType", "Contact Control") erpnext.patches.v4_2.recalculate_bom_costs erpnext.patches.v4_2.discount_amount erpnext.patches.v4_2.update_landed_cost_voucher -erpnext.patches.v4_2.set_item_batch +erpnext.patches.v4_2.set_item_has_batch diff --git a/erpnext/patches/v4_2/set_item_batch.py b/erpnext/patches/v4_2/set_item_has_batch.py similarity index 100% rename from erpnext/patches/v4_2/set_item_batch.py rename to erpnext/patches/v4_2/set_item_has_batch.py From 8147f74e4ef37226784f81e6819d9a4459c5f452 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 27 Jan 2015 13:16:18 +0530 Subject: [PATCH 4/6] [minor] Mandatory filters in Customer Acquisition and Loyalty --- .../customer_acquisition_and_loyalty.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js index ce19f519b9..5e74431978 100644 --- a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js +++ b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js @@ -8,19 +8,22 @@ frappe.query_reports["Customer Acquisition and Loyalty"] = { "label": __("Company"), "fieldtype": "Link", "options": "Company", - "default": frappe.defaults.get_user_default("company") + "default": frappe.defaults.get_user_default("company"), + "reqd": 1 }, { "fieldname":"from_date", "label": __("From Date"), "fieldtype": "Date", - "default": frappe.defaults.get_user_default("year_start_date") + "default": frappe.defaults.get_user_default("year_start_date"), + "reqd": 1 }, { "fieldname":"to_date", "label": __("To Date"), "fieldtype": "Date", - "default": frappe.defaults.get_user_default("year_end_date") + "default": frappe.defaults.get_user_default("year_end_date"), + "reqd": 1 }, ] -} \ No newline at end of file +} From 6f701b3b6a01367390e4bdae42180cc1aa71f3cb Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 27 Jan 2015 13:18:01 +0530 Subject: [PATCH 5/6] [minor] Packing Slip get_query --- erpnext/stock/doctype/packing_slip/packing_slip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py index bd79835d58..1916cef242 100644 --- a/erpnext/stock/doctype/packing_slip/packing_slip.py +++ b/erpnext/stock/doctype/packing_slip/packing_slip.py @@ -166,4 +166,4 @@ def item_details(doctype, txt, searchfield, start, page_len, filters): and %s like "%s" %s limit %s, %s """ % ("%s", searchfield, "%s", get_match_cond(doctype), "%s", "%s"), - (filters["delivery_note"], "%%%s%%" % txt, start, page_len)) + ((filters or {}).get("delivery_note"), "%%%s%%" % txt, start, page_len)) From 408a8e804c7728097d5e6d77622d7f735dd53191 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Tue, 27 Jan 2015 15:13:53 +0600 Subject: [PATCH 6/6] bumped to version 4.20.1 --- 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 75c77f13ac..884d464b52 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1 +1 @@ -__version__ = '4.20.0' +__version__ = '4.20.1' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 90ac2e7492..6f906755bd 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -4,7 +4,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.20.0" +app_version = "4.20.1" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index f2c3988a9e..f093f55176 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.20.0" +version = "4.20.1" with open("requirements.txt", "r") as f: install_requires = f.readlines()