From b4aa0f8ce8b8b35a8274afd2d79ef94eb3c9fad9 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 22 Jun 2012 10:56:12 +0530 Subject: [PATCH] fix in price list: check if a row has content before checking its length; allow only 1 attachment --- .../setup/doctype/price_list/price_list.py | 2 +- .../setup/doctype/price_list/price_list.txt | 87 ++++++++++--------- 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/erpnext/setup/doctype/price_list/price_list.py b/erpnext/setup/doctype/price_list/price_list.py index f2f32c2eef..be59c65816 100644 --- a/erpnext/setup/doctype/price_list/price_list.py +++ b/erpnext/setup/doctype/price_list/price_list.py @@ -57,7 +57,7 @@ class DocType: updated = 0 for line in data: - if len(line)==3: + if line and len(line)==3: # if item exists if sql("select name from tabItem where name=%s", line[0]): if self.is_currency_valid(line[2]): diff --git a/erpnext/setup/doctype/price_list/price_list.txt b/erpnext/setup/doctype/price_list/price_list.txt index 5d7e57e9cf..2881cd7122 100644 --- a/erpnext/setup/doctype/price_list/price_list.txt +++ b/erpnext/setup/doctype/price_list/price_list.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:22', + 'creation': '2012-05-15 12:15:02', 'docstatus': 0, - 'modified': '2012-03-27 14:36:22', + 'modified': '2012-06-22 10:51:23', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -19,12 +19,13 @@ 'colour': u'White:FFF', 'doctype': 'DocType', 'document_type': u'Master', + 'max_attachments': 1, 'module': u'Setup', 'name': '__common__', 'section_style': u'Simple', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 6 + 'version': 1 }, # These values are common for all DocField @@ -54,6 +55,46 @@ 'name': u'Price List' }, + # DocPerm + { + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Sales Manager', + 'write': 0 + }, + + # DocPerm + { + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Sales Manager', + 'write': 0 + }, + + # DocPerm + { + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Sales User', + 'write': 0 + }, + + # DocPerm + { + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Sales User', + 'write': 0 + }, + # DocPerm { 'cancel': 1, @@ -64,46 +105,6 @@ 'write': 1 }, - # DocPerm - { - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Sales Manager', - 'write': 0 - }, - - # DocPerm - { - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Sales Manager', - 'write': 0 - }, - - # DocPerm - { - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Sales User', - 'write': 0 - }, - - # DocPerm - { - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Sales User', - 'write': 0 - }, - # DocField { 'doctype': u'DocField',