Merge branch 'renamedt' into shf_rename

Conflicts:
	erpnext/patches/patch_list.py
This commit is contained in:
Anand Doshi
2012-03-29 15:31:17 +05:30
15 changed files with 383 additions and 163 deletions

View File

@@ -131,10 +131,10 @@
{
'checking_operator': u'=',
'doctype': u'Field Mapper Detail',
'from_field': u'basic_rate',
'from_field': u'export_rate',
'map': u'Yes',
'match_id': 1,
'to_field': u'basic_rate'
'to_field': u'export_rate'
},
# Field Mapper Detail
@@ -264,4 +264,4 @@
'to_table': u'Delivery Note',
'validation_logic': u'docstatus = 1'
}
]
]