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

Merge pull request #3561 from nabinhait/develop

Browse Source 
Fixes
This commit is contained in:
Nabin Hait 2015-07-02 17:55:18 +05:30
commit 7028ba507e
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/v5_0/update_item_desc_in_invoice.py
View File

@ -31,7 +31,9 @@ def execute():
desc, image = extract_image_and_description(cstr(d.description)) desc, image = extract_image_and_description(cstr(d.description))
if not image: if not image:
image = item_details.get(d.item_code).image item_detail = item_details.get(d.item_code)
if item_detail:
image = item_detail.image
frappe.db.sql("""update `tab{0}` set description = %s, image = %s frappe.db.sql("""update `tab{0}` set description = %s, image = %s
where name = %s """.format(dt), (desc, image, d.name)) where name = %s """.format(dt), (desc, image, d.name))

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

@ -174,15 +174,6 @@ class Item(WebsiteGenerator):
if bom_item not in (self.name, self.variant_of): if bom_item not in (self.name, self.variant_of):
frappe.throw(_("Default BOM ({0}) must be active for this item or its template").format(bom_item)) frappe.throw(_("Default BOM ({0}) must be active for this item or its template").format(bom_item))
if self.is_purchase_item != "Yes":
bom_mat = frappe.db.sql("""select distinct t1.parent
from `tabBOM Item` t1, `tabBOM` t2 where t2.name = t1.parent
and t1.item_code =%s and ifnull(t1.bom_no, '') = '' and t2.is_active = 1
and t2.docstatus = 1 and t1.docstatus =1 """, self.name)
if bom_mat and bom_mat[0][0]:
frappe.throw(_("Item must be a purchase item, as it is present in one or many Active BOMs"))
def fill_customer_code(self): def fill_customer_code(self):
""" Append all the customer codes and insert into "customer_code" field of item table """ """ Append all the customer codes and insert into "customer_code" field of item table """
cust_code=[] cust_code=[]