mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-31 10:49:09 +00:00
Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
'istable': None,
|
||||
'max_attachments': None,
|
||||
'menu_index': None,
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'module': 'Accounts',
|
||||
'name': 'Account',
|
||||
@@ -65,7 +65,7 @@
|
||||
'execute': None,
|
||||
'idx': 1,
|
||||
'match': None,
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-02-19 13:20:49',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'PERM00042',
|
||||
'owner': 'Administrator',
|
||||
@@ -88,7 +88,7 @@
|
||||
'execute': None,
|
||||
'idx': 2,
|
||||
'match': None,
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-02-19 13:20:49',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'PERM00043',
|
||||
'owner': 'Administrator',
|
||||
@@ -111,7 +111,7 @@
|
||||
'execute': None,
|
||||
'idx': 3,
|
||||
'match': None,
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-02-19 13:20:49',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'PERM00044',
|
||||
'owner': 'Administrator',
|
||||
@@ -134,7 +134,7 @@
|
||||
'execute': None,
|
||||
'idx': 4,
|
||||
'match': None,
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-02-19 13:20:49',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'PERM00045',
|
||||
'owner': 'Administrator',
|
||||
@@ -157,7 +157,7 @@
|
||||
'execute': None,
|
||||
'idx': 5,
|
||||
'match': None,
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-02-19 13:20:49',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'PERM00046',
|
||||
'owner': 'Administrator',
|
||||
@@ -180,7 +180,7 @@
|
||||
'execute': None,
|
||||
'idx': 6,
|
||||
'match': None,
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-02-19 13:20:49',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'PERM00047',
|
||||
'owner': 'Administrator',
|
||||
@@ -203,7 +203,7 @@
|
||||
'execute': None,
|
||||
'idx': 7,
|
||||
'match': None,
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-02-19 13:20:49',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'PERM00048',
|
||||
'owner': 'Administrator',
|
||||
@@ -226,7 +226,7 @@
|
||||
'execute': None,
|
||||
'idx': 8,
|
||||
'match': None,
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-02-19 13:20:49',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'PERM00049',
|
||||
'owner': 'Administrator',
|
||||
@@ -242,7 +242,7 @@
|
||||
{
|
||||
'allow_on_submit': None,
|
||||
'colour': None,
|
||||
'creation': '2011-03-21 11:13:07',
|
||||
'creation': '2011-06-23 17:11:38',
|
||||
'default': None,
|
||||
'depends_on': None,
|
||||
'description': None,
|
||||
@@ -255,9 +255,9 @@
|
||||
'idx': 1,
|
||||
'in_filter': None,
|
||||
'label': 'Properties',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': '000013925',
|
||||
'name': 'FL05605',
|
||||
'no_column': None,
|
||||
'no_copy': None,
|
||||
'oldfieldname': None,
|
||||
@@ -278,7 +278,7 @@
|
||||
{
|
||||
'allow_on_submit': None,
|
||||
'colour': None,
|
||||
'creation': '2011-03-21 11:13:07',
|
||||
'creation': '2011-06-23 17:11:38',
|
||||
'default': None,
|
||||
'depends_on': None,
|
||||
'description': None,
|
||||
@@ -291,9 +291,9 @@
|
||||
'idx': 2,
|
||||
'in_filter': None,
|
||||
'label': None,
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': '000013926',
|
||||
'name': 'FL05606',
|
||||
'no_column': None,
|
||||
'no_copy': None,
|
||||
'oldfieldname': None,
|
||||
@@ -327,7 +327,7 @@
|
||||
'idx': 3,
|
||||
'in_filter': 1,
|
||||
'label': 'Account Name',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00433',
|
||||
'no_column': None,
|
||||
@@ -363,7 +363,7 @@
|
||||
'idx': 4,
|
||||
'in_filter': None,
|
||||
'label': 'Parent Account',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00434',
|
||||
'no_column': None,
|
||||
@@ -399,7 +399,7 @@
|
||||
'idx': 5,
|
||||
'in_filter': None,
|
||||
'label': 'Level',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00435',
|
||||
'no_column': None,
|
||||
@@ -435,7 +435,7 @@
|
||||
'idx': 6,
|
||||
'in_filter': 1,
|
||||
'label': 'Group or Ledger',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00436',
|
||||
'no_column': None,
|
||||
@@ -458,7 +458,7 @@
|
||||
{
|
||||
'allow_on_submit': None,
|
||||
'colour': None,
|
||||
'creation': '2011-03-21 11:13:07',
|
||||
'creation': '2011-03-22 16:06:53',
|
||||
'default': None,
|
||||
'depends_on': None,
|
||||
'description': None,
|
||||
@@ -471,9 +471,9 @@
|
||||
'idx': 7,
|
||||
'in_filter': None,
|
||||
'label': 'Convert to Group',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': '000013923',
|
||||
'name': '000001803',
|
||||
'no_column': None,
|
||||
'no_copy': None,
|
||||
'oldfieldname': None,
|
||||
@@ -494,7 +494,7 @@
|
||||
{
|
||||
'allow_on_submit': None,
|
||||
'colour': None,
|
||||
'creation': '2011-03-21 11:13:07',
|
||||
'creation': '2011-03-22 16:06:53',
|
||||
'default': None,
|
||||
'depends_on': None,
|
||||
'description': None,
|
||||
@@ -507,9 +507,9 @@
|
||||
'idx': 8,
|
||||
'in_filter': None,
|
||||
'label': 'Convert to Ledger',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': '000013924',
|
||||
'name': '000001804',
|
||||
'no_column': None,
|
||||
'no_copy': None,
|
||||
'oldfieldname': None,
|
||||
@@ -543,7 +543,7 @@
|
||||
'idx': 9,
|
||||
'in_filter': 1,
|
||||
'label': 'Debit or Credit',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00441',
|
||||
'no_column': None,
|
||||
@@ -579,7 +579,7 @@
|
||||
'idx': 10,
|
||||
'in_filter': 1,
|
||||
'label': 'Is PL Account',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00437',
|
||||
'no_column': None,
|
||||
@@ -615,7 +615,7 @@
|
||||
'idx': 11,
|
||||
'in_filter': 1,
|
||||
'label': 'Account Type',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00439',
|
||||
'no_column': None,
|
||||
@@ -651,7 +651,7 @@
|
||||
'idx': 12,
|
||||
'in_filter': None,
|
||||
'label': 'Rate',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00440',
|
||||
'no_column': None,
|
||||
@@ -674,7 +674,7 @@
|
||||
{
|
||||
'allow_on_submit': None,
|
||||
'colour': None,
|
||||
'creation': '2011-03-21 11:13:07',
|
||||
'creation': '2011-06-23 17:11:38',
|
||||
'default': None,
|
||||
'depends_on': None,
|
||||
'description': None,
|
||||
@@ -687,9 +687,9 @@
|
||||
'idx': 13,
|
||||
'in_filter': None,
|
||||
'label': None,
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': '000013927',
|
||||
'name': 'FL05607',
|
||||
'no_column': None,
|
||||
'no_copy': None,
|
||||
'oldfieldname': None,
|
||||
@@ -723,7 +723,7 @@
|
||||
'idx': 14,
|
||||
'in_filter': None,
|
||||
'label': 'Freeze Account',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00438',
|
||||
'no_column': None,
|
||||
@@ -759,7 +759,7 @@
|
||||
'idx': 15,
|
||||
'in_filter': 1,
|
||||
'label': 'Company',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00442',
|
||||
'no_column': None,
|
||||
@@ -790,12 +790,12 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'credit_days',
|
||||
'fieldtype': 'Int',
|
||||
'hidden': 1,
|
||||
'hidden': 0,
|
||||
'icon': None,
|
||||
'idx': 16,
|
||||
'in_filter': None,
|
||||
'label': 'Credit Days',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00443',
|
||||
'no_column': None,
|
||||
@@ -826,12 +826,12 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'credit_limit',
|
||||
'fieldtype': 'Currency',
|
||||
'hidden': 1,
|
||||
'hidden': 0,
|
||||
'icon': None,
|
||||
'idx': 17,
|
||||
'in_filter': None,
|
||||
'label': 'Credit Limit',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00444',
|
||||
'no_column': None,
|
||||
@@ -867,7 +867,7 @@
|
||||
'idx': 18,
|
||||
'in_filter': None,
|
||||
'label': 'Master Type',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00453',
|
||||
'no_column': None,
|
||||
@@ -903,7 +903,7 @@
|
||||
'idx': 19,
|
||||
'in_filter': None,
|
||||
'label': 'Master Name',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00454',
|
||||
'no_column': None,
|
||||
@@ -926,7 +926,7 @@
|
||||
{
|
||||
'allow_on_submit': None,
|
||||
'colour': None,
|
||||
'creation': '2011-03-21 11:13:07',
|
||||
'creation': '2011-06-23 17:11:38',
|
||||
'default': None,
|
||||
'depends_on': None,
|
||||
'description': None,
|
||||
@@ -939,9 +939,9 @@
|
||||
'idx': 20,
|
||||
'in_filter': None,
|
||||
'label': 'TDS',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': '000013928',
|
||||
'name': 'FL05608',
|
||||
'no_column': None,
|
||||
'no_copy': None,
|
||||
'oldfieldname': None,
|
||||
@@ -975,7 +975,7 @@
|
||||
'idx': 21,
|
||||
'in_filter': None,
|
||||
'label': 'PAN Number',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00451',
|
||||
'no_column': None,
|
||||
@@ -1011,7 +1011,7 @@
|
||||
'idx': 22,
|
||||
'in_filter': None,
|
||||
'label': 'TDS Applicable',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00452',
|
||||
'no_column': None,
|
||||
@@ -1047,7 +1047,7 @@
|
||||
'idx': 23,
|
||||
'in_filter': None,
|
||||
'label': 'TDS Details',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00456',
|
||||
'no_column': None,
|
||||
@@ -1083,7 +1083,7 @@
|
||||
'idx': 24,
|
||||
'in_filter': None,
|
||||
'label': 'Old Parent',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00447',
|
||||
'no_column': None,
|
||||
@@ -1119,7 +1119,7 @@
|
||||
'idx': 25,
|
||||
'in_filter': 1,
|
||||
'label': 'Lft',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00448',
|
||||
'no_column': None,
|
||||
@@ -1155,7 +1155,7 @@
|
||||
'idx': 26,
|
||||
'in_filter': 1,
|
||||
'label': 'Rgt',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00449',
|
||||
'no_column': None,
|
||||
@@ -1191,7 +1191,7 @@
|
||||
'idx': 27,
|
||||
'in_filter': None,
|
||||
'label': 'Trash Reason',
|
||||
'modified': '2011-06-23 12:36:56',
|
||||
'modified': '2011-06-23 17:11:38',
|
||||
'modified_by': 'Administrator',
|
||||
'name': 'FL00457',
|
||||
'no_column': None,
|
||||
|
||||
Reference in New Issue
Block a user