Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed spaces to tabs

Browse Source
This commit is contained in:
joezsweet 2018-02-05 13:16:00 +01:00 committed by GitHub
parent a8d5ef4891
commit 097a98cc10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/stock/doctype/item/item.py
View File

@ -5,19 +5,17 @@ from __future__ import unicode_literals
import itertools import itertools
import json import json
import erpnext import erpnext
import frappe import frappe
from erpnext.controllers.item_variant import (ItemVariantExistsError, from erpnext.controllers.item_variant import (ItemVariantExistsError,
copy_attributes_to_variant, copy_attributes_to_variant,
get_variant, get_variant,
make_variant_item_code, make_variant_item_code,
validate_item_variant_attributes) validate_item_variant_attributes)
from erpnext.setup.doctype.item_group.item_group import (get_parent_item_groups, from erpnext.setup.doctype.item_group.item_group import (get_parent_item_groups, invalidate_cache_for)
invalidate_cache_for)
from frappe import _, msgprint from frappe import _, msgprint
from frappe.utils import (cint, cstr, flt, formatdate, get_timestamp, getdate, from frappe.utils import (cint, cstr, flt, formatdate, get_timestamp, getdate,
now_datetime, random_string, strip) now_datetime, random_string, strip)
from frappe.utils.html_utils import clean_html from frappe.utils.html_utils import clean_html
from frappe.website.doctype.website_slideshow.website_slideshow import \ from frappe.website.doctype.website_slideshow.website_slideshow import \
get_slideshow get_slideshow
@ -487,7 +485,8 @@ class Item(WebsiteGenerator):
if len(self.barcodes) > 0: if len(self.barcodes) > 0:
for item_barcode in self.barcodes: for item_barcode in self.barcodes:
if item_barcode.barcode: if item_barcode.barcode:
duplicate = frappe.db.sql("""select parent from `tabItem Barcode` where barcode = %s and parent != %s""", (item_barcode.barcode, self.name)) duplicate = frappe.db.sql(
"""select parent from `tabItem Barcode` where barcode = %s and parent != %s""", (item_barcode.barcode, self.name))
if duplicate: if duplicate:
frappe.throw(_("Barcode {0} already used in Item {1}").format( frappe.throw(_("Barcode {0} already used in Item {1}").format(
item_barcode.barcode, duplicate[0][0])) item_barcode.barcode, duplicate[0][0]))