From 8a4111fe0eca17c786c4eb6ea5ad6cd03ea2fa6c Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Fri, 17 Jan 2014 18:50:44 +0530 Subject: [PATCH 1/5] decimal places fixed in item prices report --- stock/report/item_prices/item_prices.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock/report/item_prices/item_prices.py b/stock/report/item_prices/item_prices.py index e744cc73e4..18228ff64b 100644 --- a/stock/report/item_prices/item_prices.py +++ b/stock/report/item_prices/item_prices.py @@ -15,8 +15,8 @@ def execute(filters=None): bom_rate = get_item_bom_rate() val_rate_map = get_valuation_rate() - precision = get_currency_precision or 2 - + precision = get_currency_precision() or 2 + data = [] for item in sorted(item_map): data.append([item, item_map[item]["item_name"], From ed87335513986af2ba6766e331906078c830a9bd Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Fri, 17 Jan 2014 18:57:21 +0530 Subject: [PATCH 2/5] decimal places fix in item prices report --- stock/report/item_prices/item_prices.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock/report/item_prices/item_prices.py b/stock/report/item_prices/item_prices.py index e744cc73e4..5eee7df42d 100644 --- a/stock/report/item_prices/item_prices.py +++ b/stock/report/item_prices/item_prices.py @@ -15,7 +15,7 @@ def execute(filters=None): bom_rate = get_item_bom_rate() val_rate_map = get_valuation_rate() - precision = get_currency_precision or 2 + precision = get_currency_precision() or 2 data = [] for item in sorted(item_map): From 529709e08b08ba51479d6a69a55662107361cc17 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Mon, 20 Jan 2014 16:39:03 +0530 Subject: [PATCH 3/5] patch for enabling all price list --- patches/1401/enable_all_price_list.py | 9 +++++++++ patches/patch_list.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 patches/1401/enable_all_price_list.py diff --git a/patches/1401/enable_all_price_list.py b/patches/1401/enable_all_price_list.py new file mode 100644 index 0000000000..9cf141fe67 --- /dev/null +++ b/patches/1401/enable_all_price_list.py @@ -0,0 +1,9 @@ +# Copyright (c) 2014, Web Notes Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import webnotes + +def execute(): + webnotes.reload_doc("stock", "doctype", "price_list") + webnotes.conn.sql("""update `tabPrice List` set enabled=1""") \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index 5bf730af0b..89e33091bf 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -266,5 +266,5 @@ patch_list = [ "patches.1401.p01_move_related_property_setters_to_custom_field", "patches.1401.p01_make_buying_selling_as_check_box_in_price_list", "patches.1401.update_billing_status_for_zero_value_order", - "execute:webnotes.reload_doc('stock', 'doctype', 'price_list') #2014-01-20", + "patches.1401.enable_all_price_list", ] \ No newline at end of file From afe93d633ca0320d5e57fbb4b2049be71bbc5524 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 20 Jan 2014 18:28:48 +0530 Subject: [PATCH 4/5] Increased remarks width in general ledger --- accounts/report/general_ledger/general_ledger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/report/general_ledger/general_ledger.py b/accounts/report/general_ledger/general_ledger.py index 2f5716ece3..4b1a63b8b3 100644 --- a/accounts/report/general_ledger/general_ledger.py +++ b/accounts/report/general_ledger/general_ledger.py @@ -34,7 +34,7 @@ def validate_filters(filters, account_details): def get_columns(): return ["Posting Date:Date:100", "Account:Link/Account:200", "Debit:Float:100", "Credit:Float:100", "Voucher Type::120", "Voucher No::160", "Link::20", - "Against Account::120", "Cost Center:Link/Cost Center:100", "Remarks::200"] + "Against Account::120", "Cost Center:Link/Cost Center:100", "Remarks::400"] def get_result(filters, account_details): gl_entries = get_gl_entries(filters) From 872e4d1f3d660355ceec220967983aa4ee19e7f2 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 20 Jan 2014 19:51:25 +0600 Subject: [PATCH 5/5] bumped to version 3.6.4 --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 450e2bca6d..5a916c569b 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "app_name": "ERPNext", - "app_version": "3.6.3", + "app_version": "3.6.4", "base_template": "app/portal/templates/base.html", "modules": { "Accounts": { @@ -74,5 +74,5 @@ "type": "module" } }, - "requires_framework_version": "==3.7.3" + "requires_framework_version": "==3.7.4" } \ No newline at end of file