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

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2011-07-26 15:46:10 +05:30
parent de9826cba1 a1c232ac16
commit 587ac5c941
16 changed files with 291 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2011-07-08 13:30:05',
'creation': '2011-07-08 11:14:15',
'docstatus': 0,
'modified': '2011-07-08 13:30:05',
'modified': '2011-07-26 00:59:27',
'modified_by': 'Administrator',
'owner': 'Administrator'
},

6
utilities/doctype/rename_tool/rename_tool.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2011-06-23 11:03:25',
'creation': '2011-06-27 10:52:02',
'docstatus': 0,
'modified': '2011-07-01 17:46:42',
'modified': '2011-07-26 00:59:27',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -70,7 +70,7 @@
'fieldtype': 'Select',
'idx': 1,
'label': 'Select DocType',
'options': 'link:DocType'
'options': '\nAccount\nCompany\nCustomer\nSupplier\nEmployee\nWarehouse\nItem'
},
# DocField