Merge branch 'master' into production

Conflicts:
	patches/patch_list.py
	production/doctype/bom_explosion_item/bom_explosion_item.txt
This commit is contained in:
Anand Doshi
2012-12-11 14:59:19 +05:30
96 changed files with 52 additions and 132 deletions

View File

@@ -19,7 +19,6 @@
"hide_heading": 0,
"issingle": 0,
"name": "__common__",
"default_print_format": "Standard",
"allow_rename": 0,
"doctype": "DocType",
"is_submittable": 1,