<commit_before>[
 {
  "creation": "2013-03-28 10:35:31", 
  "docstatus": 0, 
<<<<<<< HEAD:erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
  "modified": "2013-12-20 16:06:50", 
=======
  "modified": "2014-01-15 15:45:07", 
>>>>>>> dbb495548352d46b30bf84fb4b29ef4a247cb21c:stock/doctype/stock_reconciliation/stock_reconciliation.txt
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
 {
  "allow_attach": 0, 
  "allow_copy": 1, 
  "autoname": "SR/.######", 
  "description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.", 
  "doctype": "DocType", 
  "icon": "icon-upload-alt", 
  "is_submittable": 1, 
  "max_attachments": 1, 
  "module": "Stock", 
  "name": "__common__", 
  "read_only_onload": 0, 
  "search_fields": "posting_date"
 }, 
 {
  "doctype": "DocField", 
  "name": "__common__", 
  "parent": "Stock Reconciliation", 
  "parentfield": "fields", 
  "parenttype": "DocType", 
  "permlevel": 0
 }, 
 {
  "amend": 0, 
  "cancel": 1, 
  "create": 1, 
  "doctype": "DocPerm", 
  "name": "__common__", 
  "parent": "Stock Reconciliation", 
  "parentfield": "permissions", 
  "parenttype": "DocType", 
  "permlevel": 0, 
  "read": 1, 
  "report": 1, 
  "role": "Material Manager", 
  "submit": 1, 
  "write": 1
 }, 
 {
  "doctype": "DocType", 
  "name": "Stock Reconciliation"
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "posting_date", 
  "fieldtype": "Date", 
  "in_filter": 0, 
  "in_list_view": 1, 
  "label": "Posting Date", 
  "oldfieldname": "reconciliation_date", 
  "oldfieldtype": "Date", 
  "read_only": 0, 
  "reqd": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "posting_time", 
  "fieldtype": "Time", 
  "in_filter": 0, 
  "in_list_view": 1, 
  "label": "Posting Time", 
  "oldfieldname": "reconciliation_time", 
  "oldfieldtype": "Time", 
  "read_only": 0, 
  "reqd": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "amended_from", 
  "fieldtype": "Link", 
  "ignore_restrictions": 1, 
  "label": "Amended From", 
  "no_copy": 1, 
  "options": "Stock Reconciliation", 
  "print_hide": 1, 
  "read_only": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "fiscal_year", 
  "fieldtype": "Select", 
  "label": "Fiscal Year", 
  "options": "link:Fiscal Year", 
  "print_hide": 1, 
  "reqd": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "company", 
  "fieldtype": "Link", 
  "label": "Company", 
  "options": "Company", 
  "reqd": 1
 }, 
 {
  "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
  "doctype": "DocField", 
  "fieldname": "expense_account", 
  "fieldtype": "Link", 
  "label": "Difference Account", 
  "options": "Account"
 }, 
 {
  "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
  "doctype": "DocField", 
  "fieldname": "cost_center", 
  "fieldtype": "Link", 
  "label": "Cost Center", 
  "options": "Cost Center"
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "col1", 
  "fieldtype": "Column Break"
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "upload_html", 
  "fieldtype": "HTML", 
  "label": "Upload HTML", 
  "print_hide": 1, 
  "read_only": 1
 }, 
 {
  "depends_on": "reconciliation_json", 
  "doctype": "DocField", 
  "fieldname": "sb2", 
  "fieldtype": "Section Break", 
  "label": "Reconciliation Data"
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "reconciliation_html", 
  "fieldtype": "HTML", 
  "hidden": 0, 
  "label": "Reconciliation HTML", 
  "print_hide": 0, 
  "read_only": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "reconciliation_json", 
  "fieldtype": "Long Text", 
  "hidden": 1, 
  "label": "Reconciliation JSON", 
  "no_copy": 1, 
  "print_hide": 1, 
  "read_only": 1
 }, 
 {
  "doctype": "DocPerm"
 }
]<commit_msg>Fixed conflict while merging with develop branch<commit_after>[
 {
  "creation": "2013-03-28 10:35:31", 
  "docstatus": 0, 
  "modified": "2014-01-15 15:45:07", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
 {
  "allow_attach": 0, 
  "allow_copy": 1, 
  "autoname": "SR/.######", 
  "description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.", 
  "doctype": "DocType", 
  "icon": "icon-upload-alt", 
  "is_submittable": 1, 
  "max_attachments": 1, 
  "module": "Stock", 
  "name": "__common__", 
  "read_only_onload": 0, 
  "search_fields": "posting_date"
 }, 
 {
  "doctype": "DocField", 
  "name": "__common__", 
  "parent": "Stock Reconciliation", 
  "parentfield": "fields", 
  "parenttype": "DocType", 
  "permlevel": 0
 }, 
 {
  "amend": 0, 
  "cancel": 1, 
  "create": 1, 
  "doctype": "DocPerm", 
  "name": "__common__", 
  "parent": "Stock Reconciliation", 
  "parentfield": "permissions", 
  "parenttype": "DocType", 
  "permlevel": 0, 
  "read": 1, 
  "report": 1, 
  "role": "Material Manager", 
  "submit": 1, 
  "write": 1
 }, 
 {
  "doctype": "DocType", 
  "name": "Stock Reconciliation"
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "posting_date", 
  "fieldtype": "Date", 
  "in_filter": 0, 
  "in_list_view": 1, 
  "label": "Posting Date", 
  "oldfieldname": "reconciliation_date", 
  "oldfieldtype": "Date", 
  "read_only": 0, 
  "reqd": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "posting_time", 
  "fieldtype": "Time", 
  "in_filter": 0, 
  "in_list_view": 1, 
  "label": "Posting Time", 
  "oldfieldname": "reconciliation_time", 
  "oldfieldtype": "Time", 
  "read_only": 0, 
  "reqd": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "amended_from", 
  "fieldtype": "Link", 
  "ignore_restrictions": 1, 
  "label": "Amended From", 
  "no_copy": 1, 
  "options": "Stock Reconciliation", 
  "print_hide": 1, 
  "read_only": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "fiscal_year", 
  "fieldtype": "Select", 
  "label": "Fiscal Year", 
  "options": "link:Fiscal Year", 
  "print_hide": 1, 
  "reqd": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "company", 
  "fieldtype": "Link", 
  "label": "Company", 
  "options": "Company", 
  "reqd": 1
 }, 
 {
  "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
  "doctype": "DocField", 
  "fieldname": "expense_account", 
  "fieldtype": "Link", 
  "label": "Difference Account", 
  "options": "Account"
 }, 
 {
  "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
  "doctype": "DocField", 
  "fieldname": "cost_center", 
  "fieldtype": "Link", 
  "label": "Cost Center", 
  "options": "Cost Center"
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "col1", 
  "fieldtype": "Column Break"
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "upload_html", 
  "fieldtype": "HTML", 
  "label": "Upload HTML", 
  "print_hide": 1, 
  "read_only": 1
 }, 
 {
  "depends_on": "reconciliation_json", 
  "doctype": "DocField", 
  "fieldname": "sb2", 
  "fieldtype": "Section Break", 
  "label": "Reconciliation Data"
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "reconciliation_html", 
  "fieldtype": "HTML", 
  "hidden": 0, 
  "label": "Reconciliation HTML", 
  "print_hide": 0, 
  "read_only": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "reconciliation_json", 
  "fieldtype": "Long Text", 
  "hidden": 1, 
  "label": "Reconciliation JSON", 
  "no_copy": 1, 
  "print_hide": 1, 
  "read_only": 1
 }, 
 {
  "doctype": "DocPerm"
 }
]
{'fraction_non_alphanumeric': 0.2016400053770668, 'fraction_numerical': 0.023659093964242504, 'mean_word_length': 3.8469055374592833, 'pattern_counts': {'":': 247, '<': 10, '<?xml version=': 0, '>': 10, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '4627475', 'n_tokens_mistral': 3254, 'n_tokens_neox': 2818, 'n_words': 613}