nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into production

Browse Source 
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
parent 3519d7de01 69b3730a18
commit c551964d5d
96 changed files with 52 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
patches/patch_list.py
View File

@@ -525,5 +525,8 @@ patch_list = [
{
'patch_module': 'patches.december_2012',
'patch_file': 'production_cleanup',
{
'patch_module': 'patches.december_2012',
'patch_file': 'fix_default_print_format',
},
]