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

fixed conflict

Browse Source
This commit is contained in:
Brahma K
2011-07-27 10:54:11 +05:30
parent d7db2ea20f a01ca6e732
commit 790a78785b
103 changed files with 841 additions and 2232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utilities/doctype/address/address.txt
View File

@@ -117,7 +117,7 @@
'label': 'City/Town',
'permlevel': 0,
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField
@@ -129,7 +129,7 @@
'in_filter': 1,
'label': 'Pincode',
'permlevel': 0,
'search_index': 1
'search_index': 0
},
# DocField
@@ -144,7 +144,7 @@
'options': 'link:Country',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
'search_index': 0,
'trigger': 'Client'
},
@@ -214,6 +214,7 @@
'label': 'Customer',
'options': 'Customer',
'permlevel': 0,
'search_index': 1,
'trigger': 'Client'
},
@@ -240,6 +241,7 @@
'label': 'Supplier',
'options': 'Supplier',
'permlevel': 0,
'search_index': 1,
'trigger': 'Client'
},

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'
},

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

@@ -173,7 +173,7 @@
'label': 'Fiscal Year',
'oldfieldname': 'fiscal_year',
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField
@@ -202,7 +202,7 @@
'in_filter': 1,
'label': 'Company',
'oldfieldname': 'company',
'search_index': 1
'search_index': 0
},
# DocField

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