Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/erpnext/patches/jan_mar_2012/rename_dt.py b/erpnext/patches/jan_mar_2012/rename_dt.py
index 9d92fad..a507a1c 100644
--- a/erpnext/patches/jan_mar_2012/rename_dt.py
+++ b/erpnext/patches/jan_mar_2012/rename_dt.py
@@ -1,6 +1,6 @@
import webnotes
import conf
-from webnotes.model import rename, delete_doc
+import webnotes.model
from webnotes.model.code import get_obj
from wnf import replace_code
from termcolor import colored
@@ -150,10 +150,13 @@
print colored('Renaming... ' + d + ' --> '+ ren_data[d], 'yellow')
#rename
try:
- rename(data_type, d, ren_data[d], is_doctype)
+ webnotes.model.rename(data_type, d, ren_data[d], is_doctype)
except Exception, e:
- print e
- pass
+ if e.args[0]!=1050:
+ raise e
+ else:
+ print e
+ pass
def update_dt_in_records(rendt):
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index 71c9436..32a1e77 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -228,16 +228,16 @@
'description': 'SO-RV duplicate mapper entry removal'
},
{
- 'patch_module': 'patches.jan_mar_2012',
- 'patch_file': 'sync_ref_db',
- 'description': 'Deletes non required doctypes'
- },
- {
'patch_module': 'patches.mar_2012',
'patch_file': 'clean_property_setter',
'description': 'Patch related to property setter cleanup'
},
{
+ 'patch_module': 'patches.jan_mar_2012',
+ 'patch_file': 'sync_ref_db',
+ 'description': 'Deletes non required doctypes'
+ },
+ {
'patch_module': 'patches.april_2012',
'patch_file': 'naming_series_patch',
'description': 'Move naming series options into property setter'
diff --git a/erpnext/utilities/doctype/rename_tool/rename_tool.txt b/erpnext/utilities/doctype/rename_tool/rename_tool.txt
index f84fbd5..c9ee46f 100755
--- a/erpnext/utilities/doctype/rename_tool/rename_tool.txt
+++ b/erpnext/utilities/doctype/rename_tool/rename_tool.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-03-27 14:36:47',
+ 'creation': '2012-05-03 18:43:31',
'docstatus': 0,
- 'modified': '2012-03-27 14:36:47',
+ 'modified': '2012-05-25 11:58:44',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -24,7 +24,7 @@
'name': '__common__',
'section_style': u'Simple',
'show_in_menu': 0,
- 'version': 7
+ 'version': 1
},
# These values are common for all DocField
@@ -68,7 +68,7 @@
'fieldname': u'select_doctype',
'fieldtype': u'Select',
'label': u'Select DocType',
- 'options': u'\nAccount\nCompany\nCustomer\nSupplier\nEmployee\nWarehouse\nItem'
+ 'options': u'\nAccount\nCompany\nCustomer\nSupplier\nEmployee\nWarehouse\nItem\nProfile'
},
# DocField