From d21f55b5d25c882134f97d1d418418d10a7cbe77 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 29 Apr 2014 16:24:37 +0530 Subject: [PATCH] fix in naming and feature setup on install: --- erpnext/accounts/doctype/pos_setting/pos_setting.json | 7 ++++--- erpnext/setup/doctype/naming_series/naming_series.py | 2 +- erpnext/setup/install.py | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.json b/erpnext/accounts/doctype/pos_setting/pos_setting.json index 0e68bc3fed..20082771f1 100755 --- a/erpnext/accounts/doctype/pos_setting/pos_setting.json +++ b/erpnext/accounts/doctype/pos_setting/pos_setting.json @@ -1,6 +1,6 @@ { - "autoname": "POS/.####", - "creation": "2013-05-24 12:15:51.000000", + "autoname": "naming_series:", + "creation": "2013-05-24 12:15:51", "docstatus": 0, "doctype": "DocType", "fields": [ @@ -34,6 +34,7 @@ "no_copy": 1, "oldfieldname": "naming_series", "oldfieldtype": "Select", + "options": "POS-Setting-.#", "permlevel": 0, "read_only": 0, "reqd": 1 @@ -200,7 +201,7 @@ ], "icon": "icon-cog", "idx": 1, - "modified": "2014-01-29 13:08:25.000000", + "modified": "2014-04-27 03:11:44.969097", "modified_by": "Administrator", "module": "Accounts", "name": "POS Setting", diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py index 1dcf218a5e..100c8ba1cf 100644 --- a/erpnext/setup/doctype/naming_series/naming_series.py +++ b/erpnext/setup/doctype/naming_series/naming_series.py @@ -24,7 +24,7 @@ class NamingSeries(Document): } def scrub_options_list(self, ol): - options = filter(lambda x: x, [cstr(n.upper()).strip() for n in ol]) + options = filter(lambda x: x, [cstr(n).strip() for n in ol]) return options def update_series(self, arg=None): diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index b08efbdb84..7d05e8d6fe 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -57,7 +57,8 @@ def feature_setup(): 'fs_recurring_invoice', 'fs_pos', 'fs_manufacturing', 'fs_quality', 'fs_page_break', 'fs_more_info', 'fs_pos_view' ] - doc.update(dict(zip(flds, [1]*len(flds)))) + for f in flds: + doc.set(f, 1) doc.save() def set_single_defaults():