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

Merge branch 'master' of github.com:webnotes/erpnext into navupdate

Browse Source
This commit is contained in:
Rushabh Mehta 2012-02-23 11:46:39 +05:30
commit c023cdd0c0
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches/jan_mar_2012/website/all.py
View File

@ -5,6 +5,7 @@ import patches.jan_mar_2012.website.cleanups
import patches.jan_mar_2012.website.domain_list
import patches.jan_mar_2012.website.file_data_rename
import patches.jan_mar_2012.website.analytics
import patches.jan_mar_2012.website.allow_product_delete
def execute():
@ -15,3 +16,4 @@ def execute():
patches.jan_mar_2012.website.domain_list.execute()
patches.jan_mar_2012.website.file_data_rename.execute()
patches.jan_mar_2012.website.analytics.execute()
patches.jan_mar_2012.website.allow_product_delete.execute()

8
erpnext/patches/jan_mar_2012/website/allow_product_delete.py Normal file
View File

@ -0,0 +1,8 @@
def execute():
"""
Allow deletion of products
"""
import webnotes
webnotes.conn.sql("""UPDATE `tabDocPerm` SET cancel=1
WHERE parent='Product' AND role='Website Manager'
AND permlevel=0""")

2
erpnext/production/doctype/bill_of_materials/bill_of_materials.py
View File

@ -268,7 +268,7 @@ class DocType:
def check_if_item_repeated(self, item, op, check_list):
if [cstr(item), cstr(op)] in check_list:
msgprint("Item %s has been entered twice against same operation" % d.item_code, raise_exception = 1)
msgprint("Item %s has been entered twice against same operation" % item, raise_exception = 1)
else:
check_list.append([cstr(item), cstr(op)])

7
erpnext/website/doctype/product/product.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2012-01-30 16:21:29',
'creation': '2012-02-17 15:53:22',
'docstatus': 0,
'modified': '2012-02-06 16:15:29',
'modified': '2012-02-22 18:32:46',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -18,12 +18,13 @@
'colour': u'White:FFF',
'description': u'A Product is shown on the website and is linked to an item.',
'doctype': 'DocType',
'document_type': u'Master',
'max_attachments': 5,
'module': u'Website',
'name': '__common__',
'section_style': u'Simple',
'show_in_menu': 0,
'version': 11
'version': 12
},
# These values are common for all DocField